[TIMOB-24958] Fix detection of SDK specific winappdeploycmd (#75)

appcelerator-archive · Aug 16, 2017 · 3d0e841 · 3d0e841
1 parent 5882368
commit 3d0e841
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,5 @@
+0.5.4 (08/15/2017)
+  * [TIMOB-24958] Fix detection of SDK specific winappdeploycmd
 0.5.3 (08/09/2017)
   * [TIMOB-24683] Must call the callback with an object like {devices:[], emulator:[]}
 0.5.2 (07/12/2017)

diff --git a/lib/windowsphone.js b/lib/windowsphone.js
@@ -155,11 +155,20 @@ function detectWin10(options, callback) {
 								sdks: []
 							};
 
-							var deployCmd = path.join(parts[2], 'bin', 'x86', 'WinAppDeployCmd.exe'),
-								signTool = path.join(parts[2], 'bin', 'x86', 'signtool.exe');
+							var binDir = path.join(parts[2], 'bin'),
+								deployCmd = path.join(binDir, 'x86', 'WinAppDeployCmd.exe'),
+								signTool = path.join(binDir, 'x86', 'signtool.exe');
 							if (fs.existsSync(deployCmd)) {
 								results.windowsphone[version].deployCmd = deployCmd;
 							}
+							var dirs = fs.readdirSync(binDir).filter(dirname => /(\d+\.\d+\.\d+)\.\d+/.test(dirname));
+							for (var i = 0; i < dirs.length; i++) {
+								var sdk = dirs[i];
+								deployCmd = path.join(binDir, sdk, 'x86', 'WinAppDeployCmd.exe')
+								if (fs.existsSync(deployCmd)) {
+									results.windowsphone[version].deployCmd = deployCmd;
+								}
+							}
 							if (fs.existsSync(signTool)) {
 								results.windowsphone[version].xapSignTool = signTool;
 							}

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "windowslib",
-	"version": "0.5.3",
+	"version": "0.5.4",
 	"description": "Windows Phone Utility Library",
 	"keywords": [
 		"appcelerator",