Skip to content

Commit 6954973

Browse files
authored
Add ipy32 to msi (#1184)
1 parent 5e70cc6 commit 6954973

4 files changed

Lines changed: 41 additions & 0 deletions

File tree

IronPython.sln

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "msi", "msi", "{450F93D5-DF0
101101
Package\msi\Version.wxi = Package\msi\Version.wxi
102102
EndProjectSection
103103
EndProject
104+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPythonWindow32", "Src\IronPythonWindow32\IronPythonWindow32.csproj", "{8F177DC2-9822-45BD-AB05-1F40FCA86168}"
105+
EndProject
104106
Global
105107
GlobalSection(SolutionConfigurationPlatforms) = preSolution
106108
Debug|Any CPU = Debug|Any CPU
@@ -163,6 +165,10 @@ Global
163165
{DA3415F3-6922-42D0-93D7-BEE2E8603A18}.Debug|Any CPU.Build.0 = Debug|Any CPU
164166
{DA3415F3-6922-42D0-93D7-BEE2E8603A18}.Release|Any CPU.ActiveCfg = Release|Any CPU
165167
{DA3415F3-6922-42D0-93D7-BEE2E8603A18}.Release|Any CPU.Build.0 = Release|Any CPU
168+
{8F177DC2-9822-45BD-AB05-1F40FCA86168}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
169+
{8F177DC2-9822-45BD-AB05-1F40FCA86168}.Debug|Any CPU.Build.0 = Debug|Any CPU
170+
{8F177DC2-9822-45BD-AB05-1F40FCA86168}.Release|Any CPU.ActiveCfg = Release|Any CPU
171+
{8F177DC2-9822-45BD-AB05-1F40FCA86168}.Release|Any CPU.Build.0 = Release|Any CPU
166172
EndGlobalSection
167173
GlobalSection(SolutionProperties) = preSolution
168174
HideSolutionNode = FALSE

Package/msi/IronPython.wxs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
<File Id="ipy.exe" KeyPath="yes" Source="$(var.PlatformDir)\ipy.exe">
1717
<netfx:NativeImage Id="ngen_ipy.exe" Platform="all" AppBaseDirectory="INSTALLDIR"/>
1818
</File>
19+
<File Id="ipy32.exe" Source="$(var.PlatformDir)\ipy32.exe">
20+
<netfx:NativeImage Id="ngen_ipy32.exe" Platform="all" AppBaseDirectory="INSTALLDIR"/>
21+
</File>
1922
</Component>
2023

2124
<Component Guid="{F7E1626D-3007-405D-A656-1A971D172A07}">
@@ -29,6 +32,9 @@
2932
<File Id="ipyw.exe" KeyPath="yes" Source="$(var.PlatformDir)\ipyw.exe">
3033
<netfx:NativeImage Id="ngen_ipyw.exe" Platform="all" AppBaseDirectory="INSTALLDIR"/>
3134
</File>
35+
<File Id="ipyw32.exe" Source="$(var.PlatformDir)\ipyw32.exe">
36+
<netfx:NativeImage Id="ngen_ipyw32.exe" Platform="all" AppBaseDirectory="INSTALLDIR"/>
37+
</File>
3238
</Component>
3339

3440
<Directory Id="IronPython_DLLs" Name="DLLs">

Src/IronPythonWindow/ipy.ico

-9.9 KB
Binary file not shown.
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFrameworks>net46</TargetFrameworks>
5+
<PlatformTarget>x86</PlatformTarget>
6+
<OutputType>WinExe</OutputType>
7+
<RootNamespace>IronPythonWindow</RootNamespace>
8+
<AssemblyName>ipyw32</AssemblyName>
9+
<ApplicationIcon>..\IronPythonWindow\ipyw.ico</ApplicationIcon>
10+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
11+
</PropertyGroup>
12+
13+
<ItemGroup>
14+
<ProjectReference Include="..\IronPython\IronPython.csproj" />
15+
</ItemGroup>
16+
17+
<ItemGroup>
18+
<Reference Include="System.Windows.Forms" />
19+
</ItemGroup>
20+
21+
<ItemGroup>
22+
<Compile Include="..\IronPythonWindow\Properties\AssemblyInfo.cs" Link="Properties\AssemblyInfo.cs" />
23+
<Compile Include="..\IronPythonWindow\IronPythonWindow.cs" Link="IronPythonWindow.cs" />
24+
</ItemGroup>
25+
26+
<Import Project="$(AfterTargetFiles)" />
27+
<Target Name="AfterBuildEnds" AfterTargets="AfterBuild" DependsOnTargets="$(AfterTargets)" />
28+
29+
</Project>

0 commit comments

Comments
 (0)