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

Fix: multiple execution of universal:stage task produces duplicated version strings

This commit is contained in:
tksk 2017-05-05 15:45:20 +09:00
parent a602ed760e
commit b66b0ff7f6
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.sbt
View File

@ -155,9 +155,11 @@ val root = (project in file(".")).
val old = (stage in Universal).value val old = (stage in Universal).value
val sd = (stagingDirectory in Universal).value val sd = (stagingDirectory in Universal).value
val x = IO.read(sd / "bin" / "sbt-launch-lib.bash") val x = IO.read(sd / "bin" / "sbt-launch-lib.bash")
IO.write(sd / "bin" / "sbt-launch-lib.bash", x.replaceAllLiterally("declare init_sbt_version=", s"declare init_sbt_version=$sbtVersionToRelease")) IO.write(sd / "bin" / "sbt-launch-lib.bash", x.replaceAllLiterally(
"declare init_sbt_version=_to_be_replaced", s"declare init_sbt_version=$sbtVersionToRelease"))
val y = IO.read(sd / "bin" / "sbt.bat") val y = IO.read(sd / "bin" / "sbt.bat")
IO.write(sd / "bin" / "sbt.bat", y.replaceAllLiterally("set INIT_SBT_VERSION=", s"set INIT_SBT_VERSION=$sbtVersionToRelease")) IO.write(sd / "bin" / "sbt.bat", y.replaceAllLiterally(
"set INIT_SBT_VERSION=_TO_BE_REPLACED", s"set INIT_SBT_VERSION=$sbtVersionToRelease"))
old old
}, },

2
src/universal/bin/sbt-launch-lib.bash
View File

@ -12,7 +12,7 @@ declare -a scalac_args
declare -a sbt_commands declare -a sbt_commands
declare java_cmd=java declare java_cmd=java
declare java_version declare java_version
declare init_sbt_version= declare init_sbt_version=_to_be_replaced
declare SCRIPT=$0 declare SCRIPT=$0
while [ -h "$SCRIPT" ] ; do while [ -h "$SCRIPT" ] ; do

2
src/universal/bin/sbt.bat
View File

@ -53,7 +53,7 @@ rem We use the value of the JAVA_OPTS environment variable if defined, rather th
set _JAVA_OPTS=%JAVA_OPTS% set _JAVA_OPTS=%JAVA_OPTS%
if "%_JAVA_OPTS%"=="" set _JAVA_OPTS=%CFG_OPTS% if "%_JAVA_OPTS%"=="" set _JAVA_OPTS=%CFG_OPTS%
set INIT_SBT_VERSION= set INIT_SBT_VERSION=_TO_BE_REPLACED
:args_loop :args_loop
if "%~1" == "" goto args_end if "%~1" == "" goto args_end