diff options
| -rwxr-xr-x | make_osx_package.sh | 2 | ||||
| -rw-r--r-- | windows/make-windows-installer.bat | 8 | ||||
| -rw-r--r-- | windows/pandoc.wxs | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/make_osx_package.sh b/make_osx_package.sh index fc3691218..1a12601dc 100755 --- a/make_osx_package.sh +++ b/make_osx_package.sh @@ -27,7 +27,7 @@ echo Building pandoc... cabal sandbox init cabal clean # Use cpphs to avoid problems with clang cpp on ghc 7.8 osx: -which cpphs || cabal install cpphs +cabal install cpphs alex happy hsb2hs cabal install --reinstall --flags="embed_data_files" --ghc-options '-pgmPcpphs -optP--cpp' cabal install --reinstall --flags="embed_data_files" pandoc-citeproc --ghc-options '-pgmPcpphs -optP--cpp' diff --git a/windows/make-windows-installer.bat b/windows/make-windows-installer.bat index 3e16c887f..4b17b449f 100644 --- a/windows/make-windows-installer.bat +++ b/windows/make-windows-installer.bat @@ -3,7 +3,7 @@ cd .. cabal update
cabal sandbox init
cabal clean
-cabal install hsb2hs
+cabal install hsb2hs alex happy
if %errorlevel% neq 0 exit /b %errorlevel%
cabal install -v1 --force --reinstall --flags="embed_data_files"
if %errorlevel% neq 0 exit /b %errorlevel%
@@ -11,12 +11,12 @@ cabal install -v1 --reinstall --flags="embed_data_files" pandoc-citeproc if %errorlevel% neq 0 exit /b %errorlevel%
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
+.\.cabal-sandbox\bin\pandoc.exe -s --template data\templates\default.html -S README -o README.html
if %errorlevel% neq 0 exit /b %errorlevel%
-.\cabal-sandbox\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-sandbox\bin\pandoc --version') do (
+for /f "tokens=1-2 delims= " %%a in ('.\.cabal-sandbox\bin\pandoc --version') do (
@set VERSION=%%b
goto :next
)
diff --git a/windows/pandoc.wxs b/windows/pandoc.wxs index 7a20effe5..75c316772 100644 --- a/windows/pandoc.wxs +++ b/windows/pandoc.wxs @@ -44,7 +44,7 @@ Name="Version" Type="string" Value="[ProductVersion]" KeyPath="yes"/>
<RemoveFolder Id="APPLICATIONFOLDER" On="uninstall"/>
<File Id="pandocEXE" Name="pandoc.exe"
- Source="..\cabal-dev\bin\pandoc.exe" />
+ Source="..\.cabal-sandbox\bin\pandoc.exe" />
<File Id="pandocCOPYRIGHT" Name="COPYRIGHT.txt"
Source="..\COPYRIGHT.txt" />
<File Id="pandocCOPYING" Name="COPYING.rtf"
@@ -56,7 +56,7 @@ <RegistryValue Root="HKMU" Key="Software\John MacFarlane\Pandoc"
Name="Version" Type="string" Value="[ProductVersion]" KeyPath="yes"/>
<File Id="pandoc_citeprocEXE" Name="pandoc-citeproc.exe"
- Source="..\cabal-dev\bin\pandoc-citeproc.exe" />
+ Source="..\.cabal-sandbox\bin\pandoc-citeproc.exe" />
</Component>
<Component Id="UpdatePathUser"
|