@@ -3,17 +3,30 @@ clone_folder: "c:\\pandoc"
3environment:
3environment:
5 WIXBIN: "c:\\Program Files (x86)\\WiX Toolset v3.11\\bin"
5 WIXBIN: "c:\\Program Files (x86)\\WiX Toolset v3.11\\bin"
6− STACK_YAML: "c:\\pandoc\\stack.yaml"
7 STACK_BUILD_OPTS: "--no-terminal -j1 --no-terminal --test --local-bin-path=.\\windows"
6 STACK_BUILD_OPTS: "--no-terminal -j1 --no-terminal --test --local-bin-path=.\\windows"
8 # see #4201, https://github.com/haskell-tools/haskell-tools/issues/277
7 # see #4201, https://github.com/haskell-tools/haskell-tools/issues/277
10 - STACK_VERSION: "windows-i386"
9 - STACK_VERSION: "windows-i386"
11 STACK_ROOT: "c:\\sr32"
10 STACK_ROOT: "c:\\sr32"
11+ STACK_YAML: "stack.lts11.yaml"
12 STACK: "%STACK_ROOT%\\stack.exe"
12 STACK: "%STACK_ROOT%\\stack.exe"
13 STACK_FLAGS: "--flag=hslua:lua_32bits"
13 STACK_FLAGS: "--flag=hslua:lua_32bits"
14 ARCH: "x86"
14 ARCH: "x86"
15 - STACK_VERSION: "windows-x86_64"
15 - STACK_VERSION: "windows-x86_64"
16 STACK_ROOT: "c:\\sr64"
16 STACK_ROOT: "c:\\sr64"
17+ STACK_YAML: "stack.lts11.yaml"
18+ STACK: "%STACK_ROOT%\\stack.exe"
21+ - STACK_VERSION: "windows-i386"
22+ STACK_ROOT: "c:\\sr32"
23+ STACK_YAML: "stack.yaml"
24+ STACK: "%STACK_ROOT%\\stack.exe"
25+ STACK_FLAGS: "--flag=hslua:lua_32bits"
27+ - STACK_VERSION: "windows-x86_64"
28+ STACK_ROOT: "c:\\sr64"
29+ STACK_YAML: "stack.yaml"
17 STACK: "%STACK_ROOT%\\stack.exe"
30 STACK: "%STACK_ROOT%\\stack.exe"
18 STACK_FLAGS: ""
31 STACK_FLAGS: ""
19 ARCH: "x64"
32 ARCH: "x64"
@@ -55,10 +68,10 @@ test_script:
55 # The ugly echo "" hack is to avoid complaints about 0 being an invalid file
68 # The ugly echo "" hack is to avoid complaints about 0 being an invalid file
56 # descriptor
69 # descriptor
58− %STACK% setup --stack-yaml stack.lts11.yaml > nul
71+ %STACK% setup --stack-yaml %STACK_YAML% > nul
59 %STACK% path
72 %STACK% path
60 echo "" | %STACK% clean
73 echo "" | %STACK% clean
61− echo "" | %STACK% install --stack-yaml stack.lts11.yaml %STACK_BUILD_OPTS% pandoc pandoc-citeproc %STACK_FLAGS%
74+ echo "" | %STACK% install --stack-yaml %STACK_YAML% %STACK_BUILD_OPTS% pandoc pandoc-citeproc %STACK_FLAGS%
63after_test:
76after_test:
64 # .\ in the stack commandline seems to be .\windows\ (where the stack-appveyor.yaml is)
77 # .\ in the stack commandline seems to be .\windows\ (where the stack-appveyor.yaml is)