Commit graph

122 commits

Author SHA1 Message Date
fiddlosopher
2b52241928 Changed references to source directory in Makefile and pandoc.cabal.*.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1105 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-29 02:02:38 +00:00
fiddlosopher
3dfe4cb708 Makefile: Add .exe extension to BUILDCMD if building on Windows.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1096 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-26 21:27:59 +00:00
fiddlosopher
99d8d45b74 + 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.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1095 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-25 01:51:36 +00:00
roktas
5b5d9bcd76 Use $(GHC) instead of ghc and make them user configurable through environment
to support unusual ghc installations, for example:

	GHC=/opt/ghc/bin/ghc GHC_PKG=/opt/ghc/bin/ghc-pkg make


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1081 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-17 21:01:34 +00:00
fiddlosopher
8a057e77af Modified 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.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1066 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-06 00:07:17 +00:00
fiddlosopher
fe684764e6 Reverted back to state as of r1062. The template haskell changes
are more trouble than they're worth.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1064 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-03 23:27:58 +00:00
fiddlosopher
4a841bfc54 Use 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.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1063 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-03 22:14:03 +00:00
roktas
175ddc3f6e Makefile:
- New variables to make use in debian/rules: DATADIR, DOCDIR.  Cabal uses
  $prefix/pandoc-$VERSION/doc for the documentation files, where as the
  Debian package uses $prefix/doc/pandoc.  We need these variables to resolve
  the conflict.

debian/rules:

- Set and export DATADIR, DOCDIR which controls the installation of document
  files at install-program target.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1045 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-10-07 21:43:44 +00:00
roktas
068f94a51f Changes in Makefile:
- For generic installations, use $prefix/share/pandoc-$VERSION/doc directory
  to put all the documentation files.  This fixes the issue of having two
  copies of the library documentation (one in $prefix/share/pandoc-doc, the
  other is in $prefix/share/pandoc-$VERSION).
- Remove uninstall-lib-doc target and move the relevant code to uninstall-all
  target.  Add extra code to remove the html directory.  These changes fix the
  issue of leaving the library documentation in $prefix/share/pandoc-$VERSION
  uninstalled.
- Remove the confusing NAME and THIS variables and create new variables: PKG
  (same as THIS), and PKGID ($PKG-$VERSION = $THIS-$VERSION).  Remove RELNAME
  (which is equal to PKGID).  All these changes simplified things a bit in
  "Cabal constants" section and uninstall-all target.
- Remove some Cabal constants for the sake of simplicity and add a few new
  ones: PKGDATAPATH and PKGDOCPATH.  We at least need a PKGDOCPATH variable to
  install DOCS, as Cabal doesn't provide a command for this target (hence,
  install-doc).  I wish to set this variable by using ghc-pkg (just like
  libdir in install-all), but this seems a bit difficult to me, as there is no
  docdir variable in .installed-pkg-config and we would have to resort to an
  unclean hack which extracts docdir from haddock-dir.
- Keep all non-critical steps (i.e. rmdir) quiet to reduce noise.
- Ensure to use stderr for all messages.
- Avoid forking a subshell in $(web_dest).
- A few unrelated cosmetic changes.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1043 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-10-07 17:49:45 +00:00
fiddlosopher
175a7e27ee No need to add $(BUILDDIR) and $(BUILDCONF) to cleanup_files,
because they are removed automatically by '$(BUILDCMD) clean'.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1006 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-03 18:06:38 +00:00
roktas
1142c88727 * 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.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1005 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-03 16:57:17 +00:00
roktas
b13e696c93 * 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#22


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1004 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-03 15:31:47 +00:00
fiddlosopher
0c09f4c529 Makefile: Get VERSION from cabal file, not Main.hs.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@973 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-31 06:25:00 +00:00
fiddlosopher
6bf82d8f29 Removed local references to Portfile, since pandoc is now in the
MacPorts repository.  Updated INSTALL instructions and website.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@919 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-27 22:18:36 +00:00
fiddlosopher
1a0c9d53a2 Don't try to generate distinfo in Makefile. Make this using
'make makesum' in freebsd instead.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@915 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-26 17:56:44 +00:00
fiddlosopher
19a51a2c6f Make freeebsd and macports targets depend on tarball.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@911 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-26 16:50:38 +00:00
fiddlosopher
71b70418f6 Removed osx-package specific files, and references to them
in Makefiles.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@906 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-26 15:46:44 +00:00
fiddlosopher
bdb55edd18 Removed 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.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@905 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-26 15:43:44 +00:00
fiddlosopher
3462d2d1b6 Changes to website for new installation instructions.
Removed OSX package.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@904 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-26 15:41:45 +00:00
fiddlosopher
b46bedaf39 Changed macport target to use 'openssl md5' instead of
'md5sum', which isn't found on OSX.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@899 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-25 20:28:46 +00:00
fiddlosopher
021f152289 Separated $(web_dest) and website targets.
Fixed a bug in index.txt.in.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@898 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-25 18:39:06 +00:00
fiddlosopher
ab23086b1b Build web index from a template (including version number).
git-svn-id: https://pandoc.googlecode.com/svn/trunk@896 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-25 18:05:07 +00:00
fiddlosopher
4e252b18fc Updated Makefile for macports instead of macport.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@892 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-25 17:47:10 +00:00
fiddlosopher
ca0b8e97ca Removed macports (renamed as macport).
git-svn-id: https://pandoc.googlecode.com/svn/trunk@888 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-25 17:40:53 +00:00
fiddlosopher
64306faf7d Modifications in freebsd packaging:
+ Added freebsd target to Makefile, which creates Makefile from
  Makefile.in and creates distinfo.
+ Removed Makefile and distinfo from the repository.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@887 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-25 17:35:53 +00:00
fiddlosopher
631d3930af Added macport target to Makefile; Portfile is now built from
a template.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@886 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-25 16:52:42 +00:00
fiddlosopher
c3b27348cc Simplified Makefile install-all and uninstall-all targets.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@853 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-15 21:51:38 +00:00
fiddlosopher
2892335680 Fixed bug in tarball target in Makefile (should be RELNAME instead
of fullname).


git-svn-id: https://pandoc.googlecode.com/svn/trunk@850 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-15 17:49:10 +00:00
fiddlosopher
ad31ae693b Makefile: instead of testing for existence of pandoc
symlink in build-exec, use the -f option in ln.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@814 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-28 03:56:27 +00:00
fiddlosopher
56016a998d Use HTML version of README in OSX installer, instead
of plain text or RTF (since RTF tables don't work
well in OSX Preview).


git-svn-id: https://pandoc.googlecode.com/svn/trunk@805 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-27 16:09:18 +00:00
fiddlosopher
64f9aee1ee Use 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.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@790 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-23 23:13:43 +00:00
fiddlosopher
8d0fcce06a Backup '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).


git-svn-id: https://pandoc.googlecode.com/svn/trunk@735 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-16 08:24:39 +00:00
fiddlosopher
9a96429a1a Revamped website.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@699 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-14 06:28:09 +00:00
fiddlosopher
dfdcec77a3 Use smartquotes and table of contents in generating
README.html.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@673 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-11 07:28:12 +00:00
fiddlosopher
dc7102eec3 Use -S option in building man pages.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@643 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-08 03:22:00 +00:00
fiddlosopher
98372ea277 Renamed 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.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@631 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-07 05:25:44 +00:00
fiddlosopher
cd08eabd26 Changes to website:
- Added groff man to list of output formats in index.txt
- Added a demo of man page creation to demos page


git-svn-id: https://pandoc.googlecode.com/svn/trunk@617 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-03 04:11:57 +00:00
fiddlosopher
6d6fafde16 Don't use -S option in processing man pages,
since the '--' in options will be read as an
En-dash.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@611 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-02 02:19:43 +00:00
fiddlosopher
5fbe057d27 Man pages are now generated from markdown templates,
using pandoc's man page writer.  Removed man pages
from repository, added (.md) templates.  Modified
Makefile to generate man pages as part of the build
process.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@609 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-01 23:26:20 +00:00
fiddlosopher
3c46f8a600 Makefile changes:
+ Include files built from templates in the distribution tarball,
  so it can be built using Cabal and included in Hackage.
+ Remove unnecessary 'cabalize' step.  We no longer build
  Pandoc.cabal from a template.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@605 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-06-17 16:20:50 +00:00
fiddlosopher
f99cedd236 Strip executable binaries before installing.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@551 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-02-27 07:16:20 +00:00
fiddlosopher
e0303dfc79 'cp -a' does not work in BSD. Replace with 'cp -R'.
Note that we don't want user and group to be preserved,
anyway.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@547 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-02-23 17:31:46 +00:00
fiddlosopher
9a2c653277 More website tweaks. Added demo of extra xsl configuration
and CSS in chunked xhtml produced from docbook.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@489 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-10 03:17:37 +00:00
fiddlosopher
3528c72d7e Minor changes to Makefile required by changes to website
build system.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@488 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-10 02:41:27 +00:00
fiddlosopher
c80f181137 Reorganized Makefile target - now uses a subsidiary Makefile
that can be run from the website directory for small changes.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@485 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-09 18:55:50 +00:00
fiddlosopher
11f1e77402 Change to Makefile to add features page to website.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@467 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-09 02:07:20 +00:00
roktas
06e6107f53 Fix the bug in 'install-all' target which does not install the wrappers.
(This target is somewhat special as it should handle installing and 
_registering_ the library in generic installations.)  We can't rely on 
'install-exec' to fix this bug (but we should depend on 'build-exec' 
nevertheless), since the 'install-all' target already installs pandoc along 
with the library files.  Therefore we should install wrappers separately by 
using a helper function which was specifically created to avoid code 
duplication ('install-exec' target was also updated so as to use this 
function).


git-svn-id: https://pandoc.googlecode.com/svn/trunk@426 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-05 10:16:15 +00:00
fiddlosopher
d4370154ff Nicer informational message in test-markdown target.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@420 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-05 01:20:18 +00:00
fiddlosopher
b6663c7e16 Changed test-markdown target in Makefile: Now it will find any
markdown test suites in the 'test' directory (subdirectories
beginning with 'MarkdownTest_') and run them all.  This allows
us to have multiple test suites, e.g. for 1.0 and for a beta
version.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@414 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-04 17:23:30 +00:00
fiddlosopher
a8a0dd8766 Cleaned up and improved Makefile target for wrappers.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@408 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-03 17:22:55 +00:00