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 2014/12/26 11:08:39 UTC
[1/3] cordova-wp8 git commit: Use the newer AppDeployCmd when
available The old XapDeployCmd could raise "Error: The parameter is
incorrect." with project files that were opened with more recent versions of
Visual Studio. This change looks for the Window
Repository: cordova-wp8
Updated Branches:
refs/heads/master 54a51f5b2 -> 4ea341041
Use the newer AppDeployCmd when available
The old XapDeployCmd could raise "Error: The parameter is incorrect." with project files that were opened with more recent versions of Visual Studio.
This change looks for the Windows Phone SDK 8.1 AppDeployCmd before falling back to the WP SDK 8.0 XapDeployCmd.
Project: http://git-wip-us.apache.org/repos/asf/cordova-wp8/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-wp8/commit/d292b80a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-wp8/tree/d292b80a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-wp8/diff/d292b80a
Branch: refs/heads/master
Commit: d292b80a69d302280eef940b5ee816bd8e2d7d2c
Parents: 6bb3fc3
Author: Oliver Salzburg <ol...@gmail.com>
Authored: Mon Dec 15 15:42:39 2014 +0100
Committer: Oliver Salzburg <ol...@gmail.com>
Committed: Mon Dec 15 15:42:39 2014 +0100
----------------------------------------------------------------------
template/cordova/lib/utils.js | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/d292b80a/template/cordova/lib/utils.js
----------------------------------------------------------------------
diff --git a/template/cordova/lib/utils.js b/template/cordova/lib/utils.js
index 28fb018..f3efd7e 100644
--- a/template/cordova/lib/utils.js
+++ b/template/cordova/lib/utils.js
@@ -23,8 +23,16 @@ var Q = require('Q'),
proc = require('child_process'),
msbuildTools = require('./MSBuildTools');
-// returns path to XapDeploy util from Windows Phone 8.1 SDK
+// returns path to app deployment util from Windows Phone 8.x SDK
module.exports.getXapDeploy = function () {
+ // Try the newer AppDeploy first
+ var appDeployUtils = path.join((process.env["ProgramFiles(x86)"] || process.env["ProgramFiles"]),
+ 'Microsoft SDKs', 'Windows Phone', 'v8.1', 'Tools', 'AppDeploy', 'AppDeployCmd.exe');
+ if (fs.existsSync(appDeployUtils)) {
+ return Q.resolve(appDeployUtils);
+ }
+
+ // If AppDeployCmd wasn't found, try XapDeployCmd
var xapDeployUtils = path.join((process.env["ProgramFiles(x86)"] || process.env["ProgramFiles"]),
'Microsoft SDKs', 'Windows Phone', 'v8.0', 'Tools', 'Xap Deployment', 'XapDeployCmd.exe');
// Check if XapDeployCmd is exists
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/3] cordova-wp8 git commit: Merge remote-tracking branch
'hartwig-cordova/feature/appdeploy-wpsdk8.1'
Posted by sg...@apache.org.
Merge remote-tracking branch 'hartwig-cordova/feature/appdeploy-wpsdk8.1'
Project: http://git-wip-us.apache.org/repos/asf/cordova-wp8/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-wp8/commit/3d9c8f6e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-wp8/tree/3d9c8f6e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-wp8/diff/3d9c8f6e
Branch: refs/heads/master
Commit: 3d9c8f6ee138a1682251b6a46aecf666b0713adb
Parents: 54a51f5 d292b80
Author: sgrebnov <v-...@microsoft.com>
Authored: Fri Dec 26 12:50:46 2014 +0300
Committer: sgrebnov <v-...@microsoft.com>
Committed: Fri Dec 26 12:50:46 2014 +0300
----------------------------------------------------------------------
template/cordova/lib/utils.js | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[3/3] cordova-wp8 git commit: CB-8060 Updated AppDeployCmd lookup code
Posted by sg...@apache.org.
CB-8060 Updated AppDeployCmd lookup code
github: close #67
Project: http://git-wip-us.apache.org/repos/asf/cordova-wp8/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-wp8/commit/4ea34104
Tree: http://git-wip-us.apache.org/repos/asf/cordova-wp8/tree/4ea34104
Diff: http://git-wip-us.apache.org/repos/asf/cordova-wp8/diff/4ea34104
Branch: refs/heads/master
Commit: 4ea34104127ca944c15e6aa0a42e9c2f8e25f1f6
Parents: 3d9c8f6
Author: sgrebnov <v-...@microsoft.com>
Authored: Fri Dec 26 13:08:28 2014 +0300
Committer: sgrebnov <v-...@microsoft.com>
Committed: Fri Dec 26 13:08:28 2014 +0300
----------------------------------------------------------------------
template/cordova/lib/utils.js | 31 ++++++++++++++++---------------
1 file changed, 16 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/4ea34104/template/cordova/lib/utils.js
----------------------------------------------------------------------
diff --git a/template/cordova/lib/utils.js b/template/cordova/lib/utils.js
index f3efd7e..eaea655 100644
--- a/template/cordova/lib/utils.js
+++ b/template/cordova/lib/utils.js
@@ -25,22 +25,23 @@ var Q = require('Q'),
// returns path to app deployment util from Windows Phone 8.x SDK
module.exports.getXapDeploy = function () {
- // Try the newer AppDeploy first
- var appDeployUtils = path.join((process.env["ProgramFiles(x86)"] || process.env["ProgramFiles"]),
- 'Microsoft SDKs', 'Windows Phone', 'v8.1', 'Tools', 'AppDeploy', 'AppDeployCmd.exe');
- if (fs.existsSync(appDeployUtils)) {
- return Q.resolve(appDeployUtils);
- }
-
- // If AppDeployCmd wasn't found, try XapDeployCmd
- var xapDeployUtils = path.join((process.env["ProgramFiles(x86)"] || process.env["ProgramFiles"]),
- 'Microsoft SDKs', 'Windows Phone', 'v8.0', 'Tools', 'Xap Deployment', 'XapDeployCmd.exe');
- // Check if XapDeployCmd is exists
- if (!fs.existsSync(xapDeployUtils)) {
- console.warn("WARNING: XapDeploy tool (XapDeployCmd.exe) didn't found. Assume that it's in %PATH%");
- return Q.resolve("XapDeployCmd");
+ var toolsLookupLocations = [
+ // Windows Phone 8.1
+ path.join((process.env["ProgramFiles(x86)"] || process.env["ProgramFiles"]),
+ 'Microsoft SDKs', 'Windows Phone', 'v8.1', 'Tools', 'AppDeploy', 'AppDeployCmd.exe'),
+ // Windows Phone 8.0
+ path.join((process.env["ProgramFiles(x86)"] || process.env["ProgramFiles"]),
+ 'Microsoft SDKs', 'Windows Phone', 'v8.0', 'Tools', 'Xap Deployment', 'XapDeployCmd.exe')
+ ];
+
+ for (idx in toolsLookupLocations) {
+ if (fs.existsSync(toolsLookupLocations[idx])) {
+ return Q.resolve(toolsLookupLocations[idx]);
+ }
}
- return Q.resolve(xapDeployUtils);
+
+ console.warn("WARNING: XapDeploy tool (XapDeployCmd.exe) didn't found. Assume that it's in %PATH%");
+ return Q.resolve("XapDeployCmd");
};
module.exports.getOSVersion = function () {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org