Skip to content

Commit 877e9e7

Browse files
authored
Merge pull request #2588 from dotty-staging/pack-bootstraped
add bootstrapped distribution
2 parents 2127e9f + 2146a65 commit 877e9e7

File tree

3 files changed

+20
-3
lines changed

3 files changed

+20
-3
lines changed

build.sbt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ val `scala-compiler` = Build.`scala-compiler`
1919
val `scala-reflect` = Build.`scala-reflect`
2020
val scalap = Build.scalap
2121
val dist = Build.dist
22+
val `dist-bootstrapped` = Build.`dist-bootstrapped`
2223

2324
val `sbt-dotty` = Build.`sbt-dotty`
2425
val `vscode-dotty` = Build.`vscode-dotty`

dist/bin/dotd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ for filename in $PROG_HOME/lib/*.jar; do
6464
[[ $filename =~ /jsoup.*.jar ]] && JSOUP_LIB=$filename
6565
done
6666

67-
CLASS_PATH="-classpath $DOTTY_LIB$PSEP$DOTTY_COMP$PSEP$DOTTY_DOC_LIB$PSEP$DOTTY_INTF"
67+
CLASS_PATH="-classpath $DOTTY_LIB$PSEP$DOTTY_COMP$PSEP$DOTTY_DOC_LIB$PSEP$DOTTY_INTF$PSEP$SBT_INTF"
6868
CLASS_PATH="$CLASS_PATH$PSEP$SCALA_LIB"
6969
CLASS_PATH="$CLASS_PATH$PSEP$FLEXMARK_LIBS"
7070
CLASS_PATH="$CLASS_PATH$PSEP$JACKSON_LIBS"

project/Build.scala

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1169,12 +1169,28 @@ object Build {
11691169
settings(commonNonBootstrappedSettings).
11701170
settings(packSettings).
11711171
settings(
1172-
triggeredMessage in ThisBuild := Watched.clearWhenTriggered,
1173-
submoduleChecks,
11741172
publishArtifact := false,
11751173
// packMain := Map("dummy" -> "dotty.tools.dotc.Main"),
11761174
packExpandedClasspath := true,
11771175
packResourceDir += (baseDirectory.value / "bin" -> "bin"),
11781176
packArchiveName := "dotty-" + dottyVersion
11791177
)
1178+
1179+
// Same as `dist` but using bootstrapped projects.
1180+
lazy val `dist-bootstrapped` = project.
1181+
dependsOn(`dotty-interfaces`).
1182+
dependsOn(`dotty-library-bootstrapped`).
1183+
dependsOn(`dotty-compiler-bootstrapped`).
1184+
dependsOn(`dotty-doc-bootstrapped`).
1185+
settings(commonBootstrappedSettings).
1186+
settings(packSettings).
1187+
settings(
1188+
target := baseDirectory.value / "target", // override setting in commonBootstrappedSettings
1189+
publishArtifact := false,
1190+
// packMain := Map("dummy" -> "dotty.tools.dotc.Main"),
1191+
packExpandedClasspath := true,
1192+
// packExcludeJars := Seq("scala-library-.*\\.jar"),
1193+
packResourceDir += (baseDirectory.value / "bin" -> "bin"),
1194+
packArchiveName := "dotty-" + dottyVersion
1195+
)
11801196
}

0 commit comments

Comments
 (0)