Merge pull request scribble#115 from rhu1/rhu1-research

rhu1 · web-flow · commit cdbb4bf289b5 · 2017-06-21T11:53:21.000+01:00
Updated scribblec.sh with new module locations.
diff --git a/scribble-dist/src/main/resources/scribblec.sh b/scribble-dist/src/main/resources/scribblec.sh
@@ -14,17 +14,29 @@
 #
 
 
-# Directory containing Scribble jars
-LIB=lib
+##
+#  Usage notes
+#
+#  - ANTLR:
+#    Assuming $DIR is the scribble-java root directory, set $ANTLR (below) to
+#    the location of the ANTLR runtime jar or put the jar in:  $DIR/$LIB
+#    (This script looks for ANTLR in those locations.)
+#
+
 
-# antlr 3.2 location (if no lib jar)
+# ANTLR 3 runtime location (if no lib jar)
 ANTLR=
-  # e.g. '/cygdrive/c/Users/[User]/.m2/repository/org/antlr/antlr-runtime/3.2/antlr-runtime-3.2.jar'
+  # e.g. '/cygdrive/c/Users/[User]/.m2/repository/org/antlr/antlr-runtime/3.4/antlr-runtime-3.4.jar'
+  # (i.e., the maven install location)
+
+DIR=`dirname "$0"`   # Default
+#DIR=`dirname "$0"`/.. # (Cygwin: e.g., script is in $DIR/bin)
+
+#PRG=`basename "$0"`
+
+# Directory containing Scribble jars
+LIB=lib
 
-PRG=`basename "$0"`
-DIR=`dirname "$0"`   # Non Cygwin..
-#DIR=`dirname "$0"`/.. # Cygwin
-#BASEDIR=$(dirname $0)
 
 usage() {
   echo Usage:  'scribblec.sh [option]... <SCRFILE> [option]...'
@@ -88,18 +100,16 @@ fixpath() {
 
 ARGS=
 
-CLASSPATH=$DIR'/modules/cli/target/classes/'
-CLASSPATH=$CLASSPATH':'$DIR'/modules/core/target/classes'
-CLASSPATH=$CLASSPATH':'$DIR'/modules/parser/target/classes'
-CLASSPATH=$CLASSPATH':'$DIR'/modules/f17/target/classes'
+CLASSPATH=$DIR'/scribble-cli/target/classes/'
+CLASSPATH=$CLASSPATH':'$DIR'/scribble-core/target/classes'
+CLASSPATH=$CLASSPATH':'$DIR'/scribble-parser/target/classes'
 CLASSPATH=$CLASSPATH':'$ANTLR
 CLASSPATH=$CLASSPATH':'$DIR'/'$LIB'/antlr.jar'
 CLASSPATH=$CLASSPATH':'$DIR'/'$LIB'/antlr-runtime.jar'
 CLASSPATH=$CLASSPATH':'$DIR'/'$LIB'/commons-io.jar'
 CLASSPATH=$CLASSPATH':'$DIR'/'$LIB'/scribble-cli.jar'
 CLASSPATH=$CLASSPATH':'$DIR'/'$LIB'/scribble-core.jar'
 CLASSPATH=$CLASSPATH':'$DIR'/'$LIB'/scribble-parser.jar'
-CLASSPATH=$CLASSPATH':'$DIR'/'$LIB'/scribble-f17.jar'
 CLASSPATH=$CLASSPATH':'$DIR'/'$LIB'/stringtemplate.jar'
 CLASSPATH="'"`fixpath "$CLASSPATH"`"'"
 
