From 73f473efce7d485ebb434e83477012722504549e Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Mon, 22 Mar 2021 04:19:27 -0400 Subject: [PATCH] Remove export-rt The feature of export-rt is now folded into sbt-launcher --- build.sbt | 18 ++---------------- src/universal/bin/sbt | 10 +++------- src/universal/bin/sbt.bat | 22 ++++++++++------------ 3 files changed, 15 insertions(+), 35 deletions(-) diff --git a/build.sbt b/build.sbt index 23474eb73..c2459f8a3 100755 --- a/build.sbt +++ b/build.sbt @@ -33,8 +33,6 @@ lazy val scala212Jline = "jline" % "jline" % "2.14.6" // use the scala-xml version used by the compiler not the latest: https://github.com/scala/scala/blob/v2.12.10/versions.properties#L22 lazy val scala212Xml = "org.scala-lang.modules" % "scala-xml_2.12" % "1.0.6" lazy val sbtActual = "org.scala-sbt" % "sbt" % sbtVersionToRelease -val java9rtexportVersion = "0.1.0" -lazy val java9rtexport = "org.scala-sbt.rt" % "java9-rt-export" % java9rtexportVersion % Runtime lazy val sbt013ExtraDeps = { if (sbtVersionToRelease startsWith "0.13.") Seq(scala210Jline) @@ -65,7 +63,6 @@ val windowsBuildId = settingKey[Int]("build id for Windows installer") val debianBuildId = settingKey[Int]("build id for Debian") val exportRepoUsingCoursier = taskKey[File]("export Maven style repository") -val rtExportUsingCoursier = taskKey[File]("Grab RT export utility") val exportRepoCsrDirectory = settingKey[File]("") val x86MacPlatform = "x86_64-apple-darwin" @@ -252,15 +249,6 @@ val root = (project in file(".")). packageName in Universal := packageName.value, // needs to be set explicitly due to a bug in native-packager version in Universal := sbtVersionToRelease, - rtExportUsingCoursier := { - val csr = - if (isWindows) (baseDirectory in LocalRootProject).value / "bin" / "coursier.bat" - else (baseDirectory in LocalRootProject).value / "bin" / "coursier" - val cache = target.value / "coursier" - s"$csr fetch --cache $cache ${colonName(java9rtexport)}".! - (cache ** "*.jar").get.head - }, - mappings in Universal := { val t = (target in Universal).value val prev = (mappings in Universal).value @@ -292,10 +280,8 @@ val root = (project in file(".")). mappings in Universal ++= { val launchJar = sbtLaunchJar.value - val rtExportJar = rtExportUsingCoursier.value Seq( - launchJar -> "bin/sbt-launch.jar", - rtExportJar -> "bin/java9-rt-export.jar" + launchJar -> "bin/sbt-launch.jar" ) ++ sbtnJarsMappings.value }, mappings in Universal ++= (Def.taskDyn { @@ -432,7 +418,7 @@ lazy val dist = (project in file("dist")) if (sbtVersionToRelease startsWith "0.13.") scala210 else scala212 }, - libraryDependencies ++= Seq(sbtActual, java9rtexport, jansi, scala212Compiler, scala212Jline, scala212Xml) ++ sbt013ExtraDeps, + libraryDependencies ++= Seq(sbtActual, jansi, scala212Compiler, scala212Jline, scala212Xml) ++ sbt013ExtraDeps, exportRepo := { val old = exportRepo.value sbtVersionToRelease match { diff --git a/src/universal/bin/sbt b/src/universal/bin/sbt index 64c8527be..ac198cc8b 100755 --- a/src/universal/bin/sbt +++ b/src/universal/bin/sbt @@ -105,10 +105,6 @@ acquire_sbt_jar () { fi } -rt_export_file () { - echo "$(cygwinpath "${sbt_bin_dir}/java9-rt-export.jar")" -} - # execRunner should be called only once to give up control to java execRunner () { # print the arguments one to a line, quoting any containing spaces @@ -337,10 +333,9 @@ checkJava() { copyRt() { local at_least_9="$(expr $java_version ">=" 9)" if [[ "$at_least_9" == "1" ]]; then - rtexport=$(rt_export_file) # The grep for java9-rt-ext- matches the filename prefix printed in Export.java java9_ext=$("$java_cmd" "${sbt_options[@]}" "${java_args[@]}" \ - -jar "$rtexport" --rt-ext-dir | grep java9-rt-ext- | tr -d '\r') + -jar "$sbt_jar" --rt-ext-dir | grep java9-rt-ext- | tr -d '\r') java9_rt=$(echo "$java9_ext/rt.jar") vlog "[copyRt] java9_rt = '$java9_rt'" if [[ ! -f "$java9_rt" ]]; then @@ -349,7 +344,8 @@ copyRt() { "$java_cmd" \ "${sbt_options[@]}" \ "${java_args[@]}" \ - -jar "$rtexport" \ + -jar "$sbt_jar" \ + --export-rt \ "${java9_rt}" fi addJava "-Dscala.ext.dirs=${java9_ext}" diff --git a/src/universal/bin/sbt.bat b/src/universal/bin/sbt.bat index ccab7ad19..cda987c9e 100755 --- a/src/universal/bin/sbt.bat +++ b/src/universal/bin/sbt.bat @@ -530,6 +530,14 @@ if !run_native_client! equ 1 ( call :checkjava +if defined sbt_args_sbt_jar ( + set "sbt_jar=!sbt_args_sbt_jar!" +) else ( + set "sbt_jar=!SBT_HOME!\bin\sbt-launch.jar" +) + +set sbt_jar=!sbt_jar:"=! + call :copyrt if defined JVM_DEBUG_PORT ( @@ -601,14 +609,6 @@ if defined sbt_args_traces ( set _SBT_OPTS=-Dsbt.traces=true !_SBT_OPTS! ) -if defined sbt_args_sbt_jar ( - set "sbt_jar=!sbt_args_sbt_jar!" -) else ( - set "sbt_jar=!SBT_HOME!\bin\sbt-launch.jar" -) - -set sbt_jar=!sbt_jar:"=! - rem TODO: _SBT_OPTS needs to be processed as args and diffed against SBT_ARGS if !sbt_args_print_sbt_version! equ 1 ( @@ -872,15 +872,13 @@ exit /B 1 :copyrt if /I !JAVA_VERSION! GEQ 9 ( - set "rtexport=!SBT_BIN_DIR!java9-rt-export.jar" - - "!_JAVACMD!" !_JAVA_OPTS! !_SBT_OPTS! -jar "!rtexport!" --rt-ext-dir > "%TEMP%.\rtext.txt" + "!_JAVACMD!" !_JAVA_OPTS! !_SBT_OPTS! -jar "!sbt_jar!" --rt-ext-dir > "%TEMP%.\rtext.txt" set /p java9_ext= < "%TEMP%.\rtext.txt" set "java9_rt=!java9_ext!\rt.jar" if not exist "!java9_rt!" ( mkdir "!java9_ext!" - "!_JAVACMD!" !_JAVA_OPTS! !_SBT_OPTS! -jar "!rtexport!" "!java9_rt!" + "!_JAVACMD!" !_JAVA_OPTS! !_SBT_OPTS! -jar "!sbt_jar!" --export-rt "!java9_rt!" ) set _JAVA_OPTS=!_JAVA_OPTS! -Dscala.ext.dirs="!java9_ext!" )