Commit graph

151 commits

Author SHA1 Message Date
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