Permalink
Browse files

Merge from ironpython2 (#373)

* Merge from ironpython2

* Fix version
  • Loading branch information...
slide committed Feb 20, 2018
1 parent da95223 commit a201c0ee58e85aa95104b1056809bf382b406423
Showing with 50,872 additions and 217 deletions.
  1. +71 −39 .gitignore
  2. +3 −10 .travis.yml
  3. +22 −5 Build.proj
  4. +0 −1 Build/Common.proj
  5. +27 −0 Package/choco/IronPython.nuspec
  6. +38 −0 Package/msi/Dlr.wxs
  7. +11 −55 Package/msi/IronPython.Installer.wixproj
  8. +29 −44 Package/msi/IronPython.wxs
  9. +293 −0 Package/msi/License.rtf
  10. +9 −28 Package/msi/Product.wxs
  11. BIN Package/msi/banner.bmp
  12. BIN Package/msi/ironpython.bmp
  13. +1 −1 Package/nuget/IronPython.StdLib.nuspec
  14. +1 −1 Package/nuget/IronPython.nuspec
  15. +1 −1 Src/IronPython.Wpf/_wpf.cs
  16. +0 −1 Src/IronPythonCompiler/Program.cs
  17. +2 −3 Src/IronPythonTest/BinderTest.cs
  18. +5 −1 Src/IronPythonTest/Cases/AllCPythonCasesManifest.ini
  19. +10 −1 Src/IronPythonTest/Cases/IronPythonCases.cs
  20. +1 −2 Src/IronPythonTest/Cases/IronPythonCasesManifest.ini
  21. +6 −9 Src/IronPythonTest/EngineTest.cs
  22. +4 −4 Src/IronPythonTest/IronPythonTest.csproj
  23. +1 −4 Src/Scripts/generate.py
  24. +1 −1 Src/Scripts/generate_calls.py
  25. +0 −5 Src/Scripts/generate_exception_factory.py
  26. BIN Util/Wix/LuxTasks.dll
  27. BIN Util/Wix/Microsoft.Deployment.Compression.Cab.dll
  28. BIN Util/Wix/Microsoft.Deployment.Compression.dll
  29. BIN Util/Wix/Microsoft.Deployment.Resources.dll
  30. BIN Util/Wix/Microsoft.Deployment.WindowsInstaller.Package.dll
  31. BIN Util/Wix/Microsoft.Deployment.WindowsInstaller.dll
  32. BIN Util/Wix/ThmViewer.exe
  33. BIN Util/Wix/WixBalExtension.dll
  34. BIN Util/Wix/WixComPlusExtension.dll
  35. BIN Util/Wix/WixCop.exe
  36. BIN Util/Wix/WixDependencyExtension.dll
  37. BIN Util/Wix/WixDifxAppExtension.dll
  38. BIN Util/Wix/WixDirectXExtension.dll
  39. BIN Util/Wix/WixFirewallExtension.dll
  40. BIN Util/Wix/WixGamingExtension.dll
  41. BIN Util/Wix/WixHttpExtension.dll
  42. BIN Util/Wix/WixIIsExtension.dll
  43. BIN Util/Wix/WixLuxExtension.dll
  44. BIN Util/Wix/WixMsmqExtension.dll
  45. BIN Util/Wix/WixNetFxExtension.dll
  46. BIN Util/Wix/WixPSExtension.dll
  47. BIN Util/Wix/WixSqlExtension.dll
  48. BIN Util/Wix/WixTagExtension.dll
  49. BIN Util/Wix/WixTasks.dll
  50. BIN Util/Wix/WixUIExtension.dll
  51. BIN Util/Wix/WixUtilExtension.dll
  52. BIN Util/Wix/WixVSExtension.MSBuild12.dll
  53. BIN Util/Wix/WixVSExtension.MSBuild14.dll
  54. BIN Util/Wix/WixVSExtension.dll
  55. BIN Util/Wix/candle.exe
  56. +13 −0 Util/Wix/candle.exe.config
  57. BIN Util/Wix/darice.cub
  58. BIN Util/Wix/dark.exe
  59. +16 −0 Util/Wix/dark.exe.config
  60. BIN Util/Wix/difxapp_x64.wixlib
  61. BIN Util/Wix/difxapp_x86.wixlib
  62. BIN Util/Wix/doc/DTF.chm
  63. BIN Util/Wix/doc/DTFAPI.chm
  64. +221 −0 Util/Wix/doc/Dependency.xsd
  65. BIN Util/Wix/doc/WiX.chm
  66. +249 −0 Util/Wix/doc/bal.xsd
  67. +944 −0 Util/Wix/doc/complus.xsd
  68. +108 −0 Util/Wix/doc/difxapp.xsd
  69. +211 −0 Util/Wix/doc/firewall.xsd
  70. +127 −0 Util/Wix/doc/gaming.xsd
  71. +148 −0 Util/Wix/doc/http.xsd
  72. +1,104 −0 Util/Wix/doc/iis.xsd
  73. +221 −0 Util/Wix/doc/lux.xsd
  74. +121 −0 Util/Wix/doc/msmq.xsd
  75. +235 −0 Util/Wix/doc/netfx.xsd
  76. +201 −0 Util/Wix/doc/ps.xsd
  77. +342 −0 Util/Wix/doc/sql.xsd
  78. +154 −0 Util/Wix/doc/tag.xsd
  79. +688 −0 Util/Wix/doc/thmutil.xsd
  80. +1,610 −0 Util/Wix/doc/util.xsd
  81. +292 −0 Util/Wix/doc/vs.xsd
  82. +13,082 −0 Util/Wix/doc/wix.xsd
  83. +134 −0 Util/Wix/doc/wixloc.xsd
  84. BIN Util/Wix/heat.exe
  85. +16 −0 Util/Wix/heat.exe.config
  86. BIN Util/Wix/insignia.exe
  87. +10 −0 Util/Wix/insignia.exe.config
  88. BIN Util/Wix/light.exe
  89. +13 −0 Util/Wix/light.exe.config
  90. BIN Util/Wix/lit.exe
  91. +13 −0 Util/Wix/lit.exe.config
  92. BIN Util/Wix/lux.exe
  93. +12 −0 Util/Wix/lux.exe.config
  94. +112 −0 Util/Wix/lux.targets
  95. BIN Util/Wix/melt.exe
  96. +13 −0 Util/Wix/melt.exe.config
  97. BIN Util/Wix/mergemod.cub
  98. BIN Util/Wix/mergemod.dll
  99. BIN Util/Wix/mspatchc.dll
  100. BIN Util/Wix/nit.exe
  101. +9 −0 Util/Wix/nit.exe.config
  102. BIN Util/Wix/pyro.exe
  103. +13 −0 Util/Wix/pyro.exe.config
  104. BIN Util/Wix/retina.exe
  105. +12 −0 Util/Wix/retina.exe.config
  106. +26 −0 Util/Wix/sdk/BootstrapperCore.config
  107. BIN Util/Wix/sdk/BootstrapperCore.dll
  108. +2,803 −0 Util/Wix/sdk/BootstrapperCore.xml
  109. BIN Util/Wix/sdk/DocCompiler.exe
  110. BIN Util/Wix/sdk/MakeSfxCA.exe
  111. +10 −0 Util/Wix/sdk/MakeSfxCA.exe.config
  112. BIN Util/Wix/sdk/Microsoft.Deployment.Compression.Cab.dll
  113. +490 −0 Util/Wix/sdk/Microsoft.Deployment.Compression.Cab.xml
  114. BIN Util/Wix/sdk/Microsoft.Deployment.Compression.Zip.dll
  115. +547 −0 Util/Wix/sdk/Microsoft.Deployment.Compression.Zip.xml
  116. BIN Util/Wix/sdk/Microsoft.Deployment.Compression.dll
  117. +1,961 −0 Util/Wix/sdk/Microsoft.Deployment.Compression.xml
  118. BIN Util/Wix/sdk/Microsoft.Deployment.Resources.dll
  119. +536 −0 Util/Wix/sdk/Microsoft.Deployment.Resources.xml
  120. BIN Util/Wix/sdk/Microsoft.Deployment.WindowsInstaller.Linq.dll
  121. +459 −0 Util/Wix/sdk/Microsoft.Deployment.WindowsInstaller.Linq.xml
  122. BIN Util/Wix/sdk/Microsoft.Deployment.WindowsInstaller.Package.dll
  123. +724 −0 Util/Wix/sdk/Microsoft.Deployment.WindowsInstaller.Package.xml
  124. BIN Util/Wix/sdk/Microsoft.Deployment.WindowsInstaller.dll
  125. +7,409 −0 Util/Wix/sdk/Microsoft.Deployment.WindowsInstaller.xml
  126. BIN Util/Wix/sdk/MsgGen.exe
  127. BIN Util/Wix/sdk/XsdGen.exe
  128. BIN Util/Wix/sdk/XsdStitch.exe
  129. +693 −0 Util/Wix/sdk/inc/BalBaseBootstrapperApplication.h
  130. +755 −0 Util/Wix/sdk/inc/IBootstrapperApplication.h
  131. +29 −0 Util/Wix/sdk/inc/IBootstrapperBAFunction.h
  132. +221 −0 Util/Wix/sdk/inc/IBootstrapperEngine.h
  133. +153 −0 Util/Wix/sdk/inc/aclutil.h
  134. +45 −0 Util/Wix/sdk/inc/apputil.h
  135. +86 −0 Util/Wix/sdk/inc/apuputil.h
  136. +146 −0 Util/Wix/sdk/inc/atomutil.h
  137. +58 −0 Util/Wix/sdk/inc/balcondition.h
  138. +107 −0 Util/Wix/sdk/inc/balinfo.h
  139. +64 −0 Util/Wix/sdk/inc/balretry.h
  140. +116 −0 Util/Wix/sdk/inc/balutil.h
  141. +80 −0 Util/Wix/sdk/inc/buffutil.h
  142. +31 −0 Util/Wix/sdk/inc/butil.h
  143. +62 −0 Util/Wix/sdk/inc/cabcutil.h
  144. +56 −0 Util/Wix/sdk/inc/cabutil.h
  145. +66 −0 Util/Wix/sdk/inc/certutil.h
  146. +97 −0 Util/Wix/sdk/inc/conutil.h
  147. +103 −0 Util/Wix/sdk/inc/cryputil.h
  148. +130 −0 Util/Wix/sdk/inc/custommsierrors.h
  149. +147 −0 Util/Wix/sdk/inc/deputil.h
  150. +69 −0 Util/Wix/sdk/inc/dictutil.h
  151. +59 −0 Util/Wix/sdk/inc/dirutil.h
  152. +59 −0 Util/Wix/sdk/inc/dlutil.h
  153. +214 −0 Util/Wix/sdk/inc/dutil.h
  154. +223 −0 Util/Wix/sdk/inc/eseutil.h
  155. +219 −0 Util/Wix/sdk/inc/fileutil.h
  156. +30 −0 Util/Wix/sdk/inc/gdiputil.h
  157. +222 −0 Util/Wix/sdk/inc/iis7util.h
  158. +39 −0 Util/Wix/sdk/inc/inetutil.h
  159. +73 −0 Util/Wix/sdk/inc/iniutil.h
  160. +112 −0 Util/Wix/sdk/inc/jsonutil.h
  161. +120 −0 Util/Wix/sdk/inc/locutil.h
  162. +200 −0 Util/Wix/sdk/inc/logutil.h
  163. +55 −0 Util/Wix/sdk/inc/memutil.h
  164. +52 −0 Util/Wix/sdk/inc/metautil.h
  165. +39 −0 Util/Wix/sdk/inc/osutil.h
  166. +228 −0 Util/Wix/sdk/inc/pathutil.h
  167. +24 −0 Util/Wix/sdk/inc/perfutil.h
  168. +39 −0 Util/Wix/sdk/inc/polcutil.h
  169. +75 −0 Util/Wix/sdk/inc/procutil.h
  170. +233 −0 Util/Wix/sdk/inc/regutil.h
  171. +43 −0 Util/Wix/sdk/inc/resrutil.h
  172. +31 −0 Util/Wix/sdk/inc/reswutil.h
  173. +54 −0 Util/Wix/sdk/inc/rexutil.h
  174. +46 −0 Util/Wix/sdk/inc/rmutil.h
  175. +89 −0 Util/Wix/sdk/inc/rssutil.h
  176. +261 −0 Util/Wix/sdk/inc/sceutil.h
  177. +47 −0 Util/Wix/sdk/inc/shelutil.h
  178. +136 −0 Util/Wix/sdk/inc/sqlutil.h
  179. +45 −0 Util/Wix/sdk/inc/srputil.h
  180. +306 −0 Util/Wix/sdk/inc/strutil.h
  181. +21 −0 Util/Wix/sdk/inc/svcutil.h
  182. +555 −0 Util/Wix/sdk/inc/thmutil.h
  183. +34 −0 Util/Wix/sdk/inc/timeutil.h
  184. +100 −0 Util/Wix/sdk/inc/uriutil.h
  185. +32 −0 Util/Wix/sdk/inc/userutil.h
  186. +14 −0 Util/Wix/sdk/inc/wcalog.h
  187. +369 −0 Util/Wix/sdk/inc/wcautil.h
  188. +20 −0 Util/Wix/sdk/inc/wcawow64.h
  189. +130 −0 Util/Wix/sdk/inc/wcawrapquery.h
  190. +373 −0 Util/Wix/sdk/inc/wiutil.h
  191. +19 −0 Util/Wix/sdk/inc/wuautil.h
  192. +167 −0 Util/Wix/sdk/inc/xmlutil.h
  193. BIN Util/Wix/sdk/vs2010/lib/x64/deputil.lib
  194. BIN Util/Wix/sdk/vs2010/lib/x64/dutil.lib
  195. BIN Util/Wix/sdk/vs2010/lib/x64/wcautil.lib
  196. BIN Util/Wix/sdk/vs2010/lib/x86/balutil.lib
  197. BIN Util/Wix/sdk/vs2010/lib/x86/deputil.lib
  198. BIN Util/Wix/sdk/vs2010/lib/x86/dutil.lib
  199. BIN Util/Wix/sdk/vs2010/lib/x86/wcautil.lib
  200. BIN Util/Wix/sdk/vs2012/lib/x64/deputil.lib
  201. BIN Util/Wix/sdk/vs2012/lib/x64/dutil.lib
  202. BIN Util/Wix/sdk/vs2012/lib/x64/wcautil.lib
  203. BIN Util/Wix/sdk/vs2012/lib/x86/balutil.lib
  204. BIN Util/Wix/sdk/vs2012/lib/x86/deputil.lib
  205. BIN Util/Wix/sdk/vs2012/lib/x86/dutil.lib
  206. BIN Util/Wix/sdk/vs2012/lib/x86/wcautil.lib
  207. BIN Util/Wix/sdk/vs2013/lib/x64/deputil.lib
  208. BIN Util/Wix/sdk/vs2013/lib/x64/dutil.lib
  209. BIN Util/Wix/sdk/vs2013/lib/x64/wcautil.lib
  210. BIN Util/Wix/sdk/vs2013/lib/x86/balutil.lib
  211. BIN Util/Wix/sdk/vs2013/lib/x86/deputil.lib
  212. BIN Util/Wix/sdk/vs2013/lib/x86/dutil.lib
  213. BIN Util/Wix/sdk/vs2013/lib/x86/wcautil.lib
  214. BIN Util/Wix/sdk/vs2015/lib/x64/deputil.lib
  215. BIN Util/Wix/sdk/vs2015/lib/x64/dutil.lib
  216. BIN Util/Wix/sdk/vs2015/lib/x64/wcautil.lib
  217. BIN Util/Wix/sdk/vs2015/lib/x86/balutil.lib
  218. BIN Util/Wix/sdk/vs2015/lib/x86/deputil.lib
  219. BIN Util/Wix/sdk/vs2015/lib/x86/dutil.lib
  220. BIN Util/Wix/sdk/vs2015/lib/x86/wcautil.lib
  221. +183 −0 Util/Wix/sdk/wix.ca.targets
  222. BIN Util/Wix/sdk/x64/sfxca.dll
  223. BIN Util/Wix/sdk/x86/sfxca.dll
  224. BIN Util/Wix/shine.exe
  225. +9 −0 Util/Wix/shine.exe.config
  226. BIN Util/Wix/smoke.exe
  227. +13 −0 Util/Wix/smoke.exe.config
  228. BIN Util/Wix/torch.exe
  229. +13 −0 Util/Wix/torch.exe.config
  230. BIN Util/Wix/wconsole.dll
  231. BIN Util/Wix/winterop.dll
  232. BIN Util/Wix/wix.dll
  233. +22 −0 Util/Wix/wix.targets
  234. +3,090 −0 Util/Wix/wix200x.targets
  235. +3,071 −0 Util/Wix/wix2010.targets
  236. BIN Util/Wix/x86/burn.exe
  237. +5 −1 appveyor.yml
View
@@ -6,62 +6,94 @@
obj/
bin/
/bin/
/Package/Release/
/Package/Debug/
/Stage
/Packages
/.vscode
#Backup files
*.bak
# Temporary VS files
*.suo
*.csproj.user
*.wixproj.user
*.pidb
*.db
*.opendb
*.lock.json
*.nuget.targets
launchSettings.json
# NuGet Packages
packages/*
# Visual Studio 2015 cache/options directory
.vs/
# Generated files
BuildInfo.Generated.cs
CurrentVersion.Generated.cs
TestResult.xml
Solutions/TestResults/
Runtime/Samples/Hosting/Scenarios/bin/
# TODO - testing scripts should not create these files
debug.log
External.LCA_RESTRICTED/Languages/IronPython/27/Lib/@test_*
External.LCA_RESTRICTED/Languages/IronPython/27/Lib/lib2to3/Grammar2.9.9.alpha.0.pickle
External.LCA_RESTRICTED/Languages/IronPython/27/Lib/lib2to3/PatternGrammar2.9.9.alpha.0.pickle
Languages/IronPython/Tests/ImportTestDir/
Languages/IronPython/Tests/InheritanceTypes.dll
Languages/IronPython/Tests/OutterDir/
Languages/IronPython/Tests/another.py
Languages/IronPython/Tests/cached_type_dll.dll
Languages/IronPython/Tests/cp7007/
Languages/IronPython/Tests/finaltest.dll
Languages/IronPython/Tests/foo
Languages/IronPython/Tests/imfpstart.tpy
Languages/IronPython/Tests/impcp13736.py
Languages/IronPython/Tests/impmodfrmpkg/
Languages/IronPython/Tests/onlyread.tmp
Languages/IronPython/Tests/onlywrite.tmp
Languages/IronPython/Tests/tempFile1.tpy
Languages/IronPython/Tests/temp_syspath_none.py
Languages/IronPython/Tests/test.dll
Languages/IronPython/Tests/test.pyil
Languages/IronPython/Tests/test.xaml
Languages/IronPython/Tests/testfile.tmp
Languages/IronPython/Tests/testilcode.dll
Languages/IronPython/Tests/the_dir/
Languages/IronPython/Tests/vbproptest0.*.dll
Src/StdLib/Lib/@test_*
Util/References
# created by CPython tests
Src/StdLib/Lib/lib2to3/Grammar*.pickle
Src/StdLib/Lib/lib2to3/PatternGrammar*.pickle
# NuGet Packages
packages/*
# created by side by side tests
Tests/compat/*.log
Tests/compat/*.pyc
Tests/compat/*/*.pyc
Tests/compat/sbs_library.dll
Tests/compat/tempfile.txt
Tests/Tools/stdmodules.py.stdout.log
Tests/test_data.gz
*.bak
__pycache__/
.vscode/
Src/StdLib/Lib/shelftemp*
Src/StdLib/Lib/@test*
Tests/clrusetest*
build-*.binlog
# created by tests
abc.txt
*-result.xml
Src/StdLib/Lib/@test_*
Src/StdLib/Lib/lib2to3/Grammar2.9.9.alpha.0.pickle
Src/StdLib/Lib/lib2to3/PatternGrammar2.9.9.alpha.0.pickle
Tests/ImportTestDir/
Tests/cp15803/
Tests/InheritanceTypes.dll
Tests/OutterDir/
Tests/ImpTest/
Tests/StandAlone/
Tests/another.py
Tests/cached_type_dll.dll
Tests/clruse*.py
Tests/_fileio*
Tests/cp7007/
Tests/finaltest.dll
Tests/foo
Tests/imfpstart.tpy
Tests/impcp13736.py
Tests/impmodfrmpkg/
Tests/onlyread.tmp
Tests/onlywrite.tmp
Tests/tempFile1.tpy
Tests/temp_syspath_none.py
Tests/test.dll
Tests/test.pyil
Tests/test.xaml
Tests/testfile.tmp
Tests/testilcode.dll
Tests/the_dir/
Tests/vbproptest0.*.dll
tmp/
Src/IronPythonConsole/App.config
Src/IronPythonConsoleAny/App.config
Src/IronPythonWindow/App.config
Src/IronPythonWindowAny/App.config
Package/nuget/**/*.nupkg
*.binlog
Package/Release/
build-*.ProjectImports.zip
*.trx
*.un~
View
@@ -4,9 +4,6 @@ os:
language: csharp
services:
- docker
env:
- CONFIGURATION=Release
@@ -18,16 +15,12 @@ dist: trusty
osx_image: xcode9.1
dotnet: 2.0.0
dotnet: 2.1.4
script:
# remove this workaround when https://bugzilla.xamarin.com/show_bug.cgi?id=60340 is fixed and released
- if [[ "$TRAVIS_OS_NAME" != "osx" ]] ; then (cd /usr/lib/mono/msbuild/15.0/bin/Roslyn ; sudo ln -s ../../../../4.5/csc.exe . ; sudo ln -s ../../../../4.5/csc.exe.config . ; sudo ln -s ../../../../4.5/csc.rsp .) ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then (cd /Library/Frameworks/Mono.framework/Versions/Current/lib/mono/msbuild/15.0/bin/Roslyn/ ; sudo ln -s ../../../../4.5/csc.exe . ; sudo ln -s ../../../../4.5/csc.exe.config . ; sudo ln -s ../../../../4.5/csc.rsp .) ; fi
- dotnet restore IronPython.sln --packages ./packages
- if [[ "$TRAVIS_OS_NAME" != "osx" ]] ; then make ; fi
- if [[ "$TRAVIS_OS_NAME" != "osx" ]] ; then docker run -v /home/travis/build/IronLanguages/ironpython3:/home/travis/build/IronLanguages/ironpython3 mono:4.8 /bin/sh -c "apt-get update ; apt-get install make ; cd /home/travis/build/IronLanguages/ironpython3 && make test-all" ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then make ; fi
- make
- if [[ "$TRAVIS_OS_NAME" != "osx" ]] ; then make test-all ; fi
notifications:
email:
View
@@ -14,14 +14,15 @@
<BuildSysDir>$(RootDir)\Build</BuildSysDir>
<MSBuildCommunityTasksPath>$(RootDir)\Util\MSBuildCommunityTasks</MSBuildCommunityTasksPath>
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net45;netcoreapp2.0</TargetFrameworks>
<ChocolateyVersion>0.10.8</ChocolateyVersion>
</PropertyGroup>
<Import Project="$(BuildSysDir)\Versioning.targets" />
<Import Project="$(MSBuildCommunityTasksPath)\MSBuild.Community.Tasks.Targets" />
<PropertyGroup>
<StageDir>$(RootDir)\Package\$(BuildFlavour)\Stage\IronPython-$(PackageVersion)</StageDir>
<PackageDir>$(RootDir)\Package\$(BuildFlavour)\Packages\IronPython-$(PackageVersion)</PackageDir>
<StageDir>$(RootDir)Package\$(BuildFlavour)\Stage\IronPython-$(PackageVersion)</StageDir>
<PackageDir>$(RootDir)Package\$(BuildFlavour)\Packages\IronPython-$(PackageVersion)</PackageDir>
</PropertyGroup>
<PropertyGroup>
@@ -133,7 +134,7 @@
<Target Name="Stage" DependsOnTargets="$(StageDependsOn)" />
<Target Name="Package" DependsOnTargets="MsiPackage;ZipPackage;NuGetPackage;DebPackage" />
<Target Name="Package" DependsOnTargets="MsiPackage;ZipPackage;NuGetPackage;ChocoPackage;DebPackage" />
<Target Name="MakePackageDir">
<MakeDir Directories="$(PackageDir)" Condition="!Exists('$(PackageDir)')" />
@@ -170,6 +171,13 @@
<Delete Files="@(TempCopied)" />
</Target>
<Target Name="ChocoPackage" Condition="'$(OS)' != 'Unix' " DependsOnTargets="Stage;MakePackageDir"
Outputs="$(PackageDir)\ironpython.chocolatey.$(PackageVersion).nupkg">
<Exec Command="$(NuGet) install chocolatey -Version $(ChocolateyVersion) -OutputDirectory &quot;$(RootDir)\packages&quot; -Source https://api.nuget.org/v3/index.json" />
<Exec Command="$(RootDir)packages\chocolatey.$(ChocolateyVersion)\tools\chocolateyInstall\choco.exe pack &quot;$(RootDir)\Package\choco\IronPython.nuspec&quot; --outputdirectory &quot;$(StageDir)&quot; --version $(PackageVersion) STAGEDIR=&quot;$(StageDir)&quot;" />
<Move SourceFiles="$(StageDir)\ironpython.$(PackageVersion).nupkg" DestinationFiles="$(PackageDir)\ironpython.chocolatey.$(PackageVersion).nupkg" />
</Target>
<Target Name="ZipPackage" DependsOnTargets="Stage;MakePackageDir"
Outputs="$(PackageDir)\IronPython.$(PackageVersion).zip">
<ItemGroup>
@@ -180,5 +188,14 @@
<Target Name="DebPackage" Condition="'$(OS)' == 'Unix' " DependsOnTargets="Stage;MakePackageDir" />
<Target Name="MsiPackage" Condition="'$(OS)' != 'Unix' " DependsOnTargets="Stage;MakePackageDir" />
</Project>
<Target Name="MsiPackage" Condition="'$(OS)' != 'Unix' " DependsOnTargets="Stage;MakePackageDir">
<ItemGroup>
<CleanupFiles Include="$(StageDir)\net45\IronPythonTest.dll"/>
</ItemGroup>
<Delete Files="@(CleanupFiles)" />
<MSBuild
Projects="$(RootDir)\Package\msi\IronPython.Installer.wixproj"
Properties="BindInputPaths=$(StageDir);OutputPath=$(PackageDir);Configuration=$(BuildFlavour);Platform=x64"
/>
</Target>
</Project>
View
@@ -58,7 +58,6 @@
<PropertyGroup Condition=" '$(BuildFlavour)' == '' ">
<BuildFlavour>Debug</BuildFlavour>
<BuildFlavour Condition="'$(Configuration)' == 'Release'">Release</BuildFlavour>
</PropertyGroup>
<PropertyGroup>
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Do not remove this test for UTF-8: if “Ω” doesn’t appear as greek uppercase omega letter enclosed in quotation marks, you should use an editor that supports UTF-8, not this one. -->
<package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
<metadata>
<id>ironpython</id>
<version>3.4.0</version>
<packageSourceUrl>https://github.com/IronLanguages/ironpython2/blob/master/Package/choco/IronPython.Choco.nuspec</packageSourceUrl>
<title>IronPython</title>
<authors>IronPython Contributors,Microsoft</authors>
<owners>IronPython Community</owners>
<projectUrl>http://ironpython.net</projectUrl>
<licenseUrl>https://github.com/IronLanguages/ironpython2/blob/master/LICENSE</licenseUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>IronPython is an open-source implementation of the Python programming language which is tightly integrated with the .NET Framework. IronPython can use the .NET Framework and Python libraries, and other .NET languages can use Python code just as easily.</description>
<summary>IronPython is an open-source implementation of the Python programming language which is tightly integrated with the .NET Framework.</summary>
<language>en-US</language>
<tags>ironpython python dynamic dlr</tags>
<mailingListUrl>https://ironpython.groups.io/g/users</mailingListUrl>
</metadata>
<files>
<file src="$STAGEDIR$\net45\*.dll;$STAGEDIR$\net45\*.exe" exclude="**\rowantest*.dll;**\IronPythonTest.dll" />
<file src="$STAGEDIR$\net45\DLLs\**" target="DLLs" exclude="**\*.xml" />
<file src="$STAGEDIR$\Lib\**" target="Lib" />
<file src="$STAGEDIR$\LICENSE;$STAGEDIR$\README.md" />
</files>
</package>
View
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
<Fragment>
<DirectoryRef Id="INSTALLDIR">
<Component Guid="{3C386FF0-9BC5-4B45-9628-4EE4AC1916A2}">
<File Id="Microsoft.Scripting.dll" KeyPath="yes" Source="$(var.PlatformDir)\Microsoft.Scripting.dll"/>
</Component>
<Component Guid="{9D15CFB0-C88B-4223-A9E6-C8FA6B336E2B}">
<File Id="Microsoft.Dynamic.dll" KeyPath="yes" Source="$(var.PlatformDir)\Microsoft.Dynamic.dll" />
</Component>
</DirectoryRef>
<DirectoryRef Id="GAC">
<Component Guid="{24AAD7FE-15E3-440C-84E7-26DBDF7F9EBE}">
<File Id="gac_Microsoft.Scripting.dll" Name="Microsoft.Scripting.dll" Assembly=".net" KeyPath="yes" Source="$(var.PlatformDir)\Microsoft.Scripting.dll">
<netfx:NativeImage Id="ngen_Microsoft.Scripting.dll" Platform="all" AppBaseDirectory="INSTALLDIR"/>
</File>
</Component>
<Component Guid="{A62AD5D3-18CE-4933-9FF7-AA593537C4C2}">
<File Id="gac_Microsoft.Dynamic.dll" Name="Microsoft.Dynamic.dll" Assembly=".net" KeyPath="yes" Source="$(var.PlatformDir)\Microsoft.Dynamic.dll">
<netfx:NativeImage Id="ngen_Microsoft.Dynamic.dll" Platform="all" AppBaseDirectory="INSTALLDIR"/>
</File>
</Component>
</DirectoryRef>
<ComponentGroup Id="Dlr">
<ComponentRef Id="Microsoft.Scripting.dll" />
<ComponentRef Id="Microsoft.Dynamic.dll" />
</ComponentGroup>
<ComponentGroup Id="DlrGac">
<ComponentRef Id="gac_Microsoft.Scripting.dll" />
<ComponentRef Id="gac_Microsoft.Dynamic.dll" />
</ComponentGroup>
</Fragment>
</Wix>
Oops, something went wrong.

0 comments on commit a201c0e

Please sign in to comment.