You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2014/08/19 13:30:49 UTC
git commit: CB-7129 VS2012 solution now accepts "anycpu" target
instead of "any cpu"
Repository: cordova-windows
Updated Branches:
refs/heads/master 9b3248659 -> 10eb7b4ad
CB-7129 VS2012 solution now accepts "anycpu" target instead of "any cpu"
Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/10eb7b4a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/10eb7b4a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/10eb7b4a
Branch: refs/heads/master
Commit: 10eb7b4adadab20b0aa0fb84290da4638b1af986
Parents: 9b32486
Author: Vladimir Kotikov <v-...@microsoft.com>
Authored: Tue Aug 19 15:21:18 2014 +0400
Committer: Vladimir Kotikov <v-...@microsoft.com>
Committed: Tue Aug 19 15:25:26 2014 +0400
----------------------------------------------------------------------
windows/template/CordovaApp.vs2012.sln | 16 ++++++++--------
windows/template/cordova/lib/build.js | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/10eb7b4a/windows/template/CordovaApp.vs2012.sln
----------------------------------------------------------------------
diff --git a/windows/template/CordovaApp.vs2012.sln b/windows/template/CordovaApp.vs2012.sln
index 60a27bc..b08ca94 100644
--- a/windows/template/CordovaApp.vs2012.sln
+++ b/windows/template/CordovaApp.vs2012.sln
@@ -23,19 +23,19 @@ Project("{262852C6-CD72-467D-83FE-5EEB1973A190}") = "CordovaApp.Windows8.0", "Co
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
+ Debug|AnyCPU = Debug|AnyCPU
Debug|ARM = Debug|ARM
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
- Release|Any CPU = Release|Any CPU
+ Release|AnyCPU = Release|AnyCPU
Release|ARM = Release|ARM
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {EFFFAB2F-BFC5-4EDA-B545-45EF4995F55A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {EFFFAB2F-BFC5-4EDA-B545-45EF4995F55A}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {EFFFAB2F-BFC5-4EDA-B545-45EF4995F55A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+ {EFFFAB2F-BFC5-4EDA-B545-45EF4995F55A}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
+ {EFFFAB2F-BFC5-4EDA-B545-45EF4995F55A}.Debug|AnyCPU.Build.0 = Debug|Any CPU
+ {EFFFAB2F-BFC5-4EDA-B545-45EF4995F55A}.Debug|AnyCPU.Deploy.0 = Debug|Any CPU
{EFFFAB2F-BFC5-4EDA-B545-45EF4995F55A}.Debug|ARM.ActiveCfg = Debug|ARM
{EFFFAB2F-BFC5-4EDA-B545-45EF4995F55A}.Debug|ARM.Build.0 = Debug|ARM
{EFFFAB2F-BFC5-4EDA-B545-45EF4995F55A}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -45,9 +45,9 @@ Global
{EFFFAB2F-BFC5-4EDA-B545-45EF4995F55A}.Debug|x86.ActiveCfg = Debug|x86
{EFFFAB2F-BFC5-4EDA-B545-45EF4995F55A}.Debug|x86.Build.0 = Debug|x86
{EFFFAB2F-BFC5-4EDA-B545-45EF4995F55A}.Debug|x86.Deploy.0 = Debug|x86
- {EFFFAB2F-BFC5-4EDA-B545-45EF4995F55A}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {EFFFAB2F-BFC5-4EDA-B545-45EF4995F55A}.Release|Any CPU.Build.0 = Release|Any CPU
- {EFFFAB2F-BFC5-4EDA-B545-45EF4995F55A}.Release|Any CPU.Deploy.0 = Release|Any CPU
+ {EFFFAB2F-BFC5-4EDA-B545-45EF4995F55A}.Release|AnyCPU.ActiveCfg = Release|Any CPU
+ {EFFFAB2F-BFC5-4EDA-B545-45EF4995F55A}.Release|AnyCPU.Build.0 = Release|Any CPU
+ {EFFFAB2F-BFC5-4EDA-B545-45EF4995F55A}.Release|AnyCPU.Deploy.0 = Release|Any CPU
{EFFFAB2F-BFC5-4EDA-B545-45EF4995F55A}.Release|ARM.ActiveCfg = Release|ARM
{EFFFAB2F-BFC5-4EDA-B545-45EF4995F55A}.Release|ARM.Build.0 = Release|ARM
{EFFFAB2F-BFC5-4EDA-B545-45EF4995F55A}.Release|ARM.Deploy.0 = Release|ARM
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/10eb7b4a/windows/template/cordova/lib/build.js
----------------------------------------------------------------------
diff --git a/windows/template/cordova/lib/build.js b/windows/template/cordova/lib/build.js
index d2fefd4..0281dbb 100644
--- a/windows/template/cordova/lib/build.js
+++ b/windows/template/cordova/lib/build.js
@@ -118,8 +118,8 @@ function buildTargets() {
return buildConfigs.reduce(function (promise, build) {
return promise.then(function () {
// support for "any cpu" specified with or without space
- if (build.arch == 'anycpu') {
- build.arch = 'any cpu';
+ if (build.arch == 'any cpu') {
+ build.arch = 'anycpu';
}
// msbuild 4.0 requires .sln file, we can't build jsproj
if (msbuild.version == '4.0' && build.target == projFiles.win80) {