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

Merge pull request #307 from er1c/script-version-no-copy 

Update sbt.bat --script-version to execute early and avoid java check/robocopy bootstrap
This commit is contained in:
eugene yokota 2019-11-18 07:49:17 +02:00 committed by GitHub
parent 98aac0a413 8122bd7020
commit 031021cea0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
citest/project/build.properties
View File

@ -1 +1 @@
sbt.version=1.3.0-M4 sbt.version=1.3.0

2
integration-test/src/test/scala/RunnerTest.scala
View File

@ -161,7 +161,7 @@ object SbtRunnerTest extends SimpleTestSuite with PowerAssertions {
} }
test("sbt --script-version should print sbtVersion") { test("sbt --script-version should print sbtVersion") {
val out = sbtProcessWithOpts("--numeric-version", "", "").!!.trim val out = sbtProcessWithOpts("--script-version", "", "").!!.trim
val expectedVersion = "^"+versionRegEx+"$" val expectedVersion = "^"+versionRegEx+"$"
assert(out.matches(expectedVersion)) assert(out.matches(expectedVersion))
() ()

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

@ -459,8 +459,6 @@ goto args_loop
rem Confirm a user's intent if the current directory does not look like an sbt rem Confirm a user's intent if the current directory does not look like an sbt
rem top-level directory and the "new" command was not given. rem top-level directory and the "new" command was not given.
rem TODO: if not -sbt-create
if not defined sbt_args_sbt_create if not defined sbt_args_print_version if not defined sbt_args_print_sbt_version if not defined sbt_args_print_sbt_script_version if not exist build.sbt ( if not defined sbt_args_sbt_create if not defined sbt_args_print_version if not defined sbt_args_print_sbt_version if not defined sbt_args_print_sbt_script_version if not exist build.sbt (
if not exist project\ ( if not exist project\ (
if not defined sbt_new ( if not defined sbt_new (
@ -486,6 +484,13 @@ if not defined sbt_args_sbt_create if not defined sbt_args_print_version if not
call :process call :process
rem avoid bootstrapping/java version check for script version
if !sbt_args_print_sbt_script_version! equ 1 (
echo !init_sbt_version!
goto :eof
)
call :checkjava call :checkjava
call :copyrt call :copyrt
@ -569,11 +574,6 @@ set sbt_jar=!sbt_jar:"=!
rem TODO: _SBT_OPTS needs to be processed as args and diffed against SBT_ARGS rem TODO: _SBT_OPTS needs to be processed as args and diffed against SBT_ARGS
if !sbt_args_print_sbt_script_version! equ 1 (
echo !init_sbt_version!
goto :eof
)
if !sbt_args_print_sbt_version! equ 1 ( if !sbt_args_print_sbt_version! equ 1 (
call :set_sbt_version call :set_sbt_version
echo !sbt_version! echo !sbt_version!