cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shaz...@apache.org
Subject [48/50] ios commit: Merge branch 'master' into 4.0.x
Date Thu, 25 Jun 2015 01:09:36 GMT
Merge branch 'master' into 4.0.x


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

Branch: refs/heads/master
Commit: 4096f2d425fa4302e97f996758505dbd283472f0
Parents: 9f24951 5198edb
Author: Shazron Abdullah <shazron@gmail.com>
Authored: Wed Jun 17 15:05:19 2015 -0700
Committer: Shazron Abdullah <shazron@gmail.com>
Committed: Wed Jun 17 15:05:19 2015 -0700

----------------------------------------------------------------------
 .ratignore            |   6 +++
 bin/lib/check_reqs.js | 108 ++++++++++++++++++++++++++++++++++++---------
 bin/lib/create.js     |   2 +-
 3 files changed, 94 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/4096f2d4/bin/lib/check_reqs.js
----------------------------------------------------------------------
diff --cc bin/lib/check_reqs.js
index 04d7ef9,d1f6333..fe2088c
--- a/bin/lib/check_reqs.js
+++ b/bin/lib/check_reqs.js
@@@ -26,18 -21,19 +21,19 @@@ var Q     = require('q')
      shell = require('shelljs'),
      versions = require('./versions');
  
 -var XCODEBUILD_MIN_VERSION = '4.6.0';
 +var XCODEBUILD_MIN_VERSION = '6.0.0';
+ var XCODEBUILD_NOT_FOUND_MESSAGE =
+     'Please install version ' + XCODEBUILD_MIN_VERSION + ' or greater from App Store';
  
 -var IOS_SIM_MIN_VERSION = '3.0.0';
 +var IOS_SIM_MIN_VERSION = '4.0.0';
- var IOS_SIM_NOT_FOUND_MESSAGE = 'ios-sim was not found. Please download, build and install
version ' + IOS_SIM_MIN_VERSION +
-     ' or greater from https://github.com/phonegap/ios-sim into your path.' +
-     ' Or \'npm install -g ios-sim\' using node.js: http://nodejs.org';
+ var IOS_SIM_NOT_FOUND_MESSAGE =
+     'Please download, build and install version ' + IOS_SIM_MIN_VERSION + ' or greater'
+
+     ' from https://github.com/phonegap/ios-sim into your path, or do \'npm install -g ios-sim\'';
  
 -var IOS_DEPLOY_MIN_VERSION = '1.4.0';
 +var IOS_DEPLOY_MIN_VERSION = '1.7.0';
- var IOS_DEPLOY_NOT_FOUND_MESSAGE = 'ios-deploy was not found. Please download, build and
install version ' + IOS_DEPLOY_MIN_VERSION +
-     ' or greater from https://github.com/phonegap/ios-deploy into your path.' +
-     ' Or \'npm install -g ios-deploy\' using node.js: http://nodejs.org';
+ var IOS_DEPLOY_NOT_FOUND_MESSAGE =
+     'Please download, build and install version ' + IOS_DEPLOY_MIN_VERSION + ' or greater'
+
+     ' from https://github.com/phonegap/ios-deploy into your path, or do \'npm install -g
ios-deploy\'';
  
  /**
   * Checks if xcode util is available


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


Mime
View raw message