From b241472a90e8cdb3146acfbe555f50abd4b3b302 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Thu, 28 May 2015 18:15:01 -0700 Subject: Better fix for #2187. * Reverted kludgy change to make-windows-installer.bat. * Removed make-reference-fiels.hs. * Moved the individual ingredients of reference.docx and reference.odt to the data directory. * Removed reference.docx and reference.odt from data directory. * We now build the reference archives from their ingredient pieces in the docx and odt writers, instead of having a reference.docx or reference.odt intermediary. This should fix #2187. It also simplifies the bulid procedure. The one thing users may notice is different is that you can no longer get the reference.docx or reference.odt using `--print-default-data-file`. Instead, simply generate a docx or odt using pandoc with a blank or minimal input, and use that (or a customized version) with `--reference-docx` or `--reference-odt`. --- windows/make-windows-installer.bat | 4 ---- 1 file changed, 4 deletions(-) (limited to 'windows') diff --git a/windows/make-windows-installer.bat b/windows/make-windows-installer.bat index 5b0e7f567..d4816fa69 100644 --- a/windows/make-windows-installer.bat +++ b/windows/make-windows-installer.bat @@ -5,10 +5,6 @@ cabal sandbox init cabal clean cabal install hsb2hs if %errorlevel% neq 0 exit /b %errorlevel% -REM We do it once to regenrate data/reference.docx/odt -cabal install -v1 --force --reinstall -cabal clean -REM then again for real, because otherwise it won't work with embed_data_files: cabal install -v1 --force --reinstall --flags="embed_data_files" . pandoc-citeproc if %errorlevel% neq 0 exit /b %errorlevel% strip .\.cabal-sandbox\bin\pandoc.exe -- cgit v1.2.3