From d440e40d3b6b505693169f4071028891b9119af8 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Mon, 6 May 2002 18:07:21 +0000 Subject: [PATCH] r1971: *** empty log message *** --- make-debian.sh | 2 +- make-upstream.sh | 38 +++++++++++++++++++++++++++++--------- 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/make-debian.sh b/make-debian.sh index 778ce0a..eb2ca3f 100755 --- a/make-debian.sh +++ b/make-debian.sh @@ -1,6 +1,6 @@ #!/bin/bash -DEBPKG=cl-uffi +DEBPKG=ctsim DEBVERSION=`sed -n -e "s/${DEBPKG} (\(.*\)).*/\1/p" < debian/changelog |head -1` TOPDIR=`pwd` PACKAGE_DIR=/usr/local/src/Packages/${DEBPKG} diff --git a/make-upstream.sh b/make-upstream.sh index 1a2a22e..6c0e258 100755 --- a/make-upstream.sh +++ b/make-upstream.sh @@ -28,8 +28,8 @@ while [ $# != 0 ]; do shift done -DEBPKG=cl-uffi -PKG=uffi +DEBPKG=ctsim +PKG=ctsim TOPDIR=`pwd` VERSION=`sed -n -e "s/${DEBPKG} (\(.*\)-[0-9.]).*/\1/p" < debian/changelog |head -1` @@ -43,8 +43,15 @@ if [ ! -z ${opt_tag} ]; 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 +if [ ! -f docs/${PKG}.htb -o ! -f docs/html/${PKG}_contents.html -o ! -f docs/${PKG}.pdf ]; then + echo "Making documentation" + pushd doc + make all + popd fi + # Prepare for archive cd .. rm -f ${PKG}_${VERSION}.tar.gz ${DEBPKG}_${VERSION}.orig.tar.gz @@ -59,26 +66,39 @@ rm -rf `find . -type d -name CVS` 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` +rm -rf images doc stamp-h.in build-stamp configure-stamp autom4te.cache cd .. 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} +rm -rf ${DISTDIR} +if [ "${DISTDIR}" != "${DEBDIR}" ]; then + cp -a ${DISTDIR} ${DEBDIR} +else + cp -a ${DISTDIR} ${DEBDIR}-copy +fi -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` +unix2dos `find ${DISTDIR} -type f -and -name '*.c' -or -name '*.h' -or \ + -name '*.cpp' -or -name '*.sh' -or -name '*.in' -or \ + -name 'Makefile*' -or -name ChangeLog -or -name COPYRIGHT -or -name TODO -or \ + -name README -or -name INSTALL -or -name NEWS -or -name '*.tex' -or \ + -name '*.hhc' -or -name '*.hhk' -or -name '*.hpj' -or -name '*.ini' -or \ + -name COPYING* -or -name catalog` zip -rq ${DISTDIR}.zip ${DISTDIR} +rm -r {$DISTDIR} + +if [ "${DISTDIR}" == "${DEBDIR}" ]; then + mv ${DEBDIR}-copy ${DEBDIR} +fi +GZIP=-9 tar czf ${DEBPKG}_${VERSION}.orig.tar.gz ${DEBDIR} cp -a ${TOPDIR}/debian ${DEBDIR} rm -f ${DEBDIR}/debian/.cvsignore rm -rf ${DEBDIR}/debian/CVS -rm -rf ${DISTDIR} ${DEBDIR} +rm -rf ${DEBDIR} echo "Moving upstream archives to ${PACKAGE_DIR}" mkdir -p /usr/local/src/Packages/${DEBPKG} -- 2.34.1