From df6951195d0c0753067fccde355bdf26ca7da203 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Micheloud?= Date: Thu, 24 Feb 2022 20:22:53 +0100 Subject: [PATCH 1/2] fixed function classpathArgs() --- dist/bin/scaladoc | 2 +- dist/bin/scaladoc.bat | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/bin/scaladoc b/dist/bin/scaladoc index a3a23a1accea..36639065e0d9 100755 --- a/dist/bin/scaladoc +++ b/dist/bin/scaladoc @@ -59,6 +59,7 @@ classpathArgs () { CLASS_PATH+="$(find_lib "*scala3-interfaces*")$PSEP" CLASS_PATH+="$(find_lib "*scala3-library*")$PSEP" CLASS_PATH+="$(find_lib "*tasty-core*")$PSEP" + CLASS_PATH+="$(find_lib "*scala3-staging*")$PSEP" CLASS_PATH+="$(find_lib "*scala3-tasty-inspector*")$PSEP" CLASS_PATH+="$(find_lib "*flexmark-0*")$PSEP" CLASS_PATH+="$(find_lib "*flexmark-html-parser*")$PSEP" @@ -97,7 +98,6 @@ classpathArgs () { CLASS_PATH+="$(find_lib "*flexmark-ext-ins*")$PSEP" CLASS_PATH+="$(find_lib "*flexmark-ext-superscript*")$PSEP" CLASS_PATH+="$(find_lib "*antlr4-runtime*")$PSEP" - CLASS_PATH+="$(find_lib "*ST4*")" jvm_cp_args="-classpath \"$CLASS_PATH\"" } diff --git a/dist/bin/scaladoc.bat b/dist/bin/scaladoc.bat index 698f2a7c36f1..884eafbe16fa 100644 --- a/dist/bin/scaladoc.bat +++ b/dist/bin/scaladoc.bat @@ -106,6 +106,7 @@ call :updateClasspath "scala3-compiler" call :updateClasspath "scala3-interfaces" call :updateClasspath "scala3-library" call :updateClasspath "tasty-core" +call :updateClasspath "scala3-staging" call :updateClasspath "scala3-tasty-inspector" call :updateClasspath "flexmark-0" call :updateClasspath "flexmark-html-parser" @@ -144,14 +145,13 @@ call :updateClasspath "flexmark-ext-tables" call :updateClasspath "flexmark-ext-ins" call :updateClasspath "flexmark-ext-superscript" call :updateClasspath "antlr4-runtime" -call :updateClasspath "ST4" goto :eof @rem input parameter: %1=pattern for library file @rem output parameter: _CLASS_PATH :updateClasspath set "__PATTERN=%~1" -for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*%__PATTERN%*"') do ( +for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*%__PATTERN%*" 2^>NUL') do ( set "_CLASS_PATH=!_CLASS_PATH!%_LIB_DIR%\%%f%_PSEP%" ) goto :eof From b7d0f63379774e65c341858ca99d56358c8ef9dd Mon Sep 17 00:00:00 2001 From: Stephane MICHELOUD Date: Mon, 21 Mar 2022 20:27:08 +0100 Subject: [PATCH 2/2] reverted addition of 'scala3-staging' library --- dist/bin/scaladoc | 1 - dist/bin/scaladoc.bat | 1 - 2 files changed, 2 deletions(-) diff --git a/dist/bin/scaladoc b/dist/bin/scaladoc index 36639065e0d9..67210f0d6b4f 100755 --- a/dist/bin/scaladoc +++ b/dist/bin/scaladoc @@ -59,7 +59,6 @@ classpathArgs () { CLASS_PATH+="$(find_lib "*scala3-interfaces*")$PSEP" CLASS_PATH+="$(find_lib "*scala3-library*")$PSEP" CLASS_PATH+="$(find_lib "*tasty-core*")$PSEP" - CLASS_PATH+="$(find_lib "*scala3-staging*")$PSEP" CLASS_PATH+="$(find_lib "*scala3-tasty-inspector*")$PSEP" CLASS_PATH+="$(find_lib "*flexmark-0*")$PSEP" CLASS_PATH+="$(find_lib "*flexmark-html-parser*")$PSEP" diff --git a/dist/bin/scaladoc.bat b/dist/bin/scaladoc.bat index 884eafbe16fa..e14cd519889f 100644 --- a/dist/bin/scaladoc.bat +++ b/dist/bin/scaladoc.bat @@ -106,7 +106,6 @@ call :updateClasspath "scala3-compiler" call :updateClasspath "scala3-interfaces" call :updateClasspath "scala3-library" call :updateClasspath "tasty-core" -call :updateClasspath "scala3-staging" call :updateClasspath "scala3-tasty-inspector" call :updateClasspath "flexmark-0" call :updateClasspath "flexmark-html-parser"