Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1
13117 commits 2 branches 0 tags 65 MiB
Commit graph

289 commits

Author SHA1 Message Date
John MacFarlane
54cc8e2702 Makefile - disable parallel build on 'make quick'. 
Interleaved error messages too confusing.
 2017-08-11 22:09:15 -07:00
John MacFarlane
ca3413690f Reorganized Makefile. 2017-08-09 13:45:22 -07:00
John MacFarlane
4cef2a296f Makefile: use nightly + colored output for quick. 2017-08-09 13:21:18 -07:00
John MacFarlane
b4f069c11c Makefile: use nightly. 2017-08-09 13:18:34 -07:00
John MacFarlane
3b3ae54a39 Makefile: split 'make haddock' from 'make full'. 2017-06-25 10:06:19 +02:00
John MacFarlane
dd8f086a2c Makefile: improved 'make full'. 
- Disable optimizations.
- Build everything, inc. trypandoc and benchmarks.
- Use parallel build.
 2017-06-24 13:46:40 +02:00
John MacFarlane
9849ba7fd7 Use Control.Monad.State.Strict throughout. 
This gives 20-30% speedup and reduction of memory
usage in most of the writers.
 2017-06-17 07:45:28 +02:00
John MacFarlane
25bfa26554 Fixed weigh-pandoc for Text readers. 2017-06-10 21:10:52 +02:00
John MacFarlane
28bea39e83 Changed comodo code signing key path. 2017-06-09 23:14:26 +02:00
John MacFarlane
c00471ca0d Makefile: added 'lint' target. 2017-06-01 15:09:30 +02:00
John MacFarlane
00fffefb36 Makefile: fixed filename for windows package download. 2017-05-24 22:54:16 +02:00
John MacFarlane
af57de0b27 default.ms: Add settings for document variables like width. 2017-03-24 22:15:46 +01:00
John MacFarlane
6756e23f94 Rename static-linux -> linux. 2017-03-19 15:35:52 +01:00
John MacFarlane
e98b9f6796 Removed unneeded deb directory. 
We now use static-linux to create the deb.
 2017-03-19 15:35:22 +01:00
John MacFarlane
257d96f199 Makefile: allow make test to take TESTARGS. 2017-03-15 17:22:07 +01:00
John MacFarlane
6ecc5b96a9 Use tasty for tests rather than test-framework. 2017-03-14 17:07:23 +01:00
John MacFarlane
738880bfcb Makefile - removed 'refactor' target. 2017-03-04 13:40:02 +01:00
John MacFarlane
19d86132a8 Makefile: Separate refactor and reformat targets. 
Removed tools/refactor.sh.
 2017-03-04 13:13:12 +01:00
John MacFarlane
0edfbf1478 Added 'make refactor' using hlint, stylish-haskell. 2017-03-04 12:49:14 +01:00
John MacFarlane
f10dd380bb Makefile: make version overridable. 2017-02-07 19:01:21 +01:00
John MacFarlane
18bc0a67eb Makefile: added BRANCH variable for winpkg 2017-02-05 12:15:02 +01:00
John MacFarlane
c96b64e91b Name change OSX -> MacOS. 
Add a -MacOS suffix to mac package rather than -OSX.
CHanged local names from osx to macos.
 2017-01-31 15:06:58 +01:00
John MacFarlane
47da92df2d Fixed up github changes target in Makefile so #s aren't escaped. 2017-01-29 21:55:08 +01:00
John MacFarlane
0c029e8258 Moved make_osx_package.sh to osx/ directory. 2016-12-10 22:58:05 +01:00
John MacFarlane
f3cb472f31 Makefile: use stack. 2016-12-08 11:46:40 +01:00
ickc
74ebeeedf0 remove make_travis_yml.hs (#3235) 2016-11-16 11:58:11 +01:00
Albert Krewinkel
a396003a31 Rename README to MANUAL.txt 2016-07-20 21:16:45 +02:00
John MacFarlane
7826cc2a20 Added winpkg target to Makefile. 
This downloads the windows package from appveyor and signs
it using the key.

This way we needn't mess with a Windows VM to build the package.
 2016-07-14 10:29:46 -07:00
John MacFarlane
90a2df3f7c Fixed debpkg target. 2016-01-02 16:54:45 -08:00
John MacFarlane
5c45a43399 stack.full.yaml - use local versions of everything. 2015-11-28 17:36:05 -08:00
John MacFarlane
a52b18807a 'make dist' - use stack to build from tarball. 2015-11-15 23:15:51 -08:00
John MacFarlane
87470bdcef Removed 'changes' Makefile target. 2015-11-15 10:06:26 -08:00
John MacFarlane
8914b6530a Added 'make changes_github' and 'make changes', updated release checklist. 2015-11-15 08:19:26 -08:00
John MacFarlane
07e1234c3b Added 'make changes' target. 
This copies to osx clipboard a github-markdown version of the
changes from the latest release in the changelog.
 2015-11-15 08:17:09 -08:00
John MacFarlane
43bcf5b4d4 Makefile: include version in man page. 2015-11-12 19:51:36 -08:00
John MacFarlane
a25c565f81 Added comment in .travis.yml to explain last change. 2015-10-09 22:33:15 -07:00
John MacFarlane
c13494c808 New .travis.yml. 
Autgenerated using make_travis_yml.hs.

This script has been modified to add GHCOPTS.

'make .travis.yml' regenerates it based on the tested-with
field of the cabal file.
 2015-10-08 13:39:32 -07:00
John MacFarlane
b74099c052 Makefile: prettier 'download_stats'. 2015-07-04 10:29:52 -07:00
John MacFarlane
79764df2d5 Added pandoc.1 to repository. Don't build as part of cabal build. 
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.
 2015-07-02 22:12:38 -07:00
John MacFarlane
28cb50503b Generate man page in cabal build process and include in data/. 
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
 2015-07-01 16:29:44 -07:00
John MacFarlane
668833dd0b Ignore sandbox on 'make quick' 2015-07-01 12:11:44 -07:00
John MacFarlane
a04c15a422 New method for building man pages. 
+ Removed `--man1`, `--man5` options (breaking change).
+ Removed `Text.Pandoc.ManPages` module (breaking API change).
+ Version bump to 1.15 because of the breaking changes, even
  though they involve features that have only been in pandoc
  for a day.
+ Makefile target for `man/man1/pandoc.1`.  This uses pandoc to
  create the man page from README using a custom template and filters.
+ Added `man/` directory with template and filters needed to build
  man page.
+ We no longer have two man pages: pandoc.1 and pandoc_markdown.5.
  Now there is just pandoc.1, which has all the content from README.
  This change was needed because of the extensive cross-references
  between parts of the README.
+ Removed old `data/pandoc.1.template` and
  `data/pandoc_markdown.5.template`.
 2015-07-01 11:27:15 -07:00
John MacFarlane
e1a6110cc2 Added download_stats target to Makefile. 2015-06-29 14:42:07 -07:00
John MacFarlane
3f20fb3f9f Always build man pages. Removed make-pandoc-man-pages flag. 
Updated INSTALL instructions.

Makefile:  removed man target, now that we generate man pages by default.
 2015-03-28 15:40:50 -07:00
John MacFarlane
8dfc372278 Changed bindist target to debpkg. 2014-12-17 12:04:20 -08:00
John MacFarlane
a4193a619a Added make_binary_package.sh. 
This script creates a generic binary package in a tarball.
Intended mostly for use with linux.
 2014-12-16 17:58:31 -08:00
John MacFarlane
19b744191f Fixed Makefile tab 2014-12-16 17:27:39 -08:00
John MacFarlane
658f01f072 Added bindist target to Makefile. 
This creates a binary package with a standalone executable and
man pages.
 2014-12-16 13:58:34 -08:00
John MacFarlane
4455905550 Makefile: simplified 'make dist'. 
Note that this may not work with older cabal versions.
 2014-08-30 23:15:04 -07:00
John MacFarlane
58b32107ad Makefile: Add README as dependency of man pages. 2014-08-30 15:39:40 -07:00
John MacFarlane
9c8588f208 Makefile: Fixed install target to use copy, register. 
This way the last configuration is used.
 2014-08-30 13:40:45 -07:00
John MacFarlane
a79d477667 More Makefile tweaks. 2014-08-18 18:12:49 -07:00
John MacFarlane
112b2f9f52 Makefile tweaks. 2014-08-18 17:40:35 -07:00
John MacFarlane
84f27995ca Makefile: Added 'install' to PHONY list. 2014-08-18 16:14:31 -07:00
John MacFarlane
3dd536a4ee Makefile: include trypandoc flag in main build target. 2014-08-17 16:12:46 -07:00
John MacFarlane
fa0d9a28df Makefile: added osxpkg target. 2014-08-17 13:34:12 -07:00
John MacFarlane
fd8ad0413b Makefile: Added 'quick' target. 2014-08-16 17:14:33 -07:00
John MacFarlane
0d9b35a6e3 Minor Makefile tweaks. 2014-08-15 21:07:22 -07:00
John MacFarlane
c8fa545ee4 Added 'dist' target to Makefile that does a sanity check on tarball. 2014-08-13 17:52:34 -07:00
John MacFarlane
80a610b73c Added new Makefile targets. 2014-08-13 14:00:03 -07:00
John MacFarlane
a0e795fc40 Added Makefile to rebuild man pages. 
This should only be needed by developers.
 2014-08-13 12:31:19 -07:00
John MacFarlane
575cc7eddc Remove Makefile. 2014-03-18 09:51:42 -07:00
John MacFarlane
5af0de23cc Makefile: Remove *everything* on 'make veryclean'. 2013-08-15 12:20:57 -07:00
John MacFarlane
f7c7672c40 Makefile: --enable-benchmarks no longer works with cabal install. 2013-07-13 15:06:09 -07:00
John MacFarlane
aee3f3f8f3 Updated Makefile. 2013-06-25 10:39:08 -07:00
John MacFarlane
286fc44bba Makefile: Don't enable tests in 'make prof'. 2013-01-25 17:53:39 -08:00
John MacFarlane
8b2e2e623f Fixed Makefile PHONY line. 2013-01-25 11:09:12 -08:00
John MacFarlane
8d5d490d7a Makefile: Added sdist. 2013-01-23 19:26:39 -08:00
John MacFarlane
5720dc0ba9 Updated Makefile to use Hackage pandoc-types. 2013-01-18 21:37:03 -08:00
John MacFarlane
360f8a3d01 Makefile: make prep now handles updates to pandoc-types. 2013-01-14 15:15:09 -08:00
John MacFarlane
a7cd65f2b3 Makefile: Do submodule updates and install cabal-dev in make prep. 2013-01-02 11:41:02 -08:00
John MacFarlane
1a24841450 Makefile: added 'relocatable' target. 2012-12-30 16:05:02 -08:00
John MacFarlane
06300e59d5 Removed citationSuppressParens. 
Makefile: Use citeproc-0.3.6 release.
 2012-10-28 09:36:15 -07:00
John MacFarlane
7179163826 Makefile: Back to using citeproc-hs repository. 
The released version lacks some features we need.
 2012-10-14 21:08:41 -07:00
John MacFarlane
f9d76bd666 Makefile: cabal-dev/cabal update. 2012-10-02 16:38:46 -07:00
John MacFarlane
4b65c2041c Makefile: Use Hackage citeproc-hs 0.3.5. 2012-09-28 21:57:37 -04:00
John MacFarlane
90a42fae05 Makefile: Don't remove citeproc-hs and pandoc-types with clean. 
Added new 'veryclean' target that removes these too.
 2012-09-26 17:08:31 -07:00
John MacFarlane
c13f23e0b1 Makefile: Use Andrea's repository for citeproc-hs. 2012-09-26 16:26:54 -07:00
John MacFarlane
eca9eeab6b MediaWiki reader: Misc fixes, put category links at end. 2012-09-15 13:50:02 -04:00
John MacFarlane
37c29bfa3d Textile reader: Improved speed of hyphenedWords. 
This speeds up the textile  reader by about a factor of 4.
But the reader is still very slow, compared to others readers.
 2012-09-06 14:08:59 -07:00
John MacFarlane
c2b520fb36 Makefile: Build profiling libraries in 'prep', added 'prof' target. 2012-09-06 13:30:34 -07:00
John MacFarlane
25f78dc432 Added install target to Makefile. 2012-08-14 10:01:33 -07:00
John MacFarlane
34f1f9716b Makefile: Require pandoc-types before citeproc-hs. 2012-08-08 18:01:22 -07:00
John MacFarlane
db2106c57d Added Makefile for development. 2012-08-07 22:49:56 -07:00
fiddlosopher
0fb6a1b5af Removed obsolete Makefile. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1817 788f1e2b-df1e-0410-8736-df70ead52e1b
 2010-01-17 08:45:16 +00:00
fiddlosopher
abd73635a1 Removed obsolete debian stuff from distclean target. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1805 788f1e2b-df1e-0410-8736-df70ead52e1b
 2010-01-12 05:24:22 +00:00
fiddlosopher
bfba911b03 Removed obsolete win-pkg Makefile target. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1804 788f1e2b-df1e-0410-8736-df70ead52e1b
 2010-01-12 03:47:00 +00:00
fiddlosopher
af46691a20 Makefile: specify --template explicitly when using pandoc. 
Reason:  pandoc may not yet have been installed, so the
templates may not be in the cabal data directory.
Resolves Issue #192.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1792 788f1e2b-df1e-0410-8736-df70ead52e1b
 2010-01-03 08:24:59 +00:00
fiddlosopher
6426664bcd Makefile: Don't try to build man pages in build-doc. 
They are now built by Cabal.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1627 788f1e2b-df1e-0410-8736-df70ead52e1b
 2009-11-28 03:22:10 +00:00
fiddlosopher
a4a5d41441 Don't build Haskell wrappers in Makefile. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1614 788f1e2b-df1e-0410-8736-df70ead52e1b
 2009-10-31 21:09:30 +00:00
fiddlosopher
69a84f7b14 Changed EXECSBASE so it doesn't pull in hsmarkdown & markdown2pdf. 
Otherwise strip tries to strip shell scripts when you install
using 'make'.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1606 788f1e2b-df1e-0410-8736-df70ead52e1b
 2009-08-13 20:07:44 +00:00
fiddlosopher
71ab63e0ba Changed srcdir in Makefile. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1530 788f1e2b-df1e-0410-8736-df70ead52e1b
 2009-01-31 17:13:21 +00:00
fiddlosopher
3b58456673 Moved odt-styles/ to data/. Removed unneeded variable in Makefile. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1458 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-09-23 15:55:30 +00:00
fiddlosopher
27b3146bce Pandoc is no longer a native debian package. 
It is easier for releases if debian packaging is separate.

+ Removed debian directory and references to debian in Makefile and INSTALL.
+ Made COPYRIGHT and changelog standalone files rather than symlinks to
  debian directory.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1422 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-09-06 18:49:46 +00:00
fiddlosopher
3d2ff3d0a8 Removed PDF writer from core pandoc, restored markdown2pdf. 
+ Added markdown2pdf.
+ Removed Text/Pandoc/PDF.hs.
+ Removed references to PDF writer from Main.hs.
+ Removed references to PDF writer from pandoc.cabal.
+ Added markdown2pdf.1 to list of man pages in Setup.hs.
+ Added markdown2pdf.1.md man page source.
+ Added reference to markdown2pdf(1) in pandoc man page.
+ Added markdown2pdf to WRAPPERS in Makefile.
+ Removed mention of pdf writer from README; added markdown2pdf.
+ Added remarks on markdown2pdf dependencies to README.Debian.
+ Added markdown2pdf to web/index.txt.in.
+ Use markdown2pdf for pdf web demos.
+ Put markdown2pdf back into debian control and rules.
+ Added markdown2pdf to macports Portfile.
+ Added markdown2pdf to freebsd package.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1415 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-08-27 05:50:26 +00:00
fiddlosopher
2a1406a933 Makefile: Added 'configure' as dependency of 'uninstall-all'. 
(It uses the Cabal build program.)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1402 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-08-10 23:26:40 +00:00
fiddlosopher
1cbc974e7e Removed markdown2pdf and all references to it. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1395 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-08-10 17:34:02 +00:00
fiddlosopher
9d54611d87 Removed dependency on reference.odt from Makefile. 
This is handled now in Setup.hs.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1392 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-08-10 00:13:51 +00:00
fiddlosopher
28828979a6 Moved more of the build process from Makefile to Setup.hs: 
+ tarball target now calls 'sdist'
+ Added to "Extra-source-files" and "Extra-tmp-files" in pandoc.cabal,
  so 'sdist' and 'clean' will work properly.
+ Makefile no longer generates man pages or reference.odt.
+ Setup.hs now generates man pages in a postbuild hook.
+ Added dependency-checking to Setup.hs, so it only rebuilds things
  that need rebuilding.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1389 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-08-09 23:45:40 +00:00
fiddlosopher
e36ff78b5e Removed layout-cache and Configurations2 from odt-styles directory. 
They don't seem to be needed.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1388 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-08-09 23:45:29 +00:00