Skip to content

Commit 2c529c6

Browse files
committed
Fix #7146: make dotty-staging available in REPL
1 parent 6d500c5 commit 2c529c6

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

dist/bin/dotr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ elif [ $execute_repl == true ] || [ ${#residual_args[@]} -ne 0 ]; then
102102
echo "warning: multiple classpaths are found, dotr only use the last one."
103103
fi
104104
if [ $with_compiler == true ]; then
105-
cp_arg+="$PSEP$DOTTY_COMP$PSEP$DOTTY_INTF$PSEP$SCALA_ASM$DOTTY_STAGING"
105+
cp_arg+="$PSEP$DOTTY_COMP$PSEP$DOTTY_INTF$PSEP$SCALA_ASM$PSEP$DOTTY_STAGING"
106106
fi
107107
eval exec "\"$JAVACMD\"" "$DEBUG" "-classpath \"$cp_arg\"" "${jvm_options[@]}" "${residual_args[@]}"
108108
else

project/Build.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1288,7 +1288,7 @@ object Build {
12881288
def asDist(implicit mode: Mode): Project = project.
12891289
enablePlugins(PackPlugin).
12901290
withCommonSettings.
1291-
dependsOn(`dotty-interfaces`, dottyCompiler, dottyLibrary, dottyDoc).
1291+
dependsOn(`dotty-interfaces`, dottyCompiler, dottyLibrary, `dotty-staging`, dottyDoc).
12921292
settings(commonDistSettings).
12931293
bootstrappedSettings(
12941294
target := baseDirectory.value / "target" // override setting in commonBootstrappedSettings

project/scripts/bootstrapCmdTests

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ clear_out "$OUT"
2323
./bin/dotr -classpath "$OUT" "$MAIN" > "$tmp"
2424
test "$EXPECTED_OUTPUT" = "$(cat "$tmp")"
2525

26+
# check that `dotc` and `dotr` works for staging
27+
clear_out "$OUT"
28+
./bin/dotc tests/run-staging/i4044f.scala -d "$OUT"
29+
./bin/dotr -classpath "$OUT" Test > "$tmp"
30+
2631
# check that `dotc -from-tasty` compiles and `dotr` runs it
2732
echo "testing ./bin/dotc -from-tasty and dotr -classpath"
2833
clear_out "$OUT1"

0 commit comments

Comments
 (0)