diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2020-01-18 16:01:46 -0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2020-01-18 16:02:28 -0800 |
| commit | 5028278569bdc06ced5b8151393e2d12602f1b7e (patch) | |
| tree | 8355fbd076832ba61cc0f4df454815a0321d057d | |
| parent | 6c8ed00e7bba8d77fc10ef26cf40ed5ee56288f6 (diff) | |
| download | pandoc-5028278569bdc06ced5b8151393e2d12602f1b7e.tar.gz | |
windows release candidate build: More fixes to get 'light' to work.
| -rw-r--r-- | .github/workflows/release-candidate.yml | 3 | ||||
| -rw-r--r-- | windows/Pandoc-en-us.wxl | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.github/workflows/release-candidate.yml b/.github/workflows/release-candidate.yml index 433f97581..368991c67 100644 --- a/.github/workflows/release-candidate.yml +++ b/.github/workflows/release-candidate.yml @@ -68,6 +68,7 @@ jobs: forfiles /P .\.stack-work\install /M pandoc*.exe /S /C "cmd /C echo @path && echo %%WINDOWS%% && copy @path %%RELEASE%%" stack exec pandoc -- -s --toc MANUAL.txt -o %RELEASE%\MANUAL.html stack exec pandoc -- -s COPYING.md -t rtf -o %RELEASE%\COPYING.rtf + copy %RELEASE%\COPYING.rtf %WINDOWS% copy COPYRIGHT %RELEASE%\COPYRIGHT.txt cd windows echo Creating msi... @@ -78,7 +79,7 @@ jobs: %WIXBIN%\candle -arch ${{ matrix.versions.arch }} -dVERSION=%VERSION% -dBINPATH=%RELEASE% *.wxs -out wixobj\ if %errorlevel% neq 0 exit /b %errorlevel% echo Running light... - %WIXBIN%\light -sw1076 -ext WixUIExtension -ext WixUtilExtension -cultures:en-us -loc Pandoc-en-us.wxl -dBINPATH=%RELEASE% -out %WORKDIR%\pandoc-%VERSION%-${{ matrix.versions.osarch }}-UNSIGNED.msi wixobj\*.wixobj + %WIXBIN%\light -sw1076 -ext WixUIExtension -ext WixUtilExtension -cultures:en-us -loc Pandoc-en-us.wxl -out %WORKDIR%\pandoc-%VERSION%-${{ matrix.versions.osarch }}-UNSIGNED.msi wixobj\*.wixobj 7z a "pandoc-%VERSION%-${{ matrix.versions.osarch }}.zip" pandoc-%VERSION% cd .. mkdir windows-release-candidate diff --git a/windows/Pandoc-en-us.wxl b/windows/Pandoc-en-us.wxl index 5bfa11f99..4722788cf 100644 --- a/windows/Pandoc-en-us.wxl +++ b/windows/Pandoc-en-us.wxl @@ -3,7 +3,7 @@ <String Id="Language">1033</String> <!-- Supported language and codepage codes can be found here: http://www.tramontana.co.hu/wix/lesson2.php#2.4 --> - <String Id="LicenseRtf" Overridable="yes">$(var.BINPATH)\COPYING.rtf</String> + <String Id="LicenseRtf" Overridable="yes">COPYING.rtf</String> <String Id="ExitDialogText">[ProductName] was installed in |