Commit graph

211 commits

Author SHA1 Message Date
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
fiddlosopher
d262d163ed Improved Makefile 'wrappers' target. (Previously, it would build
all wrappers corresponding to src/wrappers/*.in.  Now, it will only
build wrappers in WRAPPERS.  This might be useful if we decide to
have 'hsmarkdown' be a wrapper on Windows and a symlink on unix.)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@407 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-03 17:10:26 +00:00
fiddlosopher
bd31474d98 Improved test-markdown target in Makefile:
+ Use 'hsmarkdown' instead of building 'pandoc-strict' (which was a hack,
  and didn't work on Windows machines, anyway, due to the line ending problem)
+ Put top-level directory in path before running the test script, so that
  hsmarkdown can find 'pandoc' even if it hasn't been installed.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@406 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-02 21:30:07 +00:00
fiddlosopher
bcc608f3fd Fixed a bug in website generation, which only worked if 'pandoc'
and the wrappers had been installed.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@402 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-02 05:02:01 +00:00
fiddlosopher
5387ebd8db Added 'hsmarkdown' wrapper, designed to be used as a drop-in
replacement for Markdown.pl.  It calls pandoc with the options
'--from markdown --to html --strict' and disallows other options.
(Any command-line options will be interpreted as arguments.)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@399 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-02 02:58:54 +00:00
fiddlosopher
b9a348338b Inserted a needed slash in the Makefile, after $(osx_pkg_name),
which is the name of a directory!


git-svn-id: https://pandoc.googlecode.com/svn/trunk@391 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-01 21:34:50 +00:00
fiddlosopher
4ea1b2bdc0 Merged 'strict' branch from r324. This adds a '--strict'
option to pandoc, which forces it to stay as close as possible
to official Markdown syntax.  


git-svn-id: https://pandoc.googlecode.com/svn/trunk@347 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-30 22:51:49 +00:00
fiddlosopher
7cd9db048b Slight changes in website target:
+ history.html -> changelog.html
+ demo.html -> examples.html
+ Added title to changelog.html
+ Removed header div on html pages
+ Changed widths in css


git-svn-id: https://pandoc.googlecode.com/svn/trunk@319 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-29 22:51:05 +00:00
fiddlosopher
369b99513d Make wrappers executable in the top-level directory, in case people
want to try them in place without installing.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@316 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-29 21:41:09 +00:00
fiddlosopher
3c9fd01ad8 + Renamed web/demos.sh to mkdemos.sh
+ Added parameter for directory containing executables
+ Changed arithmetic statement for portability.
+ Modified Makefile accordingly.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@315 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-29 21:25:13 +00:00
fiddlosopher
3491420b53 + Changed 'web2markdown' to 'html2markdown'.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@309 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-29 18:50:13 +00:00
fiddlosopher
17837b343b Added two more demo cases to website. Put a footnote in
README for demonstration purposes.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@302 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-28 07:22:41 +00:00
fiddlosopher
2d253cadd3 Added a latex -> markdown case to demos.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@301 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-28 06:58:04 +00:00
fiddlosopher
2933f9f5e7 Added another demo case, with header and footer and css.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@299 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-28 06:48:16 +00:00
fiddlosopher
5468e76a7e Added "Demos" page to the website.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@298 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-28 06:40:21 +00:00
fiddlosopher
a1a30d69bd + Removed the convenience symlinks (which don't work on Windows under
Cygwin, due to Windows' lack of true symbolic links).
+ Modified the wrappers to use 'pandoc' instead of the symlinks.
+ Modified the Makefile to remove all references to the symlinks.
+ Removed code from Main.hs that made pandoc's behavior depend on the
  name of the calling program.
+ Added code to Main.hs that sets default reader and writer based on
  extensions of input and output filenames (if provided).  (Thanks to
  roktas for the idea.)
+ Modified README and man pages accordingly.
+ Removed WINDOWS-README target from Makefile.  It is no longer needed
  now that we don't have the symlinks.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@295 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-28 02:20:09 +00:00
fiddlosopher
a1539d9ab8 Added README-WINDOWS.html to windows package documentation.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@291 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-24 23:11:27 +00:00
fiddlosopher
5dfab2cb48 + Updates to Makefile:
- New win-pkg target to build Windows binary package.
  - Changed name on OSX package.
  - New RELNAME global variable contains release name, e.g. pandoc-0.3
  - Mac dmg is now created in top-level directory, not ..
+ Updates to website:
  - Changed download links to point to Google Code downloads area.
  - Added section on Windows binary package.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@286 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-24 02:32:01 +00:00
roktas
2deea0966a Pandoc package didn't contain 'pandoc' executable. This is because we're
using "Simply expanded variables" and PROGS expands before EXECS.  Put
PROGS after EXECS to fix this bug.  As an alternative solution, we could 
make PROGS -and possibly others- "recursively expanded" variables, but I 
tend to avoid using that flavour of variables.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@283 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-23 12:37:31 +00:00
fiddlosopher
54a7700bcb Changed osx-pkg target in Makefile to refer to COPYRIGHT
instead of (obsolete) LICENSE.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@280 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-22 20:27:32 +00:00
fiddlosopher
d829c4820a Merged changes from branches/wrappers since r177.
Summary of main changes:
+ Added -o/--output and -d/--debug options to pandoc.
+ Modified pandoc to behave differently depending on the name
  of the program.  For example, if the program name is 'html2latex',
  the default reader will be html and the default writer latex. 
+ Removed most of the old wrappers, replacing them with symlinks
  to pandoc.
+ Rewrote markdown2pdf and created a new wrapper web2markdown,
  with the functionality of the old html2markdown script.  These
  new scripts exploit pandoc's -d option to avoid having to do
  complex command-line parsing.
+ Revised man pages and documentation appropriately.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@279 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-22 20:16:03 +00:00
fiddlosopher
aac442e761 Removed TODO. ToDo list now maintained on the Wiki at pandoc's
Google Code site.  (Also in the repository:  wiki/ToDo.wiki.)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@266 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-21 20:21:40 +00:00
fiddlosopher
66da30cd78 Added 'clean' target to src/templates/Makefile, main
Makefile's 'clean' calls it to clean out template-generated
files.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@237 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-19 22:20:58 +00:00
fiddlosopher
31a956b655 Changes to build process relating to r234.
+ Corrected dependencies in Makefiles to ensure that templates
  get filled when the relevant files are modified.
+ Changed template placeholders to @xxx@ instead of <xxx>,
  for consistency with our practice with the Cabal template.
+ Changed default font for RTF writer (this had been changed earlier,
  but in the target rather than the template!)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@235 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-19 22:00:41 +00:00
fiddlosopher
4ab3eb3003 + Small changes to Makefile for better handling of Windows executable.
+ Added windows executable to the website target.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@210 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-16 19:11:49 +00:00
fiddlosopher
ba16d6ae47 Makefile now checks to see if we're running Cygwin/Windows; if we are,
'.exe' extension is added to each executable in EXECS.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@192 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-13 17:54:59 +00:00
fiddlosopher
1fdafb5204 Extract version number from src/Main.hs in cabalize and Makefile.
The authoritative version number is now in src/Main.hs, with no
duplication.  (This seems a better solution than building Main.hs
from a template.)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@182 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-12 15:41:55 +00:00
roktas
426cbadfef Merge changes in branches/wrappers into trunk.
[in trunk] svn merge -r105:HEAD \
        https://pandoc.googlecode.com/svn/branches/wrappers


git-svn-id: https://pandoc.googlecode.com/svn/trunk@177 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-12 07:04:09 +00:00
roktas
83077346a1 Using hardcoded executable paths in Makefile doesn't work. While GHC
6.6 Cabal builds executables in dist/build/$executable, older Cabal
versions use dist/build/src.  To cope with this situation:
+ Revert to old code which determines executable paths dynamically.
+ Create symlinks to the compiled executables in top directory.  Make sure 
  to not touch symlinks once they've been created.
+ As PROGS variable can now contain symlinks, determine the actual file 
  during installation.
+ Replace EXECNAMES with EXECS, as the former became a redundant name due 
  to these changes.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@104 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-16 02:37:25 +00:00
roktas
8e5f3e684c Fix a bug in 'uninstall-exec' target.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@93 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-12 19:56:59 +00:00
fiddlosopher
668a48534e Changes to OSX packaging:
+ Use $(NAME) instead of hard-coded 'Pandoc' for package and dmg names
+ Create dmg in .. (like debs)
+ Modified website target to get dmg from ..


git-svn-id: https://pandoc.googlecode.com/svn/trunk@90 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-12 00:24:50 +00:00
roktas
fa645eed39 Use compiled executables directly from their build directory, without
copying them to the top directory.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@89 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-11 10:35:10 +00:00
roktas
caf7e1ca0f Fix a serious bug in Makefile. 'make' should recompile when a source file
has been modified.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@88 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-10 10:55:18 +00:00
fiddlosopher
05c2566479 Remove signatures (and emails!) from changelog on web page.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@85 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-08 17:36:27 +00:00
fiddlosopher
30734c8d60 + Changes to osx/Welcome:
- removed hardcoded references to /usr/local
  - added title
+ Minor changes to website build process.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@84 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-08 17:27:49 +00:00
fiddlosopher
30405f3764 Revisions to website target:
+ added link for OSX package
+ minor fixes


git-svn-id: https://pandoc.googlecode.com/svn/trunk@83 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-08 15:47:54 +00:00
roktas
6c87b87835 Put all website commands into a subshell jail. If any command failed, we
would end up with web_dest directory which would have to be removed 
manually for further attempts.  If this looked ugly; as an alternative 
solution we could change 'website' target as follows:

    website: $(web_dest)/index.html
    $(web_dest)/index.html: ...


git-svn-id: https://pandoc.googlecode.com/svn/trunk@82 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-08 10:56:05 +00:00
roktas
cc14b53090 Changes for 'website':
+ Execute $(MAIN) in './' otherwise this would fail if $(MAIN) is not
  available in PATH.
+ Make echo off during file checking.
+ Copy $(deb_main) from parent directory.

Changes for 'deb':
+ Calculate $(deb_main) the essential Debian package to install.
+ Place this target before website target.
+ 'deb' should be a PHONY target.
+ Make echo off during tool checking.

Changes for 'tarball':
+ Use all-lowercase $(THIS) instead of $(MAIN).


git-svn-id: https://pandoc.googlecode.com/svn/trunk@81 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-08 10:32:53 +00:00
fiddlosopher
da1cf6a392 Changed install.html to INSTALL.html in website; replaced a reference
to README.html to INSTALL.html.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@80 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-08 07:30:51 +00:00
fiddlosopher
1c9c3acb89 Added target for creation of website. 'web' directory contains
source files for website, which is created in 'web/pandoc'.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@79 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-08 07:19:59 +00:00
fiddlosopher
fc08eb0298 Removed INSTALL.html from build-doc target.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@78 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-07 16:30:23 +00:00
roktas
2b40ef5d03 Fixes from last review:
+ Add markdown2pdf to %.pdf dependencies.
+ Make build-all target explicitly depend on build-program, instead of 
  'all' which might be changed in future.
+ Add build-program to osx-pkg-prep for the sake of explicitness.
+ Generate INSTALL.html in build-doc.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@77 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-07 10:37:18 +00:00
roktas
afd92376d6 Attempt to fix a (long-standing) Makefile drawback which is documented in
previous revisions as follows:

    # XXX: Note that we don't handle PREFIX correctly at the install-* 
    # stages, i.e. any PREFIX given at the configuration time is lost, 
    # unless it is also supplied (via environment) at these stages.

With this (optional and experimental) hack, config time settings will 
become persistent.  Such persistency allows one to specify PREFIX and/or 
DESTDIR only once (at the first run).  That is, the below actions should 
work fine now:

    DESTDIR=/tmp/foo make
    make install

In previous code these variables need to be specified at each run.  For 
example:

    DESTDIR=/tmp/foo make
    DESTDIR=/tmp/foo make install

This change (as an ugly hack) is optional (and might be removed) as the 
user could always work around that issue with 'DESTDIR=/tmp/foo make 
install'.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@75 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-03 11:26:53 +00:00
roktas
7bbe87af99 Fix a bug in variable substitution.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@73 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-03 06:15:13 +00:00
roktas
24e56f38c6 Older Cabal versions have no '--destdir' option. Detect the availability
of this option and fallback to '--copy-prefix' (which is now deprecated, as 
of GHC 6.6).

Add a short comment to cabalize.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@72 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-03 05:44:22 +00:00
roktas
2d7043ba59 Remove some code comments from previous commit.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@71 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-03 05:09:30 +00:00
roktas
2066ec5d02 More sanitizations in Makefile (needs testing):
+ Remove a bogus DOCS assignment line.
+ Cabal recreates pandoc executable by unnecessarily linking Main.o with 
  library (it skips compiling *.hs files though).  Since pandoc's time 
  stamp is modified, it is  copied from buildir to top directory, and also 
  README.html is regenerated, each time a target which has a 'build' 
  prerequisite is invoked.  As a solution, now PHONY 'build' target depends 
  on BUILDDIR/.
+ "THIS" variable has a confusing semantics and it is abusingly used in 
  various targets.  We in fact need it to specify package sub directories 
  created during installation.  Clarify this meaning by moving it to path 
  variables section.
+ Create a new variable as MAIN which holds the main executable name.  
  Sorry for my obsession to avoid simply using a magic "pandoc" name. :-)
  Modify all targets which (abusingly) refers  to THIS and replace THIS 
  with MAIN.  Note that MAIN is derived from EXECS which in turn collects  
  all executable names from Executable stanzas in cabal file.
+ As EXECS may hold more than one executable name, update EXECS target to 
  reflect this semantic.
+ Rename BINS variable as PROGS and modify it so as to hold the names of 
  all executables required to be installed.  Remove bin_all local variable 
  as PROGS can be used for the same purpose instead.
+ Modify DOCS variable so as to hold the names of all documents required to 
  be installed.  Remove doc_all local variable as DOCS can be used for the 
  same purpose instead.
+ Remove DOCS target.  README.html is already generated when needed.
+ Remove build-exec redundant prerequisite from osx_dest target.  Make can 
  find its way.
+ Set MAIN as the prerequisite of 'test' and 'test-markdown' to make things 
  more clear.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@70 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-02 14:32:57 +00:00
roktas
2d2914ff1a Sanitize Makefile:
+ Move $(BINS) target to a new PHONY 'build-exec' target.  This should be 
  used in all (non-build type) targets which refer BINS.  Also, create a 
  new 'build-program' target for user's convenience.
+ Update all targets so as to use build-exec (instead of BINS).
+ Use an explicit global DOCS variable which lists buildable documents; 
  this makes our intention more clear.  Also, for the sake of consistency, 
  move BINS variable (which lists buildable executables) to a new section 
  and create a redundant (for the moment, at least) EXECS variable.
+ Move all buildable target files in install-* targets to the related 
  build-* targets.  This mostly involves document files (e.g. README.hmtl).
  As a result, we now have a new build target 'build-doc' which builds main 
  documents.  This modification provides a clean separation between build 
  and install type targets.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@69 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-02 06:45:03 +00:00
fiddlosopher
d3f52801c7 Make osx-dmg target depend on $(osx_dmg_name), so that if the
dmg file has already been built, it does not build it again.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@68 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-02 03:47:23 +00:00
fiddlosopher
309a15010c Changes related to osx packaging:
+ Simplified osx-dmg target, which need not be built as root.
+ Made osx-pkg and osx-pkg-prep non-.PHONY, plus a few other minor
  changes to make the dependencies work correctly.
+ Removed \< from the sed regex in cabalize; this is not support in
  BSD sed.
+ Changed path information in osx/Welcome and message in uninstall-pandoc.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@67 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-02 03:30:47 +00:00
roktas
e478551382 Various changes in osx-* targets.
+ Exit 1 if permissions are not satisfied.
+ Make all targets PHONY.
+ Minor cosmetic fixes.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@63 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-01 10:28:22 +00:00
fiddlosopher
b14874fe18 Added uninstall-pandoc script to Mac OS X package.
Added information about uninstalling to Welcome message.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@62 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-01 08:29:13 +00:00
fiddlosopher
1f18bc8266 Changes to osx-pkg and osx-dmg targets.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@60 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-01 07:49:18 +00:00
fiddlosopher
c8bac7e00e Improved osx-dmg and osx-pkg targets in Makefile.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@59 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-01 07:16:58 +00:00
roktas
aeb250f28d Revert all changes related to automatic ChangeLog creation.
+ Remove ChangeLog and gnuify-changelog.pl
+ Remove 'package' target in Makefile.

Minor unrelated cosmetic changes.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@52 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-31 18:40:47 +00:00
fiddlosopher
2d128f7349 Improvements to Mac OS X package build:
+ Add "pandoc" as bundle identifier to get rid of warning.
+ Remove old make_osx_pkg_dirs script, no longer needed because of
  make target.
+ Add OSX-Welcome, with information about adding /usr/local/bin
  to PATH.
+ Modify Makefile accordingly. 


git-svn-id: https://pandoc.googlecode.com/svn/trunk@51 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-31 17:19:25 +00:00
fiddlosopher
f373c9326a Improved osx-pkg target; added Info.plist and Description.plist.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@50 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-31 07:06:30 +00:00
fiddlosopher
10633afb8d osx-pkg target: install into Package_root subdirectory of osx_dest.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@48 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-30 16:07:01 +00:00
roktas
fc8a03155e + Revert changes in 'deb' target, add new target 'package' instead. This
target updates ChangeLog and then create packages.
+ Minor fix 'ChangeLog' target, update ChangeLog.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@47 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-30 13:14:06 +00:00
roktas
45f317e71f Ensure that we have always up-to-date version of ChangeLog before creating
a Debian package.  Make 'ChangeLog' target PHONY to force an update.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@46 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-30 12:36:32 +00:00
roktas
1ba9113d7e Make debian/rules executable to avoid errors in 'distclean' target.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@45 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-30 12:15:02 +00:00
roktas
93fe9eecc4 Modifications to create a nice ChangeLog.
+ Add new file 'gnuify-changelog.pl' grabbed and adapted from subversion 
  distribution.
+ Add 'ChangeLog' target to create/update ChangeLog.
+ Update current ChangeLog.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@44 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-30 12:10:38 +00:00
roktas
0bd395c5c8 Add pandoc executable to process rules as a dependency. Make osx_dest,
osx-pkg distinction more clear.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@42 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-30 08:04:30 +00:00
roktas
f081f5ee26 Parameterise "osx-pkg".
git-svn-id: https://pandoc.googlecode.com/svn/trunk@41 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-30 07:06:40 +00:00
roktas
52f07a04b5 Add a 'osx-pkg' target for the creation of a Mac OSX® package (using
PackageMaker.App).  This target recursively uses 'install-program'
target to populate OSX package directory tree.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@40 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-30 06:41:26 +00:00
roktas
fe92360ea2 * cabalize: fix cabal version detection by using a bloody hack.
* Makefile:
  + Make 'uninstall-all' depends on 'uninstall-exec'.
  + Make the default target 'all' depends on $(BINS).  Now, invoking
    a plain 'make' builds and creates pandoc in the top directory.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@39 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-30 05:40:41 +00:00
roktas
40a8480efd Remove 'install-lib', it causes too much trouble which needs to be dealed
in ugly ways.
+ Now, we have 'install-program' and 'install-all' targets.  The former 
  installs only program and user documents, while the latter installs 
  everything: program, user documents, library files and library documents.
+ Behaviour of 'install' target hasn't changed, it calls 'install-program'.
+ Update README accordingly.
+ Implement missing uninstall-* targets (including 'uninstall-all' and 
  'uninstall-program' for the new targets).
+ Call 'install-program' in debian/rules explicitly to prevent confusions.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@33 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-29 12:54:08 +00:00
roktas
57226243fc Portability fix. Remove rmdir(1)'s '--ignore-fail-on-non-empty' option, as
it is unsupported in BSD version.  Note that the relevant line has already 
started with a '-' which means that make(1) will ignore any error.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@31 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-29 07:11:37 +00:00
roktas
156be8b17a Merge trunk with ghc66-branch.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@28 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-28 15:13:18 +00:00
roktas
86e8b9635a * Fix man files installation so that we really ignore .svn directories.
* Remove $datadir/doc/pandoc on uninstall-doc.  Only this directory is
  removed since it's a cruft directory due to its name. I couldn't find
  a reliable method to remove other directories created on installation.
* Use fakeroot when invoking dpkg-buildpackage.  Improve warnings in
  'deb' target.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@5 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-20 17:27:57 +00:00
fiddlosopher
7efc3d1864 Added markdown2html to bin_all.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@4 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-19 22:34:35 +00:00
roktas
6307568ca5 As we are using subversion, ignore '.svn' directories when building debs.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@3 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-18 01:00:01 +00:00
fiddlosopher
df7b682251 initial import
git-svn-id: https://pandoc.googlecode.com/svn/trunk@2 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-17 14:22:29 +00:00