From 8f88915c2cc63aa11c43b8a55866fe2541c3f34e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lozier?= Date: Tue, 20 Apr 2021 21:20:15 -0400 Subject: [PATCH] Add ipy32 to msi --- IronPython.sln | 6 ++++ Package/msi/IronPython.wxs | 6 ++++ Src/IronPythonWindow/ipy.ico | Bin 10134 -> 0 bytes .../IronPythonWindow32.csproj | 29 ++++++++++++++++++ 4 files changed, 41 insertions(+) delete mode 100644 Src/IronPythonWindow/ipy.ico create mode 100644 Src/IronPythonWindow32/IronPythonWindow32.csproj diff --git a/IronPython.sln b/IronPython.sln index 78a60c885..015b418ef 100644 --- a/IronPython.sln +++ b/IronPython.sln @@ -101,6 +101,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "msi", "msi", "{450F93D5-DF0 Package\msi\Version.wxi = Package\msi\Version.wxi EndProjectSection EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPythonWindow32", "Src\IronPythonWindow32\IronPythonWindow32.csproj", "{8F177DC2-9822-45BD-AB05-1F40FCA86168}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -163,6 +165,10 @@ Global {DA3415F3-6922-42D0-93D7-BEE2E8603A18}.Debug|Any CPU.Build.0 = Debug|Any CPU {DA3415F3-6922-42D0-93D7-BEE2E8603A18}.Release|Any CPU.ActiveCfg = Release|Any CPU {DA3415F3-6922-42D0-93D7-BEE2E8603A18}.Release|Any CPU.Build.0 = Release|Any CPU + {8F177DC2-9822-45BD-AB05-1F40FCA86168}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8F177DC2-9822-45BD-AB05-1F40FCA86168}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8F177DC2-9822-45BD-AB05-1F40FCA86168}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8F177DC2-9822-45BD-AB05-1F40FCA86168}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Package/msi/IronPython.wxs b/Package/msi/IronPython.wxs index 6806c7e1b..508f967c2 100644 --- a/Package/msi/IronPython.wxs +++ b/Package/msi/IronPython.wxs @@ -16,6 +16,9 @@ + + + @@ -29,6 +32,9 @@ + + + diff --git a/Src/IronPythonWindow/ipy.ico b/Src/IronPythonWindow/ipy.ico deleted file mode 100644 index 6602a51563de5c8e302f8c0a6d1d31579b247802..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10134 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 O_vrCA`Tn-`(Ek9d?t?!7 diff --git a/Src/IronPythonWindow32/IronPythonWindow32.csproj b/Src/IronPythonWindow32/IronPythonWindow32.csproj new file mode 100644 index 000000000..da4e8448e --- /dev/null +++ b/Src/IronPythonWindow32/IronPythonWindow32.csproj @@ -0,0 +1,29 @@ + + + + net46 + x86 + WinExe + IronPythonWindow + ipyw32 + ..\IronPythonWindow\ipyw.ico + true + + + + + + + + + + + + + + + + + + +