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

Minor Windows fixes

This commit is contained in:
eugene yokota 2017-04-07 22:13:12 -07:00
parent 0f8b3b0ffb
commit 70ad35ebb6
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.sbt
View File

@ -102,11 +102,12 @@ val root = (project in file(".")).
rpmProvides := Seq("sbt"), rpmProvides := Seq("sbt"),
// WINDOWS SPECIFIC // WINDOWS SPECIFIC
windowsBuildId := 1, windowsBuildId := 0,
version in Windows := { version in Windows := {
val bid = windowsBuildId.value val bid = windowsBuildId.value
val sv = sbtVersionToRelease val sv = sbtVersionToRelease
(sv split "[^\\d]" filterNot (_.isEmpty)) match { (sv split "[^\\d]" filterNot (_.isEmpty)) match {
case Array(major,minor,bugfix, _*) if bid == 0 => Seq(major, minor, bugfix) mkString "."
case Array(major,minor,bugfix, _*) => Seq(major, minor, bugfix, bid.toString) mkString "." case Array(major,minor,bugfix, _*) => Seq(major, minor, bugfix, bid.toString) mkString "."
case Array(major,minor) => Seq(major, minor, "0", bid.toString) mkString "." case Array(major,minor) => Seq(major, minor, "0", bid.toString) mkString "."
case Array(major) => Seq(major, "0", "0", bid.toString) mkString "." case Array(major) => Seq(major, "0", "0", bid.toString) mkString "."

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

@ -11,6 +11,7 @@
@echo off @echo off
set SBT_HOME=%~dp0 set SBT_HOME=%~dp0
set SBT_ARGS=
rem FIRST we load the config file of extra options. rem FIRST we load the config file of extra options.
set FN=%SBT_HOME%\..\conf\sbtconfig.txt set FN=%SBT_HOME%\..\conf\sbtconfig.txt
@ -95,19 +96,18 @@ goto :eof
:process :process
rem parses 1.7, 1.8, 9, etc out of java version "1.8.0_91" rem parses 1.7, 1.8, 9, etc out of java version "1.8.0_91"
"%_JAVACMD%" -Xmx512M -version 2> "%TEMP%.\out.txt" "%_JAVACMD%" -Xmx512M -version 2> "%TEMP%\out.txt"
set JAVA_VERSION=0 set JAVA_VERSION=0
findstr /c:"version \"9" "%TEMP%.\out.txt" >nul findstr /c:"version \"9" "%TEMP%\out.txt"
if /I %ERRORLEVEL% EQU 0 (set JAVA_VERSION=9) if /I %ERRORLEVEL% EQU 0 (set JAVA_VERSION=9)
findstr /c:"version \"1.8" "%TEMP%.\out.txt" >nul findstr /c:"version \"1.8" "%TEMP%\out.txt"
if /I %ERRORLEVEL% EQU 0 (set JAVA_VERSION=1.8) if /I %ERRORLEVEL% EQU 0 (set JAVA_VERSION=1.8)
findstr /c:"version \"1.7" "%TEMP%.\out.txt" >nul findstr /c:"version \"1.7" "%TEMP%\out.txt"
if /I %ERRORLEVEL% EQU 0 (set JAVA_VERSION=1.7) if /I %ERRORLEVEL% EQU 0 (set JAVA_VERSION=1.7)
findstr /c:"version \"1.6" "%TEMP%.\out.txt" >nul findstr /c:"version \"1.6" "%TEMP%\out.txt"
if /I %ERRORLEVEL% EQU 0 (set JAVA_VERSION=1.6) if /I %ERRORLEVEL% EQU 0 (set JAVA_VERSION=1.6)
findstr /c:"version \"1.5" "%TEMP%.\out.txt" >nul findstr /c:"version \"1.5" "%TEMP%\out.txt"
if /I %ERRORLEVEL% EQU 0 (set JAVA_VERSION=1.5) if /I %ERRORLEVEL% EQU 0 (set JAVA_VERSION=1.5)
exit /B 0 exit /B 0
:checkjava :checkjava