CB-10927 - Framework references in plugin.xml file prevent Windows Universal projects from being used on other machines
-Stop using a hardcoded path to framework references -Modify tests to deal with non-hardcoded framework paths Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/dbf6a1d2 Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/dbf6a1d2 Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/dbf6a1d2 Branch: refs/heads/4.3.x Commit: dbf6a1d2fe956cae14eb5dbaa0851d36613fcbb0 Parents: 16a0243 Author: Vladimir Kotikov <[email protected]> Authored: Thu Mar 31 10:42:07 2016 +0300 Committer: Vladimir Kotikov <[email protected]> Committed: Thu Mar 31 10:43:04 2016 +0300 ---------------------------------------------------------------------- ...ovaApp.Phone_0.0.1.0_AnyCPU_debug.appxbundle | 1 + ...CordovaApp.Windows_0.0.1.0_anycpu_debug.appx | 1 + .../platforms/windows/CordovaApp.Phone.jsproj | 99 +++++++++++++++++ .../platforms/windows/CordovaApp.Windows.jsproj | 99 +++++++++++++++++ .../windows/CordovaApp.Windows10.jsproj | 61 +++++++++++ .../windows/CordovaApp.Windows80.jsproj | 93 ++++++++++++++++ .../platforms/windows/CordovaApp.projitems | 32 ++++++ .../platforms/windows/CordovaApp.shproj | 30 ++++++ .../testProj/platforms/windows/CordovaApp.sln | 106 +++++++++++++++++++ .../platforms/windows/CordovaApp.vs2012.sln | 64 +++++++++++ .../windows/CordovaApp_TemporaryKey.pfx | Bin 0 -> 2544 bytes .../fixtures/testProj/platforms/windows/VERSION | 1 + .../testProj/platforms/windows/config.xml | 14 +++ .../windows/package.phone.appxmanifest | 57 ++++++++++ .../windows/package.windows.appxmanifest | 58 ++++++++++ .../windows/package.windows80.appxmanifest | 50 +++++++++ .../org.test.plugins.dummyplugin/plugin.xml | 79 ++++++++++++++ .../src/windows/dummer.js | 1 + .../src/windows/dummy1.dll | 0 .../src/windows/dummy1.vcxproj | 7 ++ .../src/windows/dummy2.dll | 0 .../src/windows/dummy2.vcxproj | 7 ++ .../src/windows/dummy3.dll | 0 .../src/windows/dummy3.vcxproj | 7 ++ .../src/windows/dummy4.dll | 0 .../src/windows/dummy4.vcxproj | 7 ++ .../src/windows/dummy5.dll | 0 .../src/windows/dummy6.dll | 0 .../src/windows/text_sample1.txt | 0 .../src/windows/text_sample2.txt | 0 .../src/windows/text_sample3.txt | 0 .../src/windows/text_sample4.txt | 0 .../www/dummyplugin.js | 1 + .../www/dummyplugin/image.jpg | 1 + template/cordova/lib/JsprojManager.js | 2 +- template/cordova/lib/PluginHandler.js | 8 +- 36 files changed, 881 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/dbf6a1d2/spec/unit/fixtures/testProj/platforms/windows/AppPackages/CordovaApp.Phone_0.0.1.0_debug_Test/CordovaApp.Phone_0.0.1.0_AnyCPU_debug.appxbundle ---------------------------------------------------------------------- diff --git a/spec/unit/fixtures/testProj/platforms/windows/AppPackages/CordovaApp.Phone_0.0.1.0_debug_Test/CordovaApp.Phone_0.0.1.0_AnyCPU_debug.appxbundle b/spec/unit/fixtures/testProj/platforms/windows/AppPackages/CordovaApp.Phone_0.0.1.0_debug_Test/CordovaApp.Phone_0.0.1.0_AnyCPU_debug.appxbundle new file mode 100644 index 0000000..654e7f0 --- /dev/null +++ b/spec/unit/fixtures/testProj/platforms/windows/AppPackages/CordovaApp.Phone_0.0.1.0_debug_Test/CordovaApp.Phone_0.0.1.0_AnyCPU_debug.appxbundle @@ -0,0 +1 @@ +(dummy package) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/dbf6a1d2/spec/unit/fixtures/testProj/platforms/windows/AppPackages/CordovaApp.Windows_0.0.1.0_anycpu_debug_Test/CordovaApp.Windows_0.0.1.0_anycpu_debug.appx ---------------------------------------------------------------------- diff --git a/spec/unit/fixtures/testProj/platforms/windows/AppPackages/CordovaApp.Windows_0.0.1.0_anycpu_debug_Test/CordovaApp.Windows_0.0.1.0_anycpu_debug.appx b/spec/unit/fixtures/testProj/platforms/windows/AppPackages/CordovaApp.Windows_0.0.1.0_anycpu_debug_Test/CordovaApp.Windows_0.0.1.0_anycpu_debug.appx new file mode 100644 index 0000000..654e7f0 --- /dev/null +++ b/spec/unit/fixtures/testProj/platforms/windows/AppPackages/CordovaApp.Windows_0.0.1.0_anycpu_debug_Test/CordovaApp.Windows_0.0.1.0_anycpu_debug.appx @@ -0,0 +1 @@ +(dummy package) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/dbf6a1d2/spec/unit/fixtures/testProj/platforms/windows/CordovaApp.Phone.jsproj ---------------------------------------------------------------------- diff --git a/spec/unit/fixtures/testProj/platforms/windows/CordovaApp.Phone.jsproj b/spec/unit/fixtures/testProj/platforms/windows/CordovaApp.Phone.jsproj new file mode 100644 index 0000000..43e4fe2 --- /dev/null +++ b/spec/unit/fixtures/testProj/platforms/windows/CordovaApp.Phone.jsproj @@ -0,0 +1,99 @@ +<?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\phone\$(Configuration)\$(Platform)\</OutputPath> + <IntermediateOutputPath>build\phone\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>31b67a35-9503-4213-857e-f44eb42ae549</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" /> + <PropertyGroup Label="Configuration"> + <TargetPlatformIdentifier>WindowsPhoneApp</TargetPlatformIdentifier> + <TargetPlatformVersion>8.1</TargetPlatformVersion> + <RequiredPlatformVersion>8.1</RequiredPlatformVersion> + <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion> + </PropertyGroup> + <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).props" /> + <PropertyGroup> + <DefaultLanguage>en-US</DefaultLanguage> + </PropertyGroup> + <ItemGroup> + <AppxManifest Include="package.phone.appxmanifest"> + <SubType>Designer</SubType> + </AppxManifest> + <Content Include="images\*.png" Exclude="images\*.scale-180.*" /> + </ItemGroup> + <ItemGroup> + <SDKReference Include="Microsoft.Phone.WinJS.2.1, 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/dbf6a1d2/spec/unit/fixtures/testProj/platforms/windows/CordovaApp.Windows.jsproj ---------------------------------------------------------------------- diff --git a/spec/unit/fixtures/testProj/platforms/windows/CordovaApp.Windows.jsproj b/spec/unit/fixtures/testProj/platforms/windows/CordovaApp.Windows.jsproj new file mode 100644 index 0000000..6905ba6 --- /dev/null +++ b/spec/unit/fixtures/testProj/platforms/windows/CordovaApp.Windows.jsproj @@ -0,0 +1,99 @@ +<?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\*.png" Exclude="images\*.scale-240.*" /> + <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/dbf6a1d2/spec/unit/fixtures/testProj/platforms/windows/CordovaApp.Windows10.jsproj ---------------------------------------------------------------------- diff --git a/spec/unit/fixtures/testProj/platforms/windows/CordovaApp.Windows10.jsproj b/spec/unit/fixtures/testProj/platforms/windows/CordovaApp.Windows10.jsproj new file mode 100644 index 0000000..e4b9b06 --- /dev/null +++ b/spec/unit/fixtures/testProj/platforms/windows/CordovaApp.Windows10.jsproj @@ -0,0 +1,61 @@ +<?xml version='1.0' encoding='utf-8'?> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> + <PropertyGroup> + <OutputPath>build\windows\$(Configuration)\$(Platform)\</OutputPath> + <IntermediateOutputPath>build\windows\bld\</IntermediateOutputPath> + <AppxPackageSigningEnabled>true</AppxPackageSigningEnabled> + </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>f9b0ae20-c91c-42b9-9c6e-d3bc28b4509e</ProjectGuid> + </PropertyGroup> + <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" /> + <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' < '14.0'"> + <VisualStudioVersion>14.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>UAP</TargetPlatformIdentifier> + <TargetPlatformVersion>10.0.10240.0</TargetPlatformVersion> + <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion> + <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion> + </PropertyGroup> + <PropertyGroup Condition="'$(VisualStudioVersion)' < '14.0'"> + <TargetPlatformVersion>10.0</TargetPlatformVersion> + <TargetPlatformMinVersion>10.0</TargetPlatformMinVersion> + </PropertyGroup> +</Project> http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/dbf6a1d2/spec/unit/fixtures/testProj/platforms/windows/CordovaApp.Windows80.jsproj ---------------------------------------------------------------------- diff --git a/spec/unit/fixtures/testProj/platforms/windows/CordovaApp.Windows80.jsproj b/spec/unit/fixtures/testProj/platforms/windows/CordovaApp.Windows80.jsproj new file mode 100644 index 0000000..34d1985 --- /dev/null +++ b/spec/unit/fixtures/testProj/platforms/windows/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\*.png" Exclude="images\*.scale-240.*" /> + <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> + <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/dbf6a1d2/spec/unit/fixtures/testProj/platforms/windows/CordovaApp.projitems ---------------------------------------------------------------------- diff --git a/spec/unit/fixtures/testProj/platforms/windows/CordovaApp.projitems b/spec/unit/fixtures/testProj/platforms/windows/CordovaApp.projitems new file mode 100644 index 0000000..972a1a4 --- /dev/null +++ b/spec/unit/fixtures/testProj/platforms/windows/CordovaApp.projitems @@ -0,0 +1,32 @@ +<?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 xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> + <PropertyGroup> + <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects> + <HasSharedItems>true</HasSharedItems> + <SharedGUID>9ebdb27f-d75b-4d8c-b53f-7be4a1fe89f9</SharedGUID> + </PropertyGroup> + <ItemGroup> + <Content Include="$(MSBuildThisFileDirectory)www\**" /> + </ItemGroup> + <ItemGroup> + <Content Include="$(MSBuildThisFileDirectory)config.xml" /> + </ItemGroup> +</Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/dbf6a1d2/spec/unit/fixtures/testProj/platforms/windows/CordovaApp.shproj ---------------------------------------------------------------------- diff --git a/spec/unit/fixtures/testProj/platforms/windows/CordovaApp.shproj b/spec/unit/fixtures/testProj/platforms/windows/CordovaApp.shproj new file mode 100644 index 0000000..08b59df --- /dev/null +++ b/spec/unit/fixtures/testProj/platforms/windows/CordovaApp.shproj @@ -0,0 +1,30 @@ +<?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 Label="Globals"> + <ProjectGuid>{9ebdb27f-d75b-4d8c-b53f-7be4a1fe89f9}</ProjectGuid> + </PropertyGroup> + <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> + <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" /> + <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" /> + <PropertyGroup /> + <Import Project="CordovaApp.projitems" Label="Shared" /> + <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.CodeSharing.JavaScript.targets" /> +</Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/dbf6a1d2/spec/unit/fixtures/testProj/platforms/windows/CordovaApp.sln ---------------------------------------------------------------------- diff --git a/spec/unit/fixtures/testProj/platforms/windows/CordovaApp.sln b/spec/unit/fixtures/testProj/platforms/windows/CordovaApp.sln new file mode 100644 index 0000000..5d4c18f --- /dev/null +++ b/spec/unit/fixtures/testProj/platforms/windows/CordovaApp.sln @@ -0,0 +1,106 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +# +# 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. +# +VisualStudioVersion = 12.0.30324.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CordovaApp", "CordovaApp", "{3A47E08D-7EA5-4F3F-AA6D-1D4A41F26944}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "CordovaApp", "CordovaApp.shproj", "{9EBDB27F-D75B-4D8C-B53F-7BE4A1FE89F9}" +EndProject +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 +Global + GlobalSection(SharedMSBuildProjectFiles) = preSolution + CordovaApp.projitems*{58950fb6-2f93-4963-b9cd-637f83f3efbf}*SharedItemsImports = 5 + CordovaApp.projitems*{9ebdb27f-d75b-4d8c-b53f-7be4a1fe89f9}*SharedItemsImports = 13 + CordovaApp.projitems*{31b67a35-9503-4213-857e-f44eb42ae549}*SharedItemsImports = 5 + EndGlobalSection + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|ARM = Debug|ARM + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|ARM = Release|ARM + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {58950FB6-2F93-4963-B9CD-637F83F3EFBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {58950FB6-2F93-4963-B9CD-637F83F3EFBF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {58950FB6-2F93-4963-B9CD-637F83F3EFBF}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {58950FB6-2F93-4963-B9CD-637F83F3EFBF}.Debug|ARM.ActiveCfg = Debug|ARM + {58950FB6-2F93-4963-B9CD-637F83F3EFBF}.Debug|ARM.Build.0 = Debug|ARM + {58950FB6-2F93-4963-B9CD-637F83F3EFBF}.Debug|ARM.Deploy.0 = Debug|ARM + {58950FB6-2F93-4963-B9CD-637F83F3EFBF}.Debug|x64.ActiveCfg = Debug|x64 + {58950FB6-2F93-4963-B9CD-637F83F3EFBF}.Debug|x64.Build.0 = Debug|x64 + {58950FB6-2F93-4963-B9CD-637F83F3EFBF}.Debug|x64.Deploy.0 = Debug|x64 + {58950FB6-2F93-4963-B9CD-637F83F3EFBF}.Debug|x86.ActiveCfg = Debug|x86 + {58950FB6-2F93-4963-B9CD-637F83F3EFBF}.Debug|x86.Build.0 = Debug|x86 + {58950FB6-2F93-4963-B9CD-637F83F3EFBF}.Debug|x86.Deploy.0 = Debug|x86 + {58950FB6-2F93-4963-B9CD-637F83F3EFBF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {58950FB6-2F93-4963-B9CD-637F83F3EFBF}.Release|Any CPU.Build.0 = Release|Any CPU + {58950FB6-2F93-4963-B9CD-637F83F3EFBF}.Release|Any CPU.Deploy.0 = Release|Any CPU + {58950FB6-2F93-4963-B9CD-637F83F3EFBF}.Release|ARM.ActiveCfg = Release|ARM + {58950FB6-2F93-4963-B9CD-637F83F3EFBF}.Release|ARM.Build.0 = Release|ARM + {58950FB6-2F93-4963-B9CD-637F83F3EFBF}.Release|ARM.Deploy.0 = Release|ARM + {58950FB6-2F93-4963-B9CD-637F83F3EFBF}.Release|x64.ActiveCfg = Release|x64 + {58950FB6-2F93-4963-B9CD-637F83F3EFBF}.Release|x64.Build.0 = Release|x64 + {58950FB6-2F93-4963-B9CD-637F83F3EFBF}.Release|x64.Deploy.0 = Release|x64 + {58950FB6-2F93-4963-B9CD-637F83F3EFBF}.Release|x86.ActiveCfg = Release|x86 + {58950FB6-2F93-4963-B9CD-637F83F3EFBF}.Release|x86.Build.0 = Release|x86 + {58950FB6-2F93-4963-B9CD-637F83F3EFBF}.Release|x86.Deploy.0 = Release|x86 + {31B67A35-9503-4213-857E-F44EB42AE549}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {31B67A35-9503-4213-857E-F44EB42AE549}.Debug|Any CPU.Build.0 = Debug|Any CPU + {31B67A35-9503-4213-857E-F44EB42AE549}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {31B67A35-9503-4213-857E-F44EB42AE549}.Debug|ARM.ActiveCfg = Debug|ARM + {31B67A35-9503-4213-857E-F44EB42AE549}.Debug|ARM.Build.0 = Debug|ARM + {31B67A35-9503-4213-857E-F44EB42AE549}.Debug|ARM.Deploy.0 = Debug|ARM + {31B67A35-9503-4213-857E-F44EB42AE549}.Debug|x64.ActiveCfg = Debug|x64 + {31B67A35-9503-4213-857E-F44EB42AE549}.Debug|x64.Build.0 = Debug|x64 + {31B67A35-9503-4213-857E-F44EB42AE549}.Debug|x64.Deploy.0 = Debug|x64 + {31B67A35-9503-4213-857E-F44EB42AE549}.Debug|x86.ActiveCfg = Debug|x86 + {31B67A35-9503-4213-857E-F44EB42AE549}.Debug|x86.Build.0 = Debug|x86 + {31B67A35-9503-4213-857E-F44EB42AE549}.Debug|x86.Deploy.0 = Debug|x86 + {31B67A35-9503-4213-857E-F44EB42AE549}.Release|Any CPU.ActiveCfg = Release|Any CPU + {31B67A35-9503-4213-857E-F44EB42AE549}.Release|Any CPU.Build.0 = Release|Any CPU + {31B67A35-9503-4213-857E-F44EB42AE549}.Release|Any CPU.Deploy.0 = Release|Any CPU + {31B67A35-9503-4213-857E-F44EB42AE549}.Release|ARM.ActiveCfg = Release|ARM + {31B67A35-9503-4213-857E-F44EB42AE549}.Release|ARM.Build.0 = Release|ARM + {31B67A35-9503-4213-857E-F44EB42AE549}.Release|ARM.Deploy.0 = Release|ARM + {31B67A35-9503-4213-857E-F44EB42AE549}.Release|x64.ActiveCfg = Release|x64 + {31B67A35-9503-4213-857E-F44EB42AE549}.Release|x64.Build.0 = Release|x64 + {31B67A35-9503-4213-857E-F44EB42AE549}.Release|x64.Deploy.0 = Release|x64 + {31B67A35-9503-4213-857E-F44EB42AE549}.Release|x86.ActiveCfg = Release|x86 + {31B67A35-9503-4213-857E-F44EB42AE549}.Release|x86.Build.0 = Release|x86 + {31B67A35-9503-4213-857E-F44EB42AE549}.Release|x86.Deploy.0 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {9EBDB27F-D75B-4D8C-B53F-7BE4A1FE89F9} = {3A47E08D-7EA5-4F3F-AA6D-1D4A41F26944} + {58950FB6-2F93-4963-B9CD-637F83F3EFBF} = {3A47E08D-7EA5-4F3F-AA6D-1D4A41F26944} + {31B67A35-9503-4213-857E-F44EB42AE549} = {3A47E08D-7EA5-4F3F-AA6D-1D4A41F26944} + EndGlobalSection +EndGlobal http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/dbf6a1d2/spec/unit/fixtures/testProj/platforms/windows/CordovaApp.vs2012.sln ---------------------------------------------------------------------- diff --git a/spec/unit/fixtures/testProj/platforms/windows/CordovaApp.vs2012.sln b/spec/unit/fixtures/testProj/platforms/windows/CordovaApp.vs2012.sln new file mode 100644 index 0000000..b08ca94 --- /dev/null +++ b/spec/unit/fixtures/testProj/platforms/windows/CordovaApp.vs2012.sln @@ -0,0 +1,64 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +# +# 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("{262852C6-CD72-467D-83FE-5EEB1973A190}") = "CordovaApp.Windows8.0", "CordovaApp.Windows80.jsproj", "{EFFFAB2F-BFC5-4EDA-B545-45EF4995F55A}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|AnyCPU = Debug|AnyCPU + Debug|ARM = Debug|ARM + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + 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|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 + {EFFFAB2F-BFC5-4EDA-B545-45EF4995F55A}.Debug|x64.ActiveCfg = Debug|x64 + {EFFFAB2F-BFC5-4EDA-B545-45EF4995F55A}.Debug|x64.Build.0 = Debug|x64 + {EFFFAB2F-BFC5-4EDA-B545-45EF4995F55A}.Debug|x64.Deploy.0 = Debug|x64 + {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|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 + {EFFFAB2F-BFC5-4EDA-B545-45EF4995F55A}.Release|x64.ActiveCfg = Release|x64 + {EFFFAB2F-BFC5-4EDA-B545-45EF4995F55A}.Release|x64.Build.0 = Release|x64 + {EFFFAB2F-BFC5-4EDA-B545-45EF4995F55A}.Release|x64.Deploy.0 = Release|x64 + {EFFFAB2F-BFC5-4EDA-B545-45EF4995F55A}.Release|x86.ActiveCfg = Release|x86 + {EFFFAB2F-BFC5-4EDA-B545-45EF4995F55A}.Release|x86.Build.0 = Release|x86 + {EFFFAB2F-BFC5-4EDA-B545-45EF4995F55A}.Release|x86.Deploy.0 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/dbf6a1d2/spec/unit/fixtures/testProj/platforms/windows/CordovaApp_TemporaryKey.pfx ---------------------------------------------------------------------- diff --git a/spec/unit/fixtures/testProj/platforms/windows/CordovaApp_TemporaryKey.pfx b/spec/unit/fixtures/testProj/platforms/windows/CordovaApp_TemporaryKey.pfx new file mode 100644 index 0000000..90d7ab2 Binary files /dev/null and b/spec/unit/fixtures/testProj/platforms/windows/CordovaApp_TemporaryKey.pfx differ http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/dbf6a1d2/spec/unit/fixtures/testProj/platforms/windows/VERSION ---------------------------------------------------------------------- diff --git a/spec/unit/fixtures/testProj/platforms/windows/VERSION b/spec/unit/fixtures/testProj/platforms/windows/VERSION new file mode 100644 index 0000000..a76ccff --- /dev/null +++ b/spec/unit/fixtures/testProj/platforms/windows/VERSION @@ -0,0 +1 @@ +3.7.1 http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/dbf6a1d2/spec/unit/fixtures/testProj/platforms/windows/config.xml ---------------------------------------------------------------------- diff --git a/spec/unit/fixtures/testProj/platforms/windows/config.xml b/spec/unit/fixtures/testProj/platforms/windows/config.xml new file mode 100644 index 0000000..621d9c9 --- /dev/null +++ b/spec/unit/fixtures/testProj/platforms/windows/config.xml @@ -0,0 +1,14 @@ +<?xml version='1.0' encoding='utf-8'?> +<widget id="io.cordova.cordovaapp" version="0.0.1" xmlns="http://www.w3.org/ns/widgets"; xmlns:cdv="http://cordova.apache.org/ns/1.0";> + <preference name="windows-target-version" value="8.0" /> + <preference name="windows-phone-target-version" value="8.1" /> + <name>CordovaApp</name> + <description> + A sample Apache Cordova application that responds to the deviceready event. + </description> + <author email="[email protected]" href="http://cordova.io";> + Apache Cordova Team + </author> + <content src="index.html" /> + <access origin="*" /> +</widget> http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/dbf6a1d2/spec/unit/fixtures/testProj/platforms/windows/package.phone.appxmanifest ---------------------------------------------------------------------- diff --git a/spec/unit/fixtures/testProj/platforms/windows/package.phone.appxmanifest b/spec/unit/fixtures/testProj/platforms/windows/package.phone.appxmanifest new file mode 100644 index 0000000..c8644d4 --- /dev/null +++ b/spec/unit/fixtures/testProj/platforms/windows/package.phone.appxmanifest @@ -0,0 +1,57 @@ +<?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"; xmlns:m3="http://schemas.microsoft.com/appx/2014/manifest"; xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest";> + <Identity Name="d409db80-9793-11e4-8ffa-f71ca5ee087f" Version="1.0.0.0" Publisher="CN=$username$" /> + <mp:PhoneIdentity PhoneProductId="d409db80-9793-11e4-8ffa-f71ca5ee087f" PhonePublisherId="db093ed5-53b1-45f7-af72-751e8f36ab80" /> + <Properties> + <DisplayName>CordovaApp</DisplayName> + <PublisherDisplayName>$username$</PublisherDisplayName> + <Logo>images\StoreLogo.png</Logo> + </Properties> + <Prerequisites> + <OSMinVersion>6.3.1</OSMinVersion> + <OSMaxVersionTested>6.3.1</OSMaxVersionTested> + </Prerequisites> + <Resources> + <Resource Language="x-generate" /> + </Resources> + <Applications> + <Application Id="io.cordova.cordovaapp" StartPage="www/index.html"> + <m3:VisualElements DisplayName="CordovaApp" + Square150x150Logo="images\Square150x150Logo.png" + Square44x44Logo="images\Square44x44Logo.png" + Description="CordovaApp" + ForegroundText="light" + BackgroundColor="transparent"> + <m3:DefaultTile Wide310x150Logo="images\Wide310x150Logo.png" + Square71x71Logo="images\Square71x71Logo.png"> + <m3:ShowNameOnTiles> + <m3:ShowOn Tile="square150x150Logo" /> + <m3:ShowOn Tile="wide310x150Logo" /> + </m3:ShowNameOnTiles> + </m3:DefaultTile> + <m3:SplashScreen Image="images\SplashScreenPhone.png" /> + </m3:VisualElements> + </Application> + </Applications> + <Capabilities> + <Capability Name="internetClientServer" /> + </Capabilities> +</Package> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/dbf6a1d2/spec/unit/fixtures/testProj/platforms/windows/package.windows.appxmanifest ---------------------------------------------------------------------- diff --git a/spec/unit/fixtures/testProj/platforms/windows/package.windows.appxmanifest b/spec/unit/fixtures/testProj/platforms/windows/package.windows.appxmanifest new file mode 100644 index 0000000..782980e --- /dev/null +++ b/spec/unit/fixtures/testProj/platforms/windows/package.windows.appxmanifest @@ -0,0 +1,58 @@ +<?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="d409db80-9793-11e4-8ffa-f71ca5ee087f" Version="1.0.0.0" Publisher="CN=$username$" /> + <Properties> + <DisplayName>CordovaApp</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="io.cordova.cordovaapp" StartPage="www/index.html"> + <m2:VisualElements DisplayName="CordovaApp" + Description="CordovaApp" + ForegroundText="light" + BackgroundColor="#464646" + Square150x150Logo="images\Square150x150Logo.png" + Square30x30Logo="images\Square30x30Logo.png"> + <m2:DefaultTile Square70x70Logo="images\Square70x70Logo.png" + Square310x310Logo="images\Square310x310Logo.png" + Wide310x150Logo="images\Wide310x150Logo.png"> + <m2:ShowNameOnTiles> + <m2:ShowOn Tile="square150x150Logo" /> + <m2:ShowOn Tile="wide310x150Logo" /> + <m2:ShowOn Tile="square310x310Logo" /> + </m2:ShowNameOnTiles> + </m2:DefaultTile> + <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/dbf6a1d2/spec/unit/fixtures/testProj/platforms/windows/package.windows80.appxmanifest ---------------------------------------------------------------------- diff --git a/spec/unit/fixtures/testProj/platforms/windows/package.windows80.appxmanifest b/spec/unit/fixtures/testProj/platforms/windows/package.windows80.appxmanifest new file mode 100644 index 0000000..af9b9d9 --- /dev/null +++ b/spec/unit/fixtures/testProj/platforms/windows/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="d409db80-9793-11e4-8ffa-f71ca5ee087f" Version="1.0.0.0" Publisher="CN=$username$" /> + <Properties> + <DisplayName>CordovaApp</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="io.cordova.cordovaapp" StartPage="www/index.html"> + <VisualElements DisplayName="CordovaApp" + Logo="images\Square150x150Logo.png" + SmallLogo="images\Square30x30Logo.png" + Description="CordovaApp" + ForegroundText="light" + BackgroundColor="#464646"> + <DefaultTile ShowName="allLogos" WideLogo="images\Wide310x150Logo.png"/> + <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/dbf6a1d2/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/plugin.xml ---------------------------------------------------------------------- diff --git a/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/plugin.xml b/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/plugin.xml new file mode 100644 index 0000000..3a316b1 --- /dev/null +++ b/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/plugin.xml @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2013 Anis Kadri + + Licensed 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. + +--> + +<plugin xmlns="http://cordova.apache.org/ns/plugins/1.0"; + xmlns:android="http://schemas.android.com/apk/res/android"; + id="org.test.plugins.dummyplugin" + version="0.6.0"> + + <!-- new requirement: NO SPACES --> + <name>dummyplugin</name> + <!-- These are going to be required by plugman-registry --> + <description>my description</description> + <author>Jackson Badman</author> + <keywords>dummy,plugin</keywords> + <license>BSD</license> + <!-- end plugman-registry requirements --> + + <asset src="www/dummyplugin.js" target="dummyplugin.js" /> + <asset src="www/dummyplugin" target="dummyplugin" /> + + <config-file target="config.xml" parent="/*"> + <access origin="build.phonegap.com" /> + <access origin="s3.amazonaws.com" /> + </config-file> + + <!-- windows --> + <platform name="windows"> + <config-file target="config.xml" parent="/*"> + <feature id="dummyPlugin" required="true" version="1.0.0.0"/> + </config-file> + + <source-file src="src/windows/dummer.js"/> + + <resource-file src="src/windows/text_sample1.txt" target="text_samples/text_sample1.txt" arch="x86" /> + <resource-file src="src/windows/text_sample2.txt" target="text_samples/text_sample2.txt" versions=">=8.1" /> + <resource-file src="src/windows/text_sample3.txt" target="text_samples/text_sample3.txt" device-target="phone"/> + <resource-file src="src/windows/text_sample4.txt" target="text_samples/text_sample4.txt" device-target="windows" versions="8.0" arch="x64"/> + + <lib-file src="TestSDK1, Version=1.0" arch="x86"/> + <lib-file src="TestSDK2, Version=1.0" versions=">=8.1"/> + <lib-file src="TestSDK3, Version=1.0" device-target="phone"/> + <lib-file src="TestSDK4, Version=1.0" device-target="windows" versions="8.0" arch="x86"/> + + <framework src="src/windows/dummy1.dll" arch="x64"/> + <framework src="src/windows/dummy2.dll" versions=">=8.0"/> + <framework src="src/windows/dummy3.dll" device-target="windows"/> + <framework src="src/windows/dummy4.dll" device-target="phone" versions="8.1" arch="ARM"/> + <framework src="src/windows/dummy5.dll" custom="true" target-dir="phoneDir" device-target="phone" /> + <framework src="src/windows/dummy6.dll" custom="true" target-dir="sharedDir" versions=">=8.1" /> + + <framework src="src/windows/dummy1.vcxproj" type="projectReference" arch="x64"/> + <framework src="src/windows/dummy2.vcxproj" type="projectReference" versions="<8.1"/> + <!-- "target" attribute is an alias for "device-target" (but is deprecated) - test for it here --> + <framework src="src/windows/dummy3.vcxproj" type="projectReference" target="win"/> + <framework src="src/windows/dummy4.vcxproj" type="projectReference" device-target="all" versions="8.1" arch="x86"/> + + <js-module src="www/dummyplugin.js" name="Dummy"> + <clobbers target="dummy" /> + </js-module> + </platform> + +</plugin> http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/dbf6a1d2/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/dummer.js ---------------------------------------------------------------------- diff --git a/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/dummer.js b/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/dummer.js new file mode 100644 index 0000000..48388bc --- /dev/null +++ b/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/dummer.js @@ -0,0 +1 @@ +./org.test.plugins.dummyplugin/src/windows8/dummer.js http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/dbf6a1d2/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/dummy1.dll ---------------------------------------------------------------------- diff --git a/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/dummy1.dll b/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/dummy1.dll new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/dbf6a1d2/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/dummy1.vcxproj ---------------------------------------------------------------------- diff --git a/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/dummy1.vcxproj b/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/dummy1.vcxproj new file mode 100644 index 0000000..c454905 --- /dev/null +++ b/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/dummy1.vcxproj @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> + <PropertyGroup Label="Globals"> + <ProjectGuid>{ef7dd979-6f12-4bdf-8754-9468ce799c4d}</ProjectGuid> + <ProjectName>dummy1</ProjectName> + </PropertyGroup> +</Project> http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/dbf6a1d2/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/dummy2.dll ---------------------------------------------------------------------- diff --git a/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/dummy2.dll b/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/dummy2.dll new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/dbf6a1d2/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/dummy2.vcxproj ---------------------------------------------------------------------- diff --git a/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/dummy2.vcxproj b/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/dummy2.vcxproj new file mode 100644 index 0000000..8edd706 --- /dev/null +++ b/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/dummy2.vcxproj @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> + <PropertyGroup Label="Globals"> + <ProjectGuid>{6a760eea-8c27-442e-b98b-a487964ded42}</ProjectGuid> + <ProjectName>dummy2</ProjectName> + </PropertyGroup> +</Project> http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/dbf6a1d2/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/dummy3.dll ---------------------------------------------------------------------- diff --git a/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/dummy3.dll b/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/dummy3.dll new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/dbf6a1d2/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/dummy3.vcxproj ---------------------------------------------------------------------- diff --git a/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/dummy3.vcxproj b/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/dummy3.vcxproj new file mode 100644 index 0000000..600167c --- /dev/null +++ b/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/dummy3.vcxproj @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> + <PropertyGroup Label="Globals"> + <ProjectGuid>{5318c3c8-0921-4870-b4ad-8cce06c88238}</ProjectGuid> + <ProjectName>dummy3</ProjectName> + </PropertyGroup> +</Project> http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/dbf6a1d2/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/dummy4.dll ---------------------------------------------------------------------- diff --git a/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/dummy4.dll b/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/dummy4.dll new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/dbf6a1d2/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/dummy4.vcxproj ---------------------------------------------------------------------- diff --git a/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/dummy4.vcxproj b/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/dummy4.vcxproj new file mode 100644 index 0000000..d7acf04 --- /dev/null +++ b/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/dummy4.vcxproj @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> + <PropertyGroup Label="Globals"> + <ProjectGuid>{8e430a1b-094b-4c27-8b76-fdd7021dbfe9}</ProjectGuid> + <ProjectName>dummy4</ProjectName> + </PropertyGroup> +</Project> http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/dbf6a1d2/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/dummy5.dll ---------------------------------------------------------------------- diff --git a/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/dummy5.dll b/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/dummy5.dll new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/dbf6a1d2/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/dummy6.dll ---------------------------------------------------------------------- diff --git a/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/dummy6.dll b/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/dummy6.dll new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/dbf6a1d2/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/text_sample1.txt ---------------------------------------------------------------------- diff --git a/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/text_sample1.txt b/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/text_sample1.txt new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/dbf6a1d2/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/text_sample2.txt ---------------------------------------------------------------------- diff --git a/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/text_sample2.txt b/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/text_sample2.txt new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/dbf6a1d2/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/text_sample3.txt ---------------------------------------------------------------------- diff --git a/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/text_sample3.txt b/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/text_sample3.txt new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/dbf6a1d2/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/text_sample4.txt ---------------------------------------------------------------------- diff --git a/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/text_sample4.txt b/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/src/windows/text_sample4.txt new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/dbf6a1d2/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/www/dummyplugin.js ---------------------------------------------------------------------- diff --git a/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/www/dummyplugin.js b/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/www/dummyplugin.js new file mode 100644 index 0000000..631d6da --- /dev/null +++ b/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/www/dummyplugin.js @@ -0,0 +1 @@ +./org.test.plugins.dummyplugin/www/dummyplugin.js http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/dbf6a1d2/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/www/dummyplugin/image.jpg ---------------------------------------------------------------------- diff --git a/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/www/dummyplugin/image.jpg b/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/www/dummyplugin/image.jpg new file mode 100644 index 0000000..219c78a --- /dev/null +++ b/spec/unit/fixtures/testProj/plugins/org.test.plugins.dummyplugin/www/dummyplugin/image.jpg @@ -0,0 +1 @@ +./org.test.plugins.dummyplugin/www/dummyplugin/image.jpg http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/dbf6a1d2/template/cordova/lib/JsprojManager.js ---------------------------------------------------------------------- diff --git a/template/cordova/lib/JsprojManager.js b/template/cordova/lib/JsprojManager.js index 941e4f8..a4abccb 100644 --- a/template/cordova/lib/JsprojManager.js +++ b/template/cordova/lib/JsprojManager.js @@ -182,7 +182,7 @@ jsprojManager.prototype = { // relative_path is the actual path to the file in the current OS, where-as inserted_path is what we write in // the project file, and is always in Windows format. relative_path = path.normalize(relative_path); - var inserted_path = relative_path.split('/').join('\\'); + var inserted_path = path.join('..', '..', relative_path).split('/').join('\\'); var pluginProjectXML = xml_helpers.parseElementtreeSync(relative_path); http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/dbf6a1d2/template/cordova/lib/PluginHandler.js ---------------------------------------------------------------------- diff --git a/template/cordova/lib/PluginHandler.js b/template/cordova/lib/PluginHandler.js index 98ea02a..6fbd04b 100644 --- a/template/cordova/lib/PluginHandler.js +++ b/template/cordova/lib/PluginHandler.js @@ -69,12 +69,12 @@ var handlers = { var src = obj.src; var dest = src; var type = obj.type; + var targetDir = obj.targetDir || ''; if(type === 'projectReference') { - project.addProjectReference(path.join(plugin.dir,src), getTargetConditions(obj)); - } - else { - var targetDir = obj.targetDir || ''; + dest = path.join('plugins', plugin.id, targetDir, src); + project.addProjectReference(dest, getTargetConditions(obj)); + } else { // path.join ignores empty paths passed so we don't check whether targetDir is not empty dest = path.join('plugins', plugin.id, targetDir, path.basename(src)); copyFile(plugin.dir, src, project.root, dest); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
