X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=make-upstream.sh;h=70994b14d68ad86cc34b0eade62fba9d6e85b7ca;hb=6f1d57f65eae54947f40b751c0e588a6ca7f4254;hp=2b910d2adb931e2f52452de18833060a7d2eda52;hpb=448a10bde3b7e25abfab28a4c057b523fdfb47f4;p=clsql.git

diff --git a/make-upstream.sh b/make-upstream.sh
index 2b910d2..70994b1 100755
--- a/make-upstream.sh
+++ b/make-upstream.sh
@@ -12,7 +12,9 @@ usage () {
 Usage: $progname [options]
 Creates upstream archives
 Options:
+  -c   Commit and tag CVS tree with current version numbers
   -t   Tag CVS tree with current version numbers
+  -f   Force creation of upstream archive, even if exists'
   -h   Print this brief help
 EOF
 }
@@ -22,7 +24,9 @@ while [ $# != 0 ]; do
     value="`echo x\"$1\" | sed -e 's/^x-.//'`"
     case "$1" in
         -h)  usage; exit 0           ;;
+        -c)  opt_commit=1; opt_tag=1 ;;
         -t)  opt_tag=1               ;;
+	-f)  opt_force=1             ;;
          *)  usage; exit 0           ;;
     esac
     shift
@@ -38,6 +42,10 @@ PACKAGE_DIR=/usr/local/src/Packages/${DEBPKG}
 DISTDIR=${PKG}-${VERSION}
 DEBDIR=${DEBPKG}-${VERSION}
 
+if [ ! -z ${opt_commit} ]; then
+    cvs commit -m 'Debian build'
+fi
+
 if [ ! -z ${opt_tag} ]; then
     UPSTREAM_TAG=upstream_version_`echo ${VERSION} | tr . _`
     echo "(Re-)tagging with Upstream tag '${UPSTREAM_TAG}'"
@@ -46,7 +54,7 @@ if [ ! -z ${opt_tag} ]; then
 
 fi
 
-if [ -f ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz ]; then
+if [ -z ${opt_force} -a -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 archive? (y/N): "
   read answer
@@ -67,6 +75,7 @@ cp -a ${TOPDIR} ${DISTDIR}
 echo "Cleaning distribution directory ${DISTDIR}"
 cd ${DISTDIR}
 rm -f upload.sh make-debian.sh make-upstream.sh cvsbp-prepare.sh 
+rm -f test-suite/test.config
 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 ".*~"`