@@ -8,7 +8,9 @@ import java.util.Calendar
8
8
9
9
import scala .reflect .io .Path
10
10
import sbtassembly .AssemblyKeys .assembly
11
- import xerial .sbt .Pack ._
11
+
12
+ import xerial .sbt .pack .PackPlugin
13
+ import xerial .sbt .pack .PackPlugin .autoImport ._
12
14
13
15
import sbt .Package .ManifestAttributes
14
16
@@ -1121,9 +1123,10 @@ object Build {
1121
1123
))
1122
1124
}
1123
1125
1124
- lazy val commonDistSettings = packSettings ++ Seq (
1126
+ lazy val commonDistSettings = Seq (
1125
1127
packMain := Map (),
1126
1128
publishArtifact := false ,
1129
+ packGenerateMakefile := false ,
1127
1130
packExpandedClasspath := true ,
1128
1131
packResourceDir += (baseDirectory.value / " bin" -> " bin" ),
1129
1132
packArchiveName := " dotty-" + dottyVersion
@@ -1171,11 +1174,10 @@ object Build {
1171
1174
settings(commonBenchmarkSettings).
1172
1175
enablePlugins(JmhPlugin )
1173
1176
1174
- def asDist (implicit mode : Mode ): Project = project.withCommonSettings.
1175
- dependsOn(`dotty-interfaces`).
1176
- dependsOn(dottyCompiler).
1177
- dependsOn(dottyLibrary).
1178
- dependsOn(dottyDoc).
1177
+ def asDist (implicit mode : Mode ): Project = project.
1178
+ enablePlugins(PackPlugin ).
1179
+ withCommonSettings.
1180
+ dependsOn(`dotty-interfaces`, dottyCompiler, dottyLibrary, dottyDoc).
1179
1181
settings(commonDistSettings).
1180
1182
bootstrappedSettings(target := baseDirectory.value / " target" ) // override setting in commonBootstrappedSettings
1181
1183
0 commit comments