diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-11-17 12:10:29 +0100 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-11-17 12:10:29 +0100 |
| commit | e9a37521c499788fa7e1aab9d553c84ca00d8a4f (patch) | |
| tree | 8fa0005c105da1f5ca940f7e099fed5a954ded9a | |
| parent | 459538ff3c13e6354dbf9ce2b5bc4178464dc0b5 (diff) | |
| parent | 5df64a4d05ab504a4ca0bfdb9ba8c21430b1ccd8 (diff) | |
| download | scala-e9a37521c499788fa7e1aab9d553c84ca00d8a4f.tar.gz scala-e9a37521c499788fa7e1aab9d553c84ca00d8a4f.tar.bz2 scala-e9a37521c499788fa7e1aab9d553c84ca00d8a4f.zip | |
Merge pull request #4113 from retronym/ticket/8967
SI-8967 Only add JARs and dirs from $SCALA_HOME/lib to classpath
| -rwxr-xr-x | src/compiler/scala/tools/ant/templates/tool-unix.tmpl | 12 | ||||
| -rw-r--r-- | src/compiler/scala/tools/ant/templates/tool-windows.tmpl | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl index f58223a39e..7acb3632d2 100755 --- a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl +++ b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl @@ -86,10 +86,14 @@ fi TOOL_CLASSPATH="@classpath@" if [[ -z "$TOOL_CLASSPATH" ]]; then for ext in "$SCALA_HOME"/lib/* ; do - if [[ -z "$TOOL_CLASSPATH" ]]; then - TOOL_CLASSPATH="$ext" - else - TOOL_CLASSPATH="${TOOL_CLASSPATH}${SEP}${ext}" + file_extension="${ext##*.}" + # SI-8967 Only consider directories and files named '*.jar' + if [[ -d "$ext" || $file_extension == "jar" ]]; then + if [[ -z "$TOOL_CLASSPATH" ]]; then + TOOL_CLASSPATH="$ext" + else + TOOL_CLASSPATH="${TOOL_CLASSPATH}${SEP}${ext}" + fi fi done fi diff --git a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl index cf0e003f10..50e44fb669 100644 --- a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl +++ b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl @@ -128,7 +128,7 @@ if defined _JAVA_PARAMS set _JAVA_OPTS=%_JAVA_OPTS% %_JAVA_PARAMS% set _TOOL_CLASSPATH=@classpath@ if "%_TOOL_CLASSPATH%"=="" ( - for %%f in ("!_SCALA_HOME!\lib\*") do call :add_cpath "%%f" + for %%f in ("!_SCALA_HOME!\lib\*.jar") do call :add_cpath "%%f" for /d %%f in ("!_SCALA_HOME!\lib\*") do call :add_cpath "%%f" ) |