You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2014/04/22 21:54:48 UTC
[1/2] git commit: Fix build/deploy errors when path to project
contains spaces
Repository: cordova-windows
Updated Branches:
refs/heads/master 3fed2e871 -> ded254b73
Fix build/deploy errors when path to project contains spaces
Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/8037310a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/8037310a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/8037310a
Branch: refs/heads/master
Commit: 8037310ad388a37adcc176dffecd2d8a3a5a4e15
Parents: 1bc1036
Author: Vladimir Kotikov <v-...@microsoft.com>
Authored: Mon Apr 14 12:30:59 2014 +0400
Committer: Vladimir Kotikov <v-...@microsoft.com>
Committed: Mon Apr 14 18:41:06 2014 +0400
----------------------------------------------------------------------
windows8/template/cordova/lib/build.js | 2 +-
windows8/template/cordova/lib/deploy.js | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/8037310a/windows8/template/cordova/lib/build.js
----------------------------------------------------------------------
diff --git a/windows8/template/cordova/lib/build.js b/windows8/template/cordova/lib/build.js
index 7e84c8d..0fe1353 100644
--- a/windows8/template/cordova/lib/build.js
+++ b/windows8/template/cordova/lib/build.js
@@ -133,7 +133,7 @@ function build_appx(path,isRelease) {
// Apply config.xml settings to package.appxmanifest
Log("Applying config.xml to package.appxmanifest");
- exec_verbose('powershell -ExecutionPolicy RemoteSigned \"Unblock-File .' + PLATFORM_CONFIG_SCRIPT + '; . .' + PLATFORM_CONFIG_SCRIPT + ' ' + path + '\"');
+ exec_verbose('powershell -ExecutionPolicy RemoteSigned \"Unblock-File .' + PLATFORM_CONFIG_SCRIPT + '; . .' + PLATFORM_CONFIG_SCRIPT + ' \'' + path + '\'\"');
var MSBuildToolsPath = getMSBuildToolsPath(path);
Log("\tMSBuildToolsPath: " + MSBuildToolsPath);
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/8037310a/windows8/template/cordova/lib/deploy.js
----------------------------------------------------------------------
diff --git a/windows8/template/cordova/lib/deploy.js b/windows8/template/cordova/lib/deploy.js
index 6b2f08e..8cdcde9 100644
--- a/windows8/template/cordova/lib/deploy.js
+++ b/windows8/template/cordova/lib/deploy.js
@@ -104,7 +104,7 @@ function localMachine(path) {
uninstallApp(path);
installApp(path);
- var command = "powershell -ExecutionPolicy RemoteSigned \". .\\" + WINDOWS_STORE_UTILS + "; Start-Locally " + PACKAGE_NAME;
+ var command = "powershell -ExecutionPolicy RemoteSigned \". .\\" + WINDOWS_STORE_UTILS + "; Start-Locally '" + PACKAGE_NAME + "'\"";
Log(command);
exec_verbose(command);
}
@@ -134,7 +134,7 @@ function target(path, device_id) {
function makeAppStoreUtils(path) {
if (fso.FileExists(path + WINDOWS_STORE_UTILS)) {
Log("Removing execution restrictions from AppStoreUtils...");
- var command = "powershell \"Unblock-File " + path + WINDOWS_STORE_UTILS + "\"";
+ var command = "powershell \"Unblock-File \'" + path + WINDOWS_STORE_UTILS + "\'\"";
exec_verbose(command);
return;
}
@@ -172,7 +172,7 @@ function installApp(path) {
{
if(fso.GetExtensionName(files.item()) == "ps1")
{
- var command = "powershell -ExecutionPolicy RemoteSigned \". .\\" + WINDOWS_STORE_UTILS + "; Install-App " + "'" + files.item() + "'";
+ var command = "powershell -ExecutionPolicy RemoteSigned \". .\\" + WINDOWS_STORE_UTILS + "; Install-App " + "'" + files.item() + "'\"";
Log(command);
exec_verbose(command);
return;
[2/2] git commit: Merge branch 'CB-6442' of
https://github.com/MSOpenTech/cordova-windows
Posted by pu...@apache.org.
Merge branch 'CB-6442' of https://github.com/MSOpenTech/cordova-windows
Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/ded254b7
Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/ded254b7
Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/ded254b7
Branch: refs/heads/master
Commit: ded254b73f17e6d5023008e0016d6e9c17b76f89
Parents: 3fed2e8 8037310
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Tue Apr 22 12:50:57 2014 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Tue Apr 22 12:50:57 2014 -0700
----------------------------------------------------------------------
windows8/template/cordova/lib/build.js | 2 +-
windows8/template/cordova/lib/deploy.js | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------