wire up pack and start scripts

Author: mpollmeier

dist/bin/common

@@ -156,6 +156,8 @@ TASTY_CORE=$(find_lib "*tasty-core*")
 SCALA_ASM=$(find_lib "*scala-asm*")
 SCALA_LIB=$(find_lib "*scala-library*")
 SBT_INTF=$(find_lib "*compiler-interface*")
+DOTTY_DIST=$(find_lib "*scala3-dist*")
+DOTTY_REPL=$(find_lib "*scala3-repl*")
 JLINE_READER=$(find_lib "*jline-reader-3*")
 JLINE_TERMINAL=$(find_lib "*jline-terminal-3*")
 JLINE_TERMINAL_JNA=$(find_lib "*jline-terminal-jna-3*")
@@ -182,6 +184,8 @@ compilerJavaClasspathArgs () {
   toolchain+="$TASTY_CORE$PSEP"
   toolchain+="$DOTTY_STAGING$PSEP"
   toolchain+="$DOTTY_TASTY_INSPECTOR$PSEP"
+  toolchain+="$DOTTY_DIST$PSEP"
+  toolchain+="$DOTTY_REPL$PSEP"
 
   # jine
   toolchain+="$JLINE_READER$PSEP"

dist/bin/common.bat

@@ -51,6 +51,8 @@ for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*tasty-core*"')             do
 for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*scala-asm*"')              do set "_SCALA_ASM=%_LIB_DIR%\%%f"
 for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*scala-library*"')          do set "_SCALA_LIB=%_LIB_DIR%\%%f"
 for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*compiler-interface*"')     do set "_SBT_INTF=%_LIB_DIR%\%%f"
+for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*scala3-dist*"')            do set "_SCALA3_DIST=%_LIB_DIR%\%%f"
+for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*scala3-repl*"')            do set "_SCALA3_REPL=%_LIB_DIR%\%%f"
 for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*jline-reader-3*"')         do set "_JLINE_READER=%_LIB_DIR%\%%f"
 for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*jline-terminal-3*"')       do set "_JLINE_TERMINAL=%_LIB_DIR%\%%f"
 for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*jline-terminal-jna-3*"')   do set "_JLINE_TERMINAL_JNA=%_LIB_DIR%\%%f"

dist/bin/scala.bat

@@ -73,6 +73,8 @@ set "__TOOLCHAIN=%__TOOLCHAIN%%_SCALA3_COMP%%_PSEP%"
 set "__TOOLCHAIN=%__TOOLCHAIN%%_TASTY_CORE%%_PSEP%"
 set "__TOOLCHAIN=%__TOOLCHAIN%%_SCALA3_STAGING%%_PSEP%"
 set "__TOOLCHAIN=%__TOOLCHAIN%%_SCALA3_TASTY_INSPECTOR%%_PSEP%"
+set "__TOOLCHAIN=%__TOOLCHAIN%%_SCALA3_DIST%%_PSEP%"
+set "__TOOLCHAIN=%__TOOLCHAIN%%_SCALA3_REPL%%_PSEP%"
 
 @rem # jline
 set "__TOOLCHAIN=%__TOOLCHAIN%%_JLINE_READER%%_PSEP%"

dist/bin/scalac.bat

@@ -102,6 +102,8 @@ set "__TOOLCHAIN=%__TOOLCHAIN%%_SCALA3_COMP%%_PSEP%"
 set "__TOOLCHAIN=%__TOOLCHAIN%%_TASTY_CORE%%_PSEP%"
 set "__TOOLCHAIN=%__TOOLCHAIN%%_SCALA3_STAGING%%_PSEP%"
 set "__TOOLCHAIN=%__TOOLCHAIN%%_SCALA3_TASTY_INSPECTOR%%_PSEP%"
+set "__TOOLCHAIN=%__TOOLCHAIN%%_SCALA3_DIST%%_PSEP%"
+set "__TOOLCHAIN=%__TOOLCHAIN%%_SCALA3_REPL%%_PSEP%"
 
 @rem # jline
 set "__TOOLCHAIN=%__TOOLCHAIN%%_JLINE_READER%%_PSEP%"

dist/bin/scaladoc

@@ -60,6 +60,8 @@ classpathArgs () {
   CLASS_PATH+="$(find_lib "*scala3-library*")$PSEP"
   CLASS_PATH+="$(find_lib "*tasty-core*")$PSEP"
   CLASS_PATH+="$(find_lib "*scala3-tasty-inspector*")$PSEP"
+  CLASS_PATH+="$(find_lib "*scala3-repl*")$PSEP"
+  CLASS_PATH+="$(find_lib "*scala3-dist*")$PSEP"
   CLASS_PATH+="$(find_lib "*flexmark-0*")$PSEP"
   CLASS_PATH+="$(find_lib "*flexmark*")$PSEP"
   CLASS_PATH+="$(find_lib "*flexmark-ext-anchorlink*")$PSEP"

dist/bin/scaladoc.bat

@@ -110,6 +110,8 @@ call :updateClasspath "scala3-interfaces"
 call :updateClasspath "scala3-library"
 call :updateClasspath "tasty-core"
 call :updateClasspath "scala3-tasty-inspector"
+call :updateClasspath "scala3-repl"
+call :updateClasspath "scala3-dist"
 call :updateClasspath "flexmark-0"
 call :updateClasspath "flexmark-html-parser"
 call :updateClasspath "flexmark-ext-anchorlink"

project/Build.scala

@@ -1980,8 +1980,8 @@ object Build {
   )
 
   lazy val commonDistSettings = Seq(
+    name := "scala3-dist",
     packMain := Map(),
-    publishArtifact := false,
     packGenerateMakefile := false,
     packExpandedClasspath := true,
     packArchiveName := "scala3-" + dottyVersion