You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2012/09/17 22:27:00 UTC
[1/2] android commit: Fixing up the commons-codec issue - CB-1483
Updated Branches:
refs/heads/master dbfa2d799 -> 47daaaf14
Fixing up the commons-codec issue - CB-1483
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/47daaaf1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/47daaaf1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/47daaaf1
Branch: refs/heads/master
Commit: 47daaaf14fff0da616dff364746f7519eada82f2
Parents: 9ba5bae
Author: Joe Bowser <bo...@apache.org>
Authored: Mon Sep 17 13:26:23 2012 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Mon Sep 17 13:26:23 2012 -0700
----------------------------------------------------------------------
bin/create.js | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/47daaaf1/bin/create.js
----------------------------------------------------------------------
diff --git a/bin/create.js b/bin/create.js
index d08585d..6f89365 100644
--- a/bin/create.js
+++ b/bin/create.js
@@ -94,12 +94,12 @@ function downloadCommonsCodec() {
}
}
var app = WScript.CreateObject('Shell.Application');
- var ource = app.NameSpace(savePath).Items();
+ var source = app.NameSpace(savePath).Items();
var target = app.NameSpace(ROOT + '\\framework\\libs');
target.CopyHere(source, 256);
// Move the jar into libs
- fso.MoveFile(ROOT + '\\framework\\libs\\commons-codec-1.6\\commons-codec-1.7.jar', ROOT + '\\framework\\libs\\commons-codec-1.7.jar');
+ fso.MoveFile(ROOT + '\\framework\\libs\\commons-codec-1.7\\commons-codec-1.7.jar', ROOT + '\\framework\\libs\\commons-codec-1.7.jar');
// Clean up
fso.DeleteFile(ROOT + '\\framework\\libs\\commons-codec-1.7-bin.zip');
@@ -113,6 +113,7 @@ var args = WScript.Arguments, PROJECT_PATH="example",
// working dir
var ROOT = WScript.ScriptFullName.split('\\bin\\create.js').join('');
+WScript.echo("Root Directory:" + ROOT);
if (args.Count() == 3) {
PROJECT_PATH=args(0);
@@ -140,7 +141,7 @@ if (!fso.FileExists(ROOT+'\\cordova-'+VERSION+'.jar') &&
exec('android.bat update project --target '+TARGET+' --path '+ROOT+'\\framework');
// pull down commons codec if necessary
downloadCommonsCodec();
- exec('ant.bat -f '+ ROOT +'\\framework\\build.xml jar');
+ exec('ant.bat -f \"'+ ROOT +'\\framework\\build.xml\" jar');
}
// copy in the project template