From 9c4798666dc40aeff33cbfbb17b35650a9f00ce2 Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Thu, 14 Jan 2016 21:51:07 +0100
Subject: [PATCH] Webhelp rules
---
Doc/Makefile | 55 +++++++++++++++++++++-------------------------------
Makefile | 4 ++--
2 files changed, 24 insertions(+), 35 deletions(-)
diff --git a/Doc/Makefile b/Doc/Makefile
index fd2e1a641..716d6b820 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -55,8 +55,8 @@ mp4Set = $(foreach webmFile, $(webmSet), $(webmFile).mp4 )
videoformats:$(mp4Set)
all: ${BUILDROOT}/stage1
- cd ${BUILDROOT}; tar c- ${DOCMODULES} | tar -x -C ${BUILDNAVI}
cd ${BUILDROOT}; tar c- ${DOCMODULES} | tar -x -C webhelp
+# cd ${BUILDROOT}; tar c- ${DOCMODULES} | tar -x -C ${BUILDNAVI}
${BUILDROOT}/${SCRIPTBASENAME}_print.xml \
${BUILDROOT}/${SCRIPTBASENAME}.xml: ${SCRIPTBASENAME}.xml Common/glossary.xml Common/bibliography.xml
@@ -72,55 +72,44 @@ ${BUILDROOT}/${SCRIPTBASENAME}.xml: ${SCRIPTBASENAME}.xml Common/glossary.xml Co
${BUILDROOT}/stage1:\
${BUILDROOT}/webhelp/index.html \
- ${BUILDROOT}/${BUILDNAVI}/lectures.epub \
- ${BUILDROOT}/${BUILDNAVI}/printversion.pdf \
- ${BUILDROOT}/mobil/index.html \
- ${BUILDROOT}/${BUILDNAVI}/index.html \
- ${BUILDROOT}/${BUILDNONAVI}/index.html
+ ${BUILDROOT}/webhelp/lectures.epub \
+ ${BUILDROOT}/webhelp/printversion.pdf \
+ ${BUILDROOT}/mobil/index.html
touch ${BUILDROOT}/stage1
-
${BUILDROOT}/webhelp/index.html:${BUILDROOT}/${SCRIPTBASENAME}.xml
cd ${BUILDROOT};\
- /usr/share/xmlmind/bin/xxetool convert ${XSLPARAM} ${XSLPARAM_html} db5.toWebHelp \
+ /usr/share/xmlmind/bin/xxetool convert ${XSLPARAM} db5.toWebHelp \
${SCRIPTBASENAME}.xml -u webhelp
-${BUILDROOT}/${BUILDNAVI}/index.html: ${BUILDROOT}/${SCRIPTBASENAME}.xml
- cd ${BUILDROOT};\
- /usr/share/xmlmind/bin/xxetool convert ${XSLPARAM} ${XSLPARAM_html} db5.toEclipseHelp \
- ${SCRIPTBASENAME}.xml -u $(BUILDNAVI)
-# perl -i -p -e '$$/=undef;s/\n[ \t]*<!DOCTYPE[^>]+\n[^>]*>$$//m' ${BUILDNAVI}/*.xml
-# cp -r META-INF ${BUILDROOT}/${BUILDNAVI}
-
${BUILDROOT}/mobil/index.html:${BUILDROOT}/${SCRIPTBASENAME}.xml
cd ${BUILDROOT};\
- /usr/share/xmlmind/bin/xxetool convert ${XSLPARAM} ${XSLPARAM_html} db5.toEclipseHelp \
+ /usr/share/xmlmind/bin/xxetool convert ${XSLPARAM} db5.toEclipseHelp \
${SCRIPTBASENAME}.xml -u mobil
cd ${BUILDROOT}/mobil;ln -sf /home/info1/doc/navi/de.hdm_stuttgart.mi.lectures/P .
-${BUILDROOT}/${BUILDNONAVI}/index.html: ${BUILDROOT}/${SCRIPTBASENAME}.xml
- cd ${BUILDROOT};\
- /usr/share/xmlmind/bin/xxetool convert -p suppress.navigation 1 ${XSLPARAM} ${XSLPARAM_html} \
- db5.toEclipseHelp ${SCRIPTBASENAME}.xml -u $(BUILDNONAVI);
-
-${BUILDROOT}/${BUILDNAVI}/printversion.pdf: ${BUILDROOT}/${SCRIPTBASENAME}_print.xml
+${BUILDROOT}/webhelp/printversion.pdf: ${BUILDROOT}/${SCRIPTBASENAME}_print.xml
cd ${BUILDROOT};\
/usr/share/xmlmind/bin/xxetool convert ${XSLPARAM} ${XSLPARAM_pdf} db5.toPSFile \
- ${SCRIPTBASENAME}_print.xml -s pdf -s "|pdf" -u $(BUILDNAVI)/printversion.pdf
+ ${SCRIPTBASENAME}_print.xml -s pdf -s "|pdf" -u webhelp/printversion.pdf
-${BUILDROOT}/${BUILDNAVI}/lectures.epub: ${BUILDROOT}/${SCRIPTBASENAME}.xml
+${BUILDROOT}/webhelp/lectures.epub: ${BUILDROOT}/${SCRIPTBASENAME}.xml
cd ${BUILDROOT};\
- /usr/share/xmlmind/bin/xxetool convert ${XSLPARAM} ${XSLPARAM_html} \
- db5.toEpub ${SCRIPTBASENAME}.xml -u $(BUILDNAVI)/lectures.epub
+ /usr/share/xmlmind/bin/xxetool convert ${XSLPARAM} \
+ db5.toEpub ${SCRIPTBASENAME}.xml -u webhelp/lectures.epub
+
+#${BUILDROOT}/${BUILDNAVI}/index.html: ${BUILDROOT}/${SCRIPTBASENAME}.xml
+# cd ${BUILDROOT};\
+# /usr/share/xmlmind/bin/xxetool convert ${XSLPARAM} ${XSLPARAM_html} db5.toEclipseHelp \
+# ${SCRIPTBASENAME}.xml -u $(BUILDNAVI)
+# perl -i -p -e '$$/=undef;s/\n[ \t]*<!DOCTYPE[^>]+\n[^>]*>$$//m' ${BUILDNAVI}/*.xml
+# cp -r META-INF ${BUILDROOT}/${BUILDNAVI}
-install:#jdoc
- rsync -av --delete -e ssh ${BUILDROOT}/${BUILDNAVI} info1@${WWWBASE}/navi
- rsync -av --delete -e ssh ${BUILDROOT}/${BUILDNONAVI} info1@${WWWBASE}/nonavi
- rsync -av --delete -e ssh ${BUILDROOT}/mobil root@prog.mi.hdm-stuttgart.de:/var/www/html/freedocs
- rsync -av --delete -e ssh ${BUILDROOT}/webhelp root@prog.mi.hdm-stuttgart.de:/var/www/html/freedocs
- # ssh info1@freedocs.mi.hdm-stuttgart.de /usr/share/hdm/indexupdate.pl
+#${BUILDROOT}/${BUILDNONAVI}/index.html: ${BUILDROOT}/${SCRIPTBASENAME}.xml
+# cd ${BUILDROOT};\
+# /usr/share/xmlmind/bin/xxetool convert -p suppress.navigation 1 ${XSLPARAM} ${XSLPARAM_html} \
+# db5.toEclipseHelp ${SCRIPTBASENAME}.xml -u $(BUILDNONAVI);
clean:
rm -rf ${BUILDROOT}
-
#end
diff --git a/Makefile b/Makefile
index e0d26bebd..1d1429f27 100644
--- a/Makefile
+++ b/Makefile
@@ -25,8 +25,8 @@ clean:
mvn -T ${numCores} clean
install:
- cd Doc/target && rsync -av --delete --exclude-from=../excludeFromRsync.txt navi nonavi info1@freedocs.mi.hdm-stuttgart.de:doc
- cd Doc/target && rsync -av --delete --exclude-from=../excludeFromRsync.txt navi/ root@klausur.mi.hdm-stuttgart.de:/home/transfer/Infocenter
+# cd Doc/target && rsync -av --delete --exclude-from=../excludeFromRsync.txt navi nonavi info1@freedocs.mi.hdm-stuttgart.de:doc
+# cd Doc/target && rsync -av --delete --exclude-from=../excludeFromRsync.txt navi/ root@klausur.mi.hdm-stuttgart.de:/home/transfer/Infocenter
cd Doc/target && rsync -av --delete --exclude-from=../excludeFromRsync.txt mobil root@prog.mi.hdm-stuttgart.de:/var/www/html/freedocs
cd Doc/target && rsync -av --delete --exclude-from=../excludeFromRsync.txt webhelp root@prog.mi.hdm-stuttgart.de:/var/www/html/freedocs
ssh info1@freedocs.mi.hdm-stuttgart.de ./update_ic
--
GitLab