X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=make-upstream.sh;h=d39aa595e29d4d76132c80f70ca73585e8aba343;hb=0695e3d02bf8911708d191ac8490b7adcd8bb73a;hp=f515b13194d25975bb699f5039ce502032b4872b;hpb=17b109cba947aaec9e20266eda1d2cfe4b2779eb;p=ctsim.git

diff --git a/make-upstream.sh b/make-upstream.sh
index f515b13..d39aa59 100755
--- a/make-upstream.sh
+++ b/make-upstream.sh
@@ -13,6 +13,7 @@ Usage: $progname [options]
 Creates upstream archives
 Options:
   -t   Tag CVS tree with current version numbers
+  -c   Commit all files to CVS server
   -h   Print this brief help
 EOF
 }
@@ -23,6 +24,7 @@ while [ $# != 0 ]; do
     case "$1" in
         -h)  usage; exit 0           ;;
         -t)  opt_tag=1               ;;
+        -c)  opt_commit=1            ;;
          *)  usage; exit 0           ;;
     esac
     shift
@@ -38,9 +40,21 @@ PACKAGE_DIR=/usr/local/src/Packages/${DEBPKG}
 DISTDIR=${PKG}-${VERSION}
 DEBDIR=${DEBPKG}-${VERSION}
 
+if [ ! -z ${opt_commit} ]; then
+    echo "Committing to CVS server"
+    cvs commit -m "Committing for ${VERSION}"
+fi
+
+if [ ! -z ${opt_tag} ]; then
+    UPSTREAM_TAG=upstream_version_`echo ${VERSION} | tr . _`
+    echo "(Re-)tagging with Upstream tag '${UPSTREAM_TAG}'"
+    cvs -q rtag -d $UPSTREAM_TAG $PKG > /dev/null
+    cvs -q tag -F $UPSTREAM_TAG > /dev/null
+fi
+
 if [ -f ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz ]; then
   echo "File ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz already exists."
-  echo -n "Are you sure that you want to create a new upstream source (y/N): "
+  echo -n "Are you sure that you want to create a new upstream archive? (y/N): "
   read answer
   case $answer in
       [Yy]*) nop= ;;
@@ -50,12 +64,6 @@ if [ -f ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz ]; then
   esac
 fi
 
-if [ ! -z ${opt_tag} ]; then
-    UPSTREAM_TAG=upstream_version_`echo ${VERSION} | tr . _`
-    echo "(Re-)tagging with Upstream tag '${UPSTREAM_TAG}'"
-    cvs -q rtag -d $UPSTREAM_TAG $PKG > /dev/null
-    cvs -q tag -F $UPSTREAM_TAG > /dev/null
-fi
 
 if [ ! -f docs/${PKG}.htb -o ! -f docs/html/${PKG}_contents.html -o ! -f docs/${PKG}.pdf ]; then
   echo "Making documentation"
@@ -70,13 +78,14 @@ cp -a ${TOPDIR} ${DISTDIR}
 
 echo "Cleaning distribution directory ${DISTDIR}"
 cd ${DISTDIR}
+make distclean
 rm -f upload.sh make-debian.sh make-upstream.sh cvsbp-prepare.sh make-doc.sh 
 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 -rf `find . -type d -name CVS -or -name .deps`
+rm -f `find . -type f -name '*~' -or -name '.#*'  -or -name '#*#' -or -name ".*~" -or -name "*.o" -or -name "*.a"`
 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
+rm -rf images doc stamp-h.in build-stamp stamp-h configure-stamp autom4te.cache do-autoconf config.log config.status config.h
 cd ..
 
 echo "Creating upstream archives"