Merge branch 'cordova-hcp' of github.com:meteor/meteor into cordova-hcp

meteor

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-BUNDLE_VERSION=0.3.45
+BUNDLE_VERSION=0.3.46
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

scripts/cordova.sh

@@ -13,8 +13,11 @@ cd "$ORIG_DIR"
 ANDROID_BUNDLE="$SCRIPT_DIR/android_bundle"
 DEV_BUNDLE="$SCRIPT_DIR/dev_bundle"
 
-# add android stuff
-export PATH=${ANDROID_BUNDLE}/android-sdk/tools:${ANDROID_BUNDLE}/android-sdk/platform-tools:${PATH}
+# Put Android build tool-chain into path
+export PATH=${ANDROID_BUNDLE}/android-sdk/tools:${ANDROID_BUNDLE}/android-sdk/platform-tools:${PATH};
+
+# Put ios-sim and ios-deploy binaries' paths into path
+export PATH=${DEV_BUNDLE}/lib/ios-sim:${DEV_BUNDLE}/lib/ios-deploy:${PATH};
 
 # add ant
 export ANT_HOME=${ANDROID_BUNDLE}/apache-ant-1.9.4

scripts/generate-dev-bundle.sh

@@ -71,6 +71,39 @@ umask 022
 mkdir build
 cd build
 
+
+# ios-sim is used to run iPhone simulator from the command-line. Doesn't make
+# sense to build it for linux.
+if [ "$OS" == "osx" ]; then
+    # the build from source is not going to work on old OS X versions, until we
+    # upgrade our Mac OS X Jenkins machine, download the precompiled tarball
+
+    # which rake # rake is required to build ios-sim
+    # git clone https://github.com/phonegap/ios-sim.git
+    # cd ios-sim
+    # git checkout 2.0.1
+    # rake build
+    # which build/Release/ios-sim # check that we have in fact got the binary
+    # mkdir -p "$DIR/lib/ios-sim"
+    # cp -r build/Release/* "$DIR/lib/ios-sim/"
+
+    # Download the precompiled tarball
+    IOS_SIM_URL="http://android-bundle.s3.amazonaws.com/ios-sim.tgz"
+    curl "$IOS_SIM_URL" | tar xfz -
+    mkdir -p "$DIR/lib/ios-sim"
+    cp -r ios-sim/ios-sim "$DIR/lib/ios-sim"
+
+    git clone https://github.com/phonegap/ios-deploy.git
+    cd ios-deploy
+    git checkout 1.0.9
+    make
+    cd ..
+    mkdir -p "$DIR/lib/ios-deploy"
+    cp -r ios-deploy/ios-deploy "$DIR/lib/ios-deploy"
+fi
+
+
+cd "$DIR/build"
 git clone https://github.com/joyent/node.git
 cd node
 # When upgrading node versions, also update the values of MIN_NODE_VERSION at

tools/commands-cordova.js

@@ -186,7 +186,7 @@ cordova.ensureCordovaPlatforms = function (localPath) {
   var platformsOutput = platformsList.stdout.split('\n')[0];
   var platformsStrings = platformsOutput.match(/Installed platforms: (.*)/)[1];
 
-  if (! platformsStrings)
+  if (platformsStrings === undefined)
     throw new Error('Failed to parse the output of `cordova platform list`: ' +
                      platformsList.stdout);
 

tools/help.txt

@@ -139,6 +139,10 @@ This will not list transitive dependencies.
 Also lists the Cordova plugins and platforms used by your mobile
 build directly.
 
+>>> bundle
+Deprecated command. Use 'build' instead.
+Usage: meteor bundle <output_file.tar.gz>
+
 >>> build
 Pack this project up into a tarball.
 Usage: meteor build <output_file.tar.gz>

tools/tests/cordova-plugins.js

@@ -145,9 +145,11 @@ selftest.define("add cordova plugins", function () {
   run.matchErr("meteor add platform:");
 
   run = s.run("add", "platform:android");
+  run.waitSecs(5);
   run.match("added platform");
 
   run = s.run("add", "cordova:org.apache.cordova.camera@0.3.0");
+  run.waitSecs(5);
   run.match("added cordova plugin org.apache.cordova.camera");
 
   run = s.run("add", "cordova:org.apache.cordova.file");