changeset 311:22ca4f3a65c3

remove LUAN_HOME git-svn-id: https://luan-java.googlecode.com/svn/trunk@312 21e917c8-12df-6dd8-5cb6-c86387c605b9
author fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
date Tue, 23 Dec 2014 07:39:30 +0000
parents 9e9bb358b2df
children d34be4588556
files scripts/build-luan.sh scripts/check_luan_home.sh scripts/cp-luan scripts/luan-classpath.sh scripts/mmake.sh
diffstat 5 files changed, 20 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
diff -r 9e9bb358b2df -r 22ca4f3a65c3 scripts/build-luan.sh
--- a/scripts/build-luan.sh	Tue Dec 23 07:07:17 2014 +0000
+++ b/scripts/build-luan.sh	Tue Dec 23 07:39:30 2014 +0000
@@ -1,6 +1,9 @@
-. check_luan_home.sh
+set -e
 
-cd $LUAN_HOME
+cd `dirname $0`/..
+LUAN_HOME=`pwd`
+LUAN_BUILD=$LUAN_HOME/build
+
 VERSION=`svnversion`
 
 if echo $VERSION | grep :
@@ -9,11 +12,6 @@
 	exit 1
 fi
 
-
-LUAN_BUILD=~/luanbuild
-
-set -e
-
 rm -rf $LUAN_BUILD
 mkdir $LUAN_BUILD
 mkdir $LUAN_BUILD/luan
diff -r 9e9bb358b2df -r 22ca4f3a65c3 scripts/check_luan_home.sh
--- a/scripts/check_luan_home.sh	Tue Dec 23 07:07:17 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-if test -z "$LUAN_HOME"
-then
-	echo "Please define LUAN_HOME"
-	exit 1
-fi
diff -r 9e9bb358b2df -r 22ca4f3a65c3 scripts/cp-luan
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/cp-luan	Tue Dec 23 07:39:30 2014 +0000
@@ -0,0 +1,14 @@
+LUAN_HOME=~/luan
+
+CLASSPATH=$LUAN_HOME/core/src
+CLASSPATH=$CLASSPATH:$LUAN_HOME/web/src
+CLASSPATH=$CLASSPATH:$LUAN_HOME/logging/src
+CLASSPATH=$CLASSPATH:$LUAN_HOME/mail/src
+CLASSPATH=$CLASSPATH:$LUAN_HOME/lucene/src
+
+for i in $LUAN_HOME/web/ext/* ; do CLASSPATH=$CLASSPATH:$i ; done
+for i in $LUAN_HOME/logging/ext/* ; do CLASSPATH=$CLASSPATH:$i ; done
+for i in $LUAN_HOME/mail/ext/* ; do CLASSPATH=$CLASSPATH:$i ; done
+for i in $LUAN_HOME/lucene/ext/* ; do CLASSPATH=$CLASSPATH:$i ; done
+
+export CLASSPATH
diff -r 9e9bb358b2df -r 22ca4f3a65c3 scripts/luan-classpath.sh
--- a/scripts/luan-classpath.sh	Tue Dec 23 07:07:17 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-. check_luan_home.sh
-
-CLASSPATH=$LUAN_HOME/core/src
-CLASSPATH=$CLASSPATH:$LUAN_HOME/web/src
-CLASSPATH=$CLASSPATH:$LUAN_HOME/logging/src
-CLASSPATH=$CLASSPATH:$LUAN_HOME/mail/src
-CLASSPATH=$CLASSPATH:$LUAN_HOME/lucene/src
-
-for i in $LUAN_HOME/web/ext/* ; do CLASSPATH=$CLASSPATH:$i ; done
-for i in $LUAN_HOME/logging/ext/* ; do CLASSPATH=$CLASSPATH:$i ; done
-for i in $LUAN_HOME/mail/ext/* ; do CLASSPATH=$CLASSPATH:$i ; done
-for i in $LUAN_HOME/lucene/ext/* ; do CLASSPATH=$CLASSPATH:$i ; done
-
-export CLASSPATH
diff -r 9e9bb358b2df -r 22ca4f3a65c3 scripts/mmake.sh
--- a/scripts/mmake.sh	Tue Dec 23 07:07:17 2014 +0000
+++ b/scripts/mmake.sh	Tue Dec 23 07:39:30 2014 +0000
@@ -1,3 +1,1 @@
-. check_luan_home.sh
-
-luan.sh $LUAN_HOME/dist/scripts/mmake.luan $*
+luan `dirname $0`/mmake.luan $*