@@ -9,13 +9,15 @@ environment:
99 TMP: "c:\\tmp"
1010 # see #4201, https://github.com/haskell-tools/haskell-tools/issues/277
1111 matrix:
12− - STACK_VERSION: "windows-x86_64"
12+ - BUILD_TYPE: "stack"
13+ OSARCH: "windows-x86_64"
1314 STACK_ROOT: "c:\\sr64"
1415 STACK_YAML: "stack.yaml"
1516 STACK_FLAGS: "--arch=x86_64"
1617 ARCH: "x64"
1718 CHOCO_OPTS: ""
18− - STACK_VERSION: "windows-i386"
19+ - BUILD_TYPE: "stack"
20+ OSARCH: "windows-i386"
1921 STACK_ROOT: "c:\\sr32"
2022 STACK_YAML: "stack.lts11.yaml"
2123 STACK_FLAGS: "--arch=i386 --flag=hslua:lua_32bits"
@@ -24,6 +26,12 @@ environment:
2426 # note: we do a lts11 build because of
2527 # https://github.com/commercialhaskell/stackage/issues/3385
2628 # with luck this will be fixed in ghc 8.6.
29+ - BUILD_TYPE: "cabal"
30+ OSARCH: "windows-i386-cabal"
31+ GHC_VERSION: "8.6.1.1"
32+ CABAL_BUILD_OPTS: "--allow-newer=base --allow-newer=template-haskell --allow-newer=containers -flua_32bits -fembed_data_files"
33+ ARCH: "x86"
34+ CHOCO_OPTS: "--x86"
2735
2836skip_commits:
2937 files:
@@ -52,7 +60,12 @@ build: off
5260
5361install:
5462 - choco install wixtoolset %CHOCO_OPTS%
55− - choco install haskell-stack %CHOCO_OPTS%
63+ - if test "BUILD_TYPE" = stack
64+ then
65+ choco install haskell-stack %CHOCO_OPTS%
66+ else
67+ choco install ghc --version %GHC_VERSION% %CHOCO_OPTS%
68+ fi
5669
5770# before_test:
5871
@@ -60,10 +73,19 @@ test_script:
6073 # The ugly echo "" hack is to avoid complaints about 0 being an invalid file
6174 # descriptor
6275 - |
63− stack --version
64− stack path
65− echo "" | stack clean
66− echo "" | stack install --stack-yaml %STACK_YAML% %STACK_BUILD_OPTS% %STACK_FLAGS% pandoc pandoc-citeproc
76+ if test "$BUILD_TYPE" = stack
77+ then
78+ stack --version
79+ stack path
80+ echo "" | stack clean
81+ echo "" | stack install --stack-yaml %STACK_YAML% %STACK_BUILD_OPTS% %STACK_FLAGS% pandoc pandoc-citeproc
82+ else
83+ cabal --version
84+ cabal update
85+ cabal new-build %CABAL_BUILD_OPTS% . pandoc-citeproc
86+ cp "`find dist-newstyle/ -type f -name pandoc`" .\windows\
87+ cp "`find dist-newstyle/ -type f -name pandoc-citeproc`" .\windows\
88+ fi
6789
6890after_test:
6991 # .\ in the stack commandline seems to be .\windows\ (where the stack-appveyor.yaml is)
@@ -71,16 +93,16 @@ after_test:
7193 - .\pandoc.exe -s --toc ..\MANUAL.txt -o MANUAL.html
7294 - .\pandoc.exe -s ..\COPYING.md -o COPYING.rtf
7395 - copy ..\COPYRIGHT COPYRIGHT.txt
74− - 7z a "pandoc-%STACK_VERSION%.zip" pandoc.exe pandoc-citeproc.exe MANUAL.html COPYING.rtf
96+ - 7z a "pandoc-%OSARCH%.zip" pandoc.exe pandoc-citeproc.exe MANUAL.html COPYING.rtf
7597 - |
7698 set VERSION=
7799 for /f "tokens=1-2 delims= " %%a in ('.\pandoc.exe --version') do ( if not defined VERSION set "VERSION=%%b" )
78100 echo %VERSION%
79101 "%WIXBIN%"\candle -arch %ARCH% -dVERSION=%VERSION% -dBINPATH=. *.wxs -out wixobj\
80− "%WIXBIN%"\light -sw1076 -ext WixUIExtension -ext WixUtilExtension -cultures:en-us -loc Pandoc-en-us.wxl -out "pandoc-%STACK_VERSION%.msi" wixobj\*.wixobj
102+ "%WIXBIN%"\light -sw1076 -ext WixUIExtension -ext WixUtilExtension -cultures:en-us -loc Pandoc-en-us.wxl -out "pandoc-%OSARCH%.msi" wixobj\*.wixobj
81103
82104artifacts:
83− - path: 'windows\pandoc-%STACK_VERSION%.zip'
105+ - path: 'windows\pandoc-%OSARCH%.zip'
84106 name: exe
85− - path: 'windows\pandoc-%STACK_VERSION%.msi'
107+ - path: 'windows\pandoc-%OSARCH%.msi'
86108 name: msi