diff options
author | Dmitry Petrashko <dark@d-d.me> | 2015-07-12 00:38:20 +0200 |
---|---|---|
committer | Dmitry Petrashko <dark@d-d.me> | 2015-07-12 00:38:20 +0200 |
commit | 74c2e2326f6a68a889347ef3052d88a586aca84f (patch) | |
tree | c17442a42e2efd8dddf5bf1ece248e54dc7a85e3 | |
parent | b82313268b912c62f9ddc89fefd02be96f2de64c (diff) | |
parent | 3daa5ceceb5c84fa0386294e4af1febd00b229eb (diff) | |
download | dotty-74c2e2326f6a68a889347ef3052d88a586aca84f.tar.gz dotty-74c2e2326f6a68a889347ef3052d88a586aca84f.tar.bz2 dotty-74c2e2326f6a68a889347ef3052d88a586aca84f.zip |
Merge pull request #709 from alexander-myltsev/703-fix_dotc_cygwin
Fix Cygwin launch
-rwxr-xr-x | bin/dotc | 27 |
1 files changed, 23 insertions, 4 deletions
@@ -91,7 +91,7 @@ fi if [ "$JLINE_JAR" == "" ] then - JLINE_JAR=$HOME/.ivy2//cache/jline/jline/jars/jline-$JLINE_VERSION.jar + JLINE_JAR=$HOME/.ivy2/cache/jline/jline/jars/jline-$JLINE_VERSION.jar fi if [ ! -f "$SCALA_LIBRARY_JAR" -o ! -f "$SCALA_REFLECT_JAR" -o ! -f "$SCALA_COMPILER_JAR" -o ! -f "$JLINE_JAR" ] @@ -188,11 +188,30 @@ trap onExit INT # If using the boot classpath, also pass an empty classpath # to java to suppress "." from materializing. classpathArgs () { - if [[ -n $bootcp ]]; then -echo "-Xbootclasspath/a:$SCALA_LIBRARY_JAR:$SCALA_REFLECT_JAR:$SCALA_COMPILER_JAR:$JLINE_JAR:$MAIN_JAR -classpath $MAIN_JAR:$TEST_JAR" + toolchain="$SCALA_LIBRARY_JAR:$SCALA_REFLECT_JAR:$SCALA_COMPILER_JAR:$JLINE_JAR" + if [[ -n "$cygwin" ]]; then + if [[ "$OS" = "Windows_NT" ]] && cygpath -m .>/dev/null 2>/dev/null ; then + format=mixed + else + format=windows + fi + + if [[ -n $bootcp ]]; then + boot_classpath="$(cygpath --path --$format "$toolchain:$MAIN_JAR")" + classpath="$(cygpath --path --$format "$MAIN_JAR:$TEST_JAR")" + cpArgs="-Xbootclasspath/a:$boot_classpath -classpath $classpath" + else + classpath="$(cygpath --path --$format "$toolchain:$MAIN_JAR:$TEST_JAR")" + cpArgs="-classpath $classpath" + fi else -echo "-classpath $SCALA_LIBRARY_JAR:$SCALA_REFLECT_JAR:$SCALA_COMPILER_JAR:$JLINE_JAR:$MAIN_JAR:$TEST_JAR" + if [[ -n $bootcp ]]; then + cpArgs="-Xbootclasspath/a:$toolchain:$MAIN_JAR -classpath $MAIN_JAR:$TEST_JAR" + else + cpArgs="-classpath $toolchain:$MAIN_JAR:$TEST_JAR" + fi fi + echo ${cpArgs} } # e.g. path -java-home /path/to/java_home |