X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=make-dist.sh;h=1013cab4511b497d39dabfcc4e4201d5c579f972;hb=f6fdc062fd2094e475500b417488fb78cffc3b17;hp=05656301c9f7650eabffdbb1259c0f8e83718e9a;hpb=059a87862d36ddc9afebdf89c53a9d973f7301ee;p=uffi.git

diff --git a/make-dist.sh b/make-dist.sh
index 0565630..1013cab 100755
--- a/make-dist.sh
+++ b/make-dist.sh
@@ -1,26 +1,64 @@
 #!/bin/bash 
+#
 # Creates debian and upstream packages
 # Programmer: Kevin Rosenberg
 
-set -e
+set -e # abort on error
+
+progname="`basename \"$0\"`"
+
+usage () {
+  cat >&2 <<EOF
+Usage: $progname [options]
+Options:
+  -t   Tag CVS tree with versions
+  -c   Use cvs-buildpackage
+  -l   Run lintian on package
+  -h   Print this brief help
+EOF
+}
+
+# Command line
+while [ $# != 0 ]; do
+    value="`echo x\"$1\" | sed -e 's/^x-.//'`"
+    case "$1" in
+        -h)  usage; exit 0           ;;
+        -t)  opt_tag=1               ;;
+        -c)  opt_cvs_buildpackage=1  ;;
+        -l)  opt_lintian=1           ;;
+         *)  usage; exit 0           ;;
+    esac
+    shift
+done
 
 DEBPKG=cl-uffi
 PKG=uffi
-TOPDIR=`basename $PWD`
+TOPDIR=`pwd`
 
 VERSION=`cat VERSION`
 DEBVERSION=`sed -n -e "s/${DEBPKG} (\(.*\)).*/\1/p" < debian/changelog  |head -1`
-
+PACKAGE_DIR=/usr/local/src/Packages/${DEBPKG}
 DISTDIR=${PKG}-${VERSION}
 DEBDIR=${DEBPKG}-${VERSION}
 
-# TAG=debian_version_`echo ${DEBVERSION} | tr . _`
-TAG=upstream_version_`echo ${VERSION} | tr . _`
-echo "(re)tagging with release tag '$TAG'"
-cvs -q rtag -d $TAG $PKG > /dev/null
-cvs -q tag -F $TAG > /dev/null
-
+if [ ! -z ${opt_cvs_buildpackage} ]; then
+  export CVSROOT=`cat CVS/Root`
+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
+    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
 # Prepare for archive
 cd ..
 rm -f ${PKG}_${VERSION}.tar.gz ${DEBPKG}_${VERSION}.orig.tar.gz
@@ -28,11 +66,12 @@ rm -rf ${DISTDIR} ${DEBDIR} ${DISTDIR}.zip
 cp -a ${TOPDIR} ${DISTDIR}
 
 echo "Cleaning distribution directory ${DISTDIR}"
-find ${DISTDIR} -type f -name .cvsignore -exec rm -f {} \;
+rm -f ${DISTDIR}/upload.sh ${DISTDIR}/make-dist.sh
+rm -f `find ${DISTDIR} -type f -name .cvsignore`
 rm -rf `find ${DISTDIR} -type d -name CVS`
 rm -f `find ${DISTDIR} -type f -name '*~' -or -name '#*'  -or -name '#*#'`
 rm -f `find ${DISTDIR}/doc -type f -name \*.tex -or -name \*.aux -or \
-  -name \*.log -or -name \*.out -or -name \*.dvi -or -name bp`
+  -name \*.log -or -name \*.out -or -name \*.dvi`
 
 echo "Creating upstream archives"
 rm -rf ${DISTDIR}/debian
@@ -51,20 +90,31 @@ cp -a ${TOPDIR}/debian ${DEBDIR}
 rm -f ${DEBDIR}/debian/.cvsignore 
 rm -rf ${DEBDIR}/debian/CVS
 
-rm -rf ${DEBDIR}
 rm -rf ${DISTDIR}
 
-if [ "${CVS_BUILDPACKAGE}" != "" ]; then
+if [ -z ${opt_cvs_buildpackage} ]; then
   cd ${DEBDIR}
   echo "Building Debian files"
   dpkg-buildpackage -rfakeroot -kkevin@rosenberg.net -a
-  echo "Checking Debian Files"
-  lintian ${DEBPKG}_${VERSION}-*.changes
-
-  echo "Moving Debian Files to /usr/local/src/Packages/${DEBPKG}"
-  mkdir -p /usr/local/src/Packages/${DEBPKG}
-  mv ${DEBPKG}_${VERSION}* /usr/local/src/Packages/${DEBPKG}
   cd ..
+else
+  cd ${TOPDIR}
+  cvs-buildpackage -rfakeroot -kkevin@rosenberg.net -H${TOPDIR}/cvsbp-prepare -tC ${DEBPKG}
+  cd ..
+fi
+
+rm -rf ${DEBDIR}
+
+echo "Moving Upstream and Debian Files to ${PACKAGE_DIR}"
+mkdir -p /usr/local/src/Packages/${DEBPKG}
+mv ${DEBPKG}_${VERSION}* ${PACKAGE_DIR}
+mv ${DISTDIR}.zip ${PACKAGE_DIR}
+mv ${DISTDIR}.tar.gz ${PACKAGE_DIR}
+
+if [ ! -z ${opt_lintian} ]; then
+  pushd ${PACKAGE_DIR} > /dev/null
+  lintian ${DEBPKG}_${DEBVERSION}_*.changes
+  popd > /dev/null
 fi
 
 cd ${TOPDIR}