cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tim...@apache.org
Subject webworks commit: Fixed up some references to create and ant scripts to reflect the name/activity changes
Date Tue, 05 Feb 2013 06:33:30 GMT
Updated Branches:
  refs/heads/master 39456ad37 -> 0d46453cc


Fixed up some references to create and ant scripts to reflect the name/activity changes


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

Branch: refs/heads/master
Commit: 0d46453cc349776b67968e6fd7e75054ec3d0f94
Parents: 39456ad
Author: Tim Kim <timk@adobe.com>
Authored: Mon Feb 4 22:33:20 2013 -0800
Committer: Tim Kim <timk@adobe.com>
Committed: Mon Feb 4 22:33:20 2013 -0800

----------------------------------------------------------------------
 bin/create                           |    4 ++--
 bin/create.js                        |    6 +++---
 bin/templates/project/www/config.xml |    2 +-
 build.xml                            |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/0d46453c/bin/create
----------------------------------------------------------------------
diff --git a/bin/create b/bin/create
index d6dc32e..80af481 100755
--- a/bin/create
+++ b/bin/create
@@ -35,7 +35,7 @@ VERSION=$(cat "$BUILD_PATH/VERSION")
 
 PROJECT_PATH="${1:-"./example"}"
 PACKAGE=${2:-"org.apache.cordova.example"}
-ACTIVITY=${2:-"cordovaExample"}
+NAME=${2:-"cordovaExample"}
 
 # clobber any existing example
 if [ -d "$PROJECT_PATH" ]
@@ -89,5 +89,5 @@ fi
 
 # interpolate the activity and package into config.xml
 echo "Updating config.xml ..."
-sed -i '' -e "s/__ACTIVITY__/${ACTIVITY}/g" "$MANIFEST_PATH"
+sed -i '' -e "s/__NAME__/${NAME}/g" "$MANIFEST_PATH"
 sed -i '' -e "s/__PACKAGE__/${PACKAGE}/g" "$MANIFEST_PATH"

http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/0d46453c/bin/create.js
----------------------------------------------------------------------
diff --git a/bin/create.js b/bin/create.js
index 5020f53..c9737ad 100644
--- a/bin/create.js
+++ b/bin/create.js
@@ -94,7 +94,7 @@ function cleanup() {
 
 var args = WScript.Arguments, PROJECT_PATH="example", 
     PACKAGE="org.apache.cordova.example",
-    ACTIVITY="cordovaExample",
+    NAME="cordovaExample",
     shell=WScript.CreateObject("WScript.Shell");
     
 // working dir
@@ -103,7 +103,7 @@ var ROOT = WScript.ScriptFullName.split('\\bin\\create.js').join('');
 if (args.Count() == 3) {
     PROJECT_PATH=args(0);
     PACKAGE=args(1);
-    ACTIVITY=args(2);
+    NAME=args(2);
 }
 
 if(fso.FolderExists(PROJECT_PATH)) {
@@ -125,5 +125,5 @@ if(fso.FolderExists(ROOT+'\\framework')){
 }
 
 replaceInFile(MANIFEST_PATH, /__PACKAGE__/, PACKAGE);
-replaceInFile(MANIFEST_PATH, /__ACTIVITY__/, ACTIVITY);
+replaceInFile(MANIFEST_PATH, /__ACTIVITY__/, NAME);
 cleanup();

http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/0d46453c/bin/templates/project/www/config.xml
----------------------------------------------------------------------
diff --git a/bin/templates/project/www/config.xml b/bin/templates/project/www/config.xml
index 9008b35..0de8bb5 100644
--- a/bin/templates/project/www/config.xml
+++ b/bin/templates/project/www/config.xml
@@ -26,7 +26,7 @@
         xmlns:rim="http://www.blackberry.com/ns/widgets"
 	version="1.0.0.0" id="__PACKAGE__">
 
-  <name>__ACTIVITY__</name>
+  <name>__NAME__</name>
 
   <author>Your Name Here</author>
 

http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/0d46453c/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 779e0cd..8c44b06 100644
--- a/build.xml
+++ b/build.xml
@@ -204,7 +204,7 @@ Getting Started:
 
         <!-- update config.xml to have a default name-->
         <replace file="${dist.project.path}/www/config.xml" token="__NAME__" value="cordovaExample"/>
       
-        
+        <replace file="${dist.project.path}/www/config.xml" token="__PACKAGE__" value="org.apache.cordova.example"/>

         <echo>
 Distribution Complete!
 ======================


Mime
View raw message