Fix scala#8218: Add missing TASTy Inspector dependency in dist/pack

mpickering · Feb 6, 2020 · 7b322fe · 7b322fe
1 parent 3f919dd
commit 7b322fe
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/dist/bin/common b/dist/bin/common
@@ -108,7 +108,7 @@ DOTTY_COMP=$(find_lib "*dotty-compiler*")
 DOTTY_INTF=$(find_lib "*dotty-interfaces*")
 DOTTY_LIB=$(find_lib "*dotty-library*")
 DOTTY_STAGING=$(find_lib "*dotty-staging*")
-DOTTY_CONSUME_TASTY=$(find_lib "*dotty-consume-tasty*")
+DOTTY_TASTY_INSPECTOR=$(find_lib "*dotty-tasty-inspector*")
 TASTY_CORE=$(find_lib "*tasty-core*")
 SCALA_ASM=$(find_lib "*scala-asm*")
 SCALA_LIB=$(find_lib "*scala-library*")

diff --git a/dist/bin/dotc b/dist/bin/dotc
@@ -64,6 +64,7 @@ classpathArgs () {
   toolchain+="$DOTTY_COMP$PSEP"
   toolchain+="$TASTY_CORE$PSEP"
   toolchain+="$DOTTY_STAGING$PSEP"
+  toolchain+="$DOTTY_TASTY_INSPECTOR$PSEP"
 
   # jine
   toolchain+="$JLINE_READER$PSEP"

diff --git a/dist/bin/dotd b/dist/bin/dotd
@@ -76,7 +76,7 @@ ST4_LIB=$(find_lib "*ST4*")
 # Set jsoup dep:
 JSOUP_LIB=$(find_lib "*jsoup*")
 
-CLASS_PATH="$DOTTY_LIB$PSEP$DOTTY_COMP$PSEP$TASTY_CORE$PSEP$DOTTY_DOC_LIB$PSEP$DOTTY_INTF$PSEP$SBT_INTF$PSEP$DOTTY_STAGING"
+CLASS_PATH="$DOTTY_LIB$PSEP$DOTTY_COMP$PSEP$TASTY_CORE$PSEP$DOTTY_DOC_LIB$PSEP$DOTTY_INTF$PSEP$SBT_INTF$PSEP$DOTTY_STAGING$PSEP$DOTTY_TASTY_INSPECTOR"
 CLASS_PATH="$CLASS_PATH$PSEP$SCALA_LIB"
 CLASS_PATH="$CLASS_PATH$PSEP$FLEXMARK_LIBS"
 CLASS_PATH="$CLASS_PATH$PSEP$JACKSON_LIBS"

diff --git a/dist/bin/dotr b/dist/bin/dotr
@@ -102,7 +102,7 @@ elif [ $execute_repl == true ] || [ ${#residual_args[@]} -ne 0 ]; then
     echo "warning: multiple classpaths are found, dotr only use the last one."
   fi
   if [ $with_compiler == true ]; then
-    cp_arg+="$PSEP$DOTTY_COMP$PSEP$TASTY_CORE$PSEP$DOTTY_INTF$PSEP$SCALA_ASM$PSEP$DOTTY_STAGING$PSEP$DOTTY_CONSUME_TASTY"
+    cp_arg+="$PSEP$DOTTY_COMP$PSEP$TASTY_CORE$PSEP$DOTTY_INTF$PSEP$SCALA_ASM$PSEP$DOTTY_STAGING$PSEP$DOTTY_TASTY_INSPECTOR"
   fi
   eval exec "\"$JAVACMD\"" "$DEBUG"  "-classpath \"$cp_arg\"" "${jvm_options[@]}" "${residual_args[@]}"
 else

diff --git a/project/Build.scala b/project/Build.scala
@@ -1382,7 +1382,7 @@ object Build {
     def asDist(implicit mode: Mode): Project = project.
       enablePlugins(PackPlugin).
       withCommonSettings.
-      dependsOn(`dotty-interfaces`, dottyCompiler, dottyLibrary, tastyCore, `dotty-staging`, dottyDoc).
+      dependsOn(`dotty-interfaces`, dottyCompiler, dottyLibrary, tastyCore, `dotty-staging`, `dotty-tasty-inspector`, dottyDoc).
       settings(commonDistSettings).
       bootstrappedSettings(
         target := baseDirectory.value / "target" // override setting in commonBootstrappedSettings