Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7D406113A9 for ; Tue, 22 Apr 2014 19:54:49 +0000 (UTC) Received: (qmail 24751 invoked by uid 500); 22 Apr 2014 19:54:49 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 24703 invoked by uid 500); 22 Apr 2014 19:54:48 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cordova.apache.org Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 24695 invoked by uid 99); 22 Apr 2014 19:54:48 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Apr 2014 19:54:48 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 561C68C2B41; Tue, 22 Apr 2014 19:54:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: purplecabbage@apache.org To: commits@cordova.apache.org Date: Tue, 22 Apr 2014 19:54:48 -0000 Message-Id: <1a68ba21b7ef4fd09d568d0b58f8f004@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Mon Apr 14 12:30:59 2014 +0400 Committer: Vladimir Kotikov 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;