You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by sg...@apache.org on 2015/03/23 11:53:19 UTC
cordova-medic git commit: [CB-8726] Fixed naming issue for
BlackBerry. Crudely made Blackberry when no devices are specified.
Repository: cordova-medic
Updated Branches:
refs/heads/master 0e37682dc -> a4f6dc34b
[CB-8726] Fixed naming issue for BlackBerry. Crudely made Blackberry when no devices are specified.
github close #38
Project: http://git-wip-us.apache.org/repos/asf/cordova-medic/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-medic/commit/a4f6dc34
Tree: http://git-wip-us.apache.org/repos/asf/cordova-medic/tree/a4f6dc34
Diff: http://git-wip-us.apache.org/repos/asf/cordova-medic/diff/a4f6dc34
Branch: refs/heads/master
Commit: a4f6dc34b5a09eafb936bd6e23b1d5c148f48ec3
Parents: 0e37682
Author: Dmitry Blotsky <db...@microsoft.com>
Authored: Wed Mar 18 12:43:33 2015 -0700
Committer: sgrebnov <v-...@microsoft.com>
Committed: Mon Mar 23 13:53:08 2015 +0300
----------------------------------------------------------------------
buildbot-conf/cordova.conf | 29 ++++++++++++++-------------
src/build/makers/blackberry10/devices.js | 11 +++++++---
2 files changed, 23 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/a4f6dc34/buildbot-conf/cordova.conf
----------------------------------------------------------------------
diff --git a/buildbot-conf/cordova.conf b/buildbot-conf/cordova.conf
index 743e51c..7e7cd35 100644
--- a/buildbot-conf/cordova.conf
+++ b/buildbot-conf/cordova.conf
@@ -92,11 +92,12 @@ def can_find_running_tasks(step):
# renderers
@renderer
-def render_mobilespec_platform(props):
- platform = props.getProperty('platform')
- if platform == 'blackberry':
- platform = 'blackberry10'
- return '--{0}'.format(platform)
+def render_platform_repo_name(props):
+ platform_name = props.getProperty('platform')
+ repo_name = 'cordova-{0}'.format(platform_name)
+ if platform_name == 'blackberry10':
+ repo_name = 'cordova-blackberry'
+ return repo_name
@renderer
def render_repo_name(props):
@@ -245,7 +246,7 @@ common_plugins_steps = plugins_cleanup_steps + get_medic_steps + [
NPMInstall(what='cordova-cli', workdir='cordova-cli'),
NPMInstall(what='cordova-js', workdir='cordova-js'),
NPMInstall(what='cordova-plugman', workdir='cordova-plugman'),
- NPMInstall(what='platform', workdir=I('cordova-%(prop:platform)s')),
+ NPMInstall(what='platform', workdir=render_platform_repo_name),
NPMInstall(what='cordova-mobile-spec', workdir='cordova-mobile-spec/createmobilespec'),
# link the installed code
@@ -258,7 +259,7 @@ common_plugins_steps = plugins_cleanup_steps + get_medic_steps + [
'cordova-mobile-spec/createmobilespec/createmobilespec.js',
'--copywww',
'--skiplink',
- render_mobilespec_platform,
+ I('--%(prop:platform)s'),
TEST_APP_NAME
],
description='creating mobilespec app'
@@ -296,13 +297,13 @@ cordova_plugins_windows.addSteps([
c['builders'].extend([
# plugins builders
- BuilderConfig(name='cordova-ios', slavenames=OSX_SLAVES, factory=cordova_plugins_all, properties={'platform': 'ios', 'slaveos': OSX}),
- BuilderConfig(name='cordova-android-osx', slavenames=OSX_SLAVES, factory=cordova_plugins_all, properties={'platform': 'android', 'slaveos': OSX}),
- BuilderConfig(name='cordova-blackberry-osx', slavenames=OSX_SLAVES, factory=cordova_plugins_all, properties={'platform': 'blackberry', 'slaveos': OSX}),
- BuilderConfig(name='cordova-windows', slavenames=WINDOWS_SLAVES, factory=cordova_plugins_windows, properties={'platform': 'windows', 'slaveos': WINDOWS}),
- BuilderConfig(name='cordova-wp8', slavenames=WINDOWS_SLAVES, factory=cordova_plugins_all, properties={'platform': 'wp8', 'slaveos': WINDOWS}),
- BuilderConfig(name='cordova-android-win', slavenames=WINDOWS_SLAVES, factory=cordova_plugins_all, properties={'platform': 'android', 'slaveos': WINDOWS}),
- BuilderConfig(name='cordova-blackberry-win', slavenames=WINDOWS_SLAVES, factory=cordova_plugins_all, properties={'platform': 'blackberry', 'slaveos': WINDOWS}),
+ BuilderConfig(name='cordova-ios', slavenames=OSX_SLAVES, factory=cordova_plugins_all, properties={'platform': 'ios', 'slaveos': OSX}),
+ BuilderConfig(name='cordova-android-osx', slavenames=OSX_SLAVES, factory=cordova_plugins_all, properties={'platform': 'android', 'slaveos': OSX}),
+ BuilderConfig(name='cordova-blackberry-osx', slavenames=OSX_SLAVES, factory=cordova_plugins_all, properties={'platform': 'blackberry10', 'slaveos': OSX}),
+ BuilderConfig(name='cordova-windows', slavenames=WINDOWS_SLAVES, factory=cordova_plugins_windows, properties={'platform': 'windows', 'slaveos': WINDOWS}),
+ BuilderConfig(name='cordova-wp8', slavenames=WINDOWS_SLAVES, factory=cordova_plugins_all, properties={'platform': 'wp8', 'slaveos': WINDOWS}),
+ BuilderConfig(name='cordova-android-win', slavenames=WINDOWS_SLAVES, factory=cordova_plugins_all, properties={'platform': 'android', 'slaveos': WINDOWS}),
+ BuilderConfig(name='cordova-blackberry-win', slavenames=WINDOWS_SLAVES, factory=cordova_plugins_all, properties={'platform': 'blackberry10', 'slaveos': WINDOWS}),
])
####### STATUS TARGETS
http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/a4f6dc34/src/build/makers/blackberry10/devices.js
----------------------------------------------------------------------
diff --git a/src/build/makers/blackberry10/devices.js b/src/build/makers/blackberry10/devices.js
index 0d4c693..bd9fbc3 100644
--- a/src/build/makers/blackberry10/devices.js
+++ b/src/build/makers/blackberry10/devices.js
@@ -29,6 +29,11 @@ module.exports = function blackberry_scanner(callback) {
password = config.blackberry.devices.password,
storepass = config.blackberry.bb10.signingPassword;
+ if (ips.length < 1) {
+ log('no devices configured');
+ process.exit(1);
+ }
+
// figure out over what range of ips to scan
if (ips instanceof Array) {
ips.forEach(function(ip) {
@@ -47,11 +52,11 @@ module.exports = function blackberry_scanner(callback) {
callback(device);
} else if (code === 127) {
- log('Error executing cmd: ' + cmd +
- '\n returned with code: ' +
+ log('Error executing cmd: ' + cmd +
+ '\n returned with code: ' +
code + '\n make sure the blackberry:bb10:sdk value in config.json points to your installation of the BB10 Webworks SDK');
}
-
+
});
});
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org