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

Merge pull request #207 from sbt/wip/windows 

Fix "was unexpected at this time."
This commit is contained in:
eugene yokota 2018-01-08 10:33:12 -05:00 committed by GitHub
parent a8b7b5a060 417599b463
commit bf9cd40349
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
citest/build.sbt
View File

@ -16,12 +16,9 @@ lazy val root = (project in file("."))
assert(xs(4) startsWith "[info] The current project") assert(xs(4) startsWith "[info] The current project")
assert(xs(5) startsWith "[info] The current project is built against Scala 2.12.4") assert(xs(5) startsWith "[info] The current project is built against Scala 2.12.4")
val ys = IO.readLines(file("err.txt")).toVector val ys = IO.readLines(file("err.txt")).toVector.distinct
println(ys) assert(ys.size == 1, s"ys has more than one item: $ys")
assert(ys.size == 2)
assert(ys(0) startsWith "Java HotSpot(TM) 64-Bit Server VM warning") assert(ys(0) startsWith "Java HotSpot(TM) 64-Bit Server VM warning")
assert(ys(1) startsWith "Java HotSpot(TM) 64-Bit Server VM warning")
} }
) )

2
citest/test.bat
View File

@ -7,6 +7,8 @@ unzip ..\target\universal\sbt.zip -d freshly-baked
SETLOCAL SETLOCAL
"freshly-baked\sbt\bin\sbt" about
SET JAVA_HOME=C:\jdk9 SET JAVA_HOME=C:\jdk9
SET PATH=C:\jdk9\bin;%PATH% SET PATH=C:\jdk9\bin;%PATH%
SET SBT_OPTS=-Xmx4g -Dfile.encoding=UTF8 SET SBT_OPTS=-Xmx4g -Dfile.encoding=UTF8

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

@ -129,7 +129,7 @@ exit /B 1
:copyrt :copyrt
if /I "%JAVA_VERSION%" GEQ "9" ( if /I "%JAVA_VERSION%" GEQ "9" (
set rtexport=%SBT_HOME%java9-rt-export.jar set rtexport=!SBT_HOME!java9-rt-export.jar
"%_JAVACMD%" %_JAVA_OPTS% %SBT_OPTS% -jar "!rtexport!" --rt-ext-dir > "%TEMP%.\rtext.txt" "%_JAVACMD%" %_JAVA_OPTS% %SBT_OPTS% -jar "!rtexport!" --rt-ext-dir > "%TEMP%.\rtext.txt"
set /p java9_ext= < "%TEMP%.\rtext.txt" set /p java9_ext= < "%TEMP%.\rtext.txt"