X-Git-Url: http://plrg.eecs.uci.edu/git/?p=cdsspec-compiler.git;a=blobdiff_plain;f=run-javacc.sh;h=8965426c956bed67f6ddb183910ca40320602dc3;hp=a8484bdade8ecc8129e66fe25efe2e2f0ba31856;hb=19ccd7c10175f9a93b315ef34b9d3168939c87ec;hpb=3914e7a0a051d03bde44122f970d0549ef1b7dbf;ds=sidebyside

diff --git a/run-javacc.sh b/run-javacc.sh
index a8484bd..8965426 100755
--- a/run-javacc.sh
+++ b/run-javacc.sh
@@ -1,22 +1,18 @@
 #!/bin/bash
 
-if [ -z $SPEC_COMPILER_HOME ]; then
-	SPEC_COMPILER_HOME=~/spec-checker-compiler
-fi
+SPEC_COMPILER_HOME=$(pwd)
 
-JAVACC_PATH=$SPEC_COMPILER_HOME/lib
+echo "CDSSpec Compiler home: " $SPEC_COMPILER_HOME
 
-OUTPUT_PATH=$SPEC_COMPILER_HOME/src/edu/uci/eecs/specCompiler/grammerParser
-mkdir -p $OUTPUT_PATH
+JAVACC_PATH=$SPEC_COMPILER_HOME/lib
 
-GRAMMER_FILE=$SPEC_COMPILER_HOME/grammer/spec-compiler.jj
+UTIL_FILE=$SPEC_COMPILER_HOME/grammer/util.jj
 
-if [ -z $1 ]; then
-	echo "Using the default grammer file: $GRAMMER_FILE."
-else
-	GRAMMER_FILE=$1
-fi
+UTIL_OUTPUT_PATH=$SPEC_COMPILER_HOME/src/edu/uci/eecs/utilParser
 
 echo "Deleting the old generated java files."
-rm $OUTPUT_PATH/*.java
-java -cp $JAVACC_PATH/javacc.jar javacc -OUTPUT_DIRECTORY=$OUTPUT_PATH $GRAMMER_FILE
+rm -rf $UTIL_OUTPUT_PATH/*
+
+mkdir -p $UTIL_OUTPUT_PATH
+
+java -cp $JAVACC_PATH/javacc.jar javacc -OUTPUT_DIRECTORY=$UTIL_OUTPUT_PATH $UTIL_FILE