incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject [2/2] android commit: CB-1235 Fixing Android create script on Windows
Date Fri, 24 Aug 2012 19:15:09 GMT
CB-1235 Fixing Android create script on Windows


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/4a0605e0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/4a0605e0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/4a0605e0

Branch: refs/heads/master
Commit: 4a0605e09b6a970e2391126ac1b318e499483129
Parents: b30f5d7
Author: Anis Kadri <anis.kadri@gmail.com>
Authored: Fri Aug 24 12:14:58 2012 -0700
Committer: Anis Kadri <anis.kadri@gmail.com>
Committed: Fri Aug 24 12:14:58 2012 -0700

----------------------------------------------------------------------
 bin/create.js |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/4a0605e0/bin/create.js
----------------------------------------------------------------------
diff --git a/bin/create.js b/bin/create.js
index bec182b..5a0bb4d 100644
--- a/bin/create.js
+++ b/bin/create.js
@@ -154,8 +154,7 @@ if(fso.FolderExists(ROOT + '\\framework')) {
     exec('%comspec% /c copy '+ROOT+'\\framework\\assets\\www\\cordova-'+VERSION+'.js '+PROJECT_PATH+'\\assets\\www\\cordova-'+VERSION+'.js
/Y');
     exec('%comspec% /c copy '+ROOT+'\\framework\\cordova-'+VERSION+'.jar '+PROJECT_PATH+'\\libs\\cordova-'+VERSION+'.jar
/Y');
     fso.CreateFolder(PROJECT_PATH + '\\res\\xml');
-    exec('%comspec% /c copy '+ROOT+'\\framework\\res\\xml\\cordova.xml ' + PROJECT_PATH +
'\\res\\xml\\cordova.xml /Y');
-    exec('%comspec% /c copy '+ROOT+'\\framework\\res\\xml\\plugins.xml ' + PROJECT_PATH +
'\\res\\xml\\plugins.xml /Y');
+    exec('%comspec% /c copy '+ROOT+'\\framework\\res\\xml\\config.xml ' + PROJECT_PATH +
'\\res\\xml\\config.xml /Y');
 } else {
     // copy in cordova.js
     exec('%comspec% /c copy '+ROOT+'\\cordova-'+VERSION+'.js '+PROJECT_PATH+'\\assets\\www\\cordova-'+VERSION+'.js
/Y');
@@ -163,8 +162,7 @@ if(fso.FolderExists(ROOT + '\\framework')) {
     exec('%comspec% /c copy '+ROOT+'\\cordova-'+VERSION+'.jar '+PROJECT_PATH+'\\libs\\cordova-'+VERSION+'.jar
/Y');
     // copy in xml
     fso.CreateFolder(PROJECT_PATH + '\\res\\xml');
-    exec('%comspec% /c copy '+ROOT+'\\xml\\cordova.xml ' + PROJECT_PATH + '\\res\\xml\\cordova.xml
/Y');
-    exec('%comspec% /c copy '+ROOT+'\\xml\\plugins.xml ' + PROJECT_PATH + '\\res\\xml\\plugins.xml
/Y');
+    exec('%comspec% /c copy '+ROOT+'\\xml\\config.xml ' + PROJECT_PATH + '\\res\\xml\\plugins.xml
/Y');
 }
 
 // copy cordova scripts


Mime
View raw message