From 3c29ef1e7a04100d2f45ea07fab1d9d3f25801a2 Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Thu, 20 Jul 2017 17:44:24 +0200
Subject: [PATCH] Making topic list update configurable
---
Doc/.gitignore | 1 +
Doc/Makefile | 3 ---
Doc/Makefile.in | 7 +++++++
ws/Docbook/Extensions/Tdata/.gitignore | 1 +
ws/Docbook/Extensions/Tdata/{Makefile => Makefile.in} | 3 +++
ws/Docbook/Preprocess/make.rules | 2 +-
6 files changed, 13 insertions(+), 4 deletions(-)
delete mode 100644 Doc/Makefile
create mode 100644 Doc/Makefile.in
rename ws/Docbook/Extensions/Tdata/{Makefile => Makefile.in} (70%)
diff --git a/Doc/.gitignore b/Doc/.gitignore
index a55154255..f4775877a 100644
--- a/Doc/.gitignore
+++ b/Doc/.gitignore
@@ -1,2 +1,3 @@
+Makefile
target
/targetReference
diff --git a/Doc/Makefile b/Doc/Makefile
deleted file mode 100644
index 9945ca2e1..000000000
--- a/Doc/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-SCRIPTBASENAME=lectures
-
-include /usr/share/hdm-docbook-xsl/Preprocess/make.rules
diff --git a/Doc/Makefile.in b/Doc/Makefile.in
new file mode 100644
index 000000000..ea6f15b43
--- /dev/null
+++ b/Doc/Makefile.in
@@ -0,0 +1,7 @@
+SCRIPTBASENAME=lectures
+localDbookXslCommonParam=draft.mode=yes
+
+# Update Bulletin board topics
+updateTopics=no
+
+include /usr/share/hdm-docbook-xsl/Preprocess/make.rules
diff --git a/ws/Docbook/Extensions/Tdata/.gitignore b/ws/Docbook/Extensions/Tdata/.gitignore
index ccca91f9e..220f7efaf 100644
--- a/ws/Docbook/Extensions/Tdata/.gitignore
+++ b/ws/Docbook/Extensions/Tdata/.gitignore
@@ -1,4 +1,5 @@
xsltest
+Makefile
/qanda.gen.xml
*~
/bibGloss.trans.xml
diff --git a/ws/Docbook/Extensions/Tdata/Makefile b/ws/Docbook/Extensions/Tdata/Makefile.in
similarity index 70%
rename from ws/Docbook/Extensions/Tdata/Makefile
rename to ws/Docbook/Extensions/Tdata/Makefile.in
index feb8bff2e..dfd0cd4cb 100644
--- a/ws/Docbook/Extensions/Tdata/Makefile
+++ b/ws/Docbook/Extensions/Tdata/Makefile.in
@@ -1,4 +1,7 @@
SCRIPTBASENAME=fig
localDbookXslCommonParam=draft.mode=yes
+# Update Bulletin board topics
+updateTopics=no
+
include /usr/share/hdm-docbook-xsl/Preprocess/make.rules
diff --git a/ws/Docbook/Preprocess/make.rules b/ws/Docbook/Preprocess/make.rules
index a12e81659..7a92c5b4e 100644
--- a/ws/Docbook/Preprocess/make.rules
+++ b/ws/Docbook/Preprocess/make.rules
@@ -86,7 +86,7 @@ SAXONCMD=java -cp "${DBOOK_XSL}/tools/lib/saxon9he.jar:/usr/share/java/xercesImp
-xsl:${DBOOK_XSL_PREPROCESS}/Xsl/docbook2docbook.xsl > ${*}.xml
${SAXONCMD} -s:$*.xml \
-xsl:${DBOOK_XSL_PREPROCESS}/Xsl/docbook2topics.xsl ${dbookXslWebhelpParam} > ${@D}/topics.xml
- ${CMDID2TOPIC} ${@D}/topics # Only basename without .xml extension
+ if [ $(updateTopics) = 'yes' ]; then ${CMDID2TOPIC} ${@D}/topicsi;fi # Only basename without .xml extension
${SAXONCMD} -s:$*.xml \
-xsl:${DBOOK_XSL_PREPROCESS}/Xsl/docbook2html.xsl > ${*}.html.xml
${SAXONCMD} -s:$*.xml \
--
GitLab