Skip to content

C
cpython
Commit cc115eea authored by Steve Dower's avatar Steve Dower
Browse files
Options

Simplify MSI projects.

parent 17be514d
Hide whitespace changes
Inline Side-by-side
Showing with 447 additions and 334 deletions
Tools/msi/core/core.props deleted 100644 → 0
View file @ 17be514d
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\msi.props" />
<ItemGroup>
<Compile Include="*.wxs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="*.wxl" />
</ItemGroup>
<Import Project="..\msi.targets" />
</Project>
\ No newline at end of file
Tools/msi/core/core.wixproj
View file @ cc115eea
......@@ -5,7 +5,15 @@
<SchemaVersion>2.0</SchemaVersion>
<OutputName>core</OutputName>
<OutputType>Package</OutputType>
<DefineConstants>IncludeDefaultFeature=1;$(DefineConstants)</DefineConstants>
</PropertyGroup>
<Import Project="core.props" />
<Import Project="..\msi.props" />
<ItemGroup>
<Compile Include="core.wxs" />
<Compile Include="core_files.wxs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="*.wxl" />
</ItemGroup>
<Import Project="..\msi.targets" />
</Project>
\ No newline at end of file
Tools/msi/core/core.wxs
View file @ cc115eea
......@@ -6,20 +6,8 @@
<PropertyRef Id="UpgradeTable" />
<?ifdef IncludeDefaultFeature ?>
<Feature Id="DefaultFeature" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)">
<ComponentGroupRef Id="core_dll" />
</Feature>
<?endif ?>
<?ifdef IncludeSymbols ?>
<Feature Id="Symbols" AllowAdvertise="no" Title="!(loc.TitlePdb)" Description="!(loc.DescriptionPdb)">
<ComponentGroupRef Id="core_symbols" />
</Feature>
<?endif ?>
<?ifdef IncludeDebugBinaries ?>
<Feature Id="DebugBinaries" AllowAdvertise="no" Title="!(loc.Title_d)" Description="!(loc.Description_d)">
<ComponentGroupRef Id="core_dll_d" />
</Feature>
<?endif ?>
</Product>
</Wix>
Tools/msi/core/core_d.wixproj
View file @ cc115eea
......@@ -5,7 +5,15 @@
<SchemaVersion>2.0</SchemaVersion>
<OutputName>core_d</OutputName>
<OutputType>Package</OutputType>
<DefineConstants>IncludeDebugBinaries=1;$(DefineConstants)</DefineConstants>
</PropertyGroup>
<Import Project="core.props" />
<Import Project="..\msi.props" />
<ItemGroup>
<Compile Include="core_d.wxs" />
<Compile Include="core_files.wxs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="*.wxl" />
</ItemGroup>
<Import Project="..\msi.targets" />
</Project>
\ No newline at end of file
Tools/msi/core/core_d.wxs 0 → 100644
View file @ cc115eea
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="*" Language="!(loc.LCID)" Name="!(loc.Title)" Version="$(var.Version)" Manufacturer="!(loc.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
<Package InstallerVersion="300" Compressed="yes" InstallScope="perUser" Platform="$(var.Platform)" />
<MediaTemplate EmbedCab="yes" CompressionLevel="high" />
<PropertyRef Id="UpgradeTable" />
<Feature Id="DebugBinaries" AllowAdvertise="no" Title="!(loc.Title_d)" Description="!(loc.Description_d)">
<ComponentGroupRef Id="core_dll_d" />
</Feature>
</Product>
</Wix>
Tools/msi/core/core_pdb.wixproj
View file @ cc115eea
......@@ -5,7 +5,15 @@
<SchemaVersion>2.0</SchemaVersion>
<OutputName>core_pdb</OutputName>
<OutputType>Package</OutputType>
<DefineConstants>IncludeSymbols=1;$(DefineConstants)</DefineConstants>
</PropertyGroup>
<Import Project="core.props" />
<Import Project="..\msi.props" />
<ItemGroup>
<Compile Include="core_pdb.wxs" />
<Compile Include="core_files.wxs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="*.wxl" />
</ItemGroup>
<Import Project="..\msi.targets" />
</Project>
\ No newline at end of file
Tools/msi/core/core_pdb.wxs 0 → 100644
View file @ cc115eea
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="*" Language="!(loc.LCID)" Name="!(loc.Title)" Version="$(var.Version)" Manufacturer="!(loc.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
<Package InstallerVersion="300" Compressed="yes" InstallScope="perUser" Platform="$(var.Platform)" />
<MediaTemplate EmbedCab="yes" CompressionLevel="high" />
<PropertyRef Id="UpgradeTable" />
<Feature Id="Symbols" AllowAdvertise="no" Title="!(loc.TitlePdb)" Description="!(loc.DescriptionPdb)">
<ComponentGroupRef Id="core_symbols" />
</Feature>
</Product>
</Wix>
Tools/msi/dev/dev.props deleted 100644 → 0
View file @ 17be514d
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\msi.props" />
<PropertyGroup>
<DefineConstants Condition="$(BuildForRelease)">
$(DefineConstants);
IncludeMinGWLib=1;
</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Compile Include="*.wxs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="*.wxl" />
</ItemGroup>
<ItemGroup>
<InstallFiles Include="$(PySourcePath)include\*.h">
<SourceBase>$(PySourcePath)</SourceBase>
<Source>!(bindpath.src)</Source>
<TargetBase>$(PySourcePath)</TargetBase>
<Target_></Target_>
<Group>dev_include</Group>
</InstallFiles>
</ItemGroup>
<Target Name="BuildMinGWLib"
Inputs="$(BuildPath)$(PyDllName).dll"
Outputs="$(BuildPath)lib$(PyDllName).a"
AfterTargets="PrepareForBuild"
Condition="$(BuildForRelease)">
<!-- Build libpython##.a as part of this project. This requires gendef and dlltool on the path. -->
<PropertyGroup>
<_GenDefPlatform>i386</_GenDefPlatform>
<_GenDefPlatform Condition="$(Platform) == 'x64'">i386:x86-64</_GenDefPlatform>
</PropertyGroup>
<Exec Command='gendef - "$(BuildPath)$(PyDllName).dll" &gt; "$(IntermediateOutputPath)mingwlib.def"' ContinueOnError="false" />
<Exec Command='dlltool --dllname $(PyDllName).dll --def "$(IntermediateOutputPath)mingwlib.def" --output-lib "$(BuildPath)lib$(PyDllName).a" -m $(_GenDefPlatform)' />
</Target>
<Import Project="..\msi.targets" />
</Project>
\ No newline at end of file
Tools/msi/dev/dev.wixproj
View file @ cc115eea
......@@ -5,7 +5,45 @@
<SchemaVersion>2.0</SchemaVersion>
<OutputName Condition="'$(OutputName)' == ''">dev</OutputName>
<OutputType>Package</OutputType>
<DefineConstants>IncludeDefaultFeature=1;$(DefineConstants)</DefineConstants>
</PropertyGroup>
<Import Project="dev.props" />
<Import Project="..\msi.props" />
<PropertyGroup>
<DefineConstants Condition="$(BuildForRelease)">
$(DefineConstants);
IncludeMinGWLib=1;
</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Compile Include="dev.wxs" />
<Compile Include="dev_files.wxs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="*.wxl" />
</ItemGroup>
<ItemGroup>
<InstallFiles Include="$(PySourcePath)include\*.h">
<SourceBase>$(PySourcePath)</SourceBase>
<Source>!(bindpath.src)</Source>
<TargetBase>$(PySourcePath)</TargetBase>
<Target_></Target_>
<Group>dev_include</Group>
</InstallFiles>
</ItemGroup>
<Target Name="BuildMinGWLib"
Inputs="$(BuildPath)$(PyDllName).dll"
Outputs="$(BuildPath)lib$(PyDllName).a"
AfterTargets="PrepareForBuild"
Condition="$(BuildForRelease)">
<!-- Build libpython##.a as part of this project. This requires gendef and dlltool on the path. -->
<PropertyGroup>
<_GenDefPlatform>i386</_GenDefPlatform>
<_GenDefPlatform Condition="$(Platform) == 'x64'">i386:x86-64</_GenDefPlatform>
</PropertyGroup>
<Exec Command='gendef - "$(BuildPath)$(PyDllName).dll" &gt; "$(IntermediateOutputPath)mingwlib.def"' ContinueOnError="false" />
<Exec Command='dlltool --dllname $(PyDllName).dll --def "$(IntermediateOutputPath)mingwlib.def" --output-lib "$(BuildPath)lib$(PyDllName).a" -m $(_GenDefPlatform)' />
</Target>
<Import Project="..\msi.targets" />
</Project>
\ No newline at end of file
Tools/msi/dev/dev.wxs
View file @ cc115eea
......@@ -6,7 +6,6 @@
<PropertyRef Id="UpgradeTable" />
<?ifdef IncludeDefaultFeature ?>
<Feature Id="DefaultFeature" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)">
<ComponentGroupRef Id="dev_include" />
<ComponentGroupRef Id="dev_pyconfig" />
......@@ -15,11 +14,5 @@
<ComponentGroupRef Id="dev_mingw" />
<?endif ?>
</Feature>
<?endif ?>
<?ifdef IncludeDebugBinaries ?>
<Feature Id="DebugBinaries" AllowAdvertise="no" Title="!(loc.Title_d)" Description="!(loc.Description_d)">
<ComponentGroupRef Id="dev_libs_d" />
</Feature>
<?endif ?>
</Product>
</Wix>
Tools/msi/dev/dev_d.wixproj
View file @ cc115eea
......@@ -5,7 +5,15 @@
<SchemaVersion>2.0</SchemaVersion>
<OutputName>dev_d</OutputName>
<OutputType>Package</OutputType>
<DefineConstants>IncludeDebugBinaries=1;$(DefineConstants)</DefineConstants>
</PropertyGroup>
<Import Project="dev.props" />
<Import Project="..\msi.props" />
<ItemGroup>
<Compile Include="dev_d.wxs" />
<Compile Include="dev_files.wxs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="*.wxl" />
</ItemGroup>
<Import Project="..\msi.targets" />
</Project>
\ No newline at end of file
Tools/msi/dev/dev_d.wxs 0 → 100644
View file @ cc115eea
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="*" Language="!(loc.LCID)" Name="!(loc.Title)" Version="$(var.Version)" Manufacturer="!(loc.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
<Package InstallerVersion="300" Compressed="yes" InstallScope="perUser" Platform="$(var.Platform)" />
<MediaTemplate EmbedCab="yes" CompressionLevel="high" />
<PropertyRef Id="UpgradeTable" />
<Feature Id="DebugBinaries" AllowAdvertise="no" Title="!(loc.Title_d)" Description="!(loc.Description_d)">
<ComponentGroupRef Id="dev_libs_d" />
</Feature>
</Product>
</Wix>
Tools/msi/exe/exe.props deleted 100644 → 0
View file @ 17be514d
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<!-- Shortcut validation is not necessary -->
<SuppressICEs>ICE43</SuppressICEs>
</PropertyGroup>
<Import Project="..\msi.props" />
<ItemGroup>
<Compile Include="*.wxs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="*.wxl" />
<WxlTemplate Include="*.wxl_template" />
</ItemGroup>
<Target Name="_GenerateLicense" AfterTargets="PrepareForBuild">
<ItemGroup>
<LicenseFiles Include="$(PySourcePath)LICENSE;
crtlicense.txt;
$(bz2Dir)LICENSE;
$(opensslDir)LICENSE;
$(tclDir)license.terms;
$(tkDir)license.terms;
$(tixDir)license.terms" />
<_LicenseFiles Include="@(LicenseFiles)">
<Content>$([System.IO.File]::ReadAllText(%(FullPath)))</Content>
</_LicenseFiles>
</ItemGroup>
<WriteLinesToFile File="$(BuildPath)LICENSE"
Overwrite="true"
Lines="@(_LicenseFiles->'%(Content)')" />
</Target>
<Import Project="..\msi.targets" />
</Project>
\ No newline at end of file
Tools/msi/exe/exe.wixproj
View file @ cc115eea
......@@ -5,7 +5,39 @@
<SchemaVersion>2.0</SchemaVersion>
<OutputName>exe</OutputName>
<OutputType>Package</OutputType>
<DefineConstants>IncludeDefaultFeature=1;$(DefineConstants)</DefineConstants>
</PropertyGroup>
<Import Project="exe.props" />
<PropertyGroup>
<!-- Shortcut validation is not necessary -->
<SuppressICEs>ICE43</SuppressICEs>
</PropertyGroup>
<Import Project="..\msi.props" />
<ItemGroup>
<Compile Include="exe.wxs" />
<Compile Include="exe_files.wxs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="*.wxl" />
<WxlTemplate Include="*.wxl_template" />
</ItemGroup>
<Target Name="_GenerateLicense" AfterTargets="PrepareForBuild">
<ItemGroup>
<LicenseFiles Include="$(PySourcePath)LICENSE;
crtlicense.txt;
$(bz2Dir)LICENSE;
$(opensslDir)LICENSE;
$(tclDir)license.terms;
$(tkDir)license.terms;
$(tixDir)license.terms" />
<_LicenseFiles Include="@(LicenseFiles)">
<Content>$([System.IO.File]::ReadAllText(%(FullPath)))</Content>
</_LicenseFiles>
</ItemGroup>
<WriteLinesToFile File="$(BuildPath)LICENSE"
Overwrite="true"
Lines="@(_LicenseFiles->'%(Content)')" />
</Target>
<Import Project="..\msi.targets" />
</Project>
\ No newline at end of file
Tools/msi/exe/exe.wxs
View file @ cc115eea
......@@ -7,7 +7,6 @@
<PropertyRef Id="UpgradeTable" />
<PropertyRef Id="REGISTRYKEY" />
<?ifdef IncludeDefaultFeature ?>
<Feature Id="DefaultFeature" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)">
<ComponentGroupRef Id="exe_python" />
<ComponentGroupRef Id="exe_txt" />
......@@ -25,16 +24,5 @@
</RegistryKey>
</Component>
</Feature>
<?endif ?>
<?ifdef IncludeSymbols ?>
<Feature Id="Symbols" AllowAdvertise="no" Title="!(loc.TitlePdb)" Description="!(loc.DescriptionPdb)">
<ComponentGroupRef Id="exe_python_symbols" />
</Feature>
<?endif ?>
<?ifdef IncludeDebugBinaries ?>
<Feature Id="DebugBinaries" AllowAdvertise="no" Title="!(loc.Title_d)" Description="!(loc.Description_d)">
<ComponentGroupRef Id="exe_python_d" />
</Feature>
<?endif ?>
</Product>
</Wix>
Tools/msi/exe/exe_d.wixproj
View file @ cc115eea
......@@ -5,7 +5,16 @@
<SchemaVersion>2.0</SchemaVersion>
<OutputName>exe_d</OutputName>
<OutputType>Package</OutputType>
<DefineConstants>IncludeDebugBinaries=1;$(DefineConstants)</DefineConstants>
</PropertyGroup>
<Import Project="exe.props" />
<Import Project="..\msi.props" />
<ItemGroup>
<Compile Include="exe_d.wxs" />
<Compile Include="exe_files.wxs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="*.wxl" />
<WxlTemplate Include="*.wxl_template" />
</ItemGroup>
<Import Project="..\msi.targets" />
</Project>
\ No newline at end of file
Tools/msi/exe/exe_d.wxs 0 → 100644
View file @ cc115eea
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="*" Language="!(loc.LCID)" Name="!(loc.Title)" Version="$(var.Version)" Manufacturer="!(loc.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
<Package InstallerVersion="300" Compressed="yes" InstallScope="perUser" Platform="$(var.Platform)" />
<MediaTemplate EmbedCab="yes" CompressionLevel="high" />
<PropertyRef Id="UpgradeTable" />
<Feature Id="DebugBinaries" AllowAdvertise="no" Title="!(loc.Title_d)" Description="!(loc.Description_d)">
<ComponentGroupRef Id="exe_python_d" />
</Feature>
</Product>
</Wix>
Tools/msi/exe/exe_pdb.wixproj
View file @ cc115eea
......@@ -5,7 +5,16 @@
<SchemaVersion>2.0</SchemaVersion>
<OutputName>exe_pdb</OutputName>
<OutputType>Package</OutputType>
<DefineConstants>IncludeSymbols=1;$(DefineConstants)</DefineConstants>
</PropertyGroup>
<Import Project="exe.props" />
<Import Project="..\msi.props" />
<ItemGroup>
<Compile Include="exe_pdb.wxs" />
<Compile Include="exe_files.wxs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="*.wxl" />
<WxlTemplate Include="*.wxl_template" />
</ItemGroup>
<Import Project="..\msi.targets" />
</Project>
\ No newline at end of file
Tools/msi/exe/exe_pdb.wxs 0 → 100644
View file @ cc115eea
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="*" Language="!(loc.LCID)" Name="!(loc.Title)" Version="$(var.Version)" Manufacturer="!(loc.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
<Package InstallerVersion="300" Compressed="yes" InstallScope="perUser" Platform="$(var.Platform)" />
<MediaTemplate EmbedCab="yes" CompressionLevel="high" />
<PropertyRef Id="UpgradeTable" />
<Feature Id="Symbols" AllowAdvertise="no" Title="!(loc.TitlePdb)" Description="!(loc.DescriptionPdb)">
<ComponentGroupRef Id="exe_python_symbols" />
</Feature>
</Product>
</Wix>
Tools/msi/launcher/launcher.props deleted 100644 → 0
View file @ 17be514d
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\msi.props" />
<ItemGroup>
<Compile Include="*.wxs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="*.wxl" />
</ItemGroup>
<Import Project="..\msi.targets" />
</Project>
\ No newline at end of file
Tools/msi/launcher/launcher.wixproj
View file @ cc115eea
......@@ -5,7 +5,16 @@
<SchemaVersion>2.0</SchemaVersion>
<OutputName>launcher</OutputName>
<OutputType>Package</OutputType>
<DefineConstants>IncludeDefaultFeature=1;$(DefineConstants)</DefineConstants>
</PropertyGroup>
<Import Project="launcher.props" />
<Import Project="..\msi.props" />
<ItemGroup>
<Compile Include="launcher.wxs" />
<Compile Include="launcher_files.wxs" />
<Compile Include="launcher_reg.wxs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="*.wxl" />
</ItemGroup>
<Import Project="..\msi.targets" />
</Project>
\ No newline at end of file
Tools/msi/launcher/launcher.wxs
View file @ cc115eea
......@@ -8,7 +8,6 @@
<PropertyRef Id="UpgradeTable" />
<PropertyRef Id="ARPPRODUCTICON" />
<?ifdef IncludeDefaultFeature ?>
<Feature Id="DefaultFeature" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)">
<ComponentGroupRef Id="launcher_exe" Primary="yes" />
</Feature>
......@@ -16,12 +15,6 @@
<ComponentGroupRef Id="launcher_exe" />
<ComponentGroupRef Id="launcher_reg" />
</Feature>
<?endif ?>
<?ifdef IncludeSymbols ?>
<Feature Id="Symbols" AllowAdvertise="no" Title="!(loc.TitlePdb)" Description="!(loc.DescriptionPdb)">
<ComponentGroupRef Id="launcher_pdb" />
</Feature>
<?endif ?>
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="LauncherInstallDirectory" />
......
Tools/msi/launcher/launcher_files.wxs
View file @ cc115eea
......@@ -21,15 +21,4 @@
</Component>
</ComponentGroup>
</Fragment>
<Fragment>
<ComponentGroup Id="launcher_pdb">
<Component Id="py.pdb" Directory="LauncherInstallDirectory" Guid="*">
<File Id="py.pdb" Name="py.pdb" Source="py.pdb" />
</Component>
<Component Id="pyw.pdb" Directory="LauncherInstallDirectory" Guid="*">
<File Id="pyw.pdb" Name="pyw.pdb" Source="pyw.pdb" />
</Component>
</ComponentGroup>
</Fragment>
</Wix>
Tools/msi/launcher/launcher_pdb.wixproj deleted 100644 → 0
View file @ 17be514d
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{A21D4A23-483F-4822-A0B1-FCB14D8CEBA7}</ProjectGuid>
<SchemaVersion>2.0</SchemaVersion>
<OutputName>launcher_pdb</OutputName>
<OutputType>Package</OutputType>
<DefineConstants>IncludeSymbols=1;$(DefineConstants)</DefineConstants>
</PropertyGroup>
<Import Project="launcher.props" />
</Project>
\ No newline at end of file
Tools/msi/lib/lib.props deleted 100644 → 0
View file @ 17be514d
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\msi.props" />
<ItemGroup>
<Compile Include="*.wxs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="*.wxl" />
</ItemGroup>
<ItemGroup>
<ExcludeFolders Include="Lib\test;Lib\tests;Lib\tkinter;Lib\idlelib;Lib\turtledemo" />
<InstallFiles Include="$(PySourcePath)Lib\**\*"
Exclude="$(PySourcePath)Lib\**\*.pyc;
$(PySourcePath)Lib\**\*.pyo;
$(PySourcePath)Lib\site-packages\README;
@(ExcludeFolders->'$(PySourcePath)%(Identity)\*');
@(ExcludeFolders->'$(PySourcePath)%(Identity)\**\*')">
<SourceBase>$(PySourcePath)Lib</SourceBase>
<Source>!(bindpath.src)Lib\</Source>
<TargetBase>$(PySourcePath)Lib</TargetBase>
<Target_>Lib\</Target_>
<Group>lib_py</Group>
</InstallFiles>
</ItemGroup>
<Import Project="..\msi.targets" />
</Project>
\ No newline at end of file
Tools/msi/lib/lib.wixproj
View file @ cc115eea
......@@ -5,7 +5,30 @@
<SchemaVersion>2.0</SchemaVersion>
<OutputName>lib</OutputName>
<OutputType>Package</OutputType>
<DefineConstants>IncludeDefaultFeature=1;$(DefineConstants)</DefineConstants>
</PropertyGroup>
<Import Project="lib.props" />
<Import Project="..\msi.props" />
<ItemGroup>
<Compile Include="lib.wxs" />
<Compile Include="lib_files.wxs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="*.wxl" />
</ItemGroup>
<ItemGroup>
<ExcludeFolders Include="Lib\test;Lib\tests;Lib\tkinter;Lib\idlelib;Lib\turtledemo" />
<InstallFiles Include="$(PySourcePath)Lib\**\*"
Exclude="$(PySourcePath)Lib\**\*.pyc;
$(PySourcePath)Lib\**\*.pyo;
$(PySourcePath)Lib\site-packages\README;
@(ExcludeFolders->'$(PySourcePath)%(Identity)\*');
@(ExcludeFolders->'$(PySourcePath)%(Identity)\**\*')">
<SourceBase>$(PySourcePath)Lib</SourceBase>
<Source>!(bindpath.src)Lib\</Source>
<TargetBase>$(PySourcePath)Lib</TargetBase>
<Target_>Lib\</Target_>
<Group>lib_py</Group>
</InstallFiles>
</ItemGroup>
<Import Project="..\msi.targets" />
</Project>
\ No newline at end of file
Tools/msi/lib/lib.wxs
View file @ cc115eea
......@@ -7,22 +7,10 @@
<PropertyRef Id="UpgradeTable" />
<PropertyRef Id="REGISTRYKEY" />
<?ifdef IncludeDefaultFeature ?>
<Feature Id="DefaultFeature" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)">
<ComponentGroupRef Id="lib_py" />
<ComponentGroupRef Id="lib_files" />
<ComponentGroupRef Id="lib_extensions" />
</Feature>
<?endif ?>
<?ifdef IncludeSymbols ?>
<Feature Id="Symbols" AllowAdvertise="no" Title="!(loc.TitlePdb)" Description="!(loc.DescriptionPdb)">
<ComponentGroupRef Id="lib_extensions_symbols" />
</Feature>
<?endif ?>
<?ifdef IncludeDebugBinaries ?>
<Feature Id="DebugBinaries" AllowAdvertise="no" Title="!(loc.Title_d)" Description="!(loc.Description_d)">
<ComponentGroupRef Id="lib_extensions_d" />
</Feature>
<?endif ?>
</Product>
</Wix>
Tools/msi/lib/lib_d.wixproj
View file @ cc115eea
......@@ -5,7 +5,15 @@
<SchemaVersion>2.0</SchemaVersion>
<OutputName>lib_d</OutputName>
<OutputType>Package</OutputType>
<DefineConstants>IncludeDebugBinaries=1;$(DefineConstants)</DefineConstants>
</PropertyGroup>
<Import Project="lib.props" />
<Import Project="..\msi.props" />
<ItemGroup>
<Compile Include="lib_d.wxs" />
<Compile Include="lib_files.wxs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="*.wxl" />
</ItemGroup>
<Import Project="..\msi.targets" />
</Project>
\ No newline at end of file
Tools/msi/lib/lib_d.wxs 0 → 100644
View file @ cc115eea
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="*" Language="!(loc.LCID)" Name="!(loc.Title)" Version="$(var.Version)" Manufacturer="!(loc.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
<Package InstallerVersion="300" Compressed="yes" InstallScope="perUser" Platform="$(var.Platform)" />
<MediaTemplate EmbedCab="yes" CompressionLevel="high" />
<PropertyRef Id="UpgradeTable" />
<Feature Id="DebugBinaries" AllowAdvertise="no" Title="!(loc.Title_d)" Description="!(loc.Description_d)">
<ComponentGroupRef Id="lib_extensions_d" />
</Feature>
</Product>
</Wix>
Tools/msi/lib/lib_pdb.wixproj
View file @ cc115eea
......@@ -5,7 +5,15 @@
<SchemaVersion>2.0</SchemaVersion>
<OutputName>lib_pdb</OutputName>
<OutputType>Package</OutputType>
<DefineConstants>IncludeSymbols=1;$(DefineConstants)</DefineConstants>
</PropertyGroup>
<Import Project="lib.props" />
<Import Project="..\msi.props" />
<ItemGroup>
<Compile Include="lib_pdb.wxs" />
<Compile Include="lib_files.wxs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="*.wxl" />
</ItemGroup>
<Import Project="..\msi.targets" />
</Project>
\ No newline at end of file
Tools/msi/lib/lib_pdb.wxs 0 → 100644
View file @ cc115eea
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="*" Language="!(loc.LCID)" Name="!(loc.Title)" Version="$(var.Version)" Manufacturer="!(loc.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
<Package InstallerVersion="300" Compressed="yes" InstallScope="perUser" Platform="$(var.Platform)" />
<MediaTemplate EmbedCab="yes" CompressionLevel="high" />
<PropertyRef Id="UpgradeTable" />
<Feature Id="Symbols" AllowAdvertise="no" Title="!(loc.TitlePdb)" Description="!(loc.DescriptionPdb)">
<ComponentGroupRef Id="lib_extensions_symbols" />
</Feature>
</Product>
</Wix>
Tools/msi/tcltk/tcltk.props deleted 100644 → 0
View file @ 17be514d
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<!-- Shortcut validation is not necessary -->
<SuppressICEs>ICE43</SuppressICEs>
</PropertyGroup>
<Import Project="..\msi.props" />
<ItemGroup>
<Compile Include="*.wxs" />
</ItemGroup>
<ItemGroup>
<WxlTemplate Include="*.wxl_template" />
</ItemGroup>
<ItemGroup>
<InstallFiles Include="$(tcltkDir)bin\*.dll" Exclude="$(tcltkDir)bin\*g.dll">
<SourceBase>$(tcltkDir)</SourceBase>
<Source>!(bindpath.tcltk)</Source>
<TargetBase>$(tcltkDir)bin</TargetBase>
<Target_>DLLs\</Target_>
<Group>tcltk_dlls</Group>
</InstallFiles>
<InstallFiles Include="$(tcltkDir)bin\*g.dll">
<SourceBase>$(tcltkDir)</SourceBase>
<Source>!(bindpath.tcltk)</Source>
<TargetBase>$(tcltkDir)bin</TargetBase>
<Target_>DLLs\</Target_>
<Group>tcltk_dlls_d</Group>
</InstallFiles>
<InstallFiles Include="$(tcltkDir)lib\**\*">
<SourceBase>$(tcltkDir)</SourceBase>
<Source>!(bindpath.tcltk)</Source>
<TargetBase>$(tcltkDir)lib</TargetBase>
<Target_>tcl\</Target_>
<Group>tcltk_lib</Group>
</InstallFiles>
<InstallFiles Include="$(PySourcePath)Lib\tkinter\**\*;$(PySourcePath)Lib\idlelib\**\*;$(PySourcePath)Lib\turtledemo\**\*"
Exclude="$(PySourcePath)Lib\**\*.pyc;$(PySourcePath)Lib\**\*.pyo">
<SourceBase>$(PySourcePath)</SourceBase>
<Source>!(bindpath.src)</Source>
<TargetBase>$(PySourcePath)</TargetBase>
<Target_></Target_>
<Group>tkinter_lib</Group>
</InstallFiles>
</ItemGroup>
<Import Project="..\msi.targets" />
</Project>
\ No newline at end of file
Tools/msi/tcltk/tcltk.wixproj
View file @ cc115eea
......@@ -5,7 +5,45 @@
<SchemaVersion>2.0</SchemaVersion>
<OutputName>tcltk</OutputName>
<OutputType>Package</OutputType>
<DefineConstants>IncludeDefaultFeature=1;$(DefineConstants)</DefineConstants>
</PropertyGroup>
<Import Project="tcltk.props" />
<PropertyGroup>
<!-- Shortcut validation is not necessary -->
<SuppressICEs>ICE43</SuppressICEs>
</PropertyGroup>
<Import Project="..\msi.props" />
<ItemGroup>
<Compile Include="tcltk.wxs" />
<Compile Include="tcltk_files.wxs" />
</ItemGroup>
<ItemGroup>
<WxlTemplate Include="*.wxl_template" />
</ItemGroup>
<ItemGroup>
<InstallFiles Include="$(tcltkDir)bin\*.dll" Exclude="$(tcltkDir)bin\*g.dll">
<SourceBase>$(tcltkDir)</SourceBase>
<Source>!(bindpath.tcltk)</Source>
<TargetBase>$(tcltkDir)bin</TargetBase>
<Target_>DLLs\</Target_>
<Group>tcltk_dlls</Group>
</InstallFiles>
<InstallFiles Include="$(tcltkDir)lib\**\*">
<SourceBase>$(tcltkDir)</SourceBase>
<Source>!(bindpath.tcltk)</Source>
<TargetBase>$(tcltkDir)lib</TargetBase>
<Target_>tcl\</Target_>
<Group>tcltk_lib</Group>
</InstallFiles>
<InstallFiles Include="$(PySourcePath)Lib\tkinter\**\*;$(PySourcePath)Lib\idlelib\**\*;$(PySourcePath)Lib\turtledemo\**\*"
Exclude="$(PySourcePath)Lib\**\*.pyc;$(PySourcePath)Lib\**\*.pyo">
<SourceBase>$(PySourcePath)</SourceBase>
<Source>!(bindpath.src)</Source>
<TargetBase>$(PySourcePath)</TargetBase>
<Target_></Target_>
<Group>tkinter_lib</Group>
</InstallFiles>
</ItemGroup>
<Import Project="..\msi.targets" />
</Project>
\ No newline at end of file
Tools/msi/tcltk/tcltk.wxs
View file @ cc115eea
......@@ -15,7 +15,6 @@
<Condition Message="!(loc.NoPython)">PYTHON_EXE</Condition>
<?ifdef IncludeDefaultFeature ?>
<Feature Id="DefaultFeature" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)">
<ComponentGroupRef Id="tkinter_extension" />
<ComponentGroupRef Id="tcltk_dlls" />
......@@ -37,17 +36,5 @@
</Shortcut>
</Component>
</Feature>
<?endif ?>
<?ifdef IncludeSymbols ?>
<Feature Id="Symbols" AllowAdvertise="no" Title="!(loc.TitlePdb)" Description="!(loc.DescriptionPdb)">
<ComponentGroupRef Id="tkinter_extension_symbols" />
</Feature>
<?endif ?>
<?ifdef IncludeDebugBinaries ?>
<Feature Id="DebugBinaries" AllowAdvertise="no" Title="!(loc.Title_d)" Description="!(loc.Description_d)">
<ComponentGroupRef Id="tkinter_extension_d" />
<ComponentGroupRef Id="tcltk_dlls_d" />
</Feature>
<?endif ?>
</Product>
</Wix>
Tools/msi/tcltk/tcltk_d.wixproj
View file @ cc115eea
......@@ -5,7 +5,24 @@
<SchemaVersion>2.0</SchemaVersion>
<OutputName>tcltk_d</OutputName>
<OutputType>Package</OutputType>
<DefineConstants>IncludeDebugBinaries=1;$(DefineConstants)</DefineConstants>
</PropertyGroup>
<Import Project="tcltk.props" />
<Import Project="..\msi.props" />
<ItemGroup>
<Compile Include="tcltk_d.wxs" />
<Compile Include="tcltk_files.wxs" />
</ItemGroup>
<ItemGroup>
<WxlTemplate Include="*.wxl_template" />
</ItemGroup>
<ItemGroup>
<InstallFiles Include="$(tcltkDir)bin\*g.dll">
<SourceBase>$(tcltkDir)</SourceBase>
<Source>!(bindpath.tcltk)</Source>
<TargetBase>$(tcltkDir)bin</TargetBase>
<Target_>DLLs\</Target_>
<Group>tcltk_dlls_d</Group>
</InstallFiles>
</ItemGroup>
<Import Project="..\msi.targets" />
</Project>
\ No newline at end of file
Tools/msi/tcltk/tcltk_d.wxs 0 → 100644
View file @ cc115eea
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="*" Language="!(loc.LCID)" Name="!(loc.Title)" Version="$(var.Version)" Manufacturer="!(loc.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
<Package InstallerVersion="300" Compressed="yes" InstallScope="perUser" Platform="$(var.Platform)" />
<MediaTemplate EmbedCab="yes" CompressionLevel="high" />
<PropertyRef Id="UpgradeTable" />
<Feature Id="DebugBinaries" AllowAdvertise="no" Title="!(loc.Title_d)" Description="!(loc.Description_d)">
<ComponentGroupRef Id="tkinter_extension_d" />
<ComponentGroupRef Id="tcltk_dlls_d" />
</Feature>
</Product>
</Wix>
Tools/msi/tcltk/tcltk_pdb.wixproj
View file @ cc115eea
......@@ -5,7 +5,15 @@
<SchemaVersion>2.0</SchemaVersion>
<OutputName>tcltk_pdb</OutputName>
<OutputType>Package</OutputType>
<DefineConstants>IncludeSymbols=1;$(DefineConstants)</DefineConstants>
</PropertyGroup>
<Import Project="tcltk.props" />
<Import Project="..\msi.props" />
<ItemGroup>
<Compile Include="tcltk_pdb.wxs" />
<Compile Include="tcltk_files.wxs" />
</ItemGroup>
<ItemGroup>
<WxlTemplate Include="*.wxl_template" />
</ItemGroup>
<Import Project="..\msi.targets" />
</Project>
\ No newline at end of file
Tools/msi/tcltk/tcltk_pdb.wxs 0 → 100644
View file @ cc115eea
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="*" Language="!(loc.LCID)" Name="!(loc.Title)" Version="$(var.Version)" Manufacturer="!(loc.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
<Package InstallerVersion="300" Compressed="yes" InstallScope="perUser" Platform="$(var.Platform)" />
<MediaTemplate EmbedCab="yes" CompressionLevel="high" />
<PropertyRef Id="UpgradeTable" />
<Feature Id="Symbols" AllowAdvertise="no" Title="!(loc.TitlePdb)" Description="!(loc.DescriptionPdb)">
<ComponentGroupRef Id="tkinter_extension_symbols" />
</Feature>
</Product>
</Wix>
Tools/msi/test/test.props deleted 100644 → 0
View file @ 17be514d
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\msi.props" />
<ItemGroup>
<Compile Include="*.wxs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="*.wxl" />
</ItemGroup>
<ItemGroup>
<InstallFiles Include="$(PySourcePath)Lib\test\**\*"
Exclude="$(PySourcePath)Lib\**\*.pyc;$(PySourcePath)Lib\**\*.pyo">
<SourceBase>$(PySourcePath)</SourceBase>
<Source>!(bindpath.src)</Source>
<TargetBase>$(PySourcePath)</TargetBase>
<Target_></Target_>
<Group>test_py</Group>
</InstallFiles>
</ItemGroup>
<Import Project="..\msi.targets" />
</Project>
\ No newline at end of file
Tools/msi/test/test.wixproj
View file @ cc115eea
......@@ -5,7 +5,25 @@
<SchemaVersion>2.0</SchemaVersion>
<OutputName>test</OutputName>
<OutputType>Package</OutputType>
<DefineConstants>IncludeDefaultFeature=1;$(DefineConstants)</DefineConstants>
</PropertyGroup>
<Import Project="test.props" />
<Import Project="..\msi.props" />
<ItemGroup>
<Compile Include="test.wxs" />
<Compile Include="test_files.wxs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="*.wxl" />
</ItemGroup>
<ItemGroup>
<InstallFiles Include="$(PySourcePath)Lib\test\**\*"
Exclude="$(PySourcePath)Lib\**\*.pyc;$(PySourcePath)Lib\**\*.pyo">
<SourceBase>$(PySourcePath)</SourceBase>
<Source>!(bindpath.src)</Source>
<TargetBase>$(PySourcePath)</TargetBase>
<Target_></Target_>
<Group>test_py</Group>
</InstallFiles>
</ItemGroup>
<Import Project="..\msi.targets" />
</Project>
\ No newline at end of file
Tools/msi/test/test.wxs
View file @ cc115eea
......@@ -7,21 +7,9 @@
<PropertyRef Id="UpgradeTable" />
<PropertyRef Id="REGISTRYKEY" />
<?ifdef IncludeDefaultFeature ?>
<Feature Id="DefaultFeature" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)">
<ComponentGroupRef Id="test_py" />
<ComponentGroupRef Id="test_extensions" />
</Feature>
<?endif ?>
<?ifdef IncludeSymbols ?>
<Feature Id="Symbols" AllowAdvertise="no" Title="!(loc.TitlePdb)" Description="!(loc.DescriptionPdb)">
<ComponentGroupRef Id="test_extensions_symbols" />
</Feature>
<?endif ?>
<?ifdef IncludeDebugBinaries ?>
<Feature Id="DebugBinaries" AllowAdvertise="no" Title="!(loc.Title_d)" Description="!(loc.Description_d)">
<ComponentGroupRef Id="test_extensions_d" />
</Feature>
<?endif ?>
</Product>
</Wix>
Tools/msi/test/test_d.wixproj
View file @ cc115eea
......@@ -5,7 +5,15 @@
<SchemaVersion>2.0</SchemaVersion>
<OutputName>test_d</OutputName>
<OutputType>Package</OutputType>
<DefineConstants>IncludeDebugBinaries=1;$(DefineConstants)</DefineConstants>
</PropertyGroup>
<Import Project="test.props" />
<Import Project="..\msi.props" />
<ItemGroup>
<Compile Include="test_d.wxs" />
<Compile Include="test_files.wxs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="*.wxl" />
</ItemGroup>
<Import Project="..\msi.targets" />
</Project>
\ No newline at end of file
Tools/msi/test/test_d.wxs 0 → 100644
View file @ cc115eea
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="*" Language="!(loc.LCID)" Name="!(loc.Title)" Version="$(var.Version)" Manufacturer="!(loc.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
<Package InstallerVersion="300" Compressed="yes" InstallScope="perUser" Platform="$(var.Platform)" />
<MediaTemplate EmbedCab="yes" CompressionLevel="high" />
<PropertyRef Id="UpgradeTable" />
<Feature Id="DebugBinaries" AllowAdvertise="no" Title="!(loc.Title_d)" Description="!(loc.Description_d)">
<ComponentGroupRef Id="test_extensions_d" />
</Feature>
</Product>
</Wix>
Tools/msi/test/test_pdb.wixproj
View file @ cc115eea
......@@ -5,7 +5,15 @@
<SchemaVersion>2.0</SchemaVersion>
<OutputName>test_pdb</OutputName>
<OutputType>Package</OutputType>
<DefineConstants>IncludeSymbols=1;$(DefineConstants)</DefineConstants>
</PropertyGroup>
<Import Project="test.props" />
<Import Project="..\msi.props" />
<ItemGroup>
<Compile Include="test_pdb.wxs" />
<Compile Include="test_files.wxs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="*.wxl" />
</ItemGroup>
<Import Project="..\msi.targets" />
</Project>
\ No newline at end of file
Tools/msi/test/test_pdb.wxs 0 → 100644
View file @ cc115eea
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="*" Language="!(loc.LCID)" Name="!(loc.Title)" Version="$(var.Version)" Manufacturer="!(loc.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
<Package InstallerVersion="300" Compressed="yes" InstallScope="perUser" Platform="$(var.Platform)" />
<MediaTemplate EmbedCab="yes" CompressionLevel="high" />
<PropertyRef Id="UpgradeTable" />
<Feature Id="Symbols" AllowAdvertise="no" Title="!(loc.TitlePdb)" Description="!(loc.DescriptionPdb)">
<ComponentGroupRef Id="test_extensions_symbols" />
</Feature>
</Product>
</Wix>
Tools/msi/tools/tools.wixproj
View file @ cc115eea
......@@ -8,7 +8,8 @@
</PropertyGroup>
<Import Project="..\msi.props" />
<ItemGroup>
<Compile Include="*.wxs" />
<Compile Include="tools.wxs" />
<Compile Include="tools_files.wxs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="*.wxl" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7