Add html generated by docbook

.gitignore

@@ -1,6 +1,7 @@
 conf/sources/*/destination/*
 doc/old
 doc/*.html
+doc/*.htm
 doc/*.docbook
 doc/*.texi
 doc/man/*.html

Makefile

@@ -9,6 +9,8 @@ LN=ln -sf
 ASCIIDOC=asciidoc
 DOCBOOKTOTEXI=docbook2x-texi
 DOCBOOKTOMAN=docbook2x-man
+XSLTPROC=xsltproc
+XSL=/usr/share/xml/docbook/stylesheet/nwalsh/html/docbook.xsl
 
 prefix=/usr/packages/ccollect-git
 bindir=$(prefix)/bin
@@ -28,6 +30,26 @@ docdir=$(dir)/doc
 MANDOCS  = doc/man/ccollect.text
 DOCS     = $(MANDOCS) doc/ccollect.text doc/ccollect-DE.text
 
+#
+# Doku
+#
+HTMLDOCS = $(DOCS:.text=.html)
+DBHTMLDOCS = $(DOCS:.text=.htm)
+
+TEXIDOCS = $(DOCS:.text=.texi)
+
+MANPDOCS = $(MANDOCS:.text=.man)
+
+DOCBDOCS = $(DOCS:.text=.docbook)
+
+DOC_ALL  = $(HTMLDOCS) $(DBHTMLDOCS) $(TEXIDOCS) $(MANPDOCS)
+
+html: $(HTMLDOCS)
+htm: $(DBHTMLDOCS)
+info: $(TEXIDOCS)
+man: $(MANPDOCS) 
+documentation: $(DOC_ALL)
+
 #
 # End user targets
 #
@@ -48,6 +70,13 @@ install-script:
 	$(INSTALL) -D -m 0755 $(CCOLLECT) $(destination)
 
 
+# docbook gets .htm, asciidoc directly .html
+%.htm: %.docbook
+	${XSLTPROC} -o $@ ${XSL} $<
+
+%.html: %.text %.docbook
+	${ASCIIDOC} -n -o $@ $<
+
 %.html: %.text
 	${ASCIIDOC} -n -o $@ $<
 
@@ -75,35 +104,15 @@ push-work:
 
 publish-doc: documentation
 	@echo "Transferring files to $(host)"
-	@chmod a+r doc/*.html doc/*.text
+	@chmod a+r $(DOCS) $(DOC_ALL)
-	@scp doc/*.text doc/*.html doc/*.texi doc/man/*.man $(host):$(docdir)
+	@tar c $(DOCS) $(DOC_ALL) | ssh $(host) "cd $(dir); tar xv"
-	@ssh $(host) "cd $(docdir); chmod a+r *"
+#	@ssh $(host) "cd $(docdir); chmod -R a+r *"
-
-#
-# Doku
-#
-HTMLDOCS = $(DOCS:.text=.html)
-
-TEXIDOCS = $(DOCS:.text=.texi)
-
-MANPDOCS = $(MANDOCS:.text=.man)
-
-DOCBDOCS = $(DOCS:.text=.docbook)
-
-
-html: $(HTMLDOCS)
-
-info: $(TEXIDOCS)
-
-man: $(MANPDOCS) 
-
-documentation: html info man
 
 #
 # Distribution
 #
 allclean:
-	rm -f $(TEXIDOCS) $(HTMLDOCS) $(MANPDOCS) $(DOCBDOCS)
+	rm -f $(DOC_ALL)
 
 distclean:
 	rm -f $(DOCBDOCS)

TODO

@@ -42,6 +42,8 @@
 sven / markierung
    - wie seht der Marker aus?
       -> .ccollect-YEAR-MM-DD.HHmm.pid (like the directory)
+   --> assume incomplete, when we did not finish.
+   --> means it's complete,when rsync was successful
 --------------------------------------------------------------------------------
 Add ccollect-restore.sh (new project, perhaps coordinated with jchome's
 ccollect-config)