@@ -11,10 +11,10 @@ cache:
1111 - '%WIXBIN%'
1212
1313# We don't do a normal C build, but build in test_script via stack
14−build: off
14+build: off
1515
1616install:
17− - choco install wixtoolset
17+ - '"%WIXBIN%\\candle -?" || choco install wixtoolset'
1818 - curl -ostack.zip -L --insecure http://www.stackage.org/stack/windows-i386
1919 - 7z x stack.zip stack.exe
2020 - stack setup > nul
@@ -37,20 +37,19 @@ test_script:
3737after_test:
3838 # .\ in the stack commandline seems to be .\windows\ (where the stack-appveyor.yaml is)
3939 - cd windows
40− - 7z a "pandoc.zip" pandoc.exe"
40+ - 7z a "pandoc.zip" pandoc.exe
4141 - .\pandoc.exe -s -S ..\README -o README.html
4242 - .\pandoc.exe -s -S ..\COPYING -o COPYING.rtf
4343 - copy ..\COPYRIGHT COPYRIGHT.txt
4444 - |
45− set "WIXPATH=C:\\Program Files (x86)\\WiX Toolset v3.10\\bin"
4645 set VERSION=
4746 for /f "tokens=1-2 delims= " %%a in ('.\pandoc.exe --version') do ( if not defined VERSION set "VERSION=%%b" )
4847 echo %VERSION%
49− "%WIXPATH%\\candle" -dVERSION=%VERSION% -dBINPATH=. pandoc.wxs
50− "%WIXPATH%\\light" -sw1076 -ext WixUIExtension -ext WixUtilExtension -out pandoc-%VERSION%-windows.msi pandoc.wixobj
48+ "%WIXBIN%\\candle" -dVERSION=%VERSION% -dBINPATH=. pandoc.wxs
49+ "%WIXBIN%\\light" -sw1076 -ext WixUIExtension -ext WixUtilExtension -out pandoc.msi pandoc.wixobj
5150
5251artifacts:
5352 - path: windows\pandoc.zip
5453 name: exe
55− - path: windows\pandoc-%VERSION%-windows.msi
54+ - path: windows\pandoc.msi
5655 name: msi