From 7524e8e1f010868db7d26703f2443f78d4a4ceff Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Mon, 5 May 2014 07:08:57 -0700 Subject: Windows package script: use cabal sandbox, not cabal-dev. --- windows/make-windows-installer.bat | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'windows/make-windows-installer.bat') diff --git a/windows/make-windows-installer.bat b/windows/make-windows-installer.bat index d27859057..3e16c887f 100644 --- a/windows/make-windows-installer.bat +++ b/windows/make-windows-installer.bat @@ -1,21 +1,22 @@ @echo off cd .. cabal update -cabal-dev clean -cabal install hsb2hs cabal-dev +cabal sandbox init +cabal clean +cabal install hsb2hs if %errorlevel% neq 0 exit /b %errorlevel% -cabal-dev install -v1 --force --reinstall --flags="embed_data_files" +cabal install -v1 --force --reinstall --flags="embed_data_files" if %errorlevel% neq 0 exit /b %errorlevel% -cabal-dev install -v1 --reinstall --flags="embed_data_files" pandoc-citeproc +cabal install -v1 --reinstall --flags="embed_data_files" pandoc-citeproc if %errorlevel% neq 0 exit /b %errorlevel% -strip cabal-dev\bin\pandoc.exe -strip cabal-dev\bin\pandoc-citeproc.exe -cabal-dev\bin\pandoc.exe -s --template data\templates\default.html -S README -o README.html +strip .\.cabal-sandbox\bin\pandoc.exe +strip .\.cabal-sandbox\bin\pandoc-citeproc.exe +\.cabal-sandbox\bin\pandoc.exe -s --template data\templates\default.html -S README -o README.html if %errorlevel% neq 0 exit /b %errorlevel% -cabal-dev\bin\pandoc.exe -s --template data\templates\default.rtf COPYING -t rtf -S -o COPYING.rtf +.\cabal-sandbox\bin\pandoc.exe -s --template data\templates\default.rtf COPYING -t rtf -S -o COPYING.rtf if %errorlevel% neq 0 exit /b %errorlevel% copy COPYRIGHT COPYRIGHT.txt -for /f "tokens=1-2 delims= " %%a in ('cabal-dev\bin\pandoc --version') do ( +for /f "tokens=1-2 delims= " %%a in ('.\cabal-sandbox\bin\pandoc --version') do ( @set VERSION=%%b goto :next ) -- cgit v1.2.3