r1911: *** empty log message ***

[uffi.git] / make-dist.sh

diff --git a/make-dist.sh b/make-dist.sh
index 306e79b08ff243699cdd534c43ecb91b38e9235a..40bbf0c6b95a5b1700d71c3415112ae44cf4147f 100755 (executable)
--- a/make-dist.sh
+++ b/make-dist.sh
@@ -1,66 +1,76 @@
-#!/bin/sh
-
-# Creates debian and system-independent archive files
-# Programmer: Kevin Rosenberg based on script used by onShore Development
+#!/bin/bash 
+# Creates debian and upstream packages
+# Programmer: Kevin Rosenberg
 
 set -e
 
-VERSION=`cat VERSION`
 DEBPKG=cl-uffi
 PKG=uffi
 TOPDIR=`basename $PWD`
 
+VERSION=`cat VERSION`
+DEBVERSION=`sed -n -e "s/${DEBPKG} (\(.*\)).*/\1/p" < debian/changelog  |head -1`
+
 DISTDIR=${PKG}-${VERSION}
 DEBDIR=${DEBPKG}-${VERSION}
 
-TAG=upstream_version_`echo $VERSION | tr . _`
+# 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
-#cvs -q tag -F $TAG
+cvs -q rtag -d $TAG $PKG > /dev/null
+cvs -q tag -F $TAG > /dev/null
 
 
-# build the tarball
-echo "building tarballs"
+# Prepare for archive
 cd ..
 rm -f ${PKG}_${VERSION}.tar.gz ${DEBPKG}_${VERSION}.orig.tar.gz
 rm -rf ${DISTDIR} ${DEBDIR} ${DISTDIR}.zip
 cp -a ${TOPDIR} ${DISTDIR}
 
-# Remove junk from distribution dir
-find ${DISTDIR} -type f -name .cvsignore -exec rm {} \;
-find ${DISTDIR} -type d -name CVS | xargs rm -r
-find ${DISTDIR} -type f -name *~ -or -name \#*  -or -name \#*\# |xargs rm -f
-find ${DISTDIR}/doc -type f -name *.tex -or -name *.aux -or \
-    -name *.log -or -name *.out -or -name *.dvi | xargs rm -f
+echo "Cleaning distribution directory ${DISTDIR}"
+find ${DISTDIR} -type f -name .cvsignore -exec rm -f {} \;
+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`
 
-# Create original distribution archives
+echo "Creating upstream archives"
 rm -rf ${DISTDIR}/debian
 GZIP=-9 tar czf ${DISTDIR}.tar.gz ${DISTDIR}
 
 cp -a ${DISTDIR} ${DEBDIR}
 GZIP=-9 tar czf ${DEBPKG}_${VERSION}.orig.tar.gz ${DEBDIR}
 
-find ${DISTDIR} -type f -and -name *.cl -or -name *.list -or \
-    -name *.system -or -name Makefile -or -name ChangeLog -or \
-    -name COPYRIGHT -or -name TODO -or -name README -or -name INSTALL \
-    -or -name NEWS -or -name *.sgml -or -name COPYING* -or -name catalog \
-    | xargs unix2dos
+unix2dos `find ${DISTDIR} -type f -name \*.cl -or -name \*.list -or \
+    -name \*.system -or -name Makefile -or -name ChangeLog -or \
+    -name COPYRIGHT -or -name TODO -or -name README -or -name INSTALL -or \
+    -name NEWS -or -name \*.sgml -or -name COPYING\* -or -name catalog`
 zip -rq ${DISTDIR}.zip ${DISTDIR}
 
 cp -a ${TOPDIR}/debian ${DEBDIR}
 rm -f ${DEBDIR}/debian/.cvsignore 
 rm -rf ${DEBDIR}/debian/CVS
 
-cd ${DEBDIR}
-dpkg-buildpackage -rfakeroot -kkevin@b9.com -a
-
-cd ..
-rm -rf ${DEBDIR}
 rm -rf ${DISTDIR}
 
-lintian ${DEBPKG}_${VERSION}-*.changes
+export CVS_BUILDPACKAGE=1
+if [ "${CVS_BUILDPACKAGE}" != "" ]; then
+  rm -rf ${DEBDIR}
+  mv ${DEBPKG}_${VERSION}.orig.tar.gz /usr/local/src/Packages/${DEBPKG}
+else
+  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 ..
+  rm -rf ${DEBDIR}
+fi
 
-mkdir -p /usr/local/src/Packages/${DEBPKG}
-mv ${DEBPKG}_${VERSION}* /usr/local/src/Packages/${DEBPKG}
 cd ${TOPDIR}
+
 exit 0