r2214: *** empty log message ***

diff --git a/debian/make-debian.sh b/debian/make-debian.sh
index d9c6d90da07f81a793a8def73af7d531ce53ad4b..a3d6a729cb92f5768bc4b05a644d5554ddfcbd7d 100755 (executable)
--- a/debian/make-debian.sh
+++ b/debian/make-debian.sh
@@ -1,26 +1,37 @@
 #!/bin/bash
 
+PKG=ctsim
 DEBPKG=ctsim
 
-WORK_HOME=/usr/local/src/Work
-PKG_DIR=/usr/local/src/Packages/${DEBPKG}
+set -e
+
+BASE_HOME=/usr/local/src
+WORK_HOME=${BASE_HOME}/Work
 WORK_DIR=${WORK_HOME}/${PKG}
-PACKAGE_DIR=/usr/local/src/Packages/${DEBPKG}
+PACKAGE_DIR=${BASE_HOME}/Packages/${DEBPKG}
+SOURCE_DIR=${WORK_HOME}/${PKG}
 
+CHANGELOG=changelog
 CHANGELOG=${WORK_DIR}/debian/changelog
-VERSION=`sed -n -e "s/${DEBPKG} (\(.*\)-[0-9.]).*/\1/p" < ${CHANGELOG} |head -1`
-DEBVERSION=`sed -n -e "s/${DEBPKG} (\(.*\)).*/\1/p" < ${CHANGELOG} |head -1`
+UPSTREAM_VERSION=`sed -n -e "s/${DEBPKG} (\(.*\)-[0-9.]).*/\1/p" < ${CHANGELOG}  |head -1`
+DEB_VERSION=`sed -n -e "s/${DEBPKG} (\(.*\)).*/\1/p" < ${CHANGELOG}  |head -1`
 
-export CVSROOT=`cat CVS/Root`
+DEB_DIR=${WORK_HOME}/${PKG}-${UPSTREAM_VERSION}
+ORIGINAL_TARBALL=${DEBPKG}_${UPSTREAM_VERSION}.orig.tar.gz
+BUILD_LOG=${WORK_HOME}/${DEBPKG}_${DEB_VERSION}_build.log
 
+if [ -z "${DEB_VERSION}" -o -z "${UPSTREAM_VERSION}" ]; then
+  echo "Error: unable to parse version in changelog file"
+  exit 1
+fi
 
-echo "Building Debian files"
-cvs-buildpackage -rfakeroot -kkevin@rosenberg.net -H${WORK_DIR}/debian/cvsbp-prepare.sh -i"\.pdf|\.htb" -F $* -d ${DEBPKG} -uc -us -sa
+cd ${WORK_DIR}
 
-if [ ! -z ${opt_lintian} ]; then
-  pushd ${PACKAGE_DIR} > /dev/null
-  lintian ${DEBPKG}_${DEBVERSION}_*.changes
-  popd > /dev/null
-fi
+test -s CVS/Root && export CVSROOT=`cat CVS/Root`
+
+echo "Building Debian files"
+cvs-buildpackage -rfakeroot -kkevin@rosenberg.net -H${WORK_DIR}/debian/cvsbp-prepare.sh -i"\.pdf|\.htb" -F $* -d ${DEBPKG} -uc -us -sa > ${BUILD_LOG} 2>&1
 
-exit 0
+test -s ${PACKAGE_DIR}/${DEBPKG}_${DEBVERSION}_*.changes && \
+    (cd ${PACKAGE_DIR}; \ 
+    lintian ${DEBPKG}_${DEBVERSION}_*.changes)

diff --git a/doc/Makefile b/doc/Makefile
index 2aa8f5a179efabda7128ddd346308066ee81633b..3b79ebfa8d720696ebc9a5d86102e9aecb99c716 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -4,7 +4,7 @@ pkg=ctsim
 
 all: htmlhelp html pdf 
 
-CLEANFILES=$(pkg).ps $(pkg).hhc $(pkg).hhp $(pkg).hhk $(pkg).bib $(pkg).zip $(pkg).ilg $(pkg).ind $(pkg).dvi $(pkg).pdf $(pkg).htb $(pkg).bb $(pkg).blg $(pkg).idx $(pkg).toc $(pkg).bbl $(pkg).con $(pkg).ref $(pkg).blg
+CLEANFILES=$(pkg).ps $(pkg).hhc $(pkg).hhp $(pkg).hhk $(pkg).bib $(pkg).zip $(pkg).ilg $(pkg).ind $(pkg).dvi $(pkg).bb $(pkg).blg $(pkg).idx $(pkg).toc $(pkg).bbl $(pkg).con $(pkg).ref $(pkg).blg
 
 clean:
        @rm -f $(CLEANFILES) $(pkg)*.html *.aux *.log *~ '#*~' '#*#' .*~
@@ -39,12 +39,13 @@ htmlhelp: $(docs)
        zip -q $(pkg).zip *.html *.gif $(pkg).hh[pck]
        mv $(pkg).zip $(pkg).htb
 
+.PHONY: html
 html: htmlhelp
        rm -rf html
        mkdir html
        cp *.gif html
        mv *.html html
-
+       GZIP='-9' tar czf html.tar.gz html
 
 #.PHONY: winhelp
 #winhelp: $(docs)

diff --git a/make-doc.sh b/make-doc.sh
index 95f0dcc0420b3206c0befb5984662c04e4c02334..23601b4998302dda338243d251bc9d6889e151ed 100755 (executable)
--- a/make-doc.sh
+++ b/make-doc.sh
@@ -1,13 +1,13 @@
 #!/bin/sh
 
-pushd doc
+WORK_DIR=/usr/local/src/Work/ctsim
+
+pushd ${WORK_DIR} > /dev/null
+cd doc
 make all
-popd
-rm -rf docs
-mkdir docs
-mv doc/html docs
+cd ..
+mv doc/html.tar.gz docs
 mv doc/ctsim.htb docs
 mv doc/ctsim.pdf docs
-pushd doc
 make clean
-popd
+popd > /dev/null