diff options
| -rw-r--r-- | Makefile | 24 | ||||
| -rw-r--r-- | web/Makefile | 20 | ||||
| -rwxr-xr-x | web/mkdemos.sh | 2 |
3 files changed, 33 insertions, 13 deletions
@@ -368,27 +368,27 @@ website: $(MAIN) html mkdir $(web_dest); \ cp -r html $(web_dest)/doc; \ cp $(web_src)/*.css $(web_dest)/; \ - sed -e 's#@PREFIX@#$(PREFIX)#g' $(osx_src)/Welcome | \ - $(make_page) > $(web_dest)/osx-notes.html; \ + cp $(web_src)/css $(web_dest)/; \ + sed -e 's#@PREFIX@#$(PREFIX)#g' $(osx_src)/Welcome > \ + $(web_dest)/osx-notes.txt; \ sed -e '/^ --.*/d' -e 's#^# #g' changelog | \ - sed -e 's/ \(pandoc (.*\)/## \1/g' | \ - $(make_page) -T "Pandoc changelog" > $(web_dest)/changelog.html; \ - $(make_page) README > $(web_dest)/README.html; \ - $(make_page) INSTALL > $(web_dest)/INSTALL.html; \ + sed -e 's/ \(pandoc (.*\)/## \1/g' > \ + $(web_dest)/changelog.txt; \ + cp README $(web_dest)/ ; \ + cp INSTALL $(web_dest)/ ; \ sed -e 's/@TARBALL_NAME@/$(tarball_name)/g' $(web_src)/index.txt | \ sed -e 's/@OSX_DMG_NAME@/$(osx_dmg_name)/g' | \ sed -e 's/@WINDOWS_PKG_NAME@/$(win_pkg_name)/g' | \ - sed -e 's/@VERSION@/$(VERSION)/g' | \ - $(make_page) > $(web_dest)/index.html; \ - $(make_page) $(web_src)/features.txt > $(web_dest)/features.html; \ - cp README $(web_dest)/ ; \ + sed -e 's/@VERSION@/$(VERSION)/g' > $(web_dest)/index.txt; \ + cp $(web_src)/features.txt $(web_dest)/ ; \ ./$(MAIN) -s -w latex README > $(web_dest)/README.tex ; \ cp $(web_src)/myheader.tex $(web_dest)/ ; \ cp $(web_src)/S5DEMO $(web_dest)/ ; \ cp $(web_src)/header.html $(web_dest)/ ; \ cp $(web_src)/footer.html $(web_dest)/ ; \ - sh $(web_src)/mkdemos.sh $(web_dest) $(shell pwd) | \ - $(make_page) > $(web_dest)/examples.html; \ + cp $(web_src)/mkdemos.sh $(web_dest)/ ; \ + cp $(web_src)/Makefile $(web_dest)/ ; \ + PANDOC_PATH=$(shell pwd) make -C $(web_dest) ; \ ) || { rm -rf $(web_dest); exit 1; } .PHONY: distclean clean diff --git a/web/Makefile b/web/Makefile new file mode 100644 index 000000000..644ce61db --- /dev/null +++ b/web/Makefile @@ -0,0 +1,20 @@ +all: index.html osx-notes.html README.html INSTALL.html features.html changelog.html examples.html + +PANDOC_PATH ?= $(dir $(shell which pandoc)) +MAKEPAGE = $(PANDOC_PATH)/pandoc -s -S -B header.html -A footer.html -H css +PANDOC_DEPS = header.html footer.html css + +examples.txt : $(PANDOC_DEPS) mkdemos.sh + ./mkdemos.sh . $$PANDOC_PATH > $@ + +%.html : %.txt $(PANDOC_DEPS) + $(MAKEPAGE) $< > $@ + +%.html : % $(PANDOC_DEPS) + $(MAKEPAGE) $< > $@ + +changelog.html : changelog.txt $(PANDOC_DEPS) + $(MAKEPAGE) -T "Pandoc changelog" $< > $@ + +upload : + sitecopy --update macfarlane diff --git a/web/mkdemos.sh b/web/mkdemos.sh index 48cee6f91..19c17053f 100755 --- a/web/mkdemos.sh +++ b/web/mkdemos.sh @@ -1,7 +1,7 @@ #!/bin/sh -e # creates example page for pandoc # argument #1 is the destination directory -# argument #2 is the directory containing pandoc, html2markdown, markdown2pdf +# argument #2 is pandoc path DEST=$1 PROGPATH=$2 |