Skip to content

Commit 12c2e47

Browse files
authored
Merge pull request #2543 from dotty-staging/topic/fix-dotd-usejavacp
Fix dotd to use java classpath
2 parents d9e1e2d + 988fb01 commit 12c2e47

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

dist/bin/dotd

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ for filename in $PROG_HOME/lib/*.jar; do
6464
[[ $filename =~ /jsoup.*.jar ]] && JSOUP_LIB=$filename
6565
done
6666

67-
CLASS_PATH="-classpath .$PSEP$DOTTY_LIB$PSEP$DOTTY_COMP$PSEP$DOTTY_DOC_LIB$PSEP$DOTTY_INTF"
67+
CLASS_PATH="-classpath $DOTTY_LIB$PSEP$DOTTY_COMP$PSEP$DOTTY_DOC_LIB$PSEP$DOTTY_INTF"
6868
CLASS_PATH="$CLASS_PATH$PSEP$SCALA_LIB"
6969
CLASS_PATH="$CLASS_PATH$PSEP$FLEXMARK_LIBS"
7070
CLASS_PATH="$CLASS_PATH$PSEP$JACKSON_LIBS"
@@ -75,4 +75,10 @@ CLASS_PATH="$CLASS_PATH$PSEP$SNAKEYAML_LIB"
7575
CLASS_PATH="$CLASS_PATH$PSEP$ST4_LIB"
7676
CLASS_PATH="$CLASS_PATH$PSEP$JSOUP_LIB"
7777

78-
eval exec "\"$JAVACMD\"" $CLASS_PATH dotty.tools.dottydoc.Main $@
78+
eval exec "\"$JAVACMD\"" \
79+
-Dscala.usejavacp=true \
80+
$CLASS_PATH \
81+
dotty.tools.dottydoc.Main \
82+
$@
83+
84+
exit $?

0 commit comments

Comments
 (0)