From 858844556a1eed5fa8cd2ef631d4ec4703335856 Mon Sep 17 00:00:00 2001
From: John MacFarlane <fiddlosopher@gmail.com>
Date: Mon, 24 Oct 2011 00:05:08 -0700
Subject: [PATCH] Modified windows installer generater to use cabal-dev.
---
windows/make-windows-installer.bat | 12 ++++++------
windows/pandoc-setup.iss | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/windows/make-windows-installer.bat b/windows/make-windows-installer.bat
index 4c975748f..341dfd948 100644
--- a/windows/make-windows-installer.bat
+++ b/windows/make-windows-installer.bat
@@ -1,13 +1,13 @@
@echo off
cd ..
-cabal clean
+cabal-dev install --disable-library-for-ghci highlighting-kate
+cabal-dev install --flags="embed_data_files" citeproc-hs
+cabal-dev install --flags="executable wrappers -library highlighting" --datasubdir=
rem note: we use -f-library in building pandoc, because
rem if the library is built, the data file paths will not be relocatable!
-cabal configure -f-library -fwrappers -fhighlighting --datasubdir=
-cabal build
-strip dist\build\pandoc\pandoc.exe
-strip dist\build\markdown2pdf\markdown2pdf.exe
-dist\build\pandoc\pandoc.exe -s --template templates\html.template -S README -o README.html
+strip cabal-dev\bin\pandoc.exe
+strip cabal-dev\bin\markdown2pdf.exe
+cabal-dev\bin\pandoc.exe -s --template templates\html.template -S README -o README.html
copy COPYING COPYING.txt
copy COPYRIGHT COPYRIGHT.txt
cd windows
diff --git a/windows/pandoc-setup.iss b/windows/pandoc-setup.iss
index f8fd70b96..a39ef180b 100644
--- a/windows/pandoc-setup.iss
+++ b/windows/pandoc-setup.iss
@@ -53,8 +53,8 @@ end;
Name: "english"; MessagesFile: "compiler:Default.isl"
[Files]
-Source: "..\dist\build\pandoc\pandoc.exe"; DestDir: "{app}\bin"; Flags: ignoreversion
-Source: "..\dist\build\markdown2pdf\markdown2pdf.exe"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "..\cabal-dev\bin\pandoc.exe"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "..\cabal-dev\bin\markdown2pdf.exe"; DestDir: "{app}\bin"; Flags: ignoreversion
Source: "..\README.html"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\COPYRIGHT.txt"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\COPYING.txt"; DestDir: "{app}"; Flags: ignoreversion