cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fil...@apache.org
Subject [4/10] git commit: added merges to base cli documentation
Date Tue, 05 Mar 2013 00:20:33 GMT
added merges to base cli documentation

- added merges to file structure in readme.md
- added section for merges in file structure section


Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/a94d2905
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/a94d2905
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/a94d2905

Branch: refs/heads/master
Commit: a94d290581a6f83e7166a14df37da40301514d18
Parents: 51f1cc3
Author: michael.wolf <michael.wolf@MWolf-MBP.local>
Authored: Sat Mar 2 13:07:26 2013 -0500
Committer: Fil Maj <maj.fil@gmail.com>
Committed: Mon Mar 4 10:47:31 2013 -0800

----------------------------------------------------------------------
 README.md |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/a94d2905/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index b7dff50..25c3f31 100644
--- a/README.md
+++ b/README.md
@@ -52,6 +52,7 @@ directory structure:
 
     myApp/
     |-.cordova/
+    |- merges/
     |- platforms/
     |- plugins/
     `- www/
@@ -61,6 +62,9 @@ This directory identifies a tree as a cordova project. Simple configuration
info
 
 Commands other than `create` operate against the project directory itself, rather than the
current directory - a search up the current directory's parents is made to find the project
directory. Thus, any command (other than `create`) can be used from any subdirectory whose
parent is a cordova project directory (same as git).
 
+## merges/
+Platform specific web artifacts, such as .html, .css and .js files which is deployed on build
to the appropriate native directory.  Files placed in merges will override matching files
in www for a specific platform.
+
 ## platforms/
 Platforms added to your application will have the native
  application project structures laid out within this directory.
@@ -111,6 +115,9 @@ The directory structure of KewlApp now looks like this:
 
     KewlApp/
     |- .cordova/
+    |- mergess/
+       |- android/
+       `- ios/
     |- platforms/
        |- android/
        |  `- …


Mime
View raw message