[ff-cvs] fenfire Makefile jarbuilder.sh

[Tuukka Hastrup]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Tuukka Hastrup <address@hidden> 03/08/28 09:38:19

Modified files:
        .              : Makefile jarbuilder.sh 

Log message:
        exclude unneeded libraries from jar

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/Makefile.diff?tr1=1.42&tr2=1.43&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/jarbuilder.sh.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: fenfire/Makefile
diff -u fenfire/Makefile:1.42 fenfire/Makefile:1.43
--- fenfire/Makefile:1.42       Thu Aug 28 07:42:17 2003
+++ fenfire/Makefile    Thu Aug 28 09:38:17 2003
@@ -62,8 +62,9 @@
 VERSION=snapshot-`date -I`
 textmm_jar: JARNAME=textmm-$(VERSION).jar
 textmm_jar: mainclass=org.fenfire.fenmm.TextMain
+textmm_jar: excludelibs=libvob
 textmm_jar:
-       ./jarbuilder.sh "$(CLASSPATH)" "$(PYTHONPATH)" "$(VERSION)" 
"$(JARNAME)" "$(mainclass)"
+       ./jarbuilder.sh "$(CLASSPATH)" "$(PYTHONPATH)" "$(VERSION)" 
"$(JARNAME)" "$(mainclass)" "$(excludelibs)"
 
 BENCH=org.fenfire.swamp.bench.graph
 
Index: fenfire/jarbuilder.sh
diff -u fenfire/jarbuilder.sh:1.1 fenfire/jarbuilder.sh:1.2
--- fenfire/jarbuilder.sh:1.1   Thu Aug 28 06:42:00 2003
+++ fenfire/jarbuilder.sh       Thu Aug 28 09:38:19 2003
@@ -5,6 +5,11 @@
 VERSION="$3"
 JARNAME="$4"
 MAINCLASS="$5"
+EXCLUDELIBS="$6"
+
+[ "$EXCLUDELIBS" != "" ] && EXCLUDELIBS="|$EXCLUDELIBS"
+
+excludepattern="cryptix$EXCLUDELIBS"
 
 jardir=$JARNAME.build
 
@@ -29,7 +34,7 @@
 
 cd $jardir
 echo "Gathering files from CLASSPATH"
-for name in $(echo $CLASSPATH|tr : '\n'|grep -v cryptix); do
+for name in $(echo $CLASSPATH|tr : '\n'|egrep -v "$excludepattern"); do
     case $name in 
        *.jar) 
            jar xf ../$name ;
@@ -43,7 +48,7 @@
 done
 echo "Gathering files from PYTHONPATH"
 for name in $(echo $PYTHONPATH|sed "s/-Dpython.path=//"| \
-    tr : '\n'|grep -v '^\.$'); do 
+    tr : '\n'|egrep -v "^\.\$|$excludepattern"); do 
     case $name in
        *.jar)
            jar xf ../$name
@@ -56,12 +61,16 @@
     esac
 done
 
-cd "$basedir"
-echo 'Gathering *.py from PYTHONPATH and org/'
-find org $PYTHONDIRS -name "*.py"| while read file ; do 
-    mkdir -p $jardir/$(dirname $file) 
-    cp $file $jardir/$file
+echo 'Gathering *.py from PYTHONPATH and .'
+for dir in $PYTHONDIRS . ; do
+    cd "$basedir/$dir"
+    find * -name "*.py"| while read file ; do 
+       mkdir -p "$basedir/$jardir/$(dirname $file)" 
+       cp "$file" "$basedir/$jardir/$file"
+    done
 done
+
+cd "$basedir"
 
 echo 'Including *LICENSE* and *README*'
 cp *LICENSE* $jardir