diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2015-05-28 18:15:01 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2015-05-28 18:15:01 -0700 |
| commit | b241472a90e8cdb3146acfbe555f50abd4b3b302 (patch) | |
| tree | d627798f42473262729c15be0e27ca5b3ffe911b /windows/make-windows-installer.bat | |
| parent | c1f6d5e31feddacb9fa519e688da2d50a3f214ad (diff) | |
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`.
Diffstat (limited to 'windows/make-windows-installer.bat')
| -rw-r--r-- | windows/make-windows-installer.bat | 4 |
1 files changed, 0 insertions, 4 deletions
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
|