git.iko.soy/typeable/pandoc
on aeda44c help sign in
history ofMakefile
all commits
ba32c2eSimplified build process using template haskell. + Text/Pandoc/ASCIIMathML.hs, Text/Pandoc/DefaultHeaders.hs, and Text/Pandoc/Writers/S5.hs are no longer built in Setup.hs from templates in the templates/ directory. + Instead, they use template haskell to read data at compile time from the relevant files in data/. + Setup.hs is back to the default simple configuration. + Removed old templates and Extra-Tmp-Files field from pandoc.cabal.fiddlosopher c45833aMakefile: build reference.odt before configure.fiddlosopher d072ad4Added 'odt' output option to pandoc: Not a writer, but a module that inserts the output of the OpenDocument writer into an ODT archive. This replaces markdown2odt.fiddlosopher 61977cbFixed REFERENCEODT in markdown2odt to point to the right place in debian builds. Resolves Issue #79.fiddlosopher 91d9fffAdded preliminary version of markdown2odt wrapper. Added man page. Modified Makefile to create markdown2odt from template. Modified Makefile to create reference.odt file from files in odt-styles. Modified Makefile to install reference.odt into PACKAGEDATAPATH. Modified macports Portfile. Modified freebsd Makefile.fiddlosopher 9c9b41eMakefile: Add files in templates directory as dependencies for $(BUILDCONF).fiddlosopher c55ac7cCABALOPTS may now be specified with 'make'. For example: CABALOPTS=-fhighlighting makefiddlosopher e361c58Makefile: only use --with-hc-pkg if GHC_PKG is defined. Note that Cabal will automatically choose the ghc-pkg appropriate for the compiler selected, so normally specifying GHC by itself is sufficient.fiddlosopher 446a964Incorporated templates phase into Setup.hs and improved templates. + Removed templates/Makefile and fillTemplates.pl. + Removed 'templates' Makefile target. + Added postConf hook to Setup.hs that fills the templates. + Use compressed javascripts for S5 and ASCIIMathML templates. + Revised test suite.fiddlosopher 790fd46Changed names of HTML man pages to *.1.html on website.fiddlosopher 7a68e64Use \{0,1\} instead of \? in sed, so it works on BSD/Mac OSX too.fiddlosopher fa02979Makefile website target: create changelog.txt, not changelog. This ensures that browsers will treat it as text.fiddlosopher 8589f11Makefile changes: BUILDCONF and CABAL_BKP. + Changed BUILDCONF to point to dist/setup-config, not .setup-config. This is where current versions of Cabal put it. 'make clean' works again! + Do not clean up CABAL_BKP, because it might need to be recovered for a new build with a different GHC version.fiddlosopher ae5697eSmall improvements in Makefile: + Added $(BUILDCMD) target, so setup doesn't get compiled every time. + Removed (now circular) dependency of templates on ./templates.fiddlosopher 2b52241Changed references to source directory in Makefile and pandoc.cabal.*.fiddlosopher 3dfe4cbMakefile: Add .exe extension to BUILDCMD if building on Windows.fiddlosopher 99d8d45+ Makefile now checks GHC version. If GHC is 6.6, pandoc.cabal.ghc66 is copied to pandoc.cabal, and the old pandoc.cabal is copied to pandoc.cabal.orig. Otherwise, pandoc.cabal is copied to pandoc.cabal.orig but otherwise unmodified. This way, the Makefile will work properly with either GHC 6.6 or 6.8. + The changes in debian/rules from r1066 have been reverted, since they are no longer needed. Also, debian/rules has been converted to UTF-8. + INSTALL instructions have been updated accordingly.fiddlosopher 5b5d9bcUse $(GHC) instead of ghc and make them user configurable through environment to support unusual ghc installations, for example:roktas 8a057e7Modified build procedure to allow compilation with GHC 6.8: + pandoc.cabal now uses Cabal configurations and requires Cabal >=1.2. + An alternative pandoc.cabal.ghc66 is provided for those who have older versions of Cabal. + Debian build process has been modified to use pandoc.cabal.ghc66, as a temporary measure until GHC 6.8 gets into debian unstable. + INSTALL instructions have been updated. + Makefile has been updated to accommodate changes in pandoc.cabal. + pandoc.cabal.ghc68 has been removed, since the default version now works with GHC 6.8.fiddlosopher fe68476Reverted back to state as of r1062. The template haskell changes are more trouble than they're worth.fiddlosopher 4a841bfUse template haskell to avoid the need for templates: + Added library Text.Pandoc.Include, with a template haskell function $(includeStrFrom fname) to include a file as a string constant at compile time. + This removes the need for the 'templates' directory or Makefile target. These have been removed. + The base source directory has been changed from src to . + A new 'data' directory has been added, containing the ASCIIMathML.js script, writer headers, and S5 files. + The src/wrappers directory has been moved to 'wrappers'. + The Text.Pandoc.ASCIIMathML library is no longer needed, since Text.Pandoc.Writers.HTML can use includeStrFrom to include the ASCIIMathML.js code directly. It has been removed.fiddlosopher 175ddc3Makefile:roktas 068f94aChanges in Makefile:roktas 175a7e2No need to add $(BUILDDIR) and $(BUILDCONF) to cleanup_files, because they are removed automatically by '$(BUILDCMD) clean'.fiddlosopher 1142c88* The previous fix was wrong. Apply a proper fix and cross the fingers. :-) + On configure, compile 'Setup.hs' to 'setup' and use 'setup' as the build command instead of 'runhaskell', which, on some platforms (such as s390, alpha, m68k), throws the following error: runhaskell Setup.hs configure --prefix=/usr ghc-6.6.1: not built for interactive use This causes a serious FTBFS bug. Closes: #440668 (from Debian BTS). + Setup.hs: revert changes.roktas b13e696* Urgent fix to address the following issue: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440668 The below link of a similar bug explains things a bit more: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=431843#22roktas 0c09f4cMakefile: Get VERSION from cabal file, not Main.hs.fiddlosopher 6bf82d8Removed local references to Portfile, since pandoc is now in the MacPorts repository. Updated INSTALL instructions and website.fiddlosopher 1a0c9d5Don't try to generate distinfo in Makefile. Make this using 'make makesum' in freebsd instead.fiddlosopher 19a51a2Make freeebsd and macports targets depend on tarball.fiddlosopher 71b7041Removed osx-package specific files, and references to them in Makefiles.fiddlosopher bdb55edRemoved osx package targets in Makefile, and documentation for them in INSTALL. osx packaging was not working well, because of the binary's dependency on a dynamic library GMP. A MacPorts port will be provided instead.fiddlosopher 3462d2dChanges to website for new installation instructions. Removed OSX package.fiddlosopher b46bedaChanged macport target to use 'openssl md5' instead of 'md5sum', which isn't found on OSX.fiddlosopher 021f152Separated $(web_dest) and website targets. Fixed a bug in index.txt.in.fiddlosopher ab23086Build web index from a template (including version number).fiddlosopher 4e252b1Updated Makefile for macports instead of macport.fiddlosopher ca0b8e9Removed macports (renamed as macport).fiddlosopher 64306faModifications in freebsd packaging: + Added freebsd target to Makefile, which creates Makefile from Makefile.in and creates distinfo. + Removed Makefile and distinfo from the repository.fiddlosopher 631d393Added macport target to Makefile; Portfile is now built from a template.fiddlosopher c3b2734Simplified Makefile install-all and uninstall-all targets.fiddlosopher 2892335Fixed bug in tarball target in Makefile (should be RELNAME instead of fullname).fiddlosopher ad31ae6Makefile: instead of testing for existence of pandoc symlink in build-exec, use the -f option in ln.fiddlosopher 56016a9Use HTML version of README in OSX installer, instead of plain text or RTF (since RTF tables don't work well in OSX Preview).fiddlosopher 64f9aeeUse README instead of README.rtf in Welcome page of Mac OSX package, because the RTF tables don't render right in Mac's preview app.fiddlosopher 8d0fcceBackup 'var' before making deb and restore after. Reason: In because in the process of making the debian package, 'var' gets overwritten with the local debian build directory as DESTDIR. This will break future 'make uninstall's, which will try to delete files from there instead of /usr/local (or wherever).fiddlosopher 9a96429Revamped website.fiddlosopher dfdcec7Use smartquotes and table of contents in generating README.html.fiddlosopher dc7102eUse -S option in building man pages.fiddlosopher 98372eaRenamed Pandoc.cabal -> pandoc.cabal, for better compatibility with HackageDB, which likes the cabal file to have the same name as the tarball. Modified references to Pandoc.cabal in INSTALL and Makefile.fiddlosopher