summaryrefslogtreecommitdiff
path: root/Setup.hs
Commit message (Collapse)AuthorAge
* Setup.hs: better version detection in older hsb2hs.John MacFarlane2015-07-06
| | | | | If it returns an error with input `--version`, recover gracefully.
* Make cabal require hsb2hs >= 0.3.1.John MacFarlane2015-07-05
| | | | | This is done by adding `hookedPrograms` in `Setup.hs`, which allows us to include `hsb2hs` in Build-Tools in cabal.
* Setup.hs: Don't require hsb2hs unless embed_data_files flag specified.John MacFarlane2015-07-03
|
* Added pandoc.1 to repository. Don't build as part of cabal build.John MacFarlane2015-07-02
| | | | | | | | The process was too fragile. It made too many assumptions about available libraries (which failed sometimes when sandboxes were used). This is a low-tech solution. The only drawback is that `man/pandoc.1` is a generated file in the repository. It will need to be regenerated periodically when README changes.
* Make copying of man pages respect --destdir.John MacFarlane2015-07-02
| | | | Closes #2262.
* Setup.hs: ensure target directory is created when installing man page.John MacFarlane2015-07-02
|
* Install man pages as part of cabal 'copy' phase.John MacFarlane2015-07-01
|
* Generate man page in cabal build process and include in data/.John MacFarlane2015-07-01
| | | | | | | | The pandoc.1 man page is generated automatically after the cabal build process. It goes in `data/pandoc.1`. It can be obtained by the user who installs pandoc via cabal thus: pandoc --print-default-data-file pandoc.1 > pandoc.1
* New method for producing man pages.John MacFarlane2015-06-28
| | | | | | | | | | | | | | | | | | | | | This change adds `--man1` and `--man5` options to pandoc, so pandoc can generate its own man pages. It removes the old overly complex method of building a separate executable (but not installing it) just to create the man pages. The man pages are no longer automatically created in the build process. The man/ directory has been removed. The man page templates have been moved to data/. New unexported module: Text.Pandoc.ManPages. Text.Pandoc.Data now exports readmeFile, and `readDataFile` knows how to find README. Closes #2190.
* Better fix for #2187.John MacFarlane2015-05-28
| | | | | | | | | | | | | | | | | | | | | | * 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`.
* Updated copyright notices to -2015. Closes #2111.John MacFarlane2015-04-26
|
* Always build man pages. Removed make-pandoc-man-pages flag.John MacFarlane2015-03-28
| | | | | | Updated INSTALL instructions. Makefile: removed man target, now that we generate man pages by default.
* Create reference files from unpacked archives with helper programNikolay Yakimov2015-03-28
|
* Setup.hs: ensure make-man-pages not installed in bindir.John MacFarlane2014-08-13
|
* Simplified Setup.hs.John MacFarlane2014-08-13
| | | | | | | | | It no longer builds and installs man pages. All it does is hook the hsb preprocessor. This should make the build process more robust over Cabal API changes. We'll add a Makefile to generate man pages.
* Removed special testHook from Setup.John MacFarlane2014-08-13
| | | | | | | | | This was just too fragile and dependent on a changing Cabal API (see #1526). Instead of passing the bulid directory to the test program, we now let the test program find itself (using executable-path) and then find the pandoc executable relative to itself.
* no need to hide 'catch'Michael Thompson2014-05-17
| | | This doesn't normally cause a problem because of some ghc workaround special to this case, but I was able to trigger an error with a complicated mixture of sandboxing, directing `cabal` to a locally installed ghc, and something else. `catch` isn't actually used in the file, so it seems it might as well go.
* Update copyright notices for 2014, add missing noticesAlbert Krewinkel2014-05-09
|
* Pass the buildDir as first argument to test suite.John MacFarlane2013-10-20
| | | | | Allows test suite to work with cabal sandboxes. Previously we hard-coded the build directory.
* Revert "Setup.hs: Better way of handling man page building."John MacFarlane2013-10-08
| | | | This reverts commit ed061b91c8e3247e1d3b1538eca24687adf0e575.
* Setup.hs: Better way of handling man page building.John MacFarlane2013-10-06
| | | | | | | | | | Previously we tried to remove make-pandoc-man-pages from the list of packages to be haddocked, installed, copied, etc. It works better to set 'Buildable: False' on make-pandoc-man-pages, then have the buildHook temporarily set Buildable to True. This allows make-pandoc-man-pages to be built (and used in generating the man pages), but not installed.
* Use hsb2hs preprocessor instead of TH for embed_data_files.John MacFarlane2013-01-23
| | | | | This should work on Windows, unlike the TH solution with file-embed.
* Use LBI buildDir instead of hardcoded "dist" </> "build".Clint Adams2012-11-07
|
* Moved man page creation out of Setup.hs.John MacFarlane2012-10-15
| | | | | | | | | | * MakeManPage.hs has been transformed into man/make-pandoc-man-pages.hs. * There is now a cabal stanza for this, so the dependencies are handled by cabal. * Special treatment in Setup.hs ensures that this never gets installed; it is built and used to create the man pages. * Setup.hs cleaned up.
* Removed unneeded function from Setup.hs.John MacFarlane2012-10-15
|
* WhitespaceJohn MacFarlane2012-10-15
|
* Setup: getModificationTime returns UTCTime as of GHC 7.6Ben Gamari2012-09-21
|
* Integrated test suite with cabal.John MacFarlane2012-07-26
| | | | | | | | To run tests, configure with --enable-tests, then 'cabal test'. You can specify particular tests using --test-options='-t markdown'. No output is shown unless tests fail. In the future, we can move to the detailed-1.0 interface.
* Use catch from Control.Exception to avoid warnings.John MacFarlane2012-07-24
|
* Fixed permissions on installed man pages.John MacFarlane2012-03-09
| | | | Thanks to Magnus Therning for the patch.
* Removed markdown2pdf and documentation.John MacFarlane2012-01-20
|
* Setup: Making man pages now works with cabal-dev.John MacFarlane2011-12-19
| | | | | | | | In Setup.hs we now invoke 'runghc' in a way that points it to the correct package databases, instead of always falling back to the default user package db. Thanks to Antoine Latter for the patch.
* Setup.hs: Added a 5 second timeout for test cases.John MacFarlane2011-02-04
|
* Setup.hs: Don't call MakeManPage.hs unless the man pages need making.John MacFarlane2011-01-31
|
* Refactored man pages.John MacFarlane2011-01-28
| | | | | | * Markdown syntax description from README now goes in pandoc_markdown.5. * Refactored man page construction functions, putting more of the work in MakeManPages.hs.
* Setup.hs: Only make pandoc.1 if README modified, be more verbose.John MacFarlane2011-01-16
|
* Merge branch 'master' into testsJohn MacFarlane2011-01-12
|\
| * Setup.hs: -Wall clean.John MacFarlane2011-01-11
| |
* | Improvements to test suite.John MacFarlane2011-01-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + You can now specify glob patterns after 'cabal test'; e.g. 'cabal test latex' will only run the latex tests. + Instead of detecting highlighting support in Setup.hs, we now detect it in test-pandoc, by looking to see if 'languages' is null. + We now verify the lhs readers against the lhs-test.native, normalizing with 'normalize'. This makes more sense than verifying against HTML, which also brings in the HTML writer. + Added lhsn-test.nohl.{html,html+lhs}, so we can do the lhs tests whether or not highlighting has been installed.
* | Changed test-pandoc to use test-framework and HUnit.Nathan Gass2011-01-10
|/
* Added 'tests' Cabal flag.John MacFarlane2010-12-15
| | | | | | | + This ensures that test-pandoc gets built. + 'cabal test' now runs this. + The old tests/RunTests.hs has been removed, and src/test-pandoc.hs added.
* Improved process to create man page from README.John MacFarlane2010-12-07
| | | | | Previously it relied on pandoc already being installed. Now it uses dist/package.conf.inplace.
* Setup.hs: Don't assume that the build directory is "dist."John MacFarlane2010-03-22
| | | | Instead, get it from localBuildInfo.
* Removed html2markdown and hsmarkdown.fiddlosopher2010-02-06
| | | | | | | | | | | | html2markdown is no longer needed, since you can pass URI arguments to pandoc and directly convert web pages. (Note, however, that pandoc assumes the pages are UTF8. html2markdown made an attempt to guess the encoding and convert them.) hsmarkdown is pointless -- a large executable that could be replaced by 'pandoc --strict'. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1834 788f1e2b-df1e-0410-8736-df70ead52e1b
* Setup: Made man page building sensitive to build verbosity.fiddlosopher2010-01-17
| | | | git-svn-id: https://pandoc.googlecode.com/svn/trunk@1812 788f1e2b-df1e-0410-8736-df70ead52e1b
* Setup.hs : -Wall and hlint cleanup.fiddlosopher2010-01-17
| | | | git-svn-id: https://pandoc.googlecode.com/svn/trunk@1811 788f1e2b-df1e-0410-8736-df70ead52e1b
* Setup.hs: improved detection of highlighting support in test hook.fiddlosopher2010-01-14
| | | | git-svn-id: https://pandoc.googlecode.com/svn/trunk@1808 788f1e2b-df1e-0410-8736-df70ead52e1b
* Setup.hs: Install wrapper scripts into cabal bin directory.fiddlosopher2010-01-12
| | | | | | Also simplified installManpages. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1807 788f1e2b-df1e-0410-8736-df70ead52e1b
* Setup.hs: install manpages to mandir.fiddlosopher2010-01-12
| | | | | | Code borrowed from darcs. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1806 788f1e2b-df1e-0410-8736-df70ead52e1b
* Changed Setup.hs so it can build man pages again.fiddlosopher2009-12-31
| | | | | | | | Problem was that it couldn't find the man template until the data files were installed. Fixed by using --template to point it at the right file in the source directory. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1742 788f1e2b-df1e-0410-8736-df70ead52e1b