luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Drop sbt-launch.jar from Linux distro

This commit is contained in:
Eugene Yokota 2021-04-24 16:27:38 -04:00
parent 03e83bfb00
commit d7be43c449
4 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -12,3 +12,4 @@ npm-debug.log
.metals .metals
.bsp/ .bsp/
metals.sbt metals.sbt
launcher-package/citest/freshly-baked

27
launcher-package/build.sbt
View File

@ -4,7 +4,7 @@ import com.typesafe.sbt.packager.SettingsHelper._
import DebianConstants._ import DebianConstants._
lazy val sbtOfflineInstall = lazy val sbtOfflineInstall =
sys.props.getOrElse("sbt.build.offline", sys.env.getOrElse("sbt.build.offline", "true")) match { sys.props.getOrElse("sbt.build.offline", sys.env.getOrElse("sbt.build.offline", "false")) match {
case "true" | "1" => true case "true" | "1" => true
case "false" | "0" => false case "false" | "0" => false
case _ => false case _ => false
@ -15,6 +15,12 @@ lazy val sbtIncludeSbtn =
case "false" | "0" => false case "false" | "0" => false
case _ => false case _ => false
} }
lazy val sbtIncludeSbtLaunch =
sys.props.getOrElse("sbt.build.includesbtlaunch", sys.env.getOrElse("sbt.build.includesbtlaunch", "true")) match {
case "true" | "1" => true
case "false" | "0" => false
case _ => false
}
lazy val sbtVersionToRelease = sys.props.getOrElse("sbt.build.version", sys.env.getOrElse("sbt.build.version", { lazy val sbtVersionToRelease = sys.props.getOrElse("sbt.build.version", sys.env.getOrElse("sbt.build.version", {
sys.error("-Dsbt.build.version must be set") sys.error("-Dsbt.build.version must be set")
})) }))
@ -70,7 +76,7 @@ val x86MacImageName = s"sbtn-$x86MacPlatform"
val x86LinuxImageName = s"sbtn-$x86LinuxPlatform" val x86LinuxImageName = s"sbtn-$x86LinuxPlatform"
val x86WindowsImageName = s"sbtn-$x86WindowsPlatform.exe" val x86WindowsImageName = s"sbtn-$x86WindowsPlatform.exe"
organization in ThisBuild := "org.scal-sbt" organization in ThisBuild := "org.scala-sbt"
version in ThisBuild := "0.1.0" version in ThisBuild := "0.1.0"
// This build creates a SBT plugin with handy features *and* bundles the SBT script for distribution. // This build creates a SBT plugin with handy features *and* bundles the SBT script for distribution.
@ -279,13 +285,16 @@ val root = (project in file(".")).
case (k, v) => (k, v) case (k, v) => (k, v)
} }
}, },
mappings in Universal ++= (Def.taskDyn {
mappings in Universal ++= { if (sbtIncludeSbtLaunch)
val launchJar = sbtLaunchJar.value Def.task {
Seq( Seq(
launchJar -> "bin/sbt-launch.jar" sbtLaunchJar.value -> "bin/sbt-launch.jar"
) ++ sbtnJarsMappings.value )
}, }
else Def.task { Seq[(File, String)]() }
}).value,
mappings in Universal ++= sbtnJarsMappings.value,
mappings in Universal ++= (Def.taskDyn { mappings in Universal ++= (Def.taskDyn {
if (sbtOfflineInstall && sbtVersionToRelease.startsWith("1.")) if (sbtOfflineInstall && sbtVersionToRelease.startsWith("1."))
Def.task { Def.task {

21
launcher-package/citest/test.sh
View File

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash -x
# exit when something fails # exit when something fails
set -e set -e
@ -10,8 +10,9 @@ unset SBT_OPTS
java -version java -version
## end of Java switching ## end of Java switching
rm -rf freshly-baked
mkdir -p freshly-baked mkdir -p freshly-baked
unzip -qo ../target/universal/sbt.zip -d ./freshly-baked unzip ../target/universal/sbt.zip -d ./freshly-baked
./freshly-baked/sbt/bin/sbt -Dsbt.no.format=true about ./freshly-baked/sbt/bin/sbt -Dsbt.no.format=true about
./freshly-baked/sbt/bin/sbt -Dsbt.no.format=true about 1> output.txt 2> err.txt ./freshly-baked/sbt/bin/sbt -Dsbt.no.format=true about 1> output.txt 2> err.txt
@ -26,14 +27,14 @@ fail() {
exit 1 exit 1
} }
env HOME=./target/home1 ./freshly-baked/sbt/bin/sbt about # env HOME=./target/home1 ./freshly-baked/sbt/bin/sbt about
test -d ./target/home1/.sbt/preloaded/org/scala-sbt || fail "expected to find preloaded in ./target/home1/.sbt" # test -d ./target/home1/.sbt/preloaded/org/scala-sbt || fail "expected to find preloaded in ./target/home1/.sbt"
env HOME=./target/home2 ./freshly-baked/sbt/bin/sbt -sbt-dir ./target/home2/alternate-sbt about # env HOME=./target/home2 ./freshly-baked/sbt/bin/sbt -sbt-dir ./target/home2/alternate-sbt about
test -d ./target/home2/alternate-sbt/preloaded/org/scala-sbt || fail "expected to find preloaded in ./target/home2/alternate-sbt" # test -d ./target/home2/alternate-sbt/preloaded/org/scala-sbt || fail "expected to find preloaded in ./target/home2/alternate-sbt"
env HOME=./target/home3 ./freshly-baked/sbt/bin/sbt -J-Dsbt.preloaded=./target/home3/alternate-preloaded about # env HOME=./target/home3 ./freshly-baked/sbt/bin/sbt -J-Dsbt.preloaded=./target/home3/alternate-preloaded about
test -d ./target/home3/alternate-preloaded/org/scala-sbt || fail "expected to find preloaded in ./target/home3/alternate-preloaded" # test -d ./target/home3/alternate-preloaded/org/scala-sbt || fail "expected to find preloaded in ./target/home3/alternate-preloaded"
env HOME=./target/home4 ./freshly-baked/sbt/bin/sbt -J-Dsbt.global.base=./target/home4/global-base about # env HOME=./target/home4 ./freshly-baked/sbt/bin/sbt -J-Dsbt.global.base=./target/home4/global-base about
test -d ./target/home4/global-base/preloaded/org/scala-sbt || fail "expected to find preloaded in ./target/home4/global-base" # test -d ./target/home4/global-base/preloaded/org/scala-sbt || fail "expected to find preloaded in ./target/home4/global-base"

2
launcher-package/project/build.properties
View File

@ -1 +1 @@
sbt.version=0.13.17 sbt.version=0.13.18