You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by fi...@apache.org on 2013/01/24 20:41:37 UTC
git commit: still trying to figure out issues with installing from
npm...
Updated Branches:
refs/heads/master e76937372 -> ffe174b49
still trying to figure out issues with installing from npm...
Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/ffe174b4
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/ffe174b4
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/ffe174b4
Branch: refs/heads/master
Commit: ffe174b49531c40a247005acada39de957fa6a23
Parents: e769373
Author: Fil Maj <ma...@gmail.com>
Authored: Thu Jan 24 11:44:47 2013 -0800
Committer: Fil Maj <ma...@gmail.com>
Committed: Thu Jan 24 11:44:47 2013 -0800
----------------------------------------------------------------------
bootstrap.js | 33 ++++++++++++++++++++-------------
package.json | 4 ++--
2 files changed, 22 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/ffe174b4/bootstrap.js
----------------------------------------------------------------------
diff --git a/bootstrap.js b/bootstrap.js
index b93331c..95506f9 100644
--- a/bootstrap.js
+++ b/bootstrap.js
@@ -8,18 +8,25 @@ var util = require('./src/util'),
shell = require('shelljs'),
platforms = require('./platforms');
-// Create native projects using bin/create
-var tempDir = path.join(__dirname, 'spec', 'fixtures', 'projects', 'native');
-shell.rm('-rf', tempDir);
-shell.mkdir('-p', tempDir);
+var cmd = 'android update project -p ' + path.join(__dirname, 'lib', 'cordova-android', 'framework') + ' -t android-17';
+shell.exec(cmd, {async:true}, function(code, output) {
+ if (code > 0) {
+ process.exit(1);
+ } else {
+ // Create native projects using bin/create
+ var tempDir = path.join(__dirname, 'spec', 'fixtures', 'projects', 'native');
+ shell.rm('-rf', tempDir);
+ shell.mkdir('-p', tempDir);
-platforms.forEach(function(platform) {
- var fix_path = path.join(tempDir, platform + '_fixture');
- var create = path.join(util.libDirectory, 'cordova-' + platform, 'bin', 'create');
- console.log('Creating cordova-' + platform + ' project using live project lib for tests...');
- var cmd = create + ' "' + fix_path + '" org.apache.cordova.cordovaExample cordovaExample';
- if (platform == 'blackberry') cmd = create + ' "' + fix_path + '" cordovaExample';
- var create_result = shell.exec(cmd, {silent:true});
- if (create_result.code > 0) throw ('Could not create a native ' + platform + ' project test fixture: ' + create_result.output);
- console.log('.. complete.');
+ platforms.forEach(function(platform) {
+ var fix_path = path.join(tempDir, platform + '_fixture');
+ var create = path.join(util.libDirectory, 'cordova-' + platform, 'bin', 'create');
+ console.log('Creating cordova-' + platform + ' project using live project lib for tests...');
+ var cmd = create + ' "' + fix_path + '" org.apache.cordova.cordovaExample cordovaExample';
+ if (platform == 'blackberry') cmd = create + ' "' + fix_path + '" cordovaExample';
+ var create_result = shell.exec(cmd, {silent:true});
+ if (create_result.code > 0) throw ('Could not create a native ' + platform + ' project test fixture: ' + create_result.output);
+ console.log('.. complete.');
+ });
+ }
});
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/ffe174b4/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index ec64fc9..154da8c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova",
- "version": "2.4.1",
+ "version": "2.4.2",
"preferGlobal": "true",
"description": "Cordova command line interface tool",
"main": "cordova",
@@ -9,7 +9,7 @@
},
"scripts": {
"test": "./node_modules/jasmine-node/bin/jasmine-node --color spec",
- "install": "cd lib/cordova-android/framework && android update project -p . -t android-17 && cd ../../.. && node bootstrap.js && ./bin/notice"
+ "install": "node bootstrap.js && ./bin/notice"
},
"repository": {
"type": "git",