diff --git a/bin/repl b/bin/repl index a02c36c75..0fe812578 100755 --- a/bin/repl +++ b/bin/repl @@ -20,6 +20,7 @@ CP_HOME="$WYVERN_HOME" # for cygwin, convert the classpath home directory to Windows form if $cygwin ; then + CP_HOME=`readlink "$CP_HOME"` CP_HOME=`cygpath --windows "$CP_HOME"` WYV_CLASSPATH="$CP_HOME/tools/build;$CP_HOME/tools/bin;$CP_HOME/tools/lib/CopperRuntime.jar;$CP_HOME/tools/lib/asm-debug-all-5.0.1.jar;$CP_HOME/tools/lib/junit-4.11.jar" else @@ -30,5 +31,4 @@ export WYVERN_HOME="$CP_HOME" # echo $CP_HOME # echo $WYV_CLASSPATH - -java -cp "$WYV_CLASSPATH" wyvern.tools.REPL $* +java -cp "$WYV_CLASSPATH" wyvern.tools.REPL $* \ No newline at end of file diff --git a/bin/wyarch b/bin/wyarch index 365ed349c..72ae74949 100755 --- a/bin/wyarch +++ b/bin/wyarch @@ -20,6 +20,7 @@ CP_HOME="$WYVERN_HOME" # for cygwin, convert the classpath home directory to Windows form if $cygwin ; then + CP_HOME=`readlink "$CP_HOME"` CP_HOME=`cygpath --windows "$CP_HOME"` WYV_CLASSPATH="$CP_HOME/tools/build;$CP_HOME/tools/bin;$CP_HOME/tools/lib/CopperRuntime.jar;$CP_HOME/tools/lib/asm-debug-all-5.0.1.jar;$CP_HOME/tools/lib/commons-cli-1.4.jar;$CP_HOME/tools/lib/junit-4.11.jar;$CP_HOME/tools/lib/protobuf-java-3.5.1.jar" else @@ -30,5 +31,4 @@ export WYVERN_HOME="$CP_HOME" # echo $CP_HOME # echo $WYV_CLASSPATH - -java -cp "$WYV_CLASSPATH" wyvern.tools.ArchitectureInterpreter "$@" +java -cp "$WYV_CLASSPATH" wyvern.tools.ArchitectureInterpreter "$@" \ No newline at end of file diff --git a/bin/wyby b/bin/wyby index 62271fe85..735d195c2 100755 --- a/bin/wyby +++ b/bin/wyby @@ -20,6 +20,7 @@ CP_HOME="$WYVERN_HOME" # for cygwin, convert the classpath home directory to Windows form if $cygwin ; then + CP_HOME=`readlink "$CP_HOME"` CP_HOME=`cygpath --windows "$CP_HOME"` WYV_CLASSPATH="$CP_HOME/tools/build;$CP_HOME/tools/bin;$CP_HOME/tools/lib/CopperRuntime.jar;$CP_HOME/tools/lib/asm-debug-all-5.0.1.jar;$CP_HOME/tools/lib/junit-4.11.jar;$CP_HOME/tools/lib/protobuf-java-3.5.1.jar" else @@ -30,5 +31,4 @@ export WYVERN_HOME="$CP_HOME" # echo $CP_HOME # echo $WYV_CLASSPATH - java -cp "$WYV_CLASSPATH" wyvern.tools.BytecodeCompiler $* diff --git a/bin/wypy b/bin/wypy index 1f16b7b7a..714a7480a 100755 --- a/bin/wypy +++ b/bin/wypy @@ -22,9 +22,9 @@ CP_HOME="$WYVERN_HOME" # for cygwin, convert the classpath home directory to Windows form if $cygwin ; then + CP_HOME=`readlink "$CP_HOME"` CP_HOME=`cygpath --windows "$CP_HOME"` WYV_CLASSPATH="$CP_HOME/tools/build;$CP_HOME/tools/bin;$CP_HOME/tools/lib/CopperRuntime.jar;$CP_HOME/tools/lib/asm-debug-all-5.0.1.jar;$CP_HOME/tools/lib/junit-4.11.jar;$CP_HOME/tools/lib/protobuf-java-3.5.1.jar" - else WYV_CLASSPATH="$CP_HOME/tools/build:$CP_HOME/tools/bin:$CP_HOME/tools/lib/CopperRuntime.jar:$CP_HOME/tools/lib/asm-debug-all-5.0.1.jar:$CP_HOME/tools/lib/junit-4.11.jar:$CP_HOME/tools/lib/protobuf-java-3.5.1.jar" fi @@ -33,5 +33,4 @@ export WYVERN_HOME="$CP_HOME" # echo $CP_HOME # echo $WYV_CLASSPATH - -java -cp "$WYV_CLASSPATH" wyvern.tools.PythonCompiler $* +java -cp "$WYV_CLASSPATH" wyvern.tools.PythonCompiler $* \ No newline at end of file diff --git a/bin/wyrepl b/bin/wyrepl index d277b94ac..87a315348 100755 --- a/bin/wyrepl +++ b/bin/wyrepl @@ -20,6 +20,7 @@ CP_HOME="$WYVERN_HOME" # for cygwin, convert the classpath home directory to Windows form if $cygwin ; then + CP_HOME=`readlink "$CP_HOME"` CP_HOME=`cygpath --windows "$CP_HOME"` WYV_CLASSPATH="$CP_HOME/tools/build;$CP_HOME/tools/bin;$CP_HOME/tools/lib/CopperRuntime.jar;$CP_HOME/tools/lib/asm-debug-all-5.0.1.jar;$CP_HOME/tools/lib/junit-4.11.jar;$CP_HOME/tools/lib/protobuf-java-3.5.1.jar" else @@ -30,5 +31,4 @@ export WYVERN_HOME="$CP_HOME" # echo $CP_HOME # echo $WYV_CLASSPATH - -java -cp "$WYV_CLASSPATH" wyvern.tools.REPL $* +java -cp "$WYV_CLASSPATH" wyvern.tools.REPL $* \ No newline at end of file diff --git a/bin/wyreplserver b/bin/wyreplserver index 2f67798af..995926a4d 100755 --- a/bin/wyreplserver +++ b/bin/wyreplserver @@ -20,6 +20,7 @@ CP_HOME="$WYVERN_HOME" # for cygwin, convert the classpath home directory to Windows form if $cygwin ; then + CP_HOME=`readlink "$CP_HOME"` CP_HOME=`cygpath --windows "$CP_HOME"` WYV_CLASSPATH="$CP_HOME/tools/build;$CP_HOME/tools/bin;$CP_HOME/tools/lib/CopperRuntime.jar;$CP_HOME/tools/lib/asm-debug-all-5.0.1.jar;$CP_HOME/tools/lib/junit-4.11.jar;$CP_HOME/tools/lib/protobuf-java-3.5.1.jar" else @@ -30,5 +31,4 @@ export WYVERN_HOME="$CP_HOME" # echo $CP_HOME # echo $WYV_CLASSPATH - -java -cp "$WYV_CLASSPATH" wyvern.tools.ReplServer $* +java -cp "$WYV_CLASSPATH" wyvern.tools.ReplServer $* \ No newline at end of file diff --git a/bin/wyvern b/bin/wyvern index 32b5456d0..aaa318ab9 100755 --- a/bin/wyvern +++ b/bin/wyvern @@ -20,6 +20,7 @@ CP_HOME="$WYVERN_HOME" # for cygwin, convert the classpath home directory to Windows form if $cygwin ; then + CP_HOME=`readlink "$CP_HOME"` CP_HOME=`cygpath --windows "$CP_HOME"` WYV_CLASSPATH="$CP_HOME/tools/build;$CP_HOME/tools/bin;$CP_HOME/tools/lib/CopperRuntime.jar;$CP_HOME/tools/lib/asm-debug-all-5.0.1.jar;$CP_HOME/tools/lib/junit-4.11.jar;$CP_HOME/tools/lib/protobuf-java-3.5.1.jar" else @@ -30,5 +31,4 @@ export WYVERN_HOME="$CP_HOME" # echo $CP_HOME # echo $WYV_CLASSPATH - -java -Xmx6144m -cp "$WYV_CLASSPATH" wyvern.tools.Interpreter $* +java -Xmx6144m -cp "$WYV_CLASSPATH" wyvern.tools.Interpreter $* \ No newline at end of file