X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=make-upstream.sh;h=aa72dacd3d6e73c916286b5d57a97adccd2bde85;hb=e494184fb08c230c40877ba71826e0b94271a975;hp=6c0e258f7a9f09071428e1fa87e3867c00a940c8;hpb=d440e40d3b6b505693169f4071028891b9119af8;p=ctsim.git

diff --git a/make-upstream.sh b/make-upstream.sh
index 6c0e258..aa72dac 100755
--- a/make-upstream.sh
+++ b/make-upstream.sh
@@ -38,6 +38,18 @@ PACKAGE_DIR=/usr/local/src/Packages/${DEBPKG}
 DISTDIR=${PKG}-${VERSION}
 DEBDIR=${DEBPKG}-${VERSION}
 
+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
+
 if [ ! -z ${opt_tag} ]; then
     UPSTREAM_TAG=upstream_version_`echo ${VERSION} | tr . _`
     echo "(Re-)tagging with Upstream tag '${UPSTREAM_TAG}'"
@@ -47,9 +59,7 @@ 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
+  ../make-doc.sh
 fi
 
 # Prepare for archive
@@ -60,20 +70,19 @@ 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 upload.sh make-debian.sh make-upstream.sh cvsbp-prepare.sh make-doc.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 .deps`
+rm -f `find . -type f -name '*~' -or -name '.#*'  -or -name '#*#' -or -name ".*~" -or -name "*.o" -or -name "*.a"`
 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
+rm -rf images doc stamp-h.in build-stamp stamp-h configure-stamp autom4te.cache do-autoconf config.log config.status config.h
 cd ..
 
 echo "Creating upstream archives"
 rm -rf ${DISTDIR}/debian
 GZIP=-9 tar czf ${DISTDIR}.tar.gz ${DISTDIR}
 
-rm -rf ${DISTDIR}
 if [ "${DISTDIR}" != "${DEBDIR}" ]; then 
   cp -a ${DISTDIR} ${DEBDIR}
 else
@@ -87,7 +96,7 @@ unix2dos `find ${DISTDIR} -type f -and -name '*.c' -or -name '*.h' -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}
+rm -r ${DISTDIR}
 
 if [ "${DISTDIR}" == "${DEBDIR}" ]; then 
   mv ${DEBDIR}-copy ${DEBDIR}