X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=make-upstream.sh;h=adb660cf9387bbc19c6a5ce00a56080f3d98dd72;hb=c57456a61454df74d1724d13010322ca606d070a;hp=e83d933284e7094291ffcd5cde1a342d9bdcaf3b;hpb=91f9f024bee1ee744a7936c522ad2c4456726f68;p=uffi.git

diff --git a/make-upstream.sh b/make-upstream.sh
index e83d933..adb660c 100755
--- a/make-upstream.sh
+++ b/make-upstream.sh
@@ -5,24 +5,30 @@
 
 set -e # abort on error
 
-progname="`basename \"$0\"`"
-
 usage () {
-  cat >&2 <<EOF
+    progname="`basename \"$0\"`"
+
+    cat >&2 <<EOF
 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
 }
 
+opt_force=0
+
 # Command line
 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
@@ -32,26 +38,36 @@ DEBPKG=cl-uffi
 PKG=uffi
 TOPDIR=`pwd`
 
-VERSION=`cat VERSION`
-DEBVERSION=`sed -n -e "s/${DEBPKG} (\(.*\)).*/\1/p" < debian/changelog  |head -1`
+VERSION=`sed -n -e "s/${DEBPKG} (\(.*\)-[0-9.]).*/\1/p" < debian/changelog  |head -1`
+
 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
-  DEB_TAG=debian_version_`echo ${DEBVERSION} | tr . _`
-  UPSTREAM_TAG=upstream_version_`echo ${VERSION} | tr . _`
-  echo "(Re-)tagging with Debian tag '${DEB_TAG}'"
-  cvs -q rtag -d ${DEB_TAG} ${PKG} > /dev/null
-  cvs -q tag -F ${DEB_TAG} > /dev/null
-
-  # Retag with upstream tag if release not 0 or 1
-  if [ "`echo ${DEBVERSION} | egrep '\-0$\-1$]'`" != "" ]; 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
+
 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 archive? (y/N): "
+  read answer
+  case $answer in
+      [Yy]*) nop= ;;
+      *) echo "Not building"
+	 exit 1
+	  ;;
+  esac
+fi
+
 # Prepare for archive
 cd ..
 rm -f ${PKG}_${VERSION}.tar.gz ${DEBPKG}_${VERSION}.orig.tar.gz
@@ -60,10 +76,10 @@ cp -a ${TOPDIR} ${DISTDIR}
 
 echo "Cleaning distribution directory ${DISTDIR}"
 cd ${DISTDIR}
-rm -f upload.sh make-dist.sh cvsbp-prepare 
+rm -f upload.sh make-debian.sh make-upstream.sh cvsbp-prepare.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 .bin`
+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`
 cd ..