27b3146Pandoc is no longer a native debian package. It is easier for releases if debian packaging is separate.fiddlosopher18 years ago 3d2ff3dRemoved PDF writer from core pandoc, restored markdown2pdf.fiddlosopher18 years ago 2a1406aMakefile: Added 'configure' as dependency of 'uninstall-all'. (It uses the Cabal build program.)fiddlosopher18 years ago 1cbc974Removed markdown2pdf and all references to it.fiddlosopher18 years ago 9d54611Removed dependency on reference.odt from Makefile. This is handled now in Setup.hs.fiddlosopher18 years ago 2882897Moved more of the build process from Makefile to Setup.hs:fiddlosopher18 years ago e36ff78Removed layout-cache and Configurations2 from odt-styles directory. They don't seem to be needed.fiddlosopher18 years ago 2ba5ff9Include shell scripts themselves in repo, rather than generating from wrappers.fiddlosopher18 years ago 5d3d2d7Rewrote test suite so it doesn't depend on perl or unix tools.fiddlosopher18 years ago 80715bdAdded Text.Pandoc.UTF8 as a backup for when utf8-string is not present.fiddlosopher18 years ago 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.fiddlosopher18 years ago c45833aMakefile: build reference.odt before configure.fiddlosopher18 years ago 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.fiddlosopher18 years ago 61977cbFixed REFERENCEODT in markdown2odt to point to the right place in debian builds. Resolves Issue #79.fiddlosopher18 years ago 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.fiddlosopher19 years ago 9c9b41eMakefile: Add files in templates directory as dependencies for $(BUILDCONF).fiddlosopher19 years ago c55ac7cCABALOPTS may now be specified with 'make'. For example: CABALOPTS=-fhighlighting makefiddlosopher19 years ago 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.fiddlosopher19 years ago 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.fiddlosopher19 years ago 790fd46Changed names of HTML man pages to *.1.html on website.fiddlosopher19 years ago 7a68e64Use \{0,1\} instead of \? in sed, so it works on BSD/Mac OSX too.fiddlosopher19 years ago fa02979Makefile website target: create changelog.txt, not changelog. This ensures that browsers will treat it as text.fiddlosopher19 years ago 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.fiddlosopher19 years ago ae5697eSmall improvements in Makefile: + Added $(BUILDCMD) target, so setup doesn't get compiled every time. + Removed (now circular) dependency of templates on ./templates.fiddlosopher19 years ago 2b52241Changed references to source directory in Makefile and pandoc.cabal.*.fiddlosopher19 years ago 3dfe4cbMakefile: Add .exe extension to BUILDCMD if building on Windows.fiddlosopher19 years ago 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.fiddlosopher19 years ago 5b5d9bcUse $(GHC) instead of ghc and make them user configurable through environment to support unusual ghc installations, for example:roktas19 years ago 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.fiddlosopher19 years ago fe68476Reverted back to state as of r1062. The template haskell changes are more trouble than they're worth.fiddlosopher19 years ago 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.fiddlosopher19 years ago 175ddc3Makefile:roktas19 years ago 068f94aChanges in Makefile:roktas19 years ago 175a7e2No need to add $(BUILDDIR) and $(BUILDCONF) to cleanup_files, because they are removed automatically by '$(BUILDCMD) clean'.fiddlosopher19 years ago 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.roktas19 years ago 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#22roktas19 years ago 0c09f4cMakefile: Get VERSION from cabal file, not Main.hs.fiddlosopher19 years ago 6bf82d8Removed local references to Portfile, since pandoc is now in the MacPorts repository. Updated INSTALL instructions and website.fiddlosopher19 years ago 1a0c9d5Don't try to generate distinfo in Makefile. Make this using 'make makesum' in freebsd instead.fiddlosopher19 years ago 19a51a2Make freeebsd and macports targets depend on tarball.fiddlosopher19 years ago 71b7041Removed osx-package specific files, and references to them in Makefiles.fiddlosopher19 years ago 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.fiddlosopher19 years ago 3462d2dChanges to website for new installation instructions. Removed OSX package.fiddlosopher19 years ago b46bedaChanged macport target to use 'openssl md5' instead of 'md5sum', which isn't found on OSX.fiddlosopher19 years ago 021f152Separated $(web_dest) and website targets. Fixed a bug in index.txt.in.fiddlosopher19 years ago ab23086Build web index from a template (including version number).fiddlosopher19 years ago 4e252b1Updated Makefile for macports instead of macport.fiddlosopher19 years ago ca0b8e9Removed macports (renamed as macport).fiddlosopher19 years ago 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.fiddlosopher19 years ago 631d393Added macport target to Makefile; Portfile is now built from a template.fiddlosopher19 years ago