Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit cc115ee

Browse files
zoobazooba
committed
Simplify MSI projects.
1 parent 17be514 commit cc115ee

46 files changed

Lines changed: 447 additions & 334 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Tools/msi/core/core.props‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎Tools/msi/core/core.wixproj‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,15 @@
55
<SchemaVersion>2.0</SchemaVersion>
66
<OutputName>core</OutputName>
77
<OutputType>Package</OutputType>
8-
<DefineConstants>IncludeDefaultFeature=1;$(DefineConstants)</DefineConstants>
98
</PropertyGroup>
10-
<Import Project="core.props" />
9+
<Import Project="..\msi.props" />
10+
<ItemGroup>
11+
<Compile Include="core.wxs" />
12+
<Compile Include="core_files.wxs" />
13+
</ItemGroup>
14+
<ItemGroup>
15+
<EmbeddedResource Include="*.wxl" />
16+
</ItemGroup>
17+
18+
<Import Project="..\msi.targets" />
1119
</Project>

‎Tools/msi/core/core.wxs‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,8 @@
66

77
<PropertyRef Id="UpgradeTable" />
88

9-
<?ifdef IncludeDefaultFeature ?>
109
<Feature Id="DefaultFeature" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)">
1110
<ComponentGroupRef Id="core_dll" />
1211
</Feature>
13-
<?endif ?>
14-
<?ifdef IncludeSymbols ?>
15-
<Feature Id="Symbols" AllowAdvertise="no" Title="!(loc.TitlePdb)" Description="!(loc.DescriptionPdb)">
16-
<ComponentGroupRef Id="core_symbols" />
17-
</Feature>
18-
<?endif ?>
19-
<?ifdef IncludeDebugBinaries ?>
20-
<Feature Id="DebugBinaries" AllowAdvertise="no" Title="!(loc.Title_d)" Description="!(loc.Description_d)">
21-
<ComponentGroupRef Id="core_dll_d" />
22-
</Feature>
23-
<?endif ?>
2412
</Product>
2513
</Wix>

‎Tools/msi/core/core_d.wixproj‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,15 @@
55
<SchemaVersion>2.0</SchemaVersion>
66
<OutputName>core_d</OutputName>
77
<OutputType>Package</OutputType>
8-
<DefineConstants>IncludeDebugBinaries=1;$(DefineConstants)</DefineConstants>
98
</PropertyGroup>
10-
<Import Project="core.props" />
9+
<Import Project="..\msi.props" />
10+
<ItemGroup>
11+
<Compile Include="core_d.wxs" />
12+
<Compile Include="core_files.wxs" />
13+
</ItemGroup>
14+
<ItemGroup>
15+
<EmbeddedResource Include="*.wxl" />
16+
</ItemGroup>
17+
18+
<Import Project="..\msi.targets" />
1119
</Project>

‎Tools/msi/core/core_d.wxs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
3+
<Product Id="*" Language="!(loc.LCID)" Name="!(loc.Title)" Version="$(var.Version)" Manufacturer="!(loc.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
4+
<Package InstallerVersion="300" Compressed="yes" InstallScope="perUser" Platform="$(var.Platform)" />
5+
<MediaTemplate EmbedCab="yes" CompressionLevel="high" />
6+
7+
<PropertyRef Id="UpgradeTable" />
8+
9+
<Feature Id="DebugBinaries" AllowAdvertise="no" Title="!(loc.Title_d)" Description="!(loc.Description_d)">
10+
<ComponentGroupRef Id="core_dll_d" />
11+
</Feature>
12+
</Product>
13+
</Wix>

‎Tools/msi/core/core_pdb.wixproj‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,15 @@
55
<SchemaVersion>2.0</SchemaVersion>
66
<OutputName>core_pdb</OutputName>
77
<OutputType>Package</OutputType>
8-
<DefineConstants>IncludeSymbols=1;$(DefineConstants)</DefineConstants>
98
</PropertyGroup>
10-
<Import Project="core.props" />
9+
<Import Project="..\msi.props" />
10+
<ItemGroup>
11+
<Compile Include="core_pdb.wxs" />
12+
<Compile Include="core_files.wxs" />
13+
</ItemGroup>
14+
<ItemGroup>
15+
<EmbeddedResource Include="*.wxl" />
16+
</ItemGroup>
17+
18+
<Import Project="..\msi.targets" />
1119
</Project>

‎Tools/msi/core/core_pdb.wxs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
3+
<Product Id="*" Language="!(loc.LCID)" Name="!(loc.Title)" Version="$(var.Version)" Manufacturer="!(loc.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
4+
<Package InstallerVersion="300" Compressed="yes" InstallScope="perUser" Platform="$(var.Platform)" />
5+
<MediaTemplate EmbedCab="yes" CompressionLevel="high" />
6+
7+
<PropertyRef Id="UpgradeTable" />
8+
9+
<Feature Id="Symbols" AllowAdvertise="no" Title="!(loc.TitlePdb)" Description="!(loc.DescriptionPdb)">
10+
<ComponentGroupRef Id="core_symbols" />
11+
</Feature>
12+
</Product>
13+
</Wix>

‎Tools/msi/dev/dev.props‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎Tools/msi/dev/dev.wixproj‎

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,45 @@
55
<SchemaVersion>2.0</SchemaVersion>
66
<OutputName Condition="'$(OutputName)' == ''">dev</OutputName>
77
<OutputType>Package</OutputType>
8-
<DefineConstants>IncludeDefaultFeature=1;$(DefineConstants)</DefineConstants>
98
</PropertyGroup>
10-
<Import Project="dev.props" />
9+
<Import Project="..\msi.props" />
10+
<PropertyGroup>
11+
<DefineConstants Condition="$(BuildForRelease)">
12+
$(DefineConstants);
13+
IncludeMinGWLib=1;
14+
</DefineConstants>
15+
</PropertyGroup>
16+
<ItemGroup>
17+
<Compile Include="dev.wxs" />
18+
<Compile Include="dev_files.wxs" />
19+
</ItemGroup>
20+
<ItemGroup>
21+
<EmbeddedResource Include="*.wxl" />
22+
</ItemGroup>
23+
<ItemGroup>
24+
<InstallFiles Include="$(PySourcePath)include\*.h">
25+
<SourceBase>$(PySourcePath)</SourceBase>
26+
<Source>!(bindpath.src)</Source>
27+
<TargetBase>$(PySourcePath)</TargetBase>
28+
<Target_></Target_>
29+
<Group>dev_include</Group>
30+
</InstallFiles>
31+
</ItemGroup>
32+
33+
<Target Name="BuildMinGWLib"
34+
Inputs="$(BuildPath)$(PyDllName).dll"
35+
Outputs="$(BuildPath)lib$(PyDllName).a"
36+
AfterTargets="PrepareForBuild"
37+
Condition="$(BuildForRelease)">
38+
<!-- Build libpython##.a as part of this project. This requires gendef and dlltool on the path. -->
39+
<PropertyGroup>
40+
<_GenDefPlatform>i386</_GenDefPlatform>
41+
<_GenDefPlatform Condition="$(Platform) == 'x64'">i386:x86-64</_GenDefPlatform>
42+
</PropertyGroup>
43+
44+
<Exec Command='gendef - "$(BuildPath)$(PyDllName).dll" &gt; "$(IntermediateOutputPath)mingwlib.def"' ContinueOnError="false" />
45+
<Exec Command='dlltool --dllname $(PyDllName).dll --def "$(IntermediateOutputPath)mingwlib.def" --output-lib "$(BuildPath)lib$(PyDllName).a" -m $(_GenDefPlatform)' />
46+
</Target>
47+
48+
<Import Project="..\msi.targets" />
1149
</Project>

‎Tools/msi/dev/dev.wxs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
<PropertyRef Id="UpgradeTable" />
88

9-
<?ifdef IncludeDefaultFeature ?>
109
<Feature Id="DefaultFeature" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)">
1110
<ComponentGroupRef Id="dev_include" />
1211
<ComponentGroupRef Id="dev_pyconfig" />
@@ -15,11 +14,5 @@
1514
<ComponentGroupRef Id="dev_mingw" />
1615
<?endif ?>
1716
</Feature>
18-
<?endif ?>
19-
<?ifdef IncludeDebugBinaries ?>
20-
<Feature Id="DebugBinaries" AllowAdvertise="no" Title="!(loc.Title_d)" Description="!(loc.Description_d)">
21-
<ComponentGroupRef Id="dev_libs_d" />
22-
</Feature>
23-
<?endif ?>
2417
</Product>
2518
</Wix>

0 commit comments

Comments
 (0)