X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=make-dist.sh;h=387e3da3b1058116b412be01d0f4fb252e45a130;hb=a2398ff9145acb93a9d7d5034bf1eb3c2a425470;hp=bfac5c0a5c0c2efe4a13fc20b6783455d3d02724;hpb=f89d1bc4c048094680cb33a7b6120c3cc0db3938;p=ctsim.git

diff --git a/make-dist.sh b/make-dist.sh
index bfac5c0..387e3da 100755
--- a/make-dist.sh
+++ b/make-dist.sh
@@ -12,19 +12,21 @@ usage () {
 Usage: $progname [options]
 Options:
   -t   Tag CVS tree with current version numbers
-  -d   Use dpkg-buildpackage rather than default cvs-buildpackage
+  -c   Use cvs-buildpackage rather than default dpkg-buildpackage
   -l   Run lintian after building
   -h   Print this brief help
 EOF
 }
 
-# Command line
+opt_dpkg_buildpackage=1  # default is to use dpkg-buildpackage
+
+# Command line processing
 while [ $# != 0 ]; do
     value="`echo x\"$1\" | sed -e 's/^x-.//'`"
     case "$1" in
         -h)  usage; exit 0           ;;
         -t)  opt_tag=1               ;;
-        -d)  opt_dpkg_buildpackage=1 ;;
+        -c)  opt_dpkg_buildpackage=  ;;
         -l)  opt_lintian=1           ;;
          *)  usage; exit 0           ;;
     esac
@@ -35,7 +37,7 @@ DEBPKG=ctsim
 PKG=ctsim
 TOPDIR=`pwd`
 
-VERSION=`sed -n -e "s/${DEBPKG} (\(.*\)-[0-9]).*/\1/p" < debian/changelog  |head -1`
+VERSION=`sed -n -e "s/${DEBPKG} (\(.*\)-[0-9.]).*/\1/p" < debian/changelog  |head -1`
 DEBVERSION=`sed -n -e "s/${DEBPKG} (\(.*\)).*/\1/p" < debian/changelog  |head -1`
 PACKAGE_DIR=/usr/local/src/Packages/${DEBPKG}
 DISTDIR=${PKG}-${VERSION}
@@ -76,10 +78,10 @@ cp -a ${TOPDIR} ${DISTDIR}
 echo "Cleaning distribution directory ${DISTDIR}"
 cd ${DISTDIR}
 make distclean
-rm -f upload.sh make-dist.sh cvsbp-prepare 
+rm -f upload.sh make-dist.sh make-doc.sh cvsbp-prepare 
 rm -f `find . -type f -name .cvsignore`
 rm -rf `find . -type d -name CVS`
-rm -f `find . -type f -name '*~' -or -name '#*'  -or -name '#*#'` -or -name '.#*'
+rm -f `find . -type f -name '*~' -or -name '#*#' -or -name '.#*' -or -name '.*~'`
 rm -f `find doc -type f -name \*.tex -or -name \*.aux -or \
   -name \*.log -or -name \*.out -or -name \*.dvi`
 rm -rf images doc stamp-h.in build-stamp configure-stamp autom4te.cache
@@ -94,7 +96,6 @@ if [ "${DISTDIR}" != "${DEBDIR}" ]; then
 else
   cp -a ${DISTDIR} ${DEBDIR}-copy
 fi
-GZIP=-9 tar czf ${DEBPKG}_${VERSION}.orig.tar.gz ${DEBDIR}
 
 unix2dos `find ${DISTDIR} -type f -and -name '*.c' -or -name '*.h' -or \
   -name '*.cpp' -or -name '*.sh' -or -name '*.in' -or \
@@ -108,30 +109,29 @@ rm -rf ${DISTDIR}
 if [ "${DISTDIR}" == "${DEBDIR}" ]; then 
   mv ${DEBDIR}-copy ${DEBDIR}
 fi
+GZIP=-9 tar czf ${DEBPKG}_${VERSION}.orig.tar.gz ${DEBDIR}
 
 cp -a ${TOPDIR}/debian ${DEBDIR}
 rm -f ${DEBDIR}/debian/.cvsignore 
 rm -rf ${DEBDIR}/debian/CVS
 
-
-echo "Moving upstream archives to ${PACKAGE_DIR}"
-mkdir -p /usr/local/src/Packages/${DEBPKG}
-rm -f ${PACKAGE_DIR}/${DISTDIR}.zip ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz
-mv ${DISTDIR}.zip ${DEBPKG}_${VERSION}.orig.tar.gz ${DISTDIR}.tar.gz ${PACKAGE_DIR}
-
 echo "Building Debian files"
 if [ -z ${opt_dpkg_buildpackage} ]; then
   cd ${TOPDIR}
-  cvs-buildpackage -rfakeroot -kkevin@rosenberg.net -H${TOPDIR}/cvsbp-prepare -tC -i.pdf ${DEBPKG}
+  cvs-buildpackage -rfakeroot -kkevin@rosenberg.net -H${TOPDIR}/cvsbp-prepare -tC -i.pdf -mkevin@rosenberg.net ${DEBPKG}
   cd ..
 else
   cd ${DEBDIR}
   dpkg-buildpackage -rfakeroot -kkevin@rosenberg.net 
   cd ..
-  mv ${DEBPKG}_${VERSION}* ${PACKAGE_DIR}
+  mv -f ${DEBPKG}_${VERSION}* ${PACKAGE_DIR}
 fi
 rm -rf ${DEBDIR}
 
+echo "Moving upstream archives to ${PACKAGE_DIR}"
+mkdir -p /usr/local/src/Packages/${DEBPKG}
+mv -f ${DISTDIR}.zip ${DISTDIR}.tar.gz ${PACKAGE_DIR}
+
 if [ ! -z ${opt_lintian} ]; then
   pushd ${PACKAGE_DIR} > /dev/null
   lintian ${DEBPKG}_${DEBVERSION}_*.changes