Repository: cordova-windows Updated Branches: refs/heads/master e02282621 -> bdc4af329
CB-6976 Reflect new switch name to project structure For consistence reason. 1. Produce correct artefact names: Windows instead of Store before: CordovaApp.Store_0.0.1.0_anycpu_debug after: CordovaApp.Windows_0.0.1.0_anycpu_debug 2. Use <Windows> instead of <Store> suffix for file names to be consistent with terminology used in config.xml and command line switch and be more understanable for developers Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/bdc4af32 Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/bdc4af32 Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/bdc4af32 Branch: refs/heads/master Commit: bdc4af329c02658ed989b3e9b4013f81c3626cd6 Parents: 735f929 Author: sgrebnov <[email protected]> Authored: Fri Aug 15 14:00:51 2014 +0400 Committer: sgrebnov <[email protected]> Committed: Fri Aug 15 18:54:45 2014 +0400 ---------------------------------------------------------------------- windows/bin/lib/create.js | 2 +- windows/template/CordovaApp.Store.jsproj | 102 ------------------- windows/template/CordovaApp.Store80.jsproj | 93 ----------------- windows/template/CordovaApp.Windows.jsproj | 102 +++++++++++++++++++ windows/template/CordovaApp.Windows80.jsproj | 93 +++++++++++++++++ windows/template/CordovaApp.sln | 4 +- windows/template/CordovaApp.vs2012.sln | 2 +- .../cordova/lib/ApplyPlatformConfig.ps1 | 4 +- windows/template/cordova/lib/build.js | 4 +- windows/template/cordova/lib/package.js | 4 +- windows/template/cordova/lib/run.js | 8 +- windows/template/package.store.appxmanifest | 49 --------- windows/template/package.store80.appxmanifest | 50 --------- windows/template/package.windows.appxmanifest | 49 +++++++++ windows/template/package.windows80.appxmanifest | 50 +++++++++ 15 files changed, 308 insertions(+), 308 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/bdc4af32/windows/bin/lib/create.js ---------------------------------------------------------------------- diff --git a/windows/bin/lib/create.js b/windows/bin/lib/create.js index 31941b8..9b0b486 100644 --- a/windows/bin/lib/create.js +++ b/windows/bin/lib/create.js @@ -54,7 +54,7 @@ module.exports.run = function (argv) { shell.cp("-rf", path.join(root, 'VERSION'), projectPath); // replace specific values in manifests' templates - ["package.store.appxmanifest", "package.store80.appxmanifest", "package.phone.appxmanifest"].forEach(function (file) { + ["package.windows.appxmanifest", "package.windows80.appxmanifest", "package.phone.appxmanifest"].forEach(function (file) { var fileToReplace = path.join(projectPath, file); shell.sed('-i', /\$guid1\$/g, guid, fileToReplace); shell.sed('-i', /\$safeprojectname\$/g, safeAppName, fileToReplace); http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/bdc4af32/windows/template/CordovaApp.Store.jsproj ---------------------------------------------------------------------- diff --git a/windows/template/CordovaApp.Store.jsproj b/windows/template/CordovaApp.Store.jsproj deleted file mode 100644 index ae11a29..0000000 --- a/windows/template/CordovaApp.Store.jsproj +++ /dev/null @@ -1,102 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> - <PropertyGroup> - <OutputPath>build\store\$(Configuration)\$(Platform)\</OutputPath> - <IntermediateOutputPath>build\store\bld\</IntermediateOutputPath> - </PropertyGroup> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|AnyCPU"> - <Configuration>Debug</Configuration> - <Platform>AnyCPU</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|ARM"> - <Configuration>Debug</Configuration> - <Platform>ARM</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x86"> - <Configuration>Debug</Configuration> - <Platform>x86</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|AnyCPU"> - <Configuration>Release</Configuration> - <Platform>AnyCPU</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|ARM"> - <Configuration>Release</Configuration> - <Platform>ARM</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x86"> - <Configuration>Release</Configuration> - <Platform>x86</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>58950fb6-2f93-4963-b9cd-637f83f3efbf</ProjectGuid> - </PropertyGroup> - <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> - <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' < '12.0'"> - <VisualStudioVersion>12.0</VisualStudioVersion> - </PropertyGroup> - <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).Default.props" /> - <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).props" /> - <PropertyGroup> - <TargetPlatformIdentifier>Windows</TargetPlatformIdentifier> - <TargetPlatformVersion>8.1</TargetPlatformVersion> - <RequiredPlatformVersion>8.1</RequiredPlatformVersion> - <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion> - <DefaultLanguage>en-US</DefaultLanguage> - <PackageCertificateKeyFile>CordovaApp_TemporaryKey.pfx</PackageCertificateKeyFile> - </PropertyGroup> - <ItemGroup> - <AppxManifest Include="package.store.appxmanifest"> - <SubType>Designer</SubType> - </AppxManifest> - <Content Include="images\logo.png" /> - <Content Include="images\smalllogo.png" /> - <Content Include="images\splashscreen.png" /> - <Content Include="images\storelogo.png" /> - <None Include="CordovaApp_TemporaryKey.pfx" /> - </ItemGroup> - <ItemGroup> - <SDKReference Include="Microsoft.WinJS.2.0, Version=1.0" /> - </ItemGroup> - <Import Project="CordovaApp.projitems" Label="Shared" /> - <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).targets" /> - <!-- To modify your build process, add your task inside one of the targets below then uncomment - that target and the DisableFastUpToDateCheck PropertyGroup. - Other similar extension points exist, see Microsoft.Common.targets. - <Target Name="BeforeBuild"> - </Target> - <Target Name="AfterBuild"> - </Target> - <PropertyGroup> - <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck> - </PropertyGroup> - --> -</Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/bdc4af32/windows/template/CordovaApp.Store80.jsproj ---------------------------------------------------------------------- diff --git a/windows/template/CordovaApp.Store80.jsproj b/windows/template/CordovaApp.Store80.jsproj deleted file mode 100644 index e798fc0..0000000 --- a/windows/template/CordovaApp.Store80.jsproj +++ /dev/null @@ -1,93 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> - <PropertyGroup> - <OutputPath>build\store80\$(Configuration)\$(Platform)\</OutputPath> - <IntermediateOutputPath>build\store80\bld\</IntermediateOutputPath> - </PropertyGroup> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|AnyCPU"> - <Configuration>Debug</Configuration> - <Platform>AnyCPU</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|ARM"> - <Configuration>Debug</Configuration> - <Platform>ARM</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x86"> - <Configuration>Debug</Configuration> - <Platform>x86</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|AnyCPU"> - <Configuration>Release</Configuration> - <Platform>AnyCPU</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|ARM"> - <Configuration>Release</Configuration> - <Platform>ARM</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x86"> - <Configuration>Release</Configuration> - <Platform>x86</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>efffab2f-bfc5-4eda-b545-45ef4995f55a</ProjectGuid> - </PropertyGroup> - <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' < '11.0'"> - <VisualStudioVersion>11.0</VisualStudioVersion> - </PropertyGroup> - <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> - <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).Default.props" /> - <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).props" /> - <PropertyGroup> - <TargetPlatformIdentifier>Windows</TargetPlatformIdentifier> - <TargetPlatformVersion>8.0</TargetPlatformVersion> - <DefaultLanguage>en-US</DefaultLanguage> - <PackageCertificateKeyFile>CordovaApp_TemporaryKey.pfx</PackageCertificateKeyFile> - </PropertyGroup> - <ItemGroup> - <AppxManifest Include="package.store80.appxmanifest"> - <SubType>Designer</SubType> - </AppxManifest> - <Content Include="images\logo.png" /> - <Content Include="images\smalllogo.png" /> - <Content Include="images\splashscreen.png" /> - <Content Include="images\storelogo.png" /> - <None Include="CordovaApp_TemporaryKey.pfx" /> - </ItemGroup> - <ItemGroup> - <SDKReference Include="Microsoft.WinJS.1.0, Version=1.0" /> - </ItemGroup> - <Import Project="CordovaApp.projitems" Label="Shared" /> - <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).targets" /> - <PropertyGroup> - <PreBuildEvent> - </PreBuildEvent> - </PropertyGroup> -</Project> http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/bdc4af32/windows/template/CordovaApp.Windows.jsproj ---------------------------------------------------------------------- diff --git a/windows/template/CordovaApp.Windows.jsproj b/windows/template/CordovaApp.Windows.jsproj new file mode 100644 index 0000000..70d4d06 --- /dev/null +++ b/windows/template/CordovaApp.Windows.jsproj @@ -0,0 +1,102 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> + <PropertyGroup> + <OutputPath>build\windows\$(Configuration)\$(Platform)\</OutputPath> + <IntermediateOutputPath>build\windows\bld\</IntermediateOutputPath> + </PropertyGroup> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|AnyCPU"> + <Configuration>Debug</Configuration> + <Platform>AnyCPU</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|ARM"> + <Configuration>Debug</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x86"> + <Configuration>Debug</Configuration> + <Platform>x86</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|AnyCPU"> + <Configuration>Release</Configuration> + <Platform>AnyCPU</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|ARM"> + <Configuration>Release</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x86"> + <Configuration>Release</Configuration> + <Platform>x86</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>58950fb6-2f93-4963-b9cd-637f83f3efbf</ProjectGuid> + </PropertyGroup> + <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> + <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' < '12.0'"> + <VisualStudioVersion>12.0</VisualStudioVersion> + </PropertyGroup> + <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).Default.props" /> + <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).props" /> + <PropertyGroup> + <TargetPlatformIdentifier>Windows</TargetPlatformIdentifier> + <TargetPlatformVersion>8.1</TargetPlatformVersion> + <RequiredPlatformVersion>8.1</RequiredPlatformVersion> + <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion> + <DefaultLanguage>en-US</DefaultLanguage> + <PackageCertificateKeyFile>CordovaApp_TemporaryKey.pfx</PackageCertificateKeyFile> + </PropertyGroup> + <ItemGroup> + <AppxManifest Include="package.windows.appxmanifest"> + <SubType>Designer</SubType> + </AppxManifest> + <Content Include="images\logo.png" /> + <Content Include="images\smalllogo.png" /> + <Content Include="images\splashscreen.png" /> + <Content Include="images\storelogo.png" /> + <None Include="CordovaApp_TemporaryKey.pfx" /> + </ItemGroup> + <ItemGroup> + <SDKReference Include="Microsoft.WinJS.2.0, Version=1.0" /> + </ItemGroup> + <Import Project="CordovaApp.projitems" Label="Shared" /> + <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).targets" /> + <!-- To modify your build process, add your task inside one of the targets below then uncomment + that target and the DisableFastUpToDateCheck PropertyGroup. + Other similar extension points exist, see Microsoft.Common.targets. + <Target Name="BeforeBuild"> + </Target> + <Target Name="AfterBuild"> + </Target> + <PropertyGroup> + <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck> + </PropertyGroup> + --> +</Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/bdc4af32/windows/template/CordovaApp.Windows80.jsproj ---------------------------------------------------------------------- diff --git a/windows/template/CordovaApp.Windows80.jsproj b/windows/template/CordovaApp.Windows80.jsproj new file mode 100644 index 0000000..a72ec70 --- /dev/null +++ b/windows/template/CordovaApp.Windows80.jsproj @@ -0,0 +1,93 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> + <PropertyGroup> + <OutputPath>build\windows80\$(Configuration)\$(Platform)\</OutputPath> + <IntermediateOutputPath>build\windows80\bld\</IntermediateOutputPath> + </PropertyGroup> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|AnyCPU"> + <Configuration>Debug</Configuration> + <Platform>AnyCPU</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|ARM"> + <Configuration>Debug</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x86"> + <Configuration>Debug</Configuration> + <Platform>x86</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|AnyCPU"> + <Configuration>Release</Configuration> + <Platform>AnyCPU</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|ARM"> + <Configuration>Release</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x86"> + <Configuration>Release</Configuration> + <Platform>x86</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>efffab2f-bfc5-4eda-b545-45ef4995f55a</ProjectGuid> + </PropertyGroup> + <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' < '11.0'"> + <VisualStudioVersion>11.0</VisualStudioVersion> + </PropertyGroup> + <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> + <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).Default.props" /> + <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).props" /> + <PropertyGroup> + <TargetPlatformIdentifier>Windows</TargetPlatformIdentifier> + <TargetPlatformVersion>8.0</TargetPlatformVersion> + <DefaultLanguage>en-US</DefaultLanguage> + <PackageCertificateKeyFile>CordovaApp_TemporaryKey.pfx</PackageCertificateKeyFile> + </PropertyGroup> + <ItemGroup> + <AppxManifest Include="package.windows80.appxmanifest"> + <SubType>Designer</SubType> + </AppxManifest> + <Content Include="images\logo.png" /> + <Content Include="images\smalllogo.png" /> + <Content Include="images\splashscreen.png" /> + <Content Include="images\storelogo.png" /> + <None Include="CordovaApp_TemporaryKey.pfx" /> + </ItemGroup> + <ItemGroup> + <SDKReference Include="Microsoft.WinJS.1.0, Version=1.0" /> + </ItemGroup> + <Import Project="CordovaApp.projitems" Label="Shared" /> + <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).targets" /> + <PropertyGroup> + <PreBuildEvent> + </PreBuildEvent> + </PropertyGroup> +</Project> http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/bdc4af32/windows/template/CordovaApp.sln ---------------------------------------------------------------------- diff --git a/windows/template/CordovaApp.sln b/windows/template/CordovaApp.sln index 9266334..71caade 100644 --- a/windows/template/CordovaApp.sln +++ b/windows/template/CordovaApp.sln @@ -25,9 +25,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CordovaApp", "CordovaApp", EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "CordovaApp", "CordovaApp.shproj", "{9EBDB27F-D75B-4D8C-B53F-7BE4A1FE89F9}" EndProject -Project("{262852C6-CD72-467D-83FE-5EEB1973A190}") = "CordovaApp.Store80", "CordovaApp.Store80.jsproj", "{EFFFAB2F-BFC5-4EDA-B545-45EF4995F55A}" +Project("{262852C6-CD72-467D-83FE-5EEB1973A190}") = "CordovaApp.Windows8.0", "CordovaApp.Windows80.jsproj", "{EFFFAB2F-BFC5-4EDA-B545-45EF4995F55A}" EndProject -Project("{262852C6-CD72-467D-83FE-5EEB1973A190}") = "CordovaApp.Store", "CordovaApp.Store.jsproj", "{58950FB6-2F93-4963-B9CD-637F83F3EFBF}" +Project("{262852C6-CD72-467D-83FE-5EEB1973A190}") = "CordovaApp.Windows", "CordovaApp.Windows.jsproj", "{58950FB6-2F93-4963-B9CD-637F83F3EFBF}" EndProject Project("{262852C6-CD72-467D-83FE-5EEB1973A190}") = "CordovaApp.Phone", "CordovaApp.Phone.jsproj", "{31B67A35-9503-4213-857E-F44EB42AE549}" EndProject http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/bdc4af32/windows/template/CordovaApp.vs2012.sln ---------------------------------------------------------------------- diff --git a/windows/template/CordovaApp.vs2012.sln b/windows/template/CordovaApp.vs2012.sln index 300217c..60a27bc 100644 --- a/windows/template/CordovaApp.vs2012.sln +++ b/windows/template/CordovaApp.vs2012.sln @@ -19,7 +19,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # specific language governing permissions and limitations # under the License. # -Project("{262852C6-CD72-467D-83FE-5EEB1973A190}") = "CordovaApp.Store8.0", "CordovaApp.Store80.jsproj", "{EFFFAB2F-BFC5-4EDA-B545-45EF4995F55A}" +Project("{262852C6-CD72-467D-83FE-5EEB1973A190}") = "CordovaApp.Windows8.0", "CordovaApp.Windows80.jsproj", "{EFFFAB2F-BFC5-4EDA-B545-45EF4995F55A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/bdc4af32/windows/template/cordova/lib/ApplyPlatformConfig.ps1 ---------------------------------------------------------------------- diff --git a/windows/template/cordova/lib/ApplyPlatformConfig.ps1 b/windows/template/cordova/lib/ApplyPlatformConfig.ps1 index c179d5a..9e65a71 100644 --- a/windows/template/cordova/lib/ApplyPlatformConfig.ps1 +++ b/windows/template/cordova/lib/ApplyPlatformConfig.ps1 @@ -276,8 +276,8 @@ Function UpdateAssets () } -UpdateManifest "$platformRoot\package.store.appxmanifest" -UpdateManifest "$platformRoot\package.store80.appxmanifest" +UpdateManifest "$platformRoot\package.windows.appxmanifest" +UpdateManifest "$platformRoot\package.windows80.appxmanifest" UpdateManifest "$platformRoot\package.phone.appxmanifest" # replace splash screen images and icons http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/bdc4af32/windows/template/cordova/lib/build.js ---------------------------------------------------------------------- diff --git a/windows/template/cordova/lib/build.js b/windows/template/cordova/lib/build.js index 9a661a3..0281dbb 100644 --- a/windows/template/cordova/lib/build.js +++ b/windows/template/cordova/lib/build.js @@ -29,8 +29,8 @@ var Q = require('Q'), var ROOT = path.join(__dirname, '..', '..'); var projFiles = { phone: 'CordovaApp.Phone.jsproj', - win: 'CordovaApp.Store.jsproj', - win80: 'CordovaApp.Store80.jsproj' + win: 'CordovaApp.Windows.jsproj', + win80: 'CordovaApp.Windows80.jsproj' }; // parsed nopt arguments var args; http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/bdc4af32/windows/template/cordova/lib/package.js ---------------------------------------------------------------------- diff --git a/windows/template/cordova/lib/package.js b/windows/template/cordova/lib/package.js index 76175f1..95a15c2 100644 --- a/windows/template/cordova/lib/package.js +++ b/windows/template/cordova/lib/package.js @@ -75,7 +75,7 @@ module.exports.getInfo = function (packagePath) { // This RE matches with package folder name like: // CordovaApp.Phone_0.0.1.0_AnyCPU_Debug_Test // Group: ( 1 ) ( 2 ) ( 3 ) ( 4 ) - var props = /.*\.(Phone|Store|Store80)_((?:\d\.)*\d)_(AnyCPU|x64|x86|ARM)(?:_(Debug))?_Test$/i.exec(path.basename(packagePath)); + var props = /.*\.(Phone|Windows|Windows80)_((?:\d\.)*\d)_(AnyCPU|x64|x86|ARM)(?:_(Debug))?_Test$/i.exec(path.basename(packagePath)); if (props){ // return package info object inside of promise return Q.resolve({path: packagePath, @@ -104,7 +104,7 @@ module.exports.getAppId = function (platformPath) { // return package name fetched from appxmanifest // return rejected promise if appxmanifest not valid module.exports.getPackageName = function (platformPath) { - var manifest = path.join(platformPath, 'package.store.appxmanifest'); + var manifest = path.join(platformPath, 'package.windows.appxmanifest'); try { return Q.resolve(/Application Id="(.*?)"/gi.exec(fs.readFileSync(manifest, 'utf8'))[1]); } catch (e) { http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/bdc4af32/windows/template/cordova/lib/run.js ---------------------------------------------------------------------- diff --git a/windows/template/cordova/lib/run.js b/windows/template/cordova/lib/run.js index 58389b9..87fe36d 100644 --- a/windows/template/cordova/lib/run.js +++ b/windows/template/cordova/lib/run.js @@ -51,12 +51,12 @@ module.exports.run = function (argv) { // Get build/deploy options var buildType = args.release ? "release" : "debug", buildArchs = args.archs ? args.archs.split(' ') : ["anycpu"], - projectType = args.phone ? "phone" : "store", + projectType = args.phone ? "phone" : "windows", deployTarget = args.target ? args.target : args.device ? "device" : "emulator"; - // for store switch we should correctly handle 8.0 and 8.1 version as per configuration - if (projectType == 'store' && getWindowsTargetVersion() == '8.0') { - projectType = 'store80' + // for win switch we should correctly handle 8.0 and 8.1 version as per configuration + if (projectType == 'windows' && getWindowsTargetVersion() == '8.0') { + projectType = 'windows80' } // if --nobuild isn't specified then build app first http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/bdc4af32/windows/template/package.store.appxmanifest ---------------------------------------------------------------------- diff --git a/windows/template/package.store.appxmanifest b/windows/template/package.store.appxmanifest deleted file mode 100644 index 72a8d0e..0000000 --- a/windows/template/package.store.appxmanifest +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest"; xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest";> - <Identity Name="$guid1$" Version="1.0.0.0" Publisher="CN=$username$" /> - <Properties> - <DisplayName>$projectname$</DisplayName> - <PublisherDisplayName>$username$</PublisherDisplayName> - <Logo>images\storelogo.png</Logo> - </Properties> - <Prerequisites> - <OSMinVersion>6.3.0</OSMinVersion> - <OSMaxVersionTested>6.3.0</OSMaxVersionTested> - </Prerequisites> - <Resources> - <Resource Language="x-generate" /> - </Resources> - <Applications> - <Application Id="$safeprojectname$" StartPage="www/index.html"> - <m2:VisualElements DisplayName="$projectname$" - Description="CordovaApp" - ForegroundText="light" - BackgroundColor="#464646" - Square150x150Logo="images\Logo.png" - Square30x30Logo="images\SmallLogo.png"> - <m2:SplashScreen Image="images\splashscreen.png" /> - </m2:VisualElements> - </Application> - </Applications> - <Capabilities> - <Capability Name="internetClient" /> - </Capabilities> -</Package> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/bdc4af32/windows/template/package.store80.appxmanifest ---------------------------------------------------------------------- diff --git a/windows/template/package.store80.appxmanifest b/windows/template/package.store80.appxmanifest deleted file mode 100644 index 9262457..0000000 --- a/windows/template/package.store80.appxmanifest +++ /dev/null @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest";> - <Identity Name="$guid1$" Version="1.0.0.0" Publisher="CN=$username$" /> - <Properties> - <DisplayName>$projectname$</DisplayName> - <PublisherDisplayName>$username$</PublisherDisplayName> - <Logo>images\storelogo.png</Logo> - </Properties> - <Prerequisites> - <OSMinVersion>6.2.1</OSMinVersion> - <OSMaxVersionTested>6.2.1</OSMaxVersionTested> - </Prerequisites> - <Resources> - <Resource Language="x-generate" /> - </Resources> - <Applications> - <Application Id="$safeprojectname$" StartPage="www/index.html"> - <VisualElements DisplayName="$projectname$" - Logo="images\logo.png" - SmallLogo="images\smalllogo.png" - Description="CordovaApp" - ForegroundText="light" - BackgroundColor="#464646"> - <DefaultTile ShowName="allLogos" /> - <SplashScreen Image="images\splashscreen.png" /> - </VisualElements> - </Application> - </Applications> - <Capabilities> - <Capability Name="internetClient" /> - </Capabilities> -</Package> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/bdc4af32/windows/template/package.windows.appxmanifest ---------------------------------------------------------------------- diff --git a/windows/template/package.windows.appxmanifest b/windows/template/package.windows.appxmanifest new file mode 100644 index 0000000..72a8d0e --- /dev/null +++ b/windows/template/package.windows.appxmanifest @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest"; xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest";> + <Identity Name="$guid1$" Version="1.0.0.0" Publisher="CN=$username$" /> + <Properties> + <DisplayName>$projectname$</DisplayName> + <PublisherDisplayName>$username$</PublisherDisplayName> + <Logo>images\storelogo.png</Logo> + </Properties> + <Prerequisites> + <OSMinVersion>6.3.0</OSMinVersion> + <OSMaxVersionTested>6.3.0</OSMaxVersionTested> + </Prerequisites> + <Resources> + <Resource Language="x-generate" /> + </Resources> + <Applications> + <Application Id="$safeprojectname$" StartPage="www/index.html"> + <m2:VisualElements DisplayName="$projectname$" + Description="CordovaApp" + ForegroundText="light" + BackgroundColor="#464646" + Square150x150Logo="images\Logo.png" + Square30x30Logo="images\SmallLogo.png"> + <m2:SplashScreen Image="images\splashscreen.png" /> + </m2:VisualElements> + </Application> + </Applications> + <Capabilities> + <Capability Name="internetClient" /> + </Capabilities> +</Package> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/bdc4af32/windows/template/package.windows80.appxmanifest ---------------------------------------------------------------------- diff --git a/windows/template/package.windows80.appxmanifest b/windows/template/package.windows80.appxmanifest new file mode 100644 index 0000000..9262457 --- /dev/null +++ b/windows/template/package.windows80.appxmanifest @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest";> + <Identity Name="$guid1$" Version="1.0.0.0" Publisher="CN=$username$" /> + <Properties> + <DisplayName>$projectname$</DisplayName> + <PublisherDisplayName>$username$</PublisherDisplayName> + <Logo>images\storelogo.png</Logo> + </Properties> + <Prerequisites> + <OSMinVersion>6.2.1</OSMinVersion> + <OSMaxVersionTested>6.2.1</OSMaxVersionTested> + </Prerequisites> + <Resources> + <Resource Language="x-generate" /> + </Resources> + <Applications> + <Application Id="$safeprojectname$" StartPage="www/index.html"> + <VisualElements DisplayName="$projectname$" + Logo="images\logo.png" + SmallLogo="images\smalllogo.png" + Description="CordovaApp" + ForegroundText="light" + BackgroundColor="#464646"> + <DefaultTile ShowName="allLogos" /> + <SplashScreen Image="images\splashscreen.png" /> + </VisualElements> + </Application> + </Applications> + <Capabilities> + <Capability Name="internetClient" /> + </Capabilities> +</Package> \ No newline at end of file
