diff options
| author | Christian Duerr <chrisduerr@users.noreply.github.com> | 2019-04-02 22:58:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-02 22:58:18 +0000 |
| commit | 48d781d1238835db9f2d30742ccf50dd53be7bed (patch) | |
| tree | d1d93e7371b3c6ad8bb667561d030cbaebda4fc6 | |
| parent | 6f4d1afcf88e275f4a6b8c73cfc904e3833d0dd0 (diff) | |
| download | alacritty-48d781d1238835db9f2d30742ccf50dd53be7bed.tar.gz alacritty-48d781d1238835db9f2d30742ccf50dd53be7bed.zip | |
Fix Windows deployment
| -rwxr-xr-x | ci/before_deploy.sh | 23 | ||||
| -rw-r--r-- | extra/windows/wix/alacritty.wxs | 4 |
2 files changed, 13 insertions, 14 deletions
diff --git a/ci/before_deploy.sh b/ci/before_deploy.sh index 2c99cbd2..a311518a 100755 --- a/ci/before_deploy.sh +++ b/ci/before_deploy.sh @@ -1,11 +1,11 @@ #!/bin/bash # All files which should be added only if they changed -aux_files=("alacritty-completions.bash" - "alacritty-completions.fish" - "alacritty-completions.zsh" - "alacritty.desktop" - "alacritty.info" +aux_files=("extra/completions/alacritty.bash" + "extra/completions/alacritty.fish" + "extra/completions/_alacritty" + "extra/linux/alacritty.desktop" + "extra/alacritty.info" "alacritty.yml") # Get previous tag to check for changes @@ -63,17 +63,16 @@ elif [ "$TRAVIS_OS_NAME" == "windows" ]; then # Create msi installer ./WiX.*/tools/candle.exe -nologo -arch "x64" -ext WixUIExtension -ext WixUtilExtension -out "target/alacritty.wixobj" "extra/windows/wix/alacritty.wxs" - ./WiX.*/tools/light.exe -nologo -ext WixUIExtension -ext WixUtilExtension -out "target/deploy/${name}-windows-installer.msi" -sice:ICE61 -sice:ICE91 "target/alacritty.wixobj" + ./WiX.*/tools/light.exe -nologo -ext WixUIExtension -ext WixUtilExtension -out "target/installer.msi" -sice:ICE61 -sice:ICE91 "target/alacritty.wixobj" + mv "target/installer.msi" "target/deploy/${name}-windows-installer.msi" fi # Convert and add manpage if it changed -if [ -n "$(git diff $prev_tag HEAD alacritty.man)" ]; then - gzip -c "./alacritty.man" > "./target/deploy/alacritty.1.gz" +if [ -n "$(git diff $prev_tag HEAD extra/alacritty.man)" ]; then + gzip -c "./extra/alacritty.man" > "./target/deploy/alacritty.1.gz" fi -# Offer extra files if they changed +# Offer various other files for file in "${aux_files[@]}"; do - if [ -n "$(git diff $prev_tag HEAD $file)" ]; then - cp $file "./target/deploy/" - fi + cp $file "./target/deploy/" done diff --git a/extra/windows/wix/alacritty.wxs b/extra/windows/wix/alacritty.wxs index 6f88f16e..e00c01c5 100644 --- a/extra/windows/wix/alacritty.wxs +++ b/extra/windows/wix/alacritty.wxs @@ -5,8 +5,8 @@ <Product Name="Alacritty" Id="*" UpgradeCode="87c21c74-dbd5-4584-89d5-46d9cd0c40a7" Language="1033" Codepage="1252" Version="0.2.9" Manufacturer="Alacritty"> <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine"/> <MajorUpgrade AllowSameVersionUpgrades="yes" DowngradeErrorMessage="A newer version of [ProductName] is already installed."/> - <Icon Id="AlacrittyIco" SourceFile="..\alacritty.ico"/> - <WixVariable Id="WixUILicenseRtf" Value="license.rtf"/> + <Icon Id="AlacrittyIco" SourceFile="..\extra\windows\alacritty.ico"/> + <WixVariable Id="WixUILicenseRtf" Value="..\extra\windows\wix\license.rtf"/> <Property Id="ARPPRODUCTICON" Value="AlacrittyIco"/> <MediaTemplate EmbedCab="yes"/> <UIRef Id="WixUI_Minimal"/> |