GaloisInc/cryptol
1
1
Fork 0
mirror of https://github.com/GaloisInc/cryptol.git synced 2024-07-07 10:46:54 +03:00
Code Issues Projects Releases Wiki Activity

Only include bindist-related files in cryptol.msi

Browse Source 
Previously, we would include every file in the current `cryptol` checkout in
`cryptol.msi`, which would result in horribly bloated installer files. We now
only include those files under the `dist` directory (created by
`.github/ci.sh bundle_files`), which curates only those files we want to
include in a binary distribution.

While I was in town, I modified the conventioned used in `win32/cryptol.wxs`
so that we no longer need to reference `dist`, which does not show up in
`.tar.gz`-based bindists.

Fixes #977.
This commit is contained in:
Ryan Scott 2022-05-22 19:43:11 -04:00
parent 1597d72254
commit 30b963bb39
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/wix.ps1 vendored
View File

@ -1,4 +1,4 @@
& "$env:WIX\bin\heat.exe" dir "$pwd" -o allfiles.wxs -nologo -var var.pkg -ag -wixvar -cg ALLFILES -srd -dr INSTALLDIR -sfrag
& "$env:WIX\bin\candle.exe" -ext WixUIExtension -ext WixUtilExtension -dversion="$env:VERSION" -dpkg="$pwd" win32\cryptol.wxs
& "$env:WIX\bin\candle.exe" -ext WixUIExtension -ext WixUtilExtension -dversion="$env:VERSION" -dpkg="$pwd" allfiles.wxs
& "$env:WIX\bin\heat.exe" dir "$pwd/dist" -o allfiles.wxs -nologo -var var.pkg -ag -wixvar -cg ALLFILES -srd -dr INSTALLDIR -sfrag
& "$env:WIX\bin\candle.exe" -ext WixUIExtension -ext WixUtilExtension -dversion="$env:VERSION" win32\cryptol.wxs
& "$env:WIX\bin\candle.exe" -ext WixUIExtension -ext WixUtilExtension -dversion="$env:VERSION" -dpkg="$pwd/dist" allfiles.wxs
& "$env:WIX\bin\light.exe" -ext WixUIExtension -ext WixUtilExtension -sval -o cryptol.msi cryptol.wixobj allfiles.wixobj

4
win32/cryptol.wxs
View File

@ -32,7 +32,7 @@
<Shortcut Id="startmenuCryptol"
Name="Cryptol $(var.version)"
WorkingDirectory='INSTALLDIR'
Target="[INSTALLDIR]\dist\bin\cryptol.exe"
Target="[INSTALLDIR]\bin\cryptol.exe"
Icon="crypto.ico"
IconIndex="0" />
<!-- <Shortcut Id="startmenuTutorial" -->
@ -56,7 +56,7 @@
<DirectoryRef Id="TARGETDIR">
<Component Id="Path" Guid="4D7F78E6-DA16-4C1B-96C4-B33C87502C81">
<Environment Id="PATH" Name="PATH" Value="[INSTALLDIR]\dist\bin" Permanent="no" Part="last" Action="set" System="no" />
<Environment Id="PATH" Name="PATH" Value="[INSTALLDIR]\bin" Permanent="no" Part="last" Action="set" System="no" />
</Component>
</DirectoryRef>