Skip to content

Commit 1b06643

Browse files
committed
fix #2996: remove useless Makefile in distributed archive
1 parent 8ca8cd9 commit 1b06643

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

project/Build.scala

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ import java.util.Calendar
88

99
import scala.reflect.io.Path
1010
import sbtassembly.AssemblyKeys.assembly
11-
import xerial.sbt.Pack._
11+
import xerial.sbt.pack.PackPlugin._
12+
import autoImport._
1213

1314
import sbt.Package.ManifestAttributes
1415

@@ -1142,6 +1143,7 @@ object Build {
11421143
settings(
11431144
publishArtifact := false,
11441145
// packMain := Map("dummy" -> "dotty.tools.dotc.Main"),
1146+
packGenerateMakefile := false,
11451147
packExpandedClasspath := true,
11461148
packResourceDir += (baseDirectory.value / "bin" -> "bin"),
11471149
packArchiveName := "dotty-" + dottyVersion
@@ -1160,7 +1162,7 @@ object Build {
11601162
publishArtifact := false,
11611163
// packMain := Map("dummy" -> "dotty.tools.dotc.Main"),
11621164
packExpandedClasspath := true,
1163-
// packExcludeJars := Seq("scala-library-.*\\.jar"),
1165+
packGenerateMakefile := false,
11641166
packResourceDir += (baseDirectory.value / "bin" -> "bin"),
11651167
packArchiveName := "dotty-" + dottyVersion
11661168
)

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")
1313

1414
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
1515

16-
addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.8.2")
16+
addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.9.1")
1717

1818
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.2.24")
1919

0 commit comments

Comments
 (0)