git.iko.soy/typeable/pandoc
on da645eb help sign in
history ofMakefile
all commits
9a96429Revamped website.fiddlosopher dfdcec7Use smartquotes and table of contents in generating README.html.fiddlosopher dc7102eUse -S option in building man pages.fiddlosopher 98372eaRenamed 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.fiddlosopher cd08eabChanges to website: - Added groff man to list of output formats in index.txt - Added a demo of man page creation to demos pagefiddlosopher 6d6fafdDon't use -S option in processing man pages, since the '--' in options will be read as an En-dash.fiddlosopher 5fbe057Man 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.fiddlosopher 3c46f8aMakefile 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.fiddlosopher f99ceddStrip executable binaries before installing.fiddlosopher e0303df'cp -a' does not work in BSD. Replace with 'cp -R'. Note that we don't want user and group to be preserved, anyway.fiddlosopher 9a2c653More website tweaks. Added demo of extra xsl configuration and CSS in chunked xhtml produced from docbook.fiddlosopher 3528c72Minor changes to Makefile required by changes to website build system.fiddlosopher c80f181Reorganized Makefile target - now uses a subsidiary Makefile that can be run from the website directory for small changes.fiddlosopher 11f1e77Change to Makefile to add features page to website.fiddlosopher 06e6107Fix 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).roktas d437015Nicer informational message in test-markdown target.fiddlosopher b6663c7Changed 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.fiddlosopher a8a0dd8Cleaned up and improved Makefile target for wrappers.fiddlosopher d262d16Improved 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.)fiddlosopher bd31474Improved 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.fiddlosopher bcc608fFixed a bug in website generation, which only worked if 'pandoc' and the wrappers had been installed.fiddlosopher 5387ebdAdded '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.)fiddlosopher b9a3483Inserted a needed slash in the Makefile, after $(osx_pkg_name), which is the name of a directory!fiddlosopher 4ea1b2bMerged 'strict' branch from r324. This adds a '--strict' option to pandoc, which forces it to stay as close as possible to official Markdown syntax.fiddlosopher 7cd9db0Slight 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 cssfiddlosopher 369b995Make wrappers executable in the top-level directory, in case people want to try them in place without installing.fiddlosopher 3c9fd01+ Renamed web/demos.sh to mkdemos.sh + Added parameter for directory containing executables + Changed arithmetic statement for portability. + Modified Makefile accordingly.fiddlosopher 3491420+ Changed 'web2markdown' to 'html2markdown'.fiddlosopher 17837b3Added two more demo cases to website. Put a footnote in README for demonstration purposes.fiddlosopher 2d253caAdded a latex -> markdown case to demos.fiddlosopher 2933f9fAdded another demo case, with header and footer and css.fiddlosopher 5468e76Added "Demos" page to the website.fiddlosopher a1a30d6+ 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.fiddlosopher a1539d9Added README-WINDOWS.html to windows package documentation.fiddlosopher 5dfab2c+ 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.fiddlosopher 2deea09Pandoc 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.roktas 54a7700Changed osx-pkg target in Makefile to refer to COPYRIGHT instead of (obsolete) LICENSE.fiddlosopher d829c48Merged 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.fiddlosopher aac442eRemoved TODO. ToDo list now maintained on the Wiki at pandoc's Google Code site. (Also in the repository: wiki/ToDo.wiki.)fiddlosopher 66da30cAdded 'clean' target to src/templates/Makefile, main Makefile's 'clean' calls it to clean out template-generated files.fiddlosopher 31a956bChanges 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!)fiddlosopher 4ab3eb3+ Small changes to Makefile for better handling of Windows executable. + Added windows executable to the website target.fiddlosopher ba16d6aMakefile now checks to see if we're running Cygwin/Windows; if we are, '.exe' extension is added to each executable in EXECS.fiddlosopher 1fdafb5Extract 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.)fiddlosopher 426cbadMerge changes in branches/wrappers into trunk.roktas 8307734Using 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.roktas 8e5f3e6Fix a bug in 'uninstall-exec' target.roktas 668a485Changes 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 ..fiddlosopher fa645eeUse compiled executables directly from their build directory, without copying them to the top directory.roktas caf7e1cFix a serious bug in Makefile. 'make' should recompile when a source file has been modified.roktas