Mercurial > hg > may
changeset 116:44d745823a75
Use subrepo for external dependencies
| author | Chris Cannam |
|---|---|
| date | Thu, 18 Apr 2013 09:12:51 +0100 |
| parents | 30c790d2789e |
| children | 098b4efde5b1 |
| files | .hgsub .hgsubstate bin/yc bin/yetilab |
| diffstat | 4 files changed, 32 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgsub Thu Apr 18 09:12:51 2013 +0100 @@ -0,0 +1,1 @@ +ext = https://code.soundsoftware.ac.uk/hg/yetilab-dependencies
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgsubstate Thu Apr 18 09:12:51 2013 +0100 @@ -0,0 +1,1 @@ +7349390722d80414bd0ce280d121f344d9908d0d ext
--- a/bin/yc Thu Apr 18 08:47:26 2013 +0100 +++ b/bin/yc Thu Apr 18 09:12:51 2013 +0100 @@ -1,10 +1,18 @@ #!/bin/sh + +ARCH=linux32 + YLDIR=`dirname $0`/.. -AYR_DIR=$YLDIR/../ayr + +EXTDIR=$YLDIR/ext +JARDIR=$EXTDIR/jar +SODIR=$EXTDIR/native/$ARCH + YETI_LIBDIR=${YETI_LIBDIR:=$YLDIR/../yeti} if [ ! -d "$YETI_LIBDIR" ]; then YETI_LIBDIR=$YLDIR/../other/yeti fi + JVAMP_DIR=${JVAMP_DIR:=$YLDIR/../jvamp} YERTLE_DIR=${YERTLE_DIR:=$YLDIR/../yertle} @@ -14,9 +22,8 @@ shift fi -CLASSPATH=${YLJAR_WITH_COLON}$YETI_LIBDIR/yeti.jar:$YETI_LIBDIR/yeti-lib.jar:$JVAMP_DIR/jvamp.jar:$YERTLE_DIR/yertle.jar:$YLDIR/jars/jtransforms-2.4.jar:$YLDIR/jars/org.jzy3d-0.9.jar:$YLDIR/jars/jogl2-rc10/jogl-all.jar:$YLDIR/jars/jogl2-rc10/jogl-all-natives-linux-i586.jar:$YLDIR/jars/jogl2-rc10/gluegen.jar:$YLDIR/jars/jogl2-rc10/gluegen-rt.jar:$YLDIR/jars/jogl2-rc10/gluegen-rt-natives-linux-i586.jar:$YLDIR/jars/misc/opencsv-2.1.jar:$YLDIR/jars/misc/org.convexhull.jar:$YLDIR/jars/misc/swt.jar +CLASSPATH=${YLJAR_WITH_COLON}$YETI_LIBDIR/yeti.jar:$YETI_LIBDIR/yeti-lib.jar:$JVAMP_DIR/jvamp.jar:$YERTLE_DIR/yertle.jar:$JARDIR/jtransforms-2.4.jar:$JARDIR/org.jzy3d-0.9.jar:$JARDIR/jogl-all.jar:$JARDIR/gluegen.jar:$JARDIR/gluegen-rt.jar:$JARDIR/misc/opencsv-2.1.jar:$JARDIR/misc/org.convexhull.jar:$JARDIR/misc/swt.jar -YETI_MODULE_SOURCE_PATH=${YETI_LIBDIR}/modules \ - LD_LIBRARY_PATH=$AYR_DIR:$JVAMP_DIR:$YLDIR/native/linux32:$LD_LIBRARY_PATH \ +LD_LIBRARY_PATH=$JVAMP_DIR:$SODIR:$LD_LIBRARY_PATH \ $JAVA_HOME/bin/java -classpath "$CLASSPATH" yeti.lang.compiler.yeti "$@"
--- a/bin/yetilab Thu Apr 18 08:47:26 2013 +0100 +++ b/bin/yetilab Thu Apr 18 09:12:51 2013 +0100 @@ -1,16 +1,25 @@ #!/bin/sh -MYDIR=`dirname $0` -AYR_DIR=../ayr -YETI_LIBDIR=${YETI_LIBDIR:=../yeti} + +ARCH=linux32 + +YLDIR=`dirname $0`/.. + +EXTDIR=$YLDIR/ext +JARDIR=$EXTDIR/jar +SODIR=$EXTDIR/native/$ARCH + +YETI_LIBDIR=${YETI_LIBDIR:=$YLDIR/../yeti} if [ ! -d "$YETI_LIBDIR" ]; then - YETI_LIBDIR=../other/yeti + YETI_LIBDIR=$YLDIR/../other/yeti fi -JVAMP_DIR=${JVAMP_DIR:=../jvamp} -YERTLE_DIR=${YERTLE_DIR:=../yertle} + +AYR_DIR=${AYR_DIR:=$YLDIR/../ayr} +JVAMP_DIR=${JVAMP_DIR:=$YLDIR/../jvamp} +YERTLE_DIR=${YERTLE_DIR:=$YLDIR/../yertle} + +CLASSPATH=$YLDIR/yetilab.jar:$AYR_DIR/ayr.jar:$AYR_DIR/libreadline-java.jar:$YETI_LIBDIR/yeti.jar:$YETI_LIBDIR/yeti-lib.jar:$JVAMP_DIR/jvamp.jar:$YERTLE_DIR/yertle.jar:$JARDIR/jtransforms-2.4.jar:$JARDIR/org.jzy3d-0.9.jar:$JARDIR/jogl-all.jar:$JARDIR/gluegen.jar:$JARDIR/gluegen-rt.jar:$JARDIR/misc/opencsv-2.1.jar:$JARDIR/misc/org.convexhull.jar:$JARDIR/misc/swt.jar YETI_MODULE_SOURCE_PATH=${YETI_LIBDIR}/modules \ - LD_LIBRARY_PATH=$AYR_DIR:$JVAMP_DIR:./native/linux32:$LD_LIBRARY_PATH \ - $JAVA_HOME/bin/java -classpath \ - $YLDIR/yetilab.jar:$AYR_DIR/ayr.jar:$YETI_LIBDIR/yeti.jar:$YETI_LIBDIR/yeti-lib.jar:$AYR_DIR/libreadline-java.jar:$JVAMP_DIR/jvamp.jar:$YERTLE_DIR/yertle.jar:./jars/jtransforms-2.4.jar:./jars/org.jzy3d-0.9.jar:./jars/jogl2-rc10/jogl-all.jar:./jars/jogl2-rc10/jogl-all-natives-linux-i586.jar:./jars/jogl2-rc10/gluegen.jar:./jars/jogl2-rc10/gluegen-rt.jar:./jars/jogl2-rc10/gluegen-rt-natives-linux-i586.jar:./jars/misc/opencsv-2.1.jar:./jars/misc/org.convexhull.jar:./jars/misc/swt.jar \ - com.particularprograms.ayr "$@" + LD_LIBRARY_PATH=$AYR_DIR:$JVAMP_DIR:$SODIR:$LD_LIBRARY_PATH \ + $JAVA_HOME/bin/java -classpath "$CLASSPATH" com.particularprograms.ayr "$@"