You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by lo...@apache.org on 2014/12/12 20:51:22 UTC

[1/2] ios commit: [CB-8044] support for --nobuild flag

Repository: cordova-ios
Updated Branches:
  refs/heads/master ea2a94679 -> 19e954541


[CB-8044] support for --nobuild flag


Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/9ea4c782
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/9ea4c782
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/9ea4c782

Branch: refs/heads/master
Commit: 9ea4c782c64beec4a9c569f9ca61575bd25a733e
Parents: ea2a946
Author: Lorin Beer <lo...@gmail.com>
Authored: Fri Dec 12 11:38:54 2014 -0800
Committer: Lorin Beer <lo...@gmail.com>
Committed: Fri Dec 12 11:38:54 2014 -0800

----------------------------------------------------------------------
 bin/templates/scripts/cordova/run | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/9ea4c782/bin/templates/scripts/cordova/run
----------------------------------------------------------------------
diff --git a/bin/templates/scripts/cordova/run b/bin/templates/scripts/cordova/run
index ff60876..12334ac 100755
--- a/bin/templates/scripts/cordova/run
+++ b/bin/templates/scripts/cordova/run
@@ -37,6 +37,9 @@ TARGET="iPhone-6"
 USE_DEVICE=true
 USE_SIMULATOR=false
 
+# options
+NO_BUILD=false
+
 # separates "key=value", sets an array with 0th index as key, 1st index as value
 _parseOption()
 {
@@ -71,6 +74,9 @@ _parseArgs()
       USE_DEVICE=false
       USE_SIMULATOR=true
       ;;
+    "--nobuild")
+      NO_BUILD=true
+      ;;
     esac
   done
 }
@@ -109,7 +115,9 @@ if "$USE_DEVICE"; then
         USE_SIMULATOR=true
     else
         # if we got here, we can deploy the app, then exit success
-        "$CORDOVA_PATH/build" --device || exit $?
+        if [ ! $NO_BUILD ] then
+            "$CORDOVA_PATH/build" --device || exit $?
+        fi
         ios-deploy -d -b "$DEVICE_APP_PATH"
     	exit 0
     fi
@@ -131,7 +139,9 @@ if "$USE_SIMULATOR"; then
     fi
     
     # launch using ios-sim
-    "$CORDOVA_PATH/build" --emulator || exit $?
+    if [ ! $NO_BUILD ] then
+        "$CORDOVA_PATH/build" --emulator || exit $?
+    fi
     ios-sim launch "$SIMULATOR_APP_PATH" --stderr "$CORDOVA_PATH/console.log" --stdout "$CORDOVA_PATH/console.log" --devicetypeid com.apple.CoreSimulator.SimDeviceType.$TARGET --exit
 fi
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


[2/2] ios commit: [CB-8044] support for --nobuild flag in run script

Posted by lo...@apache.org.
[CB-8044] support for --nobuild flag in run script


Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/19e95454
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/19e95454
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/19e95454

Branch: refs/heads/master
Commit: 19e9545411bb055ddd12fb3754b08cfad564401d
Parents: 9ea4c78
Author: Lorin Beer <lo...@gmail.com>
Authored: Fri Dec 12 11:50:04 2014 -0800
Committer: Lorin Beer <lo...@gmail.com>
Committed: Fri Dec 12 11:50:04 2014 -0800

----------------------------------------------------------------------
 bin/templates/scripts/cordova/run | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/19e95454/bin/templates/scripts/cordova/run
----------------------------------------------------------------------
diff --git a/bin/templates/scripts/cordova/run b/bin/templates/scripts/cordova/run
index 12334ac..f66f703 100755
--- a/bin/templates/scripts/cordova/run
+++ b/bin/templates/scripts/cordova/run
@@ -115,7 +115,7 @@ if "$USE_DEVICE"; then
         USE_SIMULATOR=true
     else
         # if we got here, we can deploy the app, then exit success
-        if [ ! $NO_BUILD ] then
+        if [ ! $NO_BUILD ]; then
             "$CORDOVA_PATH/build" --device || exit $?
         fi
         ios-deploy -d -b "$DEVICE_APP_PATH"
@@ -139,7 +139,7 @@ if "$USE_SIMULATOR"; then
     fi
     
     # launch using ios-sim
-    if [ ! $NO_BUILD ] then
+    if [ ! $NO_BUILD ]; then
         "$CORDOVA_PATH/build" --emulator || exit $?
     fi
     ios-sim launch "$SIMULATOR_APP_PATH" --stderr "$CORDOVA_PATH/console.log" --stdout "$CORDOVA_PATH/console.log" --devicetypeid com.apple.CoreSimulator.SimDeviceType.$TARGET --exit


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org