Skip to content

Fix #3024: repl alias in sbt and dist/bin/dotr not working #3026

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 29, 2017
Merged

Fix #3024: repl alias in sbt and dist/bin/dotr not working #3026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
459652c
Change definition of `repl` in `Build.scala`
felixmulder Aug 28, 2017
8534d69
Fix `dist/bin/dotr`
felixmulder Aug 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dist/bin/dotc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ bootcp=true

CompilerMain=dotty.tools.dotc.Main
FromTasty=dotty.tools.dotc.FromTasty
ReplMain=dotty.tools.dotc.repl.Main
ReplMain=dotty.tools.repl.Main

PROG_NAME=$CompilerMain

Expand Down
16 changes: 14 additions & 2 deletions project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,8 +391,6 @@ object Build {
)
}.evaluated,

repl := run.evaluated,

javaOptions ++= (javaOptions in `dotty-compiler`).value,
fork in run := true,
fork in Test := true,
Expand Down Expand Up @@ -581,6 +579,20 @@ object Build {
}.evaluated,
dotc := run.evaluated,

repl := Def.inputTaskDyn {
val dottyLib = packageAll.value("dotty-library")
val args: Seq[String] = spaceDelimited("<arg>").parsed

val fullArgs = args.span(_ != "-classpath") match {
case (beforeCp, Nil) => beforeCp ++ ("-classpath" :: dottyLib :: Nil)
case (beforeCp, rest) => beforeCp ++ rest
}

(runMain in Compile).toTask(
s" dotty.tools.repl.Main " + fullArgs.mkString(" ")
)
}.evaluated,

// enable verbose exception messages for JUnit
testOptions in Test += Tests.Argument(
TestFrameworks.JUnit, "-a", "-v",
Expand Down