Skip to content

Commit d82c2c9

Browse files
committed
Fix dist-bootstrapped scripts
For some reasons symbolic links in dist-bootstrapped/bin and dist-optimised/bin are not followed anymore after updating to sbt 1.1.6. I remove these links and refer to the links' target in the build.
1 parent bbd16a6 commit d82c2c9

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

dist-bootstrapped/bin

Lines changed: 0 additions & 1 deletion
This file was deleted.

dist-optimised/bin

Lines changed: 0 additions & 1 deletion
This file was deleted.

project/Build.scala

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1138,13 +1138,21 @@ object Build {
11381138
publishArtifact := false,
11391139
packGenerateMakefile := false,
11401140
packExpandedClasspath := true,
1141-
packResourceDir += (baseDirectory.value / "bin" -> "bin"),
11421141
packArchiveName := "dotty-" + dottyVersion
11431142
)
11441143

11451144
lazy val dist = project.asDist(NonBootstrapped)
1145+
.settings(
1146+
packResourceDir += (baseDirectory.value / "bin" -> "bin"),
1147+
)
11461148
lazy val `dist-bootstrapped` = project.asDist(Bootstrapped)
1149+
.settings(
1150+
packResourceDir += ((baseDirectory in dist).value / "bin" -> "bin"),
1151+
)
11471152
lazy val `dist-optimised` = project.asDist(BootstrappedOptimised)
1153+
.settings(
1154+
packResourceDir += ((baseDirectory in dist).value / "bin" -> "bin"),
1155+
)
11481156

11491157
// /** A sandbox to play with the Scala.js back-end of dotty.
11501158
// *
@@ -1237,7 +1245,9 @@ object Build {
12371245
withCommonSettings.
12381246
dependsOn(`dotty-interfaces`, dottyCompiler, dottyLibrary, dottyDoc).
12391247
settings(commonDistSettings).
1240-
bootstrappedSettings(target := baseDirectory.value / "target") // override setting in commonBootstrappedSettings
1248+
bootstrappedSettings(
1249+
target := baseDirectory.value / "target" // override setting in commonBootstrappedSettings
1250+
)
12411251

12421252
def withCommonSettings(implicit mode: Mode): Project = project.settings(mode match {
12431253
case NonBootstrapped => commonNonBootstrappedSettings

0 commit comments

Comments
 (0)