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/23 10:05:19 UTC
git commit: moved PlatformConfig functionality to pre-build project
level so running outside of cli will still work
Repository: cordova-windows
Updated Branches:
refs/heads/master 079ea13e6 -> c3fdf80e9
moved PlatformConfig functionality to pre-build project level so running outside of cli will still work
Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/c3fdf80e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/c3fdf80e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/c3fdf80e
Branch: refs/heads/master
Commit: c3fdf80e920820e83a49918ea7a38dd7fb069f6a
Parents: 079ea13
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Wed Apr 23 01:04:56 2014 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Wed Apr 23 01:04:56 2014 -0700
----------------------------------------------------------------------
windows8/template/CordovaApp.jsproj | 7 ++++++-
windows8/template/cordova/lib/ApplyPlatformConfig.ps1 | 2 ++
windows8/template/cordova/lib/build.js | 6 ------
3 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/c3fdf80e/windows8/template/CordovaApp.jsproj
----------------------------------------------------------------------
diff --git a/windows8/template/CordovaApp.jsproj b/windows8/template/CordovaApp.jsproj
index d78baa7..611ae76 100644
--- a/windows8/template/CordovaApp.jsproj
+++ b/windows8/template/CordovaApp.jsproj
@@ -82,4 +82,9 @@
<DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
</PropertyGroup>
-->
-</Project>
\ No newline at end of file
+ <PropertyGroup>
+ <PreBuildEvent>
+Powershell -ExecutionPolicy RemoteSigned Unblock-File $(ProjectDir)\cordova\lib\ApplyPlatformConfig.ps1; Powershell -File $(ProjectDir)\cordova\lib\ApplyPlatformConfig.ps1 $(ProjectDir);
+ </PreBuildEvent>
+ </PropertyGroup>
+</Project>
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/c3fdf80e/windows8/template/cordova/lib/ApplyPlatformConfig.ps1
----------------------------------------------------------------------
diff --git a/windows8/template/cordova/lib/ApplyPlatformConfig.ps1 b/windows8/template/cordova/lib/ApplyPlatformConfig.ps1
index a0229b4..df9cbed 100644
--- a/windows8/template/cordova/lib/ApplyPlatformConfig.ps1
+++ b/windows8/template/cordova/lib/ApplyPlatformConfig.ps1
@@ -22,6 +22,8 @@ param(
[string] $platformRoot
)
+Write-Host "Applying Platform Config"
+
$configFile = "$platformRoot\config.xml"
$manifestFile = "$platformRoot\package.appxmanifest"
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/c3fdf80e/windows8/template/cordova/lib/build.js
----------------------------------------------------------------------
diff --git a/windows8/template/cordova/lib/build.js b/windows8/template/cordova/lib/build.js
index 0fe1353..1db2f28 100644
--- a/windows8/template/cordova/lib/build.js
+++ b/windows8/template/cordova/lib/build.js
@@ -26,8 +26,6 @@ var args = WScript.Arguments;
// working dir
var ROOT = WScript.ScriptFullName.split('\\cordova\\lib\\build.js').join('');
-var PLATFORM_CONFIG_SCRIPT = "\\cordova\\lib\\ApplyPlatformConfig.ps1";
-
// help/usage function
function Usage() {
Log("");
@@ -131,10 +129,6 @@ function build_appx(path,isRelease) {
try {
wscript_shell.CurrentDirectory = path;
- // 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 + '\'\"');
-
var MSBuildToolsPath = getMSBuildToolsPath(path);
Log("\tMSBuildToolsPath: " + MSBuildToolsPath);
var solutionDir = getSolutionDir(path);