X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=make-dist.sh;h=49199982787b610388d79eb0323e180314370947;hb=769726ca680e08c6ef63b81d204e7160647f59c2;hp=a7d3c5dfa81488dad855cbb12cdca418cbdfa2fd;hpb=30a084c6a38fc7936637f57dce0b9cace321489e;p=ctsim.git

diff --git a/make-dist.sh b/make-dist.sh
index a7d3c5d..4919998 100755
--- a/make-dist.sh
+++ b/make-dist.sh
@@ -15,37 +15,39 @@ DISTDIR=${PKG}-${VERSION}
 DEBDIR=${DEBPKG}-${VERSION}
 
 TAG=upstream_version_`echo $VERSION | tr . _`
-echo "(re)tagging with release tag '$TAG'"
-cvs -q rtag -d $TAG $PKG
-cvs -q tag -F $TAG
+#echo "(re)tagging with release tag '$TAG'"
+#cvs -q rtag -d $TAG $PKG
+#cvs -q tag -F $TAG
 
 
 # build the tarball
 echo "building tarballs"
-cd ..
+pushd ..
 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}/doc -type f -and -name *.tex -or -name *.aux -or \
-    -name *.log -or -name *.out -or -name *.dvi -or \
-    -name *~ -or -name ".#*"  -or -name "#*#" |xargs rm -f
+pushd ${DISTDIR}
+make distclean
+popd
+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 '.#*' -or -name '#*#' -or -name '*.fig' -or -name '*.psd'`
+
+rm -rf ${DISTDIR}/images ${DISTDIR}/copy ${DISTDIR}/make-dist.sh
 
 # Create original distribution archives
 rm -rf ${DISTDIR}/debian
-cd ${DISTDIR}
-make distclean
-cd ..
 GZIP=-9 tar czf ${DISTDIR}.tar.gz ${DISTDIR}
 
-find ${DISTDIR} -type f -and -name *.c -or -name *.h -or -name *.list -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 -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 -rf ${DISTDIR}
@@ -60,14 +62,15 @@ cp -a ${TOPDIR}/debian ${DEBDIR}
 
 # dpkg-source ${DEBDIR} ${PKG}_${VERSION}.orig.tar.gz
 
-cd ${DEBDIR}
+pushd ${DEBDIR}
 dpkg-buildpackage -rfakeroot -kkevin@b9.com  #-tc -b
-cd ..
+popd
 rm -r ${DEBDIR}
 
 lintian ${DEBPKG}_${VERSION}-*.changes
 
-mkdir -p /usr/local/share/Packages/${DEBPKG}
-mv ${DEBPKG}_${VERSION}* /usr/local/share/Packages/${DEBPKG}
-cd ${TOPDIR}
+mkdir -p /usr/local/src/Packages/${DEBPKG}
+mv ${DEBPKG}_${VERSION}* /usr/local/src/Packages/${DEBPKG}
+
+popd
 exit 0