@@ -66,31 +66,31 @@ test_script:
6666 - if not exist "%CABAL_PACKAGE_DB%" ( mkdir "%CABAL_PACKAGE_DB%" )
6767 - cabal --store-dir="%CABAL_STORE%" --version
6868 - cabal --store-dir="%CABAL_STORE%" new-update
69− - cabal --store-dir="%CABAL_STORE%" new-configure -w %GHC% --enable-tests --dependencies-only %CABAL_OPTS% --ghc-options="%GHC_OPTS%" . pandoc-citeproc
70− - cabal --store-dir="%CABAL_STORE%" new-build --dependencies-only . pandoc-citeproc
71−# - cabal --store-dir="%CABAL_STORE%" new-test . pandoc-citeproc
72−# - forfiles /P .\dist-newstyle /M pandoc*.exe /S /C "cmd /C copy @path C:\pandoc\windows"
69+ - cabal --store-dir="%CABAL_STORE%" new-configure -w %GHC% --enable-tests %CABAL_OPTS% --ghc-options="%GHC_OPTS%" . pandoc-citeproc
70+ - cabal --store-dir="%CABAL_STORE%" new-build . pandoc-citeproc
71+ - cabal --store-dir="%CABAL_STORE%" new-test . pandoc-citeproc
72+ - forfiles /P .\dist-newstyle /M pandoc*.exe /S /C "cmd /C copy @path C:\pandoc\windows"
7373
7474after_test:
7575 # create msi and zip artifacts
7676 - cd windows
77−# - .\pandoc.exe -s --toc ..\MANUAL.txt -o MANUAL.html
78−# - .\pandoc.exe -s ..\COPYING.md -o COPYING.rtf
79−# - copy ..\COPYRIGHT COPYRIGHT.txt
80−# - 7z a "pandoc-%OSARCH%.zip" pandoc.exe pandoc-citeproc.exe MANUAL.html COPYING.rtf
81−# - |
82−# set VERSION=
83−# for /f "tokens=1-2 delims= " %%a in ('.\pandoc.exe --version') do ( if not defined VERSION set "VERSION=%%b" )
84−# echo %VERSION%
85−# "%WIXBIN%"\candle -arch %ARCH% -dVERSION=%VERSION% -dBINPATH=. *.wxs -out wixobj\
86−# "%WIXBIN%"\light -sw1076 -ext WixUIExtension -ext WixUtilExtension -cultures:en-us -loc Pandoc-en-us.wxl -out "pandoc-%OSARCH%.msi" wixobj\*.wixobj
77+ - .\pandoc.exe -s --toc ..\MANUAL.txt -o MANUAL.html
78+ - .\pandoc.exe -s ..\COPYING.md -o COPYING.rtf
79+ - copy ..\COPYRIGHT COPYRIGHT.txt
80+ - 7z a "pandoc-%OSARCH%.zip" pandoc.exe pandoc-citeproc.exe MANUAL.html COPYING.rtf
81+ - |
82+ set VERSION=
83+ for /f "tokens=1-2 delims= " %%a in ('.\pandoc.exe --version') do ( if not defined VERSION set "VERSION=%%b" )
84+ echo %VERSION%
85+ "%WIXBIN%"\candle -arch %ARCH% -dVERSION=%VERSION% -dBINPATH=. *.wxs -out wixobj\
86+ "%WIXBIN%"\light -sw1076 -ext WixUIExtension -ext WixUtilExtension -cultures:en-us -loc Pandoc-en-us.wxl -out "pandoc-%OSARCH%.msi" wixobj\*.wixobj
8787
8888# for debugging
8989# on_finish:
9090# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
9191
9292artifacts:
93−# - path: 'windows\pandoc-%OSARCH%.zip'
94−# name: exe
95−# - path: 'windows\pandoc-%OSARCH%.msi'
96−# name: msi
93+ - path: 'windows\pandoc-%OSARCH%.zip'
94+ name: exe
95+ - path: 'windows\pandoc-%OSARCH%.msi'
96+ name: msi