Commit graph

163 commits

Author SHA1 Message Date
fiddlosopher
9159ebd3c1 Modified INSTALL instructions; require "make build-all" before
"make install-all".


git-svn-id: https://pandoc.googlecode.com/svn/trunk@76 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-07 06:17:56 +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
fdfe8494ca Fix all the errors lintian(1) reported:
+ "SEE ALSO" sections of man files have paragraph fillings errors which   
  groff(1) complains ("cannot adjust line").  This is because .BR line in 
  "SEE ALSO" section is too long to break properly.  Fix all man pages.
  While on it, move all AUTHORS section to the end of the files, this 
  section should come last.
+ lintian(1) complains about the debian/changelog symlink:
    W: pandoc source: changelog-is-symlink
    N:
    N:   The file debian/changelog is a symlink instead of a regular file. This
    N:   is unnecessary and makes package checking and manipulation more
    N:   difficult. If the changelog should be available in the source package
    N:   under multiple names, make debian/changelog the real file and the
    N:   other names symlinks to it.
    N:
    N:   This problem may have prevented lintian from performing other checks,
    N:   leading to undetected changelog errors.
  Reverse the source and targets in symlink to fix this warning.  Now, the 
  Debian packages can be cleanly built.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@74 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-03 07:08:47 +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
fiddlosopher
dd297dda0a Changed version numbers to 0.3.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@66 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-01 22:49:07 +00:00
fiddlosopher
836ba8694d Created new changelog, made debian/changelog a symlink to changelog
in top-level.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@65 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-01 22:38:57 +00:00
fiddlosopher
5044c1ffad Removed check for presence of pandoc in uninstall-pandoc;
if uninstall-pandoc is present, that means Pandoc is installed.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@64 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-01 15:54:11 +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
7ccf149504 Added uninstall-pandoc script for Mac OS X package.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@61 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-01 08:20:17 +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
fiddlosopher
a4a2792dc1 Use iconv on output as well as input in wrapper scripts.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@58 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-01 06:33:47 +00:00
fiddlosopher
b8d960d1b9 Improved man files for pandoc and all wrappers.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@57 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-01 06:32:52 +00:00
fiddlosopher
51536ca888 Renamed OSX-Welcome as Welcome.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@56 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-01 06:29:22 +00:00
fiddlosopher
4eec413b66 Remove files from top-level that have been moved to osx directory.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@55 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-01 06:28:40 +00:00
fiddlosopher
de7ea8576d Added osx directory for source files for Mac OS X package,
to reduce clutter at top level.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@54 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-01 06:27:47 +00:00
fiddlosopher
76bd231a70 + Improved man page for pandoc and markdown2pdf.
+ Changed README to recommend iconv on both input and output.
+ Added TODO items.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@53 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-01 04:32:00 +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
3dbd266d21 Improved LaTeX writer's handling of dashes:
+ Recognize a double hyphen as an Em-dash, even when it occurs next
  to punctuation (e.g. a quotation mark).
+ Collapse space around Em-dashes.
+ Process quotes before dashes.  This way (foo -- 'bar') will turn into
  (foo---`bar') instead of (foo---'bar').


git-svn-id: https://pandoc.googlecode.com/svn/trunk@49 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-30 23:15:28 +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
bbae8ad31f Really fix cabal version detection.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@43 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-30 08:18:00 +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
fiddlosopher
db9cebdf91 Bug fixes to make_osx_pkg_dirs.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@38 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-29 20:58:18 +00:00
fiddlosopher
340cb44f05 Added a script to make prepare directories for creation of a
Mac OSX package (using PackageMaker.app).


git-svn-id: https://pandoc.googlecode.com/svn/trunk@37 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-29 20:28:21 +00:00
fiddlosopher
362eec5a4d * Extracted installation instructions from README into a separate file,
INSTALL.  Reason:  Only those who install from source will need the
information in INSTALL, so it does not need to be included in user 
documentation.  Indeed, it might confuse people who install Pandoc by some
other method.
* Minor changes in README (using "Pandoc" as a generic name for the
system, "'pandoc'" as a name for the executable).


git-svn-id: https://pandoc.googlecode.com/svn/trunk@36 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-29 19:58:20 +00:00
fiddlosopher
6bb5548ec3 Changed date on README.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@35 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-29 19:32:49 +00:00
fiddlosopher
4972cd5566 Added a comma in README.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@34 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-29 18:58:28 +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
fiddlosopher
09473903dc Changes to RTF writer:
+ use Helvetica instead of Times New Roman as default font
+ specify \f0 in every \pard; otherwise font sizes are not registered properly
+ modify test of RTF writer accordingly


git-svn-id: https://pandoc.googlecode.com/svn/trunk@32 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-29 08:56:26 +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
fiddlosopher
bdfe906c02 + Changed debian/copyright to reflect new website location.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@30 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-28 17:46:35 +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
fiddlosopher
f0a25e4be1 Acknowledge roktas's contributions in README.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@24 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-28 06:35:35 +00:00
fiddlosopher
121cb21f8d + fixed html2markdown usage message, in which w3m occured twice
+ added usage documentation to beginning of fillTemplates.pl


git-svn-id: https://pandoc.googlecode.com/svn/trunk@23 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-28 05:56:02 +00:00