From 7cb5f935d9cf619e78ed9d2ae762dbf8dbc2b020 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Brammer?= Date: Mon, 19 Sep 2011 14:50:27 +0200 Subject: [PATCH] docs: split build_chm_files into build_contents, build_hhp and hhk.xsl This removes the dependency loop from build_contents to the .po files to contents.xml to build_contents. The .hhp file generation is a simple step which gets split off to work around Make limitations with multiple output files. --- docs/Makefile | 25 ++- docs/Template.de.hhk | 210 ------------------ docs/Template.hhk | 210 ------------------ .../{build_chm_files.py => build_contents.py} | 49 +--- docs/build_hhp.py | 13 ++ docs/clonk.xsl | 6 +- docs/experimental.py | 4 +- docs/hhc.xsl | 5 +- docs/hhk.xsl | 44 ++++ 9 files changed, 85 insertions(+), 481 deletions(-) delete mode 100644 docs/Template.de.hhk delete mode 100644 docs/Template.hhk rename docs/{build_chm_files.py => build_contents.py} (80%) mode change 100755 => 100644 create mode 100644 docs/build_hhp.py create mode 100644 docs/hhk.xsl diff --git a/docs/Makefile b/docs/Makefile index 168caee69..514ef1719 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -49,7 +49,7 @@ all: $(online-dirs) $(sdk-de-dirs) $(online-extra-files) $(online-sdk-files) online-en: $(addprefix online/en/, $(sdk-dirs) images $(htmlfiles) sdk/content.html $(extra-files)) -chm: $(chm-dirs) chm/en/Developer.chm chm/de/Entwickler.chm +chm: $(chm-dirs) $(sdk-de-dirs) chm/en/Developer.chm chm/de/Entwickler.chm install: all $(MKDIR_P) $(prefix) @@ -62,13 +62,16 @@ clean: rm -f *.mo Entwickler.chm Developer.chm doku.pot rm -rf online sdk-de chm -chm/en/Output.hhp chm/en/Output.hhk chm/de/Output.hhp chm/de/Output.hhk: sdk/content.xml -#update timestamp - touch $@ -sdk/content.xml: $(xmlfiles) chm/en/. chm/de/. build_chm_files.py experimental.py \ - sdk/content.xml.in Template.hhk Template.de.hhk Template.hhp Template.de.hhp de.mo - @echo generate chm files - @python build_chm_files.py $(xmlfiles) +sdk/content.xml: sdk/content.xml.in $(xmlfiles) build_contents.py experimental.py + @echo generate $@ + @python build_contents.py $(xmlfiles) + +chm/en/Output.hhp: $(xmlfiles) chm/en/. build_hhp.py Template.hhp + @echo generate $@ + @python build_hhp.py $@ Template.hhp $(xmlfiles) +chm/de/Output.hhp: $(xmlfiles) chm/de/. build_hhp.py Template.de.hhp + @echo generate $@ + @python build_hhp.py $@ Template.de.hhp $(xmlfiles) $(sdk-de-dirs) $(online-dirs) $(chm-dirs): mkdir -p $@ @@ -79,7 +82,7 @@ doku.pot: $(xmlfiles) extra-strings.xml sdk/content.xml.in xml2po.py clonk.py %.po: doku.pot @echo update $@ - #@msgmerge --no-wrap -w 1 -U $@ $< +# @msgmerge --no-wrap -w 1 -U $@ $< @msgmerge --no-wrap -w 1 -o $@ $@ $< %.mo: %.po @@ -104,6 +107,10 @@ chm/en/Output.hhc: stylesheet=hhc.xsl chm/de/Output.hhc: stylesheet=hhc.xsl chm/en/Output.hhc: sdk/content.xml hhc.xsl ; $(run-xslt) chm/de/Output.hhc: sdk-de/content.xml hhc.xsl ; $(run-xslt) +chm/en/Output.hhk: stylesheet=hhk.xsl +chm/de/Output.hhk: stylesheet=hhk.xsl +chm/en/Output.hhk: sdk/content.xml hhk.xsl ; $(run-xslt) +chm/de/Output.hhk: sdk-de/content.xml hhk.xsl ; $(run-xslt) $(filter online/en/%, $(online-extra-files)): online/en/%: % $(CP) $< $@ diff --git a/docs/Template.de.hhk b/docs/Template.de.hhk deleted file mode 100644 index 2a94c2e2d..000000000 --- a/docs/Template.de.hhk +++ /dev/null @@ -1,210 +0,0 @@ - - - - - - - - diff --git a/docs/Template.hhk b/docs/Template.hhk deleted file mode 100644 index 976d41c68..000000000 --- a/docs/Template.hhk +++ /dev/null @@ -1,210 +0,0 @@ - - - - - - - - diff --git a/docs/build_chm_files.py b/docs/build_contents.py old mode 100755 new mode 100644 similarity index 80% rename from docs/build_chm_files.py rename to docs/build_contents.py index b95bf092a..6ed6110bf --- a/docs/build_chm_files.py +++ b/docs/build_contents.py @@ -1,9 +1,8 @@ #!/usr/bin/env python -# -*- coding: iso-8859-15 -*- +# -*- coding: utf-8 -*- import sys import xml.sax import experimental -import gettext class ClonkEntityResolver(xml.sax.handler.EntityResolver): def resolveEntity(self, publicId, systemId): @@ -154,7 +153,7 @@ def printfunctions(f, _): def printindex(f, _): def folder(name): - f.write("
  • " + name + "\n + + +
  • diff --git a/docs/hhk.xsl b/docs/hhk.xsl new file mode 100644 index 000000000..33b3e454b --- /dev/null +++ b/docs/hhk.xsl @@ -0,0 +1,44 @@ + + + + + + + + + + + + + +
      + +
    + + +     + + +
  • + + + + + + + sdk\ + + + + +
    • +     + + + + + + + +