The following commit has been merged in the master branch:
commit e8e2943f438faaee6e5b19e0a6bc677e360aa13f
Author: Giovanni Mascellani <[email protected]>
Date: Fri Sep 30 19:11:27 2011 +0200
Further fixes to the get_orig_source.sh script.
diff --git a/debian/get_orig_source.sh b/debian/get_orig_source.sh
index 34cfd9a..3f42a19 100755
--- a/debian/get_orig_source.sh
+++ b/debian/get_orig_source.sh
@@ -6,26 +6,34 @@
# (exactly one among $TAG and $BRANCH must be specified)
# $VERSION - the upstream version of the generated tarball
# $REVISION (optional) - export a specific revision of the SVN repository
+# $ONLYFILTER - if not null, don't download the tarball from the SVN; just
re-filter its content
DESTDIR="../tarballs/geogebra-$VERSION"
DESTTGZ="../tarballs/geogebra_$VERSION.orig.tar.gz"
TEMPDIR="$(mktemp -d)"
-# Downloads code from SVN repository
-test -d ../tarballs/. || mkdir -p ../tarballs
-if [ "x$TAG" == "x" ] ; then
- SVNDIR="branches/$BRANCH/geogebra/"
+if [ "x$ONLYFILTER" == "x" ] ; then
+ # Downloads code from SVN repository
+ test -d ../tarballs/. || mkdir -p ../tarballs
+ if [ "x$TAG" == "x" ] ; then
+ SVNDIR="branches/$BRANCH/geogebra/"
+ else
+ SVNDIR="tags/$TAG/geogebra/"
+ fi
+ if [ "x$REVISION" == "x" ] ; then
+ svn export "http://geogebra.uni.lu/svn/$SVNDIR"; "$DESTDIR"
+ else
+ svn export -r "$REVISION" "http://geogebra.uni.lu/svn/$SVNDIR";
"$DESTDIR"
+ fi
else
- SVNDIR="tags/$TAG/geogebra/"
-fi
-if [ "x$REVISION" == "x" ] ; then
- svn export "http://geogebra.uni.lu/svn/$SVNDIR"; "$DESTDIR"
-else
- svn export -r "$REVISION" "http://geogebra.uni.lu/svn/$SVNDIR";
"$DESTDIR"
+ # Uncompress the previous tarball
+ tar xzfv "$DESTTGZ" -C `dirname "$DESTDIR"`
fi
-# Removes all upstream JARs
-find "$DESTDIR" -name '*.jar' | xargs rm -vf
+# Removes all upstream JARs, DLLs, SOs and JNILIBs
+for ext in jar dll so jnilib ; do
+ find "$DESTDIR" -iname '*'."$ext" | xargs rm -vf
+done
# Removes code with problematic license
rm -vfr "$DESTDIR/installer"
@@ -41,6 +49,11 @@ mv -v "$DESTDIR/geogebra/kernel/jama/GgbMat.java" "$TEMPDIR"
rm -vfr "$DESTDIR/geogebra/kernel/jama/"*
mv -v "$TEMPDIR/GgbMat.java" "$DESTDIR/geogebra/kernel/jama"
+# Remove other unecessary files
+rm -vfr "$DESTDIR/jogl1"
+rm -vfr "$DESTDIR/jogl2"
+rm -vfr "$DESTDIR/webstart"
+
# Builds tarball
tar czfv "$DESTTGZ" -C `dirname "$DESTDIR"` `basename "$DESTDIR"`
--
GeoGebra: Dynamic mathematics software for education
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
