edits

[cdsspec-compiler.git] / run-javacc.sh

diff --git a/run-javacc.sh b/run-javacc.sh
index ab350be284c50303b7db25f3a2391dcd5e18a97a..8965426c956bed67f6ddb183910ca40320602dc3 100755 (executable)
--- 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)
+
+echo "CDSSpec Compiler home: " $SPEC_COMPILER_HOME
 
 JAVACC_PATH=$SPEC_COMPILER_HOME/lib
 
-PRE_SCANNER_FILE=$SPEC_COMPILER_HOME/grammer/pre_scanner.jj
-GRAMMER_FILE=$SPEC_COMPILER_HOME/grammer/spec_compiler.jj
+UTIL_FILE=$SPEC_COMPILER_HOME/grammer/util.jj
 
-PRE_SCANNER_OUTPUT_PATH=$SPEC_COMPILER_HOME/src/edu/uci/eecs/specCompiler/grammerParser/preScanner
-GRAMMER_OUTPUT_PATH=$SPEC_COMPILER_HOME/src/edu/uci/eecs/specCompiler/grammerParser
+UTIL_OUTPUT_PATH=$SPEC_COMPILER_HOME/src/edu/uci/eecs/utilParser
 
 echo "Deleting the old generated java files."
-rm -r $GRAMMER_OUTPUT_PATH/*
+rm -rf $UTIL_OUTPUT_PATH/*
 
-mkdir -p $PRE_SCANNER_OUTPUT_PATH
-mkdir -p $GRAMMER_OUTPUT_PATH
+mkdir -p $UTIL_OUTPUT_PATH
 
-java -cp $JAVACC_PATH/javacc.jar javacc -OUTPUT_DIRECTORY=$PRE_SCANNER_OUTPUT_PATH $PRE_SCANNER_FILE
-java -cp $JAVACC_PATH/javacc.jar javacc -OUTPUT_DIRECTORY=$GRAMMER_OUTPUT_PATH $GRAMMER_FILE
+java -cp $JAVACC_PATH/javacc.jar javacc -OUTPUT_DIRECTORY=$UTIL_OUTPUT_PATH $UTIL_FILE