summaryrefslogtreecommitdiff
path: root/windows
diff options
context:
space:
mode:
authorJohn MacFarlane <fiddlosopher@gmail.com>2013-09-05 09:22:37 -0700
committerJohn MacFarlane <fiddlosopher@gmail.com>2013-09-05 09:22:37 -0700
commit8f6c27920d69c8a77ec0ff341ece81194e39bb4e (patch)
treecfd4d3aa03df7d0ae6b3e4f847f4cac9db81cdc5 /windows
parente97b54b1231f839a3ffebce97d4447d90d9638a5 (diff)
Preliminary changes to windows installer script.
Diffstat (limited to 'windows')
-rw-r--r--windows/make-windows-installer.bat8
-rw-r--r--windows/pandoc.wxs11
2 files changed, 17 insertions, 2 deletions
diff --git a/windows/make-windows-installer.bat b/windows/make-windows-installer.bat
index 998da6775..a948a1a9f 100644
--- a/windows/make-windows-installer.bat
+++ b/windows/make-windows-installer.bat
@@ -1,9 +1,13 @@
@echo off
cd ..
-rem cabal update
+cabal update
cabal-dev clean
if %errorlevel% neq 0 exit /b %errorlevel%
-cabal-dev install --reinstall --force-reinstall --flags="embed_data_files"
+cabal-dev add-source ../pandoc-types
+cabal-dev add-source ../pandoc-citeproc
+cabal-dev install hsb2hs
+cabal-dev install --reinstall --flags="embed_data_files unicode_collation" --extra-lib-dirs=../icu/lib --extra-include-dirs=../icu/include pandoc-citeproc
+cabal-dev install --reinstall --flags="embed_data_files"
if %errorlevel% neq 0 exit /b %errorlevel%
strip cabal-dev\bin\pandoc.exe
cabal-dev\bin\pandoc.exe -s --template data\templates\default.html -S README -o README.html
diff --git a/windows/pandoc.wxs b/windows/pandoc.wxs
index 85edd29a8..2c87e41e9 100644
--- a/windows/pandoc.wxs
+++ b/windows/pandoc.wxs
@@ -51,6 +51,17 @@
Source="..\COPYING.rtf" />
</Component>
+ <Component Id="CitationSupport"
+ Guid="0A214839-2E69-4026-8DBB-0F0A9DB75C12">
+ <RegistryValue Root="HKMU" Key="Software\John MacFarlane\Pandoc"
+ Name="Version" Type="string" Value="[ProductVersion]" KeyPath="yes"/>
+ <RemoveFolder Id="APPLICATIONFOLDER" On="uninstall"/>
+ <File Id="pandoc_citeprocEXE" Name="pandoc-citeproc.exe"
+ Source="..\cabal-dev\bin\pandoc-citeproc.exe" />
+ <File Id="biblio2yamlEXE" Name="biblio2yaml.exe"
+ Source="..\cabal-dev\bin\biblio2yaml.exe" />
+ </Component>
+
<Component Id="UpdatePathUser"
Guid="C7B71304-09FC-421D-9EA2-AEFB7D61759D">
<Condition><![CDATA[ ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged)) ]]></Condition>