Repository: cordova-medic Updated Branches: refs/heads/master f1a0c5bff -> 950989b3f
Removing wp8 and windows-store-8.0 builders Project: http://git-wip-us.apache.org/repos/asf/cordova-medic/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-medic/commit/950989b3 Tree: http://git-wip-us.apache.org/repos/asf/cordova-medic/tree/950989b3 Diff: http://git-wip-us.apache.org/repos/asf/cordova-medic/diff/950989b3 Branch: refs/heads/master Commit: 950989b3fc3dba41fc812c9f3fac444f0c7b138b Parents: f1a0c5b Author: Raghav Katyal <[email protected]> Authored: Mon Feb 8 14:36:26 2016 -0800 Committer: Raghav Katyal <[email protected]> Committed: Mon Feb 8 17:09:06 2016 -0800 ---------------------------------------------------------------------- buildbot-conf/cordova-config.json.sample | 3 -- buildbot-conf/cordova-repos.json | 8 ------ buildbot-conf/cordova.conf | 11 -------- lib/util.js | 1 - medic/medic-kill.js | 2 -- medic/medic-log.js | 7 ----- medic/medic-run.js | 40 ++------------------------- 7 files changed, 3 insertions(+), 69 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/950989b3/buildbot-conf/cordova-config.json.sample ---------------------------------------------------------------------- diff --git a/buildbot-conf/cordova-config.json.sample b/buildbot-conf/cordova-config.json.sample index 1625bc8..358f774 100644 --- a/buildbot-conf/cordova-config.json.sample +++ b/buildbot-conf/cordova-config.json.sample @@ -27,9 +27,6 @@ "keychainPassword": "", "keychainLocation": "" }, - "wp8": { - "target": "emulator" - }, "windows8": { "target": "emulator" }, http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/950989b3/buildbot-conf/cordova-repos.json ---------------------------------------------------------------------- diff --git a/buildbot-conf/cordova-repos.json b/buildbot-conf/cordova-repos.json index 337551b..3346f0c 100644 --- a/buildbot-conf/cordova-repos.json +++ b/buildbot-conf/cordova-repos.json @@ -81,14 +81,6 @@ "github": "https://github.com/apache/cordova-ios.git"; } }, - "cordova-wp8": { - "default_repository": "github", - "default_branch": "master", - "repositories": { - "asf": "https://git-wip-us.apache.org/repos/asf/cordova-wp8.git";, - "github": "https://github.com/apache/cordova-wp8.git"; - } - }, "cordova-windows": { "default_repository": "github", "default_branch": "master", http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/950989b3/buildbot-conf/cordova.conf ---------------------------------------------------------------------- diff --git a/buildbot-conf/cordova.conf b/buildbot-conf/cordova.conf index b8b3962..21c0081 100644 --- a/buildbot-conf/cordova.conf +++ b/buildbot-conf/cordova.conf @@ -420,10 +420,8 @@ def makeRunSteps(platform, extra_args=list()): cordova_run_android = makeRunSteps('android') cordova_run_ios = makeRunSteps('ios') -cordova_run_ws80 = makeRunSteps('windows', extra_args=['--winvers', 'store80']) cordova_run_ws81 = makeRunSteps('windows', extra_args=['--winvers', 'store']) cordova_run_wp81 = makeRunSteps('windows', extra_args=['--winvers', 'phone']) -cordova_run_wp8 = makeRunSteps('wp8') # cordova_run_bbry = makeRunSteps('blackberry10') c['builders'].extend([ @@ -431,11 +429,8 @@ c['builders'].extend([ BuilderConfig(name='cordova-android-osx', slavenames=OSX_SLAVES, factory=cordova_run_android, category=CORDOVA_SUPPORTED_CATEGORY), BuilderConfig(name='cordova-android-win', slavenames=WINDOWS_SLAVES, factory=cordova_run_android, category=CORDOVA_SUPPORTED_CATEGORY), BuilderConfig(name='cordova-ios', slavenames=OSX_SLAVES, factory=cordova_run_ios, category=CORDOVA_SUPPORTED_CATEGORY), - BuilderConfig(name='cordova-windows-store8.0', slavenames=WINDOWS_SLAVES, factory=cordova_run_ws80, category=CORDOVA_SUPPORTED_CATEGORY), BuilderConfig(name='cordova-windows-store8.1', slavenames=WINDOWS_SLAVES, factory=cordova_run_ws81, category=CORDOVA_SUPPORTED_CATEGORY), BuilderConfig(name='cordova-windows-phone8.1', slavenames=WINDOWS_SLAVES, factory=cordova_run_wp81, category=CORDOVA_SUPPORTED_CATEGORY), - BuilderConfig(name='cordova-wp8', slavenames=WINDOWS_SLAVES, factory=cordova_run_wp8, category=CORDOVA_SUPPORTED_CATEGORY), - # BuilderConfig(name='cordova-blackberry-win', slavenames=WINDOWS_SLAVES, factory=cordova_run_bbry, category=CORDOVA_UNSUPPORTED_CATEGORY), # BuilderConfig(name='cordova-blackberry-osx', slavenames=OSX_SLAVES, factory=cordova_run_bbry, category=CORDOVA_UNSUPPORTED_CATEGORY), ]) @@ -475,10 +470,8 @@ c['schedulers'].extend([ 'cordova-android-osx', 'cordova-android-win', 'cordova-ios', - 'cordova-windows-store8.0', 'cordova-windows-store8.1', 'cordova-windows-phone8.1', - 'cordova-wp8', # 'cordova-blackberry-win', # 'cordova-blackberry-osx', ], @@ -505,10 +498,8 @@ c['schedulers'].extend([ 'cordova-android-osx', 'cordova-android-win', 'cordova-ios', - 'cordova-windows-store8.0', 'cordova-windows-store8.1', 'cordova-windows-phone8.1', - 'cordova-wp8', # 'cordova-blackberry-win', # 'cordova-blackberry-osx', ], @@ -521,10 +512,8 @@ c['schedulers'].extend([ 'cordova-android-osx', 'cordova-android-win', 'cordova-ios', - 'cordova-windows-store8.0', 'cordova-windows-store8.1', 'cordova-windows-phone8.1', - 'cordova-wp8', # 'cordova-blackberry-win', # 'cordova-blackberry-osx', ], http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/950989b3/lib/util.js ---------------------------------------------------------------------- diff --git a/lib/util.js b/lib/util.js index 2f649ad..a636358 100644 --- a/lib/util.js +++ b/lib/util.js @@ -61,7 +61,6 @@ module.exports = (function () { BLACKBERRY: "blackberry10", IOS: "ios", WINDOWS: "windows", - WP8: "wp8", DEFAULT_ENCODING: "utf-8", DEFAULT_LOG_TIME: 15, http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/950989b3/medic/medic-kill.js ---------------------------------------------------------------------- diff --git a/medic/medic-kill.js b/medic/medic-kill.js index 4a2b843..72b957f 100644 --- a/medic/medic-kill.js +++ b/medic/medic-kill.js @@ -33,8 +33,6 @@ function tasksOnPlatform(platformName) { switch (platformName) { case util.WINDOWS: return ["WWAHost.exe", "Xde.exe"]; - case util.WP8: - return ["Xde.exe"]; case util.IOS: return ["iOS Simulator"]; case util.ANDROID: http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/950989b3/medic/medic-log.js ---------------------------------------------------------------------- diff --git a/medic/medic-log.js b/medic/medic-log.js index 8432697..a25c5b2 100644 --- a/medic/medic-log.js +++ b/medic/medic-log.js @@ -153,10 +153,6 @@ function logWindows(timeout) { } } -function logWP8() { - return; -} - function getLocalCLI() { if (util.isWindows()) { return "cordova.bat"; @@ -199,9 +195,6 @@ function main() { case util.WINDOWS: logWindows(timeout); break; - case util.WP8: - logWP8(); - break; default: console.warn("Logging is unsupported for " + platform); break; http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/950989b3/medic/medic-run.js ---------------------------------------------------------------------- diff --git a/medic/medic-run.js b/medic/medic-run.js index 504935d..d5cb44b 100644 --- a/medic/medic-run.js +++ b/medic/medic-run.js @@ -42,7 +42,7 @@ var DEFAULT_APP_ENTRY = "index.html"; var ANDROID_PAGE_LOAD_TIMEOUT = 120000; // in milliseconds var MEDIC_BUILD_PREFIX = "medic-cli-build"; var DEFAULT_WINDOWS_VERSION = "store"; -var WINDOWS_VERSION_CHOICES = ["store", "store80", "phone"]; +var WINDOWS_VERSION_CHOICES = ["store", "phone"]; var DEFAULT_TIMEOUT = 600; // in seconds var SERVER_RESPONSE_TIMEOUT = 15000; // in milliseconds var MAX_NUMBER_OF_TRIES = 3; @@ -204,11 +204,7 @@ function windowsSpecificPreparation(argv) { } // set windows target store version - if (winVersion === "store80") { - setWindowsTargetStoreVersion(appPath, "8.0"); - extraArgs = "--win"; - - } else if (winVersion === "store") { + if (winVersion === "store") { setWindowsTargetStoreVersion(appPath, "8.1"); extraArgs = "--win"; @@ -218,7 +214,7 @@ function windowsSpecificPreparation(argv) { } // patch WindowsStoreAppUtils script to allow app run w/out active desktop/remote session - if (winVersion === "store80" || winVersion === "store") { + if (winVersion === "store") { util.medicLog("Patching WindowsStoreAppUtils to allow app to be run in automated mode"); @@ -246,34 +242,6 @@ function windowsSpecificPreparation(argv) { return extraArgs; } -function wp8SpecificPreparation(argv) { - - var appPath = argv.app; - - // set permanent guid to prevent multiple installations - var guid = "{8449DEEE-16EB-4A4A-AFCC-8446E8F06FF7}"; - var manifestPath = path.join(appPath, "platforms", "wp8", "Properties", "WMAppManifest.xml"); - var xml = fs.readFileSync(manifestPath).toString().split("\n"); - - for (var i in xml) if (xml[i].indexOf("<App") != -1) { - if (xml[i].toLowerCase().indexOf("productid") != -1) { - var index = xml[i].toLowerCase().indexOf("productid"); - var spaceIndex = xml[i].indexOf(" ", index); - var stringAsArray = xml[i].split(""); - stringAsArray.splice(index, spaceIndex - index); - xml[i] = stringAsArray.join(""); - } - xml[i] = xml[i].substr(0, xml[i].length - 1); - xml[i] += " ProductID=\"" + guid + "\">"; - break; - } - - fs.writeFileSync(manifestPath, xml.join("\n")); - - var extraArgs = ""; - return extraArgs; -} - function getLocalCLI() { if (util.isWindows()) { return "cordova.bat"; @@ -363,8 +331,6 @@ function main() { platformArgs = androidSpecificPreparation(argv); } else if (platform === util.WINDOWS) { platformArgs = windowsSpecificPreparation(argv); - } else if (platform === util.WP8) { - platformArgs = wp8SpecificPreparation(argv); } // start waiting for test results --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
