Skip to content

Commit

Permalink
Support for symlinks on cygwin.
Browse files Browse the repository at this point in the history
  • Loading branch information
potanin committed Jan 4, 2021
1 parent c94a2fd commit 20132ad
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 14 deletions.
4 changes: 2 additions & 2 deletions bin/repl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 $*
4 changes: 2 additions & 2 deletions bin/wyarch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 "$@"
2 changes: 1 addition & 1 deletion bin/wyby
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -30,5 +31,4 @@ export WYVERN_HOME="$CP_HOME"
# echo $CP_HOME
# echo $WYV_CLASSPATH


java -cp "$WYV_CLASSPATH" wyvern.tools.BytecodeCompiler $*
5 changes: 2 additions & 3 deletions bin/wypy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 $*
4 changes: 2 additions & 2 deletions bin/wyrepl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 $*
4 changes: 2 additions & 2 deletions bin/wyreplserver
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 $*
4 changes: 2 additions & 2 deletions bin/wyvern
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 $*

0 comments on commit 20132ad

Please sign in to comment.