Getting run script to work and setting up to support native libs also…

… for OpenGL, etc...

script/java-cp → script/java-env

@@ -3,7 +3,8 @@
 DEPS=lib
 SUBMODULES=src/lib
 
-CLASSPATH=".:./src:./src/lib:./test:./session"
+SCRIPT_DIR=`dirname $0`
+CLASSPATH="$SCRIPT_DIR/..:./src:./src/lib:./test:./session"
 
 # Add jar files
 for f in "$DEPS"/*.jar; do
@@ -19,4 +20,6 @@ if [[ "$OSTYPE" == 'cygwin' ]]; then
   CLASSPATH=`cygpath -wp "$CLASSPATH"`
 fi
 
-echo "$CLASSPATH"
+DEFINES=-Djava.library.path=lib/native
+
+echo "-cp $CLASSPATH $DEFINES"

script/ng-server

@@ -38,6 +38,6 @@
 pkill -9 java
 
 SCRIPT_DIR=`dirname $0`
-CLASSPATH=`$SCRIPT_DIR/java-cp`
+JAVA_ENV=`$SCRIPT_DIR/java-env`
 
-exec java -cp $CLASSPATH com.martiansoftware.nailgun.NGServer 127.0.0.1
+exec java $JAVA_ENV com.martiansoftware.nailgun.NGServer 127.0.0.1

script/repl

@@ -1,11 +1,6 @@
 #!/bin/bash
 
-# A simple script to start a repl with the project jar files (in the lib
-# directory) on the classpath.
-
 SCRIPT_DIR=`dirname $0`
-CLASSPATH=`$SCRIPT_DIR/java-cp`
-
-#DEFINITIONS=-Djava.library.path=lib/opengl 
+JAVA_ENV=`$SCRIPT_DIR/java-env`
 
-java -cp $CLASSPATH jline.ConsoleRunner clojure.main $@
+exec java $JAVA_ENV jline.ConsoleRunner clojure.main $@

script/run

@@ -3,8 +3,6 @@
 # Run main with the classpath setup correctly
 
 SCRIPT_DIR=`dirname $0`
-CLASSPATH=`$SCRIPT_DIR/java-cp`
+JAVA_ENV=`$SCRIPT_DIR/java-env`
 
-#DEFINITIONS=-Djava.library.path=lib/opengl 
-
-java -cp $CLASSPATH overtone.app/main $@
+exec java $JAVA_ENV clojure.main -e "(use 'overtone.app.main) (-main $@)"