changeset 235:f247c2ea9eef

improve dist git-svn-id: https://luan-java.googlecode.com/svn/trunk@236 21e917c8-12df-6dd8-5cb6-c86387c605b9
author fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
date Sun, 05 Oct 2014 04:42:04 +0000
parents b25feac318d8
children 1fada5587469
files build.sh dist/jars/luan-core-trunk.jar dist/jars/luan-logging-trunk.jar dist/jars/luan-lucene-trunk.jar dist/jars/luan-mail-trunk.jar dist/jars/luan-web-trunk.jar dist/luan-core-trunk.jar dist/luan-logging-trunk.jar dist/luan-lucene-trunk.jar dist/luan-mail-trunk.jar dist/luan-web-trunk.jar dist/scripts/build-luan.sh dist/scripts/luan-cp-ext.sh dist/scripts/luan-cp.sh dist/scripts/luan.sh
diffstat 15 files changed, 66 insertions(+), 49 deletions(-) [+]
line wrap: on
line diff
diff -r b25feac318d8 -r f247c2ea9eef build.sh
--- a/build.sh	Thu Oct 02 20:08:39 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-VERSION=trunk
-
-cd `dirname $0`
-HOME=`pwd`
-
-rm dist/*.jar
-
-set -e
-
-echo "_G._VERSION = 'Luan $VERSION'" >core/src/luan/version.luan
-
-cd $HOME
-SRC=core/src
-CLASSPATH=$HOME/$SRC
-javac -classpath $CLASSPATH `find $SRC -name *.java`
-cd $SRC
-jar cvf $HOME/dist/luan-core-$VERSION.jar `find . -name *.class -o -name *.luan`
-
-cd $HOME
-SRC=web/src
-CLASSPATH=$HOME/core/src:$HOME/$SRC
-for i in $HOME/web/ext/* ; do CLASSPATH=$CLASSPATH:$i ; done
-javac -classpath $CLASSPATH `find $SRC -name *.java`
-cd $SRC
-jar cvf $HOME/dist/luan-web-$VERSION.jar `find . -name *.class -o -name *.luan`
-
-cd $HOME
-SRC=logging/src
-#CLASSPATH=$HOME/core/src:$HOME/$SRC
-#for i in $HOME/logging/ext/* ; do CLASSPATH=$CLASSPATH:$i ; done
-#javac -classpath $CLASSPATH `find $SRC -name *.java`
-cd $SRC
-jar cvf $HOME/dist/luan-logging-$VERSION.jar `find . -name *.class -o -name *.luan`
-
-cd $HOME
-SRC=mail/src
-CLASSPATH=$HOME/core/src:$HOME/$SRC
-for i in $HOME/mail/ext/* ; do CLASSPATH=$CLASSPATH:$i ; done
-javac -classpath $CLASSPATH `find $SRC -name *.java`
-cd $SRC
-jar cvf $HOME/dist/luan-mail-$VERSION.jar `find . -name *.class -o -name *.luan`
-
-cd $HOME
-SRC=lucene/src
-CLASSPATH=$HOME/core/src:$HOME/$SRC
-for i in $HOME/lucene/ext/* ; do CLASSPATH=$CLASSPATH:$i ; done
-javac -classpath $CLASSPATH `find $SRC -name *.java`
-cd $SRC
-jar cvf $HOME/dist/luan-lucene-$VERSION.jar `find . -name *.class -o -name *.luan`
diff -r b25feac318d8 -r f247c2ea9eef dist/jars/luan-core-trunk.jar
Binary file dist/jars/luan-core-trunk.jar has changed
diff -r b25feac318d8 -r f247c2ea9eef dist/jars/luan-logging-trunk.jar
Binary file dist/jars/luan-logging-trunk.jar has changed
diff -r b25feac318d8 -r f247c2ea9eef dist/jars/luan-lucene-trunk.jar
Binary file dist/jars/luan-lucene-trunk.jar has changed
diff -r b25feac318d8 -r f247c2ea9eef dist/jars/luan-mail-trunk.jar
Binary file dist/jars/luan-mail-trunk.jar has changed
diff -r b25feac318d8 -r f247c2ea9eef dist/jars/luan-web-trunk.jar
Binary file dist/jars/luan-web-trunk.jar has changed
diff -r b25feac318d8 -r f247c2ea9eef dist/luan-core-trunk.jar
Binary file dist/luan-core-trunk.jar has changed
diff -r b25feac318d8 -r f247c2ea9eef dist/luan-logging-trunk.jar
Binary file dist/luan-logging-trunk.jar has changed
diff -r b25feac318d8 -r f247c2ea9eef dist/luan-lucene-trunk.jar
Binary file dist/luan-lucene-trunk.jar has changed
diff -r b25feac318d8 -r f247c2ea9eef dist/luan-mail-trunk.jar
Binary file dist/luan-mail-trunk.jar has changed
diff -r b25feac318d8 -r f247c2ea9eef dist/luan-web-trunk.jar
Binary file dist/luan-web-trunk.jar has changed
diff -r b25feac318d8 -r f247c2ea9eef dist/scripts/build-luan.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dist/scripts/build-luan.sh	Sun Oct 05 04:42:04 2014 +0000
@@ -0,0 +1,49 @@
+VERSION=trunk
+
+cd `dirname $0`/../..
+HOME=`pwd`
+
+rm dist/jars/*.jar
+
+set -e
+
+echo "_G._VERSION = 'Luan $VERSION'" >core/src/luan/version.luan
+
+cd $HOME
+SRC=core/src
+CLASSPATH=$HOME/$SRC
+javac -classpath $CLASSPATH `find $SRC -name *.java`
+cd $SRC
+jar cvf $HOME/dist/jars/luan-core-$VERSION.jar `find . -name *.class -o -name *.luan`
+
+cd $HOME
+SRC=web/src
+CLASSPATH=$HOME/core/src:$HOME/$SRC
+for i in $HOME/web/ext/* ; do CLASSPATH=$CLASSPATH:$i ; done
+javac -classpath $CLASSPATH `find $SRC -name *.java`
+cd $SRC
+jar cvf $HOME/dist/jars/luan-web-$VERSION.jar `find . -name *.class -o -name *.luan`
+
+cd $HOME
+SRC=logging/src
+#CLASSPATH=$HOME/core/src:$HOME/$SRC
+#for i in $HOME/logging/ext/* ; do CLASSPATH=$CLASSPATH:$i ; done
+#javac -classpath $CLASSPATH `find $SRC -name *.java`
+cd $SRC
+jar cvf $HOME/dist/jars/luan-logging-$VERSION.jar `find . -name *.class -o -name *.luan`
+
+cd $HOME
+SRC=mail/src
+CLASSPATH=$HOME/core/src:$HOME/$SRC
+for i in $HOME/mail/ext/* ; do CLASSPATH=$CLASSPATH:$i ; done
+javac -classpath $CLASSPATH `find $SRC -name *.java`
+cd $SRC
+jar cvf $HOME/dist/jars/luan-mail-$VERSION.jar `find . -name *.class -o -name *.luan`
+
+cd $HOME
+SRC=lucene/src
+CLASSPATH=$HOME/core/src:$HOME/$SRC
+for i in $HOME/lucene/ext/* ; do CLASSPATH=$CLASSPATH:$i ; done
+javac -classpath $CLASSPATH `find $SRC -name *.java`
+cd $SRC
+jar cvf $HOME/dist/jars/luan-lucene-$VERSION.jar `find . -name *.class -o -name *.luan`
diff -r b25feac318d8 -r f247c2ea9eef dist/scripts/luan-cp-ext.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dist/scripts/luan-cp-ext.sh	Sun Oct 05 04:42:04 2014 +0000
@@ -0,0 +1,6 @@
+HOME=$1
+
+for i in $HOME/web/ext/* ; do CLASSPATH=$CLASSPATH:$i ; done
+for i in $HOME/logging/ext/* ; do CLASSPATH=$CLASSPATH:$i ; done
+for i in $HOME/mail/ext/* ; do CLASSPATH=$CLASSPATH:$i ; done
+for i in $HOME/lucene/ext/* ; do CLASSPATH=$CLASSPATH:$i ; done
diff -r b25feac318d8 -r f247c2ea9eef dist/scripts/luan-cp.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dist/scripts/luan-cp.sh	Sun Oct 05 04:42:04 2014 +0000
@@ -0,0 +1,5 @@
+HOME=$1
+
+for i in $HOME/dist/jars/* ; do CLASSPATH=$CLASSPATH:$i ; done
+
+. luan-cp-ext.sh $HOME
diff -r b25feac318d8 -r f247c2ea9eef dist/scripts/luan.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dist/scripts/luan.sh	Sun Oct 05 04:42:04 2014 +0000
@@ -0,0 +1,6 @@
+cd `dirname $0`/../..
+HOME=`pwd`
+
+. luan-cp.sh $HOME
+
+java -classpath $CLASSPATH luan.Luan $*