Repository: cordova-windows Updated Branches: refs/heads/master 070ce90b3 -> c27396c1a
Fixes msbuild failure after windows project creation Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/2d1866ea Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/2d1866ea Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/2d1866ea Branch: refs/heads/master Commit: 2d1866ea7c5d3f6bcb8924b37e753e191226b138 Parents: 70d8a7e Author: Vladimir Kotikov <[email protected]> Authored: Mon Sep 29 12:21:26 2014 +0400 Committer: Vladimir Kotikov <[email protected]> Committed: Thu Oct 2 17:38:33 2014 +0400 ---------------------------------------------------------------------- template/CordovaApp.Windows80.jsproj | 5 ++++- template/cordova/lib/MSBuildTools.js | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/2d1866ea/template/CordovaApp.Windows80.jsproj ---------------------------------------------------------------------- diff --git a/template/CordovaApp.Windows80.jsproj b/template/CordovaApp.Windows80.jsproj index a50df83..34d1985 100644 --- a/template/CordovaApp.Windows80.jsproj +++ b/template/CordovaApp.Windows80.jsproj @@ -84,7 +84,10 @@ <Import Project="CordovaApp.projitems" Label="Shared" /> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).targets" /> <PropertyGroup> - <PreBuildEvent> + <BuildFromCordovaTooling>false</BuildFromCordovaTooling> + <PreBuildEvent Condition="$(BuildFromCordovaTooling) != true"> + cd /d $(MSBuildThisFileDirectory) + node -e "require('./cordova/lib/prepare.js').applyPlatformConfig()" </PreBuildEvent> </PropertyGroup> </Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/2d1866ea/template/cordova/lib/MSBuildTools.js ---------------------------------------------------------------------- diff --git a/template/cordova/lib/MSBuildTools.js b/template/cordova/lib/MSBuildTools.js index c88a975..8c8946c 100644 --- a/template/cordova/lib/MSBuildTools.js +++ b/template/cordova/lib/MSBuildTools.js @@ -15,7 +15,8 @@ MSBuildTools.prototype.buildProject = function(projFile, buildType, buildarch) { var args = ['/clp:NoSummary;NoItemAndPropertyList;Verbosity=minimal', '/nologo', '/p:Configuration=' + buildType, - '/p:Platform=' + buildarch]; + '/p:Platform=' + buildarch, + '/p:BuildFromCordovaTooling=' + true]; return spawn(path.join(this.path, 'msbuild'), [projFile].concat(args)); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
