Mercurial > hg > may
changeset 113:935c6ca5d370
Add yetilab jar itself to the yc classpath (except when compiling it)
| author | Chris Cannam |
|---|---|
| date | Wed, 17 Apr 2013 21:24:57 +0100 |
| parents | f73923903ba4 |
| children | 3f5af01ff42a |
| files | Makefile bin/yetilab |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Wed Apr 17 20:23:12 2013 +0100 +++ b/Makefile Wed Apr 17 21:24:57 2013 +0100 @@ -6,7 +6,7 @@ @grep -qv passed $@.out || touch $@ yetilab.jar: $(SOURCES) - ./bin/yc -d classes -doc doc $^ + ./bin/yc --no-yetilab-jar -d classes -doc doc $^ jar cf $@ -C classes yetilab clean:
--- a/bin/yetilab Wed Apr 17 20:23:12 2013 +0100 +++ b/bin/yetilab Wed Apr 17 21:24:57 2013 +0100 @@ -11,6 +11,6 @@ YETI_MODULE_SOURCE_PATH=${YETI_LIBDIR}/modules \ LD_LIBRARY_PATH=$AYR_DIR:$JVAMP_DIR:./native/linux32:$LD_LIBRARY_PATH \ $JAVA_HOME/bin/java -classpath \ - $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 \ + $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 "$@"