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/10 00:00:35 UTC

[11/11] git commit: updates for 2.3.0 support. bumped version. removed checked-in native project fixtures for tests, now on install create fixtures based on actual `create` scripts for platforms.

Updated Branches:
  refs/heads/master 23252166c -> 5742036a9
Updated Tags:  refs/tags/2.3.0 [created] 5742036a9
  refs/tags/2.3.0rc1 [created] 23252166c


updates for 2.3.0 support. bumped version. removed checked-in native project fixtures for tests, now on install create fixtures based on actual `create` scripts for platforms.


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

Branch: refs/heads/master
Commit: 5742036a9a9b1fb19fd9bb31d33ef76755c43a88
Parents: 2325216
Author: Fil Maj <ma...@gmail.com>
Authored: Wed Jan 9 15:02:30 2013 -0800
Committer: Fil Maj <ma...@gmail.com>
Committed: Wed Jan 9 15:02:30 2013 -0800

----------------------------------------------------------------------
 .gitignore                                         |    5 +-
 README.md                                          |    3 +-
 bootstrap.js                                       |   34 +
 package.json                                       |    8 +-
 platforms.js                                       |    2 +-
 spec/build.spec.js                                 |   16 +-
 spec/cli.spec.js                                   |   15 +-
 spec/emulate.spec.js                               |   30 +-
 .../projects/native/android/AndroidManifest.xml    |   63 -
 .../projects/native/android/ant.properties         |   17 -
 .../projects/native/android/assets/www/index.html  |   12 -
 spec/fixtures/projects/native/android/build.xml    |   92 -
 spec/fixtures/projects/native/android/cordova/BOOM |   24 -
 .../projects/native/android/cordova/appinfo.jar    |  Bin 1574 -> 0 bytes
 .../fixtures/projects/native/android/cordova/clean |   24 -
 .../projects/native/android/cordova/cordova        |  102 -
 .../fixtures/projects/native/android/cordova/debug |   24 -
 .../projects/native/android/cordova/emulate        |   24 -
 spec/fixtures/projects/native/android/cordova/log  |   24 -
 .../projects/native/android/libs/cordova-2.1.0.jar |  Bin 205209 -> 0 bytes
 .../projects/native/android/local.properties       |   10 -
 .../projects/native/android/proguard-project.txt   |   20 -
 .../projects/native/android/project.properties     |   14 -
 .../android/res/drawable-hdpi/ic_launcher.png      |  Bin 9397 -> 0 bytes
 .../native/android/res/drawable-hdpi/icon.png      |  Bin 6080 -> 0 bytes
 .../android/res/drawable-ldpi/ic_launcher.png      |  Bin 2729 -> 0 bytes
 .../native/android/res/drawable-ldpi/icon.png      |  Bin 3096 -> 0 bytes
 .../android/res/drawable-mdpi/ic_launcher.png      |  Bin 5237 -> 0 bytes
 .../native/android/res/drawable-mdpi/icon.png      |  Bin 4090 -> 0 bytes
 .../android/res/drawable-xhdpi/ic_launcher.png     |  Bin 14383 -> 0 bytes
 .../native/android/res/drawable-xhdpi/icon.png     |  Bin 7685 -> 0 bytes
 .../projects/native/android/res/drawable/icon.png  |  Bin 7685 -> 0 bytes
 .../projects/native/android/res/layout/main.xml    |   13 -
 .../projects/native/android/res/values/strings.xml |    4 -
 .../projects/native/android/res/xml/config.xml     |   57 -
 .../src/io/cordova/hellocordova/HelloCordova.java  |   35 -
 .../projects/native/blackberry/blackberry.xml      |  356 -
 spec/fixtures/projects/native/blackberry/build.xml |  144 -
 .../projects/native/blackberry/cordova/debug       |   53 -
 .../projects/native/blackberry/cordova/emulate     |   40 -
 .../projects/native/blackberry/playbook.xml        |  283 -
 .../projects/native/blackberry/project.properties  |  128 -
 spec/fixtures/projects/native/blackberry/qnx.xml   |  288 -
 .../projects/native/blackberry/www/LICENSE         |  296 -
 .../fixtures/projects/native/blackberry/www/NOTICE |    8 -
 .../projects/native/blackberry/www/README.md       |   30 -
 .../projects/native/blackberry/www/VERSION         |    1 -
 .../projects/native/blackberry/www/config.xml      |   85 -
 .../native/blackberry/www/cordova-2.1.0.js         | 6675 --------------
 .../www/ext-air/Cordova_Network/library.xml        |   40 -
 .../src/org/apache/cordova/network/Network.as      |   80 -
 .../native/blackberry/www/ext-qnx/readme.md        |    1 -
 .../native/blackberry/www/ext/cordova.2.1.0.jar    |  Bin 171380 -> 0 bytes
 .../projects/native/blackberry/www/index.html      |   43 -
 .../projects/native/blackberry/www/js/index.js     |   49 -
 .../projects/native/blackberry/www/json2.js        |  482 -
 .../blackberry/www/playbook/cordova-2.1.0.js       | 7014 ---------------
 .../projects/native/blackberry/www/plugins.xml     |   34 -
 .../native/blackberry/www/qnx/cordova-2.1.0.js     | 5240 -----------
 .../projects/native/blackberry/www/spec.html       |   68 -
 .../native/ios/balls.xcodeproj/project.pbxproj     |  652 --
 spec/fixtures/projects/native/ios/balls/.gitignore |    6 -
 .../native/ios/balls/Classes/AppDelegate.h         |   45 -
 .../native/ios/balls/Classes/AppDelegate.m         |  138 -
 .../native/ios/balls/Classes/MainViewController.h  |   32 -
 .../native/ios/balls/Classes/MainViewController.m  |  155 -
 .../ios/balls/Classes/MainViewController.xib       |  138 -
 .../projects/native/ios/balls/Cordova.plist        |   89 -
 .../native/ios/balls/CordovaBuildSettings.xcconfig |   26 -
 .../projects/native/ios/balls/Plugins/README       |   20 -
 .../balls/Resources/Capture.bundle/controls_bg.png |  Bin 955 -> 0 bytes
 .../Resources/Capture.bundle/controls_bg@2x.png    |  Bin 971 -> 0 bytes
 .../Capture.bundle/controls_bg@2x~ipad.png         |  Bin 2858 -> 0 bytes
 .../Resources/Capture.bundle/controls_bg~ipad.png  |  Bin 969 -> 0 bytes
 .../Capture.bundle/microphone-568h@2x~iphone.png   |  Bin 516760 -> 0 bytes
 .../balls/Resources/Capture.bundle/microphone.png  |  Bin 72226 -> 0 bytes
 .../Resources/Capture.bundle/microphone@2x.png     |  Bin 282409 -> 0 bytes
 .../Capture.bundle/microphone@2x~ipad.png          |  Bin 911582 -> 0 bytes
 .../Resources/Capture.bundle/microphone~ipad.png   |  Bin 393975 -> 0 bytes
 .../Resources/Capture.bundle/record_button.png     |  Bin 5852 -> 0 bytes
 .../Resources/Capture.bundle/record_button@2x.png  |  Bin 13875 -> 0 bytes
 .../Capture.bundle/record_button@2x~ipad.png       |  Bin 15822 -> 0 bytes
 .../Capture.bundle/record_button~ipad.png          |  Bin 7547 -> 0 bytes
 .../Resources/Capture.bundle/recording_bg.png      |  Bin 973 -> 0 bytes
 .../Resources/Capture.bundle/recording_bg@2x.png   |  Bin 990 -> 0 bytes
 .../Capture.bundle/recording_bg@2x~ipad.png        |  Bin 1026 -> 0 bytes
 .../Resources/Capture.bundle/recording_bg~ipad.png |  Bin 996 -> 0 bytes
 .../balls/Resources/Capture.bundle/stop_button.png |  Bin 5514 -> 0 bytes
 .../Resources/Capture.bundle/stop_button@2x.png    |  Bin 12965 -> 0 bytes
 .../Capture.bundle/stop_button@2x~ipad.png         |  Bin 14474 -> 0 bytes
 .../Resources/Capture.bundle/stop_button~ipad.png  |  Bin 7119 -> 0 bytes
 .../balls/Resources/de.lproj/Localizable.strings   |   26 -
 .../balls/Resources/en.lproj/Localizable.strings   |   25 -
 .../balls/Resources/es.lproj/Localizable.strings   |   25 -
 .../native/ios/balls/Resources/icons/icon-72.png   |  Bin 4944 -> 0 bytes
 .../ios/balls/Resources/icons/icon-72@2x.png       |  Bin 11706 -> 0 bytes
 .../native/ios/balls/Resources/icons/icon.png      |  Bin 3902 -> 0 bytes
 .../native/ios/balls/Resources/icons/icon@2x.png   |  Bin 7869 -> 0 bytes
 .../balls/Resources/se.lproj/Localizable.strings   |   26 -
 .../Resources/splash/Default-568h@2x~iphone.png    |  Bin 351931 -> 0 bytes
 .../Resources/splash/Default-Landscape@2x~ipad.png |  Bin 1534088 -> 0 bytes
 .../Resources/splash/Default-Landscape~ipad.png    |  Bin 423095 -> 0 bytes
 .../Resources/splash/Default-Portrait@2x~ipad.png  |  Bin 1610434 -> 0 bytes
 .../Resources/splash/Default-Portrait~ipad.png     |  Bin 421667 -> 0 bytes
 .../balls/Resources/splash/Default@2x~iphone.png   |  Bin 350593 -> 0 bytes
 .../ios/balls/Resources/splash/Default~iphone.png  |  Bin 93897 -> 0 bytes
 .../projects/native/ios/balls/balls-Info.plist     |   78 -
 .../projects/native/ios/balls/balls-Prefix.pch     |   26 -
 spec/fixtures/projects/native/ios/balls/main.m     |   35 -
 spec/fixtures/projects/native/ios/cordova/debug    |   45 -
 spec/fixtures/projects/native/ios/cordova/emulate  |   58 -
 spec/fixtures/projects/native/ios/cordova/log      |   23 -
 .../projects/native/ios/www/cordova-2.1.0.js       | 5305 -----------
 .../fixtures/projects/native/ios/www/css/index.css |  115 -
 spec/fixtures/projects/native/ios/www/img/logo.png |  Bin 21814 -> 0 bytes
 spec/fixtures/projects/native/ios/www/index.html   |   42 -
 spec/fixtures/projects/native/ios/www/js/index.js  |   49 -
 .../native/ios/www/res/icon/ios/icon-57-2x.png     |  Bin 7869 -> 0 bytes
 .../native/ios/www/res/icon/ios/icon-57.png        |  Bin 3908 -> 0 bytes
 .../native/ios/www/res/icon/ios/icon-72-2x.png     |  Bin 11706 -> 0 bytes
 .../native/ios/www/res/icon/ios/icon-72.png        |  Bin 4944 -> 0 bytes
 .../res/screen/ios/screen-ipad-landscape-2x.png    |  Bin 1534088 -> 0 bytes
 .../www/res/screen/ios/screen-ipad-landscape.png   |  Bin 407370 -> 0 bytes
 .../www/res/screen/ios/screen-ipad-portrait-2x.png |  Bin 1610434 -> 0 bytes
 .../www/res/screen/ios/screen-ipad-portrait.png    |  Bin 422441 -> 0 bytes
 .../res/screen/ios/screen-iphone-landscape-2x.png  |  Bin 339639 -> 0 bytes
 .../www/res/screen/ios/screen-iphone-landscape.png |  Bin 92301 -> 0 bytes
 .../res/screen/ios/screen-iphone-portrait-2x.png   |  Bin 350593 -> 0 bytes
 .../www/res/screen/ios/screen-iphone-portrait.png  |  Bin 93897 -> 0 bytes
 spec/fixtures/projects/test/www/config.xml         |    2 +-
 spec/helper.js                                     |   43 -
 spec/hooker.spec.js                                |    1 +
 spec/metadata/android_parser.spec.js               |   18 +-
 spec/metadata/blackberry_parser.spec.js            |   11 +-
 spec/metadata/ios_parser.spec.js                   |   21 +-
 spec/platform.spec.js                              |  175 +-
 spec/plugin.spec.js                                |  188 +-
 src/build.js                                       |    9 +-
 src/emulate.js                                     |   11 +-
 src/metadata/android_parser.js                     |   12 +-
 src/metadata/ios_parser.js                         |   13 +
 src/platform.js                                    |  117 +-
 src/plugin.js                                      |    2 +-
 src/util.js                                        |  145 +-
 test_bootstrap.js                                  |   21 -
 145 files changed, 412 insertions(+), 29666 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index b5c985d..92dbda3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,6 @@
 node_modules
 npm-debug.log
 temp
-lib/**
-# OS X
 .DS_Store
 lib
-node_modules
-temp
+spec/fixtures/projects/native

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 71f2f11..e04d887 100644
--- a/README.md
+++ b/README.md
@@ -16,8 +16,7 @@ cordova-cli has been tested on Mas OS X and Linux.
 
 If you are using cordova-cli for building iOS applications, you will need to run the latest Mac OS with the latest XCode (4.5+) and XCode Command Line Tools.
 
-In it's prototype stages, cordova-cli only works with Cordova
-v2.3.0rc1.
+In it's prototype stages, cordova-cli only works with Cordova v2.3.0.
 
 # Install
 

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/bootstrap.js
----------------------------------------------------------------------
diff --git a/bootstrap.js b/bootstrap.js
new file mode 100644
index 0000000..dcda8bc
--- /dev/null
+++ b/bootstrap.js
@@ -0,0 +1,34 @@
+/**
+ * TEST BOOTSTRAP FILE
+ * Runs through any bs to make sure the tests are good to go.
+ **/
+
+var util      = require('./src/util'),
+    path      = require('path'),
+    shell     = require('shelljs'),
+    platforms = require('./platforms');
+
+function create_native_projects() {
+    // 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.');
+    });
+}
+
+// download cordova 
+if (!util.haveCordovaLib()) {
+    util.getCordovaLib(create_native_projects);
+} else {
+    create_native_projects();
+}

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 572a002..9610ed1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "preferGlobal": "true",
   "description": "Cordova command line interface tool",
   "main": "cordova",
@@ -8,8 +8,8 @@
     "cordova": "./bin/cordova"
   },
   "scripts": {
-    "test": "node test_bootstrap.js && ./node_modules/jasmine-node/bin/jasmine-node --color spec",
-    "install": "./bin/notice"
+    "test": "./node_modules/jasmine-node/bin/jasmine-node --color spec",
+    "install": "node test_bootstrap.js && ./bin/notice"
   },
   "repository": {
     "type": "git",
@@ -29,7 +29,7 @@
     "express":"3.0",
     "shelljs":"0.0.8",
     "ncallbacks":"1.0.0",
-    "adm-zip":"0.1.8",
+    "unzip":"0.1.0",
     "request":"2.11.4",
     "semver":"1.1.0",
     "prompt":"0.2.7"

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/platforms.js
----------------------------------------------------------------------
diff --git a/platforms.js b/platforms.js
index 544aa3d..4acc953 100644
--- a/platforms.js
+++ b/platforms.js
@@ -1 +1 @@
-module.exports = ['ios', 'android', 'blackberry-10'];
+module.exports = ['ios', 'android', 'blackberry'];

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/spec/build.spec.js
----------------------------------------------------------------------
diff --git a/spec/build.spec.js b/spec/build.spec.js
index 7a10ef2..300321f 100644
--- a/spec/build.spec.js
+++ b/spec/build.spec.js
@@ -99,10 +99,10 @@ describe('build command', function() {
                 cordova.platform('add', 'android');
             });
 
-            it('should shell out to debug command on Android', function() {
+            it('should shell out to build command on Android', function() {
                 var s = spyOn(require('shelljs'), 'exec').andReturn({code:0});
                 cordova.build();
-                expect(s.mostRecentCall.args[0].match(/\/cordova\/debug/)).not.toBeNull();
+                expect(s.mostRecentCall.args[0].match(/\/cordova\/build/)).not.toBeNull();
             });
             it('should call android_parser\'s update_project', function() {
                 spyOn(require('shelljs'), 'exec').andReturn({code:0});
@@ -112,7 +112,7 @@ describe('build command', function() {
             });
         });
         describe('iOS', function() {
-            it('should shell out to debug command on iOS', function() {
+            it('should shell out to build command on iOS', function() {
                 var cb = jasmine.createSpy();
                 var buildcb = jasmine.createSpy();
                 var s;
@@ -128,7 +128,7 @@ describe('build command', function() {
                 waitsFor(function() { return buildcb.wasCalled; }, 'ios build');
                 runs(function() {
                     expect(s).toHaveBeenCalled();
-                    expect(s.mostRecentCall.args[0].match(/\/cordova\/debug/)).not.toBeNull();
+                    expect(s.mostRecentCall.args[0].match(/\/cordova\/build/)).not.toBeNull();
                 });
             });
             it('should call ios_parser\'s update_project', function() {
@@ -146,14 +146,14 @@ describe('build command', function() {
             });
         });
         describe('BlackBerry', function() {
-            it('should shell out to ant command on blackberry-10', function() {
+            it('should shell out to ant command on blackberry', function() {
                 var buildcb = jasmine.createSpy();
                 var cb = jasmine.createSpy();
                 var s;
 
                 runs(function() {
                     var t = spyOn(require('prompt'), 'get').andReturn(true);
-                    cordova.platform('add', 'blackberry-10', cb);
+                    cordova.platform('add', 'blackberry', cb);
                     // Fake prompt invoking its callback
                     t.mostRecentCall.args[1](null, {});
                 });
@@ -176,7 +176,7 @@ describe('build command', function() {
                     }
                 }), 'utf-8');
                 runs(function() {
-                    cordova.platform('add', 'blackberry-10', cb);
+                    cordova.platform('add', 'blackberry', cb);
                 });
                 waitsFor(function() { return cb.wasCalled; }, 'bb add platform');
                 runs(function() {
@@ -243,7 +243,7 @@ describe('build command', function() {
             waitsFor(function() { return cb.wasCalled; }, 'platform add ios');
             runs(function() {
                 var g = spyOn(require('prompt'), 'get');
-                cordova.platform('add', 'blackberry-10', bbcb);
+                cordova.platform('add', 'blackberry', bbcb);
                 g.mostRecentCall.args[1](null, {}); // fake out prompt io
             });
             waitsFor(function() { return bbcb.wasCalled; }, 'platform add bb');

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/spec/cli.spec.js
----------------------------------------------------------------------
diff --git a/spec/cli.spec.js b/spec/cli.spec.js
index 1242f22..23a34c3 100644
--- a/spec/cli.spec.js
+++ b/spec/cli.spec.js
@@ -194,20 +194,7 @@ describe('cli interface', function() {
     });
 
     describe('build', function() {
-        beforeEach(function() {
-            cordova.create(tempDir);
-            process.chdir(tempDir);
-            cordova.platform('add', 'android');
-        });
-        afterEach(function() {
-            process.chdir(cwd);
-        });
-        it('should be able to build all platforms when none are specified', function() {
-            var result = shell.exec(bin + ' build', {silent:true});
-            expect(result.code).toEqual(0);
-            var buildContents = fs.readdirSync(path.join(tempDir, 'platforms', 'android', 'bin'));
-            expect(buildContents.length > 0).toBe(true);
-        });
+        xit('should be able to build all platforms when none are specified');
         xit('should be able to build a specific single platform');
         xit('should be able to build multiple, specific platforms from a single invocation');
     });

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/spec/emulate.spec.js
----------------------------------------------------------------------
diff --git a/spec/emulate.spec.js b/spec/emulate.spec.js
index 3e48ab8..04c9fb0 100644
--- a/spec/emulate.spec.js
+++ b/spec/emulate.spec.js
@@ -37,19 +37,25 @@ describe('emulate command', function() {
         });
 
         var cb = jasmine.createSpy();
+        var cbem = jasmine.createSpy();
+        var s;
 
         runs(function() {
             cordova.create(tempDir);
             process.chdir(tempDir);
-            cordova.platform('add', 'android', cb);
+            cordova.platform('add', 'ios', cb);
         });
-        waitsFor(function() { return cb.wasCalled; }, 'platform add android callback');
+        waitsFor(function() { return cb.wasCalled; }, 'platform add ios');
 
         runs(function() {
-            var s = spyOn(require('shelljs'), 'exec').andReturn({code:0});
+            s = spyOn(shell, 'exec').andReturn({code:0});
             expect(function() {
-                cordova.emulate();
+                cordova.emulate(cbem);
             }).not.toThrow();
+        });
+        waitsFor(function() { return cbem.wasCalled; }, 'ios emulate');
+
+        runs(function() {
             expect(s).toHaveBeenCalled();
         });
     });
@@ -81,10 +87,10 @@ describe('emulate command', function() {
                 cordova.platform('add', 'android');
             });
 
-            it('should shell out to emulate command on Android', function() {
+            it('should shell out to run command on Android', function() {
                 var s = spyOn(require('shelljs'), 'exec').andReturn({code:0});
                 cordova.emulate();
-                expect(s.mostRecentCall.args[0].match(/android\/cordova\/emulate/)).not.toBeNull();
+                expect(s.mostRecentCall.args[0].match(/android\/cordova\/run/)).not.toBeNull();
             });
             it('should call android_parser\'s update_project', function() {
                 spyOn(require('shelljs'), 'exec').andReturn({code:0});
@@ -130,17 +136,17 @@ describe('emulate command', function() {
             });
         });
         describe('BlackBerry', function() {
-            it('should shell out to ant command on blackberry-10', function() {
+            it('should shell out to ant command on blackberry', function() {
                 var buildcb = jasmine.createSpy();
                 var cb = jasmine.createSpy();
                 var s, t = spyOn(require('prompt'), 'get').andReturn(true);
 
                 runs(function() {
-                    cordova.platform('add', 'blackberry-10', cb);
+                    cordova.platform('add', 'blackberry', cb);
                     // Fake prompt invoking its callback
                     t.mostRecentCall.args[1](null, {});
                 });
-                waitsFor(function() { return cb.wasCalled; }, 'platform add blackberry callback');
+                waitsFor(function() { return cb.wasCalled; }, 'platform add blackberry');
                 runs(function() {
                     s = spyOn(require('shelljs'), 'exec').andReturn({code:0});
                     cordova.emulate(buildcb);
@@ -158,10 +164,10 @@ describe('emulate command', function() {
 
                 runs(function() {
                     var p = spyOn(require('prompt'), 'get');
-                    cordova.platform('add', 'blackberry-10', cb);
+                    cordova.platform('add', 'blackberry', cb);
                     p.mostRecentCall.args[1](null, {});
                 });
-                waitsFor(function() { return cb.wasCalled; }, 'platform add bb callback');
+                waitsFor(function() { return cb.wasCalled; }, 'platform add bb');
                 runs(function() {
                     s = spyOn(blackberry_parser.prototype, 'update_project');
                     cordova.emulate(buildcb);
@@ -226,7 +232,7 @@ describe('emulate command', function() {
             waitsFor(function() { return cb.wasCalled; }, 'platform add ios');
             runs(function() {
                 var g = spyOn(require('prompt'), 'get');
-                cordova.platform('add', 'blackberry-10', bbcb);
+                cordova.platform('add', 'blackberry', bbcb);
                 g.mostRecentCall.args[1](null, {}); // fake out prompt io
             });
             waitsFor(function() { return bbcb.wasCalled; }, 'platform add bb');

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/spec/fixtures/projects/native/android/AndroidManifest.xml
----------------------------------------------------------------------
diff --git a/spec/fixtures/projects/native/android/AndroidManifest.xml b/spec/fixtures/projects/native/android/AndroidManifest.xml
deleted file mode 100644
index 8a06d72..0000000
--- a/spec/fixtures/projects/native/android/AndroidManifest.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:windowSoftInputMode="adjustPan"
-      package="io.cordova.hellocordova" android:versionName="1.1" android:versionCode="5" android:hardwareAccelerated="true">
-    <supports-screens
-        android:largeScreens="true"
-        android:normalScreens="true"
-        android:smallScreens="true"
-        android:xlargeScreens="true"
-        android:resizeable="true"
-        android:anyDensity="true"
-        />
-
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.RECEIVE_SMS" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.RECORD_VIDEO"/>
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.WRITE_CONTACTS" />   
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />   
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="android.permission.BROADCAST_STICKY" />
-
-
-    <application android:icon="@drawable/icon" android:label="@string/app_name"
-        android:hardwareAccelerated="true"
-        android:debuggable="true">
-        <activity android:name="cordovaExample" android:label="@string/app_name"
-                android:theme="@android:style/Theme.Black.NoTitleBar"
-                android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="16"/>
-</manifest> 

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/spec/fixtures/projects/native/android/ant.properties
----------------------------------------------------------------------
diff --git a/spec/fixtures/projects/native/android/ant.properties b/spec/fixtures/projects/native/android/ant.properties
deleted file mode 100644
index b0971e8..0000000
--- a/spec/fixtures/projects/native/android/ant.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file is used to override default values used by the Ant build system.
-#
-# This file must be checked into Version Control Systems, as it is
-# integral to the build system of your project.
-
-# This file is only used by the Ant script.
-
-# You can use this to override default values such as
-#  'source.dir' for the location of your java source folder and
-#  'out.dir' for the location of your output folder.
-
-# You can also use it define how the release builds are signed by declaring
-# the following properties:
-#  'key.store' for the location of your keystore and
-#  'key.alias' for the name of the key to use.
-# The password will be asked during the build when you use the 'release' target.
-

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/spec/fixtures/projects/native/android/assets/www/index.html
----------------------------------------------------------------------
diff --git a/spec/fixtures/projects/native/android/assets/www/index.html b/spec/fixtures/projects/native/android/assets/www/index.html
deleted file mode 100644
index c71684f..0000000
--- a/spec/fixtures/projects/native/android/assets/www/index.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <meta name = "format-detection" content = "telephone=no"/>
-        <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width;" />
-        <title>Test Fixture App</title>
-    </head>
-    <body>
-        <h1>Test Fixture App</h1>
-    </body>
-</html>

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/spec/fixtures/projects/native/android/build.xml
----------------------------------------------------------------------
diff --git a/spec/fixtures/projects/native/android/build.xml b/spec/fixtures/projects/native/android/build.xml
deleted file mode 100644
index 9d5c206..0000000
--- a/spec/fixtures/projects/native/android/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="cordovaExample" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- if sdk.dir was not set from one of the property file, then
-         get it from the ANDROID_HOME env var.
-         This must be done before we load project.properties since
-         the proguard config can use sdk.dir -->
-    <property environment="env" />
-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
-        <isset property="env.ANDROID_HOME" />
-    </condition>
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
-            unless="sdk.dir"
-    />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true" />
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-</project>

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/spec/fixtures/projects/native/android/cordova/BOOM
----------------------------------------------------------------------
diff --git a/spec/fixtures/projects/native/android/cordova/BOOM b/spec/fixtures/projects/native/android/cordova/BOOM
deleted file mode 100755
index 443502d..0000000
--- a/spec/fixtures/projects/native/android/cordova/BOOM
+++ /dev/null
@@ -1,24 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-# http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-#!/bin/bash
-
-set -e
-
-CORDOVA_PATH=$( cd "$( dirname "$0" )" && pwd )
-
-bash $CORDOVA_PATH/cordova BOOM

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/spec/fixtures/projects/native/android/cordova/appinfo.jar
----------------------------------------------------------------------
diff --git a/spec/fixtures/projects/native/android/cordova/appinfo.jar b/spec/fixtures/projects/native/android/cordova/appinfo.jar
deleted file mode 100644
index 1b41904..0000000
Binary files a/spec/fixtures/projects/native/android/cordova/appinfo.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/spec/fixtures/projects/native/android/cordova/clean
----------------------------------------------------------------------
diff --git a/spec/fixtures/projects/native/android/cordova/clean b/spec/fixtures/projects/native/android/cordova/clean
deleted file mode 100755
index 2a6bf96..0000000
--- a/spec/fixtures/projects/native/android/cordova/clean
+++ /dev/null
@@ -1,24 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-# http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-#!/bin/bash
-
-set -e
-
-CORDOVA_PATH=$( cd "$( dirname "$0" )" && pwd )
-
-bash $CORDOVA_PATH/cordova clean

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/spec/fixtures/projects/native/android/cordova/cordova
----------------------------------------------------------------------
diff --git a/spec/fixtures/projects/native/android/cordova/cordova b/spec/fixtures/projects/native/android/cordova/cordova
deleted file mode 100755
index 8159b33..0000000
--- a/spec/fixtures/projects/native/android/cordova/cordova
+++ /dev/null
@@ -1,102 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-# http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-#!/bin/bash
-
-set -e
-
-PROJECT_PATH=$( cd "$( dirname "$0" )/.." && pwd )
-
-function check_devices {
-    local devices=`adb devices | awk '/List of devices attached/ { while(getline > 0) { print }}'`
-    if [ -z "$devices"  ] ; then
-        echo "1"
-    else
-        echo "0"
-    fi
-}
-
-function emulate {
-    declare -a avd_list=($(android list avd | grep "Name:" | cut -f 2 -d ":" | xargs))
-    # we need to start adb-server
-    adb start-server 1>/dev/null
-
-    # Do not launch an emulator if there is already one running or if a device is attached
-    if [ $(check_devices) == 0 ] ; then
-        echo "Device attached or emulator already running"
-        return
-    fi
-
-    local avd_id="1000" #FIXME: hopefully user does not have 1000 AVDs
-    # User has no AVDs
-    if [ ${#avd_list[@]} == 0 ]
-    then
-        echo "You don't have any Android Virtual Devices. Please create at least one AVD."
-        echo "android"
-    fi
-    # User has only one AVD
-    if [ ${#avd_list[@]} == 1 ]
-    then
-        emulator -cpu-delay 0 -no-boot-anim -cache /tmp/cache -avd ${avd_list[0]} 1> /dev/null 2>&1 &
-    # User has more than 1 AVD
-    elif [ ${#avd_list[@]} -gt 1 ]
-    then
-        while [ -z ${avd_list[$avd_id]} ]
-        do
-            echo "Choose from one of the following Android Virtual Devices [0 to $((${#avd_list[@]}-1))]:"
-            for(( i = 0 ; i < ${#avd_list[@]} ; i++ ))
-            do
-                echo "$i) ${avd_list[$i]}"
-            done
-            echo -n "> "
-            read avd_id
-        done
-        emulator -cpu-delay 0 -no-boot-anim -cache /tmp/cache -avd ${avd_list[$avd_id]} 1> /dev/null 2>&1 &
-    fi
-    
-}
-
-function clean {
-    ant clean
-}
-# has to be used independently and not in conjunction with other commands
-function log {
-    adb logcat
-}
-
-function debug {
-    if [ $(check_devices) == 0 ] ; then
-        ant debug install
-    else
-        ant debug
-        echo "##################################################################"
-        echo "# Plug in your device or launch an emulator with cordova/emulate #"
-        echo "##################################################################"
-    fi
-}
-
-function launch {
-    local launch_str=$(java -jar $PROJECT_PATH/cordova/appinfo.jar $PROJECT_PATH/AndroidManifest.xml)
-    adb shell am start -n $launch_str 
-}
-
-function BOOM {
-    clean && debug && launch 
-}
-
-# TODO parse arguments
-(cd $PROJECT_PATH && $1)

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/spec/fixtures/projects/native/android/cordova/debug
----------------------------------------------------------------------
diff --git a/spec/fixtures/projects/native/android/cordova/debug b/spec/fixtures/projects/native/android/cordova/debug
deleted file mode 100755
index b1e30c0..0000000
--- a/spec/fixtures/projects/native/android/cordova/debug
+++ /dev/null
@@ -1,24 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-# http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-#!/bin/bash
-
-set -e
-
-CORDOVA_PATH=$( cd "$( dirname "$0" )" && pwd )
-
-bash $CORDOVA_PATH/cordova debug

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/spec/fixtures/projects/native/android/cordova/emulate
----------------------------------------------------------------------
diff --git a/spec/fixtures/projects/native/android/cordova/emulate b/spec/fixtures/projects/native/android/cordova/emulate
deleted file mode 100755
index 5ba723a..0000000
--- a/spec/fixtures/projects/native/android/cordova/emulate
+++ /dev/null
@@ -1,24 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-# http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-#!/bin/bash
-
-set -e
-
-CORDOVA_PATH=$( cd "$( dirname "$0" )" && pwd )
-
-bash $CORDOVA_PATH/cordova emulate

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/spec/fixtures/projects/native/android/cordova/log
----------------------------------------------------------------------
diff --git a/spec/fixtures/projects/native/android/cordova/log b/spec/fixtures/projects/native/android/cordova/log
deleted file mode 100755
index 432a5c6..0000000
--- a/spec/fixtures/projects/native/android/cordova/log
+++ /dev/null
@@ -1,24 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-# http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-#!/bin/bash
-
-set -e
-
-PROJECT_PATH=$( cd "$( dirname "$0" )/.." && pwd )
-
-bash $PROJECT_PATH/cordova/cordova log

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/spec/fixtures/projects/native/android/libs/cordova-2.1.0.jar
----------------------------------------------------------------------
diff --git a/spec/fixtures/projects/native/android/libs/cordova-2.1.0.jar b/spec/fixtures/projects/native/android/libs/cordova-2.1.0.jar
deleted file mode 100644
index b55476f..0000000
Binary files a/spec/fixtures/projects/native/android/libs/cordova-2.1.0.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/spec/fixtures/projects/native/android/local.properties
----------------------------------------------------------------------
diff --git a/spec/fixtures/projects/native/android/local.properties b/spec/fixtures/projects/native/android/local.properties
deleted file mode 100644
index 793d18c..0000000
--- a/spec/fixtures/projects/native/android/local.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-
-# location of the SDK. This is only used by Ant
-# For customization when using a Version Control System, please read the
-# header note.
-sdk.dir=/Users/fil/SDKs/android-sdk-macosx

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/spec/fixtures/projects/native/android/proguard-project.txt
----------------------------------------------------------------------
diff --git a/spec/fixtures/projects/native/android/proguard-project.txt b/spec/fixtures/projects/native/android/proguard-project.txt
deleted file mode 100644
index f2fe155..0000000
--- a/spec/fixtures/projects/native/android/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/spec/fixtures/projects/native/android/project.properties
----------------------------------------------------------------------
diff --git a/spec/fixtures/projects/native/android/project.properties b/spec/fixtures/projects/native/android/project.properties
deleted file mode 100644
index e484b3c..0000000
--- a/spec/fixtures/projects/native/android/project.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=Google Inc.:Google APIs:16

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/spec/fixtures/projects/native/android/res/drawable-hdpi/ic_launcher.png
----------------------------------------------------------------------
diff --git a/spec/fixtures/projects/native/android/res/drawable-hdpi/ic_launcher.png b/spec/fixtures/projects/native/android/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 96a442e..0000000
Binary files a/spec/fixtures/projects/native/android/res/drawable-hdpi/ic_launcher.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/spec/fixtures/projects/native/android/res/drawable-hdpi/icon.png
----------------------------------------------------------------------
diff --git a/spec/fixtures/projects/native/android/res/drawable-hdpi/icon.png b/spec/fixtures/projects/native/android/res/drawable-hdpi/icon.png
deleted file mode 100644
index 4d27634..0000000
Binary files a/spec/fixtures/projects/native/android/res/drawable-hdpi/icon.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/spec/fixtures/projects/native/android/res/drawable-ldpi/ic_launcher.png
----------------------------------------------------------------------
diff --git a/spec/fixtures/projects/native/android/res/drawable-ldpi/ic_launcher.png b/spec/fixtures/projects/native/android/res/drawable-ldpi/ic_launcher.png
deleted file mode 100644
index 9923872..0000000
Binary files a/spec/fixtures/projects/native/android/res/drawable-ldpi/ic_launcher.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/spec/fixtures/projects/native/android/res/drawable-ldpi/icon.png
----------------------------------------------------------------------
diff --git a/spec/fixtures/projects/native/android/res/drawable-ldpi/icon.png b/spec/fixtures/projects/native/android/res/drawable-ldpi/icon.png
deleted file mode 100644
index cd5032a..0000000
Binary files a/spec/fixtures/projects/native/android/res/drawable-ldpi/icon.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/spec/fixtures/projects/native/android/res/drawable-mdpi/ic_launcher.png
----------------------------------------------------------------------
diff --git a/spec/fixtures/projects/native/android/res/drawable-mdpi/ic_launcher.png b/spec/fixtures/projects/native/android/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 359047d..0000000
Binary files a/spec/fixtures/projects/native/android/res/drawable-mdpi/ic_launcher.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/spec/fixtures/projects/native/android/res/drawable-mdpi/icon.png
----------------------------------------------------------------------
diff --git a/spec/fixtures/projects/native/android/res/drawable-mdpi/icon.png b/spec/fixtures/projects/native/android/res/drawable-mdpi/icon.png
deleted file mode 100644
index e79c606..0000000
Binary files a/spec/fixtures/projects/native/android/res/drawable-mdpi/icon.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/spec/fixtures/projects/native/android/res/drawable-xhdpi/ic_launcher.png
----------------------------------------------------------------------
diff --git a/spec/fixtures/projects/native/android/res/drawable-xhdpi/ic_launcher.png b/spec/fixtures/projects/native/android/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 71c6d76..0000000
Binary files a/spec/fixtures/projects/native/android/res/drawable-xhdpi/ic_launcher.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/spec/fixtures/projects/native/android/res/drawable-xhdpi/icon.png
----------------------------------------------------------------------
diff --git a/spec/fixtures/projects/native/android/res/drawable-xhdpi/icon.png b/spec/fixtures/projects/native/android/res/drawable-xhdpi/icon.png
deleted file mode 100644
index ec7ffbf..0000000
Binary files a/spec/fixtures/projects/native/android/res/drawable-xhdpi/icon.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/spec/fixtures/projects/native/android/res/drawable/icon.png
----------------------------------------------------------------------
diff --git a/spec/fixtures/projects/native/android/res/drawable/icon.png b/spec/fixtures/projects/native/android/res/drawable/icon.png
deleted file mode 100644
index ec7ffbf..0000000
Binary files a/spec/fixtures/projects/native/android/res/drawable/icon.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/spec/fixtures/projects/native/android/res/layout/main.xml
----------------------------------------------------------------------
diff --git a/spec/fixtures/projects/native/android/res/layout/main.xml b/spec/fixtures/projects/native/android/res/layout/main.xml
deleted file mode 100644
index fed0c96..0000000
--- a/spec/fixtures/projects/native/android/res/layout/main.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    >
-<TextView
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:text="Hello World, cordovaExample"
-    />
-</LinearLayout>
-

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/spec/fixtures/projects/native/android/res/values/strings.xml
----------------------------------------------------------------------
diff --git a/spec/fixtures/projects/native/android/res/values/strings.xml b/spec/fixtures/projects/native/android/res/values/strings.xml
deleted file mode 100644
index 867cc1f..0000000
--- a/spec/fixtures/projects/native/android/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">cordovaExample</string>
-</resources>

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/spec/fixtures/projects/native/android/res/xml/config.xml
----------------------------------------------------------------------
diff --git a/spec/fixtures/projects/native/android/res/xml/config.xml b/spec/fixtures/projects/native/android/res/xml/config.xml
deleted file mode 100644
index 1117f8d..0000000
--- a/spec/fixtures/projects/native/android/res/xml/config.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
--->
-<cordova>
-    <!--
-    access elements control the Android whitelist.
-    Domains are assumed blocked unless set otherwise
-     -->
-
-    <access origin="http://127.0.0.1*"/> <!-- allow local pages -->
-
-    <!-- <access origin="https://example.com" /> allow any secure requests to example.com -->
-    <!-- <access origin="https://example.com" subdomains="true" /> such as above, but including subdomains, such as www -->
-    <access origin=".*"/>
-
-    <log level="DEBUG"/>
-    <preference name="useBrowserHistory" value="false" />
-    <preference name="exit-on-suspend" value="false" />
-<plugins>
-    <plugin name="App" value="org.apache.cordova.App"/>
-    <plugin name="Geolocation" value="org.apache.cordova.GeoBroker"/>
-    <plugin name="Device" value="org.apache.cordova.Device"/>
-    <plugin name="Accelerometer" value="org.apache.cordova.AccelListener"/>
-    <plugin name="Compass" value="org.apache.cordova.CompassListener"/>
-    <plugin name="Media" value="org.apache.cordova.AudioHandler"/>
-    <plugin name="Camera" value="org.apache.cordova.CameraLauncher"/>
-    <plugin name="Contacts" value="org.apache.cordova.ContactManager"/>
-    <plugin name="File" value="org.apache.cordova.FileUtils"/>
-    <plugin name="NetworkStatus" value="org.apache.cordova.NetworkManager"/>
-    <plugin name="Notification" value="org.apache.cordova.Notification"/>
-    <plugin name="Storage" value="org.apache.cordova.Storage"/>
-    <plugin name="Temperature" value="org.apache.cordova.TempListener"/>
-    <plugin name="FileTransfer" value="org.apache.cordova.FileTransfer"/>
-    <plugin name="Capture" value="org.apache.cordova.Capture"/>
-    <plugin name="Battery" value="org.apache.cordova.BatteryListener"/>
-    <plugin name="SplashScreen" value="org.apache.cordova.SplashScreen"/>
-    <plugin name="Echo" value="org.apache.cordova.Echo" />
-    <plugin name="Globalization" value="org.apache.cordova.Globalization"/>
-</plugins>
-</cordova>
-

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/spec/fixtures/projects/native/android/src/io/cordova/hellocordova/HelloCordova.java
----------------------------------------------------------------------
diff --git a/spec/fixtures/projects/native/android/src/io/cordova/hellocordova/HelloCordova.java b/spec/fixtures/projects/native/android/src/io/cordova/hellocordova/HelloCordova.java
deleted file mode 100644
index 8a2c820..0000000
--- a/spec/fixtures/projects/native/android/src/io/cordova/hellocordova/HelloCordova.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
- */
-
-package io.cordova.hellocordova;
-
-import android.app.Activity;
-import android.os.Bundle;
-import org.apache.cordova.*;
-
-public class HelloCordova extends DroidGap
-{
-    @Override
-    public void onCreate(Bundle savedInstanceState)
-    {
-        super.onCreate(savedInstanceState);
-        super.loadUrl("file:///android_asset/www/index.html");
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/spec/fixtures/projects/native/blackberry/blackberry.xml
----------------------------------------------------------------------
diff --git a/spec/fixtures/projects/native/blackberry/blackberry.xml b/spec/fixtures/projects/native/blackberry/blackberry.xml
deleted file mode 100644
index 3555f59..0000000
--- a/spec/fixtures/projects/native/blackberry/blackberry.xml
+++ /dev/null
@@ -1,356 +0,0 @@
-<project default="help">
-<!-- 
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
--->    
-    <!-- LOAD PROPERTIES -->
-    
-    <property prefix="properties" file="project.properties" />
-    <property name="build.dir"    location="build" />
-    <property name="widget.dir"   location="${build.dir}/widget" />
-    <property name="code.sign"    value="false" />
-    <property name="generate.ext"   value="cod" />
-    
-    <!-- BlackBerry WebWorks Packager directory is required. -->
-    <fail unless="properties.blackberry.bbwp.dir" message="Please specify BlackBerry WebWorks Packager directory using 'blackberry.bbwp.dir' in your 'project.properties' file." />
-
-    <!-- OS identification -->
-    <condition property="isMacOSX" else="false">
-        <and>
-            <os family="mac" />
-            <os family="unix" />
-        </and>
-    </condition>
-
-    <condition property="javaloader" value="${properties.blackberry.bbwp.dir}/bin/javaloader" else="${properties.blackberry.bbwp.dir}/bin/JavaLoader.exe">
-        <equals arg1="${isMacOSX}" arg2="true" />
-    </condition>
-
-    <condition property="bbwp" value="${properties.blackberry.bbwp.dir}/bbwp" else="${properties.blackberry.bbwp.dir}/bbwp.exe">
-        <equals arg1="${isMacOSX}" arg2="true" />
-    </condition>
-
-
-    <!-- LOAD DEVICE -->
-    
-    <target name="load-device" depends="package-app">
-        <bbwp code-sign="true" />
-        <exec executable="${javaloader}" dir="." failonerror="true">
-            <arg value="-u" />
-            <arg value="-w${properties.blackberry.sim.password}" />
-            <arg value="load" />
-            <arg file="${build.dir}/StandardInstall/${cod.name}.cod" />
-        </exec>
-    </target>
-
-    <!-- DEBUG-LOAD DEVICE -->
-    
-    <target name="debug-device" depends="package-app">
-        <bbwp code-sign="true" debug="true" />
-        <exec executable="${javaloader}" dir="." failonerror="true">
-            <arg value="-u" />
-            <arg value="-w${properties.blackberry.sim.password}" />
-            <arg value="load" />
-            <arg file="${build.dir}/StandardInstall/${cod.name}.cod" />
-        </exec>
-    </target>
-
-    <!-- LOAD SIMULATOR -->
-    
-    <target name="load-simulator" depends="build">
-    
-        <!-- Find the simulator directory -->
-        <set-simulator-dir />
-
-        <!-- Locate BBWP simulator directory. There may be multiple, so choose the first. -->
-        <path id="bbwp.sim.path">
-            <first>
-                <fileset dir="${properties.blackberry.bbwp.dir}/simpack">
-                    <include name="**/handhelds.manifest.txt" />
-                </fileset>
-            </first>
-        </path>
-        <dirname property="bbwp.sim.dir" file="${toString:bbwp.sim.path}" />
-
-        <!-- Simulator directory: Use sim.dir property if set in project.properties file. 
-             Otherwise, use bbwp simulator directory. -->
-        <condition 
-            property="simulator.dir" 
-            value="${properties.blackberry.sim.dir}" 
-            else="${bbwp.sim.dir}">
-                <available file="${properties.blackberry.sim.dir}" type="dir" />
-        </condition>
-        <echo message="Simulator directory=${simulator.dir}" />
-
-        <!-- Simulator binary: Use sim.bin property if set in project.properties file  
-             or try setting to 'defaultSimulator.bat' in simulator directory. -->
-        <condition 
-            property="sim.bin" 
-            value="${properties.blackberry.sim.bin}" 
-            else="defaultSimulator.bat">
-                <available file="${simulator.dir}/${properties.blackberry.sim.bin}"/>
-        </condition>
-
-        <!-- If simulator executable does not exist, use the first device listed 
-             in the 'handhelds.manifest.txt' file in the simulator directory. -->
-        <loadfile 
-            property="device.list"
-            srcFile="${simulator.dir}/handhelds.manifest.txt">
-            <filterchain>
-                <tokenFilter>
-                    <stringtokenizer/>
-                </tokenFilter>
-            </filterchain>
-        </loadfile>
-
-        <propertyregex property="device"
-            input="${device.list}"
-            regexp="^\d{4}"
-            select="\0"
-            override="true" />
-        <property name="device.bin" value="${device}.bat" />
-
-        <condition
-            property="simulator.bin" 
-            value="${sim.bin}"
-            else="${device.bin}">
-                <available file="${simulator.dir}/${sim.bin}" />
-        </condition>
-        
-        <echo message="Simulator executable=${simulator.dir}/${simulator.bin}" />
-
-        <!-- Close running simulators -->
-        <echo message="Closing all running simulators..." />
-        <exec executable="${simulator.dir}/fledgecontroller.exe" dir="${simulator.dir}" spawn="false">
-            <arg value="/execute=kill" />
-        </exec>
-
-        <!-- MDS directory: Use mds.dir property if set in project.properties file. 
-             Otherwise, use bbwp MDS directory. -->
-        <condition 
-            property="mds.dir" 
-            value="${properties.blackberry.mds.dir}" 
-            else="${properties.blackberry.bbwp.dir}/mds">
-                <available file="${properties.blackberry.mds.dir}" type="dir" />
-        </condition>
-        <echo message="MDS directory=${mds.dir}" />
-        
-        <copy todir="${simulator.dir}">
-            <fileset dir="${build.dir}/StandardInstall" includes="*.cod, *.cso, *.csl, *.alx" />
-        </copy>
-        <exec executable="${mds.dir}/run.bat" dir="${mds.dir}" spawn="true" />
-        <exec executable="${simulator.dir}/${simulator.bin}" dir="${simulator.dir}" spawn="true" />
-
-        <!-- Only invoke FledgeHook.exe if it is found. Newer versions of the
-             WebWorks SDK do not include it. -->
-        <if>
-            <available file="${properties.blackberry.bbwp.dir}/FledgeHook.exe" />
-            <then>
-                <exec executable="${properties.blackberry.bbwp.dir}/FledgeHook.exe" dir="${properties.blackberry.bbwp.dir}" spawn="true" />
-            </then>
-        </if>
-    </target>
-    
-    <!-- PACKAGE-APP -->
-    
-    <target name="package-app" depends="generate-cod-name, clean">
-        <!-- Copy the WebWorks application -->
-        <mkdir dir="${widget.dir}" />
-        <copy todir="${widget.dir}" overwrite="true">
-            <fileset dir="www" excludes="ext-air/**,playbook/**,ext-qnx/**,qnx/**"/>
-        </copy>
-        
-        <!-- Package the WebWorks app by zipping the widget dir. -->
-        <mkdir dir="${build.dir}" />
-        <zip compress="false" destfile="${build.dir}/${cod.name}.zip" basedir="${widget.dir}" excludes="**/build/**,**/.settings/**,**/.project" />
-    </target>
-    
-    <!-- BUILD -->
-
-    <target name="build" depends="package-app">
-        <bbwp code-sign="${code.sign}" />
-    </target>
-
-    <!-- BBWP MACRO -->
-
-    <macrodef name="bbwp">
-        <attribute name="code-sign" default="false" />
-        <attribute name="debug" default="false" />
-        <sequential>
-            <!-- check if debug flag was passed in and set an appropriate flag for CLI exec of bbwp -->
-            <if>
-                <equals arg1="@{debug}" arg2="true" />
-                <then>
-                    <property name="debug.flag" value="/d" />
-                </then>
-                <else>
-                    <property name="debug.flag" value="" />
-                </else>
-            </if>
-
-            <!-- Ensure bbwp executable exists. -->
-            <property name="properties.blackberry.bbwp.bin" location="${bbwp}" /> 
-            <available file="${properties.blackberry.bbwp.bin}" property="properties.blackberry.bbwp.exists" />
-            <fail unless="properties.blackberry.bbwp.exists" message="Cannot find ${properties.blackberry.bbwp.bin}. Please edit 'blackberry.bbwp.dir' in your 'project.properties' file." />
-
-            <if>
-                <equals arg1="@{code-sign}" arg2="true" />
-                <then>
-                    <exec executable="${properties.blackberry.bbwp.bin}">
-                        <arg file="${build.dir}/${cod.name}.zip" />
-                        <arg value="/g" />
-                        <arg value="${properties.blackberry.sigtool.password}" />
-                        <arg line="${debug.flag} /o" />
-                        <arg file="${build.dir}" />
-                    </exec>
-                </then>
-                <else>
-                    <exec executable="${properties.blackberry.bbwp.bin}">
-                        <arg file="${build.dir}/${cod.name}.zip" />
-                        <arg line="${debug.flag} /o" />
-                        <arg file="${build.dir}" />
-                    </exec>
-                </else>
-            </if>
-        </sequential>
-    </macrodef>
-
-    <!-- CLEAN -->
-    
-    <target name="clean">
-        <delete dir="${build.dir}" />
-        <delete dir="${widget.dir}" />
-    </target>
-    
-    <!-- CLEAN DEVICE -->
-    
-    <target name="clean-device" depends="generate-cod-name">
-        <exec executable="${javaloader}">
-            <arg value="-usb" />
-            <arg value="erase" />
-            <arg value="-f" />
-            <arg value="${cod.name}.cod" />
-        </exec>
-    </target>
-    
-    <!-- CLEAN SIMULATOR -->
-    
-    <target name="clean-simulator">
-        <!-- Find the simulator directory -->
-        <set-simulator-dir />
-        
-        <exec executable="${simulator.dir}/clean.bat" dir="${simulator.dir}" />
-        
-        <delete>
-            <fileset dir="${simulator.dir}" includes="*.cod,*.csl,*.cso,*.debug,*.jar" />
-        </delete>
-    </target>
-    
-        <!-- HELPER TASKS -->
-    
-    <target name="generate-cod-name">
-        <xmlproperty file="www/config.xml" prefix="config.xml" />
-        <propertyregex property="cod.name"
-                       input="${config.xml.widget.name}"
-                       regexp="(\W+)"
-                       replace=""
-                       casesensitive="false"
-                       global="true"
-                       defaultValue="${config.xml.widget.name}" />
-        <echo message="Generated name: ${cod.name}.cod" />
-    </target>
-    
-        <!-- MACRO: SET SIMULATOR DIRECTORY -->
-    
-    <macrodef name="set-simulator-dir">
-        <sequential>
-            <!-- Locate BBWP simulator directory. There may be multiple, so choose the first. -->
-            <path id="bbwp.sim.path">
-                <first>
-                    <fileset dir="${properties.blackberry.bbwp.dir}/simpack">
-                        <include name="**/handhelds.manifest.txt" />
-                    </fileset>
-                </first>
-            </path>
-            <dirname property="bbwp.sim.dir" file="${toString:bbwp.sim.path}" />
-
-            <!-- Simulator directory: Use sim.dir property if set in project.properties file.
-                 Otherwise, use bbwp simulator directory. -->
-            <condition
-                property="simulator.dir"
-                value="${properties.blackberry.sim.dir}"
-                else="${bbwp.sim.dir}">
-                    <available file="${properties.blackberry.sim.dir}" type="dir" />
-            </condition>
-            <echo message="Simulator directory=${simulator.dir}" />
-        </sequential>
-    </macrodef>
-	
-	    <!-- HELP -->
-    
-    <target name="help">
-        <echo>
-NAME
-  ${ant.project.name}
-
-SYNOPSIS
-  ant TARGET COMMAND [-D&lt;argument&gt;=&lt;value&gt;]...
-
-DESCRIPTION
-  You can build and deploy your project to a device or simulator.
-  
-TARGETS
-  blackberry ........ Builds a cod file and deploys to a device or simulator
- 
-  playbook .......... Builds a bar file and deploys to a device or simulator
-
-COMMANDS
-  help .............. Show this help menu.
-                        ant, ant help
-
-  load-device ....... Builds and deploys project to a connected USB device.
-                        ant load-device
-
-  load-simulator .... Builds and deploys project to default simulator.
-                        ant load-simulator
-
-  build ............. Compiles and packages the project for deployment.
-                        ant build
-                                              
-  clean ............. Remove all files from the build/ directory.
-                        ant clean
-
-  clean-device ...... Remove this project from the connected USB device.
-                        ant clean-device
-
-  clean-simulator ... Remove this project from the simulator (takes a while).
-                        ant clean-simulator
-
-GETTING STARTED
-  1. Edit project.properties
-
-  2. &lt;ant load-simulator&gt; to run the project on the simulator
-
-  3. Customize your project by editing www/config.xml
-
-  4. To run the project on a BlackBerry device, you will need to obtain
-     code signing keys from RIM. Once you have the key, a project is
-     installed by connecting a BlackBerry via USB and running
-     &lt;ant load-device&gt;.
-        </echo>
-    </target>
-</project>

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/spec/fixtures/projects/native/blackberry/build.xml
----------------------------------------------------------------------
diff --git a/spec/fixtures/projects/native/blackberry/build.xml b/spec/fixtures/projects/native/blackberry/build.xml
deleted file mode 100644
index 44c93be..0000000
--- a/spec/fixtures/projects/native/blackberry/build.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<project name="Build and Deploy a Cordova BlackBerry WebWorks Project" default="help">
-<!-- 
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
--->    
-    <!-- LOAD ANT-CONTRIB LIBRARY -->
-    
-    <taskdef resource="net/sf/antcontrib/antcontrib.properties">
-      <classpath>
-        <pathelement location="./lib/ant-contrib/ant-contrib-1.0b3.jar" />
-      </classpath>
-    </taskdef>
-
-    <!-- LOAD PROPERTIES -->
-    
-    <property prefix="properties" file="project.properties" />
-    <property name="build.dir"    location="build" />
-    <property name="widget.dir"   location="${build.dir}/widget" />
-    <property name="code.sign"    value="false" />
-        
-    <target name="blackberry" >
-        <property name="subant.file"  value="blackberry.xml" />
-    </target>
-    
-    <target name="playbook" >
-        <property name="subant.file"  value="playbook.xml" />
-    </target>
-
-    <target name="qnx" >
-        <property name="subant.file"  value="qnx.xml" />
-    </target>
-    
-    <target name="load-device">
-        <subant target="load-device">
-            <fileset dir="." includes="${subant.file}"/>
-        </subant>
-    </target>
-    
-    <target name="load-simulator">
-        <subant target="load-simulator">
-            <fileset dir="." includes="${subant.file}"/>
-        </subant>
-    </target>
-
-    <target name="debug-device">
-        <subant target="debug-device">
-            <fileset dir="." includes="${subant.file}"/>
-        </subant>
-    </target>
-    
-    <target name="build">
-        <subant target="build">
-            <fileset dir="." includes="${subant.file}"/>
-        </subant>
-    </target>
-
-    <target name="clean">
-        <subant target="clean">
-            <fileset dir="." includes="${subant.file}"/>
-        </subant>
-    </target>
-    
-    <target name="clean-device">
-        <subant target="clean-device">
-            <fileset dir="." includes="${subant.file}"/>
-        </subant>
-    </target>
-    
-    <target name="clean-simulator">
-        <subant target="clean-simulator">
-            <fileset dir="." includes="${subant.file}"/>
-        </subant>
-    </target>
-    
-    <!-- HELP -->
-    
-    <target name="help">
-        <echo>
-NAME
-  ${ant.project.name}
-
-SYNOPSIS
-  ant TARGET COMMAND [-D&lt;argument&gt;=&lt;value&gt;]...
-
-DESCRIPTION
-  You can build and deploy your project to a device or simulator.
-  
-TARGETS
-  blackberry ........ Builds a cod file and deploys to a device or simulator
- 
-  playbook .......... Builds a bar file and deploys to a device or simulator
-
-  qnx ............... Builds a bar file and deploys to a device or simulator
-
-COMMANDS
-  help .............. Show this help menu.
-                        ant, ant help
-
-  load-device ....... Builds and deploys project to a connected USB device.
-                        ant TARGET load-device
-
-  load-simulator .... Builds and deploys project to default simulator.
-                        ant TARGET load-simulator
-
-  build ............. Compiles and packages the project for deployment.
-                        ant TARGET build
-
-  clean ............. Remove all files from the build/ directory.
-                        ant TARGET clean
-
-  clean-device ...... Remove this project from the connected USB device.
-                        ant TARGET clean-device
-
-  clean-simulator ... Remove this project from the simulator (takes a while).
-                        ant TARGET clean-simulator
-
-GETTING STARTED
-  1. Edit project.properties
-
-  2. &lt;ant load-simulator&gt; to run the project on the simulator
-
-  3. Customize your project by editing www/config.xml
-
-  4. To run the project on a BlackBerry device, you will need to obtain
-     code signing keys from RIM. Once you have the key, a project is
-     installed by connecting a BlackBerry via USB and running
-     &lt;ant load-device&gt;.
-        </echo>
-    </target>
-</project>

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/spec/fixtures/projects/native/blackberry/cordova/debug
----------------------------------------------------------------------
diff --git a/spec/fixtures/projects/native/blackberry/cordova/debug b/spec/fixtures/projects/native/blackberry/cordova/debug
deleted file mode 100755
index 2b10cff..0000000
--- a/spec/fixtures/projects/native/blackberry/cordova/debug
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /bin/sh
-#       Licensed to the Apache Software Foundation (ASF) under one
-#       or more contributor license agreements.  See the NOTICE file
-#       distributed with this work for additional information
-#       regarding copyright ownership.  The ASF licenses this file
-#       to you under the Apache License, Version 2.0 (the
-#       "License"); you may not use this file except in compliance
-#       with the License.  You may obtain a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#       Unless required by applicable law or agreed to in writing,
-#       software distributed under the License is distributed on an
-#       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#       KIND, either express or implied.  See the License for the
-#       specific language governing permissions and limitations
-#       under the License.
-
-ANT=$(which ant)
-
-if [ -z "$1" ]
-then
-  echo 'usage: debug <platform>'
-  echo 'where <platform> can be one of "blackberry" or "playbook"'
-  echo 'NOTE: please customize the project.properties file first before using this command!'
-  exit 0
-fi
-
-if [ "$1" == "blackberry" ]
-then
-  echo 'Do you have a BlackBerry smartphone connected to your computer? (y/n)'
-  read DEVICE
-  if [ $DEVICE == "y" ]
-  then
-    $ANT blackberry debug-device
-  else
-    $ANT blackberry load-simulator
-  fi
-else
-  if [ "$1" == "playbook" ]
-  then
-    echo 'Do you have a BlackBerry Playbook connected to your computer? (y/n)'
-    read DEVICE
-    if [ $DEVICE == "y" ]
-    then
-      $ANT playbook debug-device
-    else
-      $ANT playbook load-simulator
-    fi
-  else
-    echo 'Platform not recognized! Please use one of "blackberry" or "playbook" for the platform parameter.'
-  fi
-fi

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5742036a/spec/fixtures/projects/native/blackberry/cordova/emulate
----------------------------------------------------------------------
diff --git a/spec/fixtures/projects/native/blackberry/cordova/emulate b/spec/fixtures/projects/native/blackberry/cordova/emulate
deleted file mode 100755
index dc368b5..0000000
--- a/spec/fixtures/projects/native/blackberry/cordova/emulate
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-#       Licensed to the Apache Software Foundation (ASF) under one
-#       or more contributor license agreements.  See the NOTICE file
-#       distributed with this work for additional information
-#       regarding copyright ownership.  The ASF licenses this file
-#       to you under the Apache License, Version 2.0 (the
-#       "License"); you may not use this file except in compliance
-#       with the License.  You may obtain a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#       Unless required by applicable law or agreed to in writing,
-#       software distributed under the License is distributed on an
-#       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#       KIND, either express or implied.  See the License for the
-#       specific language governing permissions and limitations
-#       under the License.
-
-ANT=$(which ant)
-
-if [ -z "$1" ]
-then
-  echo 'usage: emulate <platform>'
-  echo 'where <platform> can be one of "blackberry" or "playbook"'
-  echo 'NOTE: please customize the project.properties file first before using this command!'
-  exit 0
-fi
-
-if [ "$1" == "blackberry" ]
-then
-  $ANT blackberry load-simulator
-else
-  if [ "$1" == "playbook" ]
-  then
-    $ANT playbook load-simulator
-  else
-    echo 'Platform not recognized! Please use one of "blackberry" or "playbook" for the platform parameter.'
-  fi
-fi
-