Skip to content

Simplify dist project definitions #3072

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 1 commit into from
Sep 5, 2017
Merged

Simplify dist project definitions #3072

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 11 additions & 17 deletions project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1133,21 +1133,21 @@ object Build {
state
}

lazy val commonDistSettings = packSettings ++ Seq(
publishArtifact := false,
packGenerateMakefile := false,
packExpandedClasspath := true,
packResourceDir += (baseDirectory.value / "bin" -> "bin"),
packArchiveName := "dotty-" + dottyVersion
)

lazy val dist = project.
dependsOn(`dotty-interfaces`).
dependsOn(`dotty-compiler`).
dependsOn(`dotty-library`).
dependsOn(`dotty-doc`).
settings(commonNonBootstrappedSettings).
settings(packSettings).
settings(
publishArtifact := false,
// packMain := Map("dummy" -> "dotty.tools.dotc.Main"),
packGenerateMakefile := false,
packExpandedClasspath := true,
packResourceDir += (baseDirectory.value / "bin" -> "bin"),
packArchiveName := "dotty-" + dottyVersion
)
settings(commonDistSettings)

// Same as `dist` but using bootstrapped projects.
lazy val `dist-bootstrapped` = project.
Expand All @@ -1156,14 +1156,8 @@ object Build {
dependsOn(`dotty-compiler-bootstrapped`).
dependsOn(`dotty-doc-bootstrapped`).
settings(commonBootstrappedSettings).
settings(packSettings).
settings(commonDistSettings).
settings(
target := baseDirectory.value / "target", // override setting in commonBootstrappedSettings
publishArtifact := false,
// packMain := Map("dummy" -> "dotty.tools.dotc.Main"),
packExpandedClasspath := true,
packGenerateMakefile := false,
packResourceDir += (baseDirectory.value / "bin" -> "bin"),
packArchiveName := "dotty-" + dottyVersion
target := baseDirectory.value / "target" // override setting in commonBootstrappedSettings
)
}