Mercurial > hg > may
changeset 376:87008fc2b30d
Use local jars; shell syntax fixes
| author | Chris Cannam |
|---|---|
| date | Wed, 04 Sep 2013 13:15:24 +0100 |
| parents | 1020b77a952d |
| children | 0e8b94940399 |
| files | .hgsubstate bin/may bin/yc |
| diffstat | 3 files changed, 8 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsubstate Fri Aug 02 23:13:24 2013 +0100 +++ b/.hgsubstate Wed Sep 04 13:15:24 2013 +0100 @@ -1,1 +1,1 @@ -fd27044461bb066480dc115c71b522528583d116 ext +66cb39aa9e710d4e872a9bcbd476c8c025f57ac4 ext
--- a/bin/may Fri Aug 02 23:13:24 2013 +0100 +++ b/bin/may Wed Sep 04 13:15:24 2013 +0100 @@ -10,7 +10,7 @@ MINGW*) ARCH=win32;; esac -if [ "$ARCH" == "unknown" ]; then +if [ "$ARCH" = "unknown" ]; then echo "Failed to guess architecture for native libraries, sorry!" 1>&2 exit 2 fi @@ -28,13 +28,9 @@ YETI_LIBDIR=$YLDIR/../other/yeti fi -AYR_DIR=${AYR_DIR:=$YLDIR/../ayr} -JVAMP_DIR=${JVAMP_DIR:=$YLDIR/../jvamp} -YERTLE_DIR=${YERTLE_DIR:=$YLDIR/../yertle} - -CLASSPATH=$YLDIR/may.jar:$AYR_DIR/ayr.jar:$YETI_LIBDIR/yeti.jar:$YETI_LIBDIR/yeti-lib.jar:$JARDIR/jline-2.11-SNAPSHOT.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/opencsv-2.1.jar:$JARDIR/org.convexhull.jar:$CLASSPATH +CLASSPATH=$YLDIR/may.jar:$JARDIR/ayr.jar:$YETI_LIBDIR/yeti.jar:$YETI_LIBDIR/yeti-lib.jar:$JARDIR/jline-2.11-SNAPSHOT.jar:$JARDIR/jvamp.jar:$JARDIR/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/opencsv-2.1.jar:$JARDIR/org.convexhull.jar:$CLASSPATH YETI_MODULE_SOURCE_PATH=${YETI_LIBDIR}/modules \ - LD_LIBRARY_PATH=$AYR_DIR:$JVAMP_DIR:$SODIR:$LD_LIBRARY_PATH \ + LD_LIBRARY_PATH=$SODIR:$LD_LIBRARY_PATH \ $JAVA_HOME/bin/java $JAVA_OPTS -classpath "$CLASSPATH" com.particularprograms.ayr "$@"
--- a/bin/yc Fri Aug 02 23:13:24 2013 +0100 +++ b/bin/yc Wed Sep 04 13:15:24 2013 +0100 @@ -10,7 +10,7 @@ MINGW*) ARCH=win32;; esac -if [ "$ARCH" == "unknown" ]; then +if [ "$ARCH" = "unknown" ]; then echo "Failed to guess architecture for native libraries, sorry!" 1>&2 exit 2 fi @@ -28,17 +28,14 @@ YETI_LIBDIR=$YLDIR/../other/yeti fi -JVAMP_DIR=${JVAMP_DIR:=$YLDIR/../jvamp} -YERTLE_DIR=${YERTLE_DIR:=$YLDIR/../yertle} - YLJAR_WITH_COLON=$YLDIR/may.jar: -if [ "$1" == "--no-may-jar" ]; then +if [ "$1" = "--no-may-jar" ]; then YLJAR_WITH_COLON="" shift fi -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:$CLASSPATH +CLASSPATH=${YLJAR_WITH_COLON}$YETI_LIBDIR/yeti.jar:$YETI_LIBDIR/yeti-lib.jar:$JARDIR/jvamp.jar:$JARDIR/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:$CLASSPATH -LD_LIBRARY_PATH=$JVAMP_DIR:$SODIR:$LD_LIBRARY_PATH \ +LD_LIBRARY_PATH=$SODIR:$LD_LIBRARY_PATH \ $JAVA_HOME/bin/java $JAVA_OPTS -classpath "$CLASSPATH" yeti.lang.compiler.yeti "$@"