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 /Setup.hs | |
parent | c1f6d5e31feddacb9fa519e688da2d50a3f214ad (diff) | |
download | pandoc-b241472a90e8cdb3146acfbe555f50abd4b3b302.tar.gz |
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 'Setup.hs')
-rw-r--r-- | Setup.hs | 15 |
1 files changed, 2 insertions, 13 deletions
@@ -38,12 +38,11 @@ main = defaultMainWithHooks $ simpleUserHooks { , instHook = \pkgdescr -> instHook simpleUserHooks pkgdescr{ executables = [x | x <- executables pkgdescr, exeName x `notElem` noInstall] } - , postBuild = \args bf pkgdescr lbi -> do + , postBuild = \args bf pkgdescr lbi -> makeManPages args bf pkgdescr lbi - makeReferenceFiles args bf pkgdescr lbi } where - noInstall = ["make-pandoc-man-pages","make-reference-files"] + noInstall = ["make-pandoc-man-pages"] ppBlobSuffixHandler :: PPSuffixHandler ppBlobSuffixHandler = ("hsb", \_ _ -> @@ -64,13 +63,3 @@ makeManPages _ bf _ LocalBuildInfo{buildDir=buildDir} where verbosity = fromFlagOrDefault normal $ buildVerbosity bf progPath = buildDir </> "make-pandoc-man-pages" </> "make-pandoc-man-pages" - -makeReferenceFiles :: Args -> BuildFlags -> PackageDescription -> LocalBuildInfo -> IO () -makeReferenceFiles _ bf _ LocalBuildInfo{buildDir=buildDir} - = mapM_ - (rawSystemExit verbosity progPath . return) - referenceFormats - where - verbosity = fromFlagOrDefault normal $ buildVerbosity bf - progPath = buildDir </> "make-reference-files" </> "make-reference-files" - referenceFormats = ["docx", "odt"] |