diff options
| author | Som Snytt <som.snytt@gmail.com> | 2012-11-02 22:00:03 -0700 |
|---|---|---|
| committer | Som Snytt <som.snytt@gmail.com> | 2012-11-28 12:52:44 -0800 |
| commit | 2857d43a5a217d45f879878740081d4b91c1b2d8 (patch) | |
| tree | 842862390dc664175f9e126a7ad977910a1f9816 /src/compiler/scala/tools/ant/templates | |
| parent | 08e717eaee731456a51adb08f72aa5d9f083a29a (diff) | |
| download | scala-2857d43a5a217d45f879878740081d4b91c1b2d8.tar.gz scala-2857d43a5a217d45f879878740081d4b91c1b2d8.tar.bz2 scala-2857d43a5a217d45f879878740081d4b91c1b2d8.zip | |
Javap for Java 7 (Fixes SI-4936)
Add support for reflective invocation of javap under jdk7,
using the quasi-javax.tools API.
Under -Ygen-javap, warn if you can't.
Since JAVA_HOME is used to locate tools.jar, the script is
updated to convert it for cygwin.
Update Javap for simpl repl.
Also, reduce clutter of JavaxTools as suggested.
JavapTool7 evades repl truncating if enabled; the truncating PrintWriter
is not line-oriented but string-oriented.
Diffstat (limited to 'src/compiler/scala/tools/ant/templates')
| -rw-r--r-- | src/compiler/scala/tools/ant/templates/tool-unix.tmpl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl index f1c6c52785..84ccaba749 100644 --- a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl +++ b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl @@ -102,6 +102,9 @@ if [[ -n "$cygwin" ]]; then format=windows fi SCALA_HOME="$(cygpath --$format "$SCALA_HOME")" + if [[ -n "$JAVA_HOME" ]]; then + JAVA_HOME="$(cygpath --$format "$JAVA_HOME")" + fi TOOL_CLASSPATH="$(cygpath --path --$format "$TOOL_CLASSPATH")" elif [[ -n "$mingw" ]]; then SCALA_HOME="$(cmd //c echo "$SCALA_HOME")" |