Using xmlto instead of docbook2html, docbook2txt or docbook2pdf. Cleaned up a bit.

scripts/nightly/generate-nightlies.sh

@@ -1,10 +1,15 @@
 #!/bin/sh
 NIGHTLYDIR=/home/gfk/lcdproc/nightly
-SSH=/usr/bin/ssh
 MAKENIGHTLY=${NIGHTLYDIR}/make-nightly.sh
+MAKEDOCS=${NIGHTLYDIR}/make-docs.sh
 #####
 
 for branch in current stable-0-5-x; do
+	# Make nightly tarball
 	${MAKENIGHTLY} $branch
-	${SSH} -q lcdproc.sourceforge.net "sh lcdproc-finish-nightly.sh $branch"
+
+	# Make docs
+	for doc in dev user; do
+	        ${MAKEDOCS} $branch $doc
+	done
 done

scripts/nightly/make-docs.sh

@@ -0,0 +1,39 @@
+#!/bin/sh
+
+DIR=/home/gfk/lcdproc/nightly
+
+# stable-0-5-x or current
+BRANCH=$1
+
+# dev or user
+DOCS=$2
+
+XMLTO=/usr/bin/xmlto
+SSH=/usr/bin/ssh
+RSYNC=/usr/bin/rsync
+
+#############################
+cd ${DIR}
+DOCSPATH=${DIR}/${BRANCH}/docs/lcdproc-${DOCS}
+DOCSFILE=${DOCSPATH}/lcdproc-${DOCS}.docbook
+
+# Generate HTML
+${XMLTO}  xhtml-nochunks ${DOCSFILE} >/dev/null  2>&1
+mv lcdproc-${DOCS}.html ${BRANCH}-${DOCS}.html
+
+# Generate PDF
+#${XMLTO} pdf ${DOCSFILE} >/dev/null  2>&1
+#mv lcdproc-${DOCS}.pdf ${BRANCH}-${DOCS}.pdf
+
+# Generate TXT
+${XMLTO} txt ${DOCSFILE} >/dev/null  2>&1
+mv lcdproc-${DOCS}.txt ${BRANCH}-${DOCS}.txt
+
+# Upload the thing
+#${SCP} -r -qB \
+${RSYNC} -qr \
+${BRANCH}-${DOCS}.html ${BRANCH}-${DOCS}.txt \
+gfk@lcdproc.sourceforge.net:www-lcdproc/docs/
+
+# Finish the process on the server
+#${SSH} -q -l gfk lcdproc.sourceforge.net "sh lcdproc-compress-html-docs.sh ${BRANCH}-${DOCS}-html"

scripts/nightly/make-nightly.sh

@@ -7,7 +7,7 @@ PERL=/usr/bin/perl
 GUNZIP=/bin/gunzip
 BZIP2=/usr/bin/bzip2
 CVS2CL=/home/gfk/lcdproc/cvs2cl.pl
-SCP=/usr/bin/scp
+SSH=/usr/bin/ssh
 RSYNC=/usr/bin/rsync
 #####
 # Branch, can be stable-0-4-x, stable-0-5-x or current
@@ -81,12 +81,9 @@ mv lcdproc-*.tar.gz lcdproc-CVS-${BRANCH}.tar.gz
 # ${BZIP2} lcdproc-CVS-${BRANCH}.tar
 
 # Upload
-# scp -qB -i ${NIGHTLYDIR}/id_dsa lcdproc-CVS-${BRANCH}.tar.gz lcdproc-CVS-${BRANCH}.tar.bz2 gfk@lcdproc.sourceforge.net:www-lcdproc/nightly/
-#${SCP} -qB \
 ${RSYNC} -q \
 lcdproc-CVS-${BRANCH}.tar.gz gfk@lcdproc.sourceforge.net:www-lcdproc/nightly/
-${RSYNC} -q \
+${SSH} -q lcdproc.sourceforge.net "sh lcdproc-finish-nightly.sh ${BRANCH}"
-lcdproc-CVS-${BRANCH}.tar.gz gfk@cf-shell.sourceforge.net:smoketest/
 
 # Cleanup
 mv configure.in.temp configure.in
@@ -94,6 +91,5 @@ mv README.temp README
 mv ChangeLog.temp ChangeLog
 rm -f nightly-ChangeLog
 rm -f nightly-cvsChanges.txt
-#mv lcdproc-CVS-${BRANCH}.tar.bz2 ../
 mv lcdproc-CVS-${BRANCH}.tar.gz ../
 sh autogen.sh >/dev/null