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

Default to -Dfile.encoding=UTF-8 

Fixes #236
This commit is contained in:
Eugene Yokota 2019-02-22 16:01:17 -05:00
parent 4d772b4745
commit 3f9e91aa4f
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
citest/test.sh
View File

@ -11,7 +11,7 @@ unzip -qo ../target/universal/sbt.zip -d ./freshly-baked
export SBT_OPTS=-Dfile.encoding=UTF-8 export SBT_OPTS=-Dfile.encoding=UTF-8
./freshly-baked/sbt/bin/sbt about run ./freshly-baked/sbt/bin/sbt about run -v
export SBT_OPTS="-Dfile.encoding=UTF-8 -Xms2048M -Xmx2048M -Xss2M -XX:MaxPermSize=512M" export SBT_OPTS="-Dfile.encoding=UTF-8 -Xms2048M -Xmx2048M -Xss2M -XX:MaxPermSize=512M"

13
src/universal/bin/sbt
View File

@ -9,7 +9,8 @@ declare java_cmd=java
declare java_version declare java_version
declare init_sbt_version=_to_be_replaced declare init_sbt_version=_to_be_replaced
declare sbt_default_mem=1024 declare sbt_default_mem=1024
declare default_sbt_opts="" declare -r default_sbt_opts=""
declare -r default_java_opts="-Dfile.encoding=UTF-8"
### ------------------------------- ### ### ------------------------------- ###
### Helper methods for BASH scripts ### ### Helper methods for BASH scripts ###
@ -422,7 +423,7 @@ Usage: `basename "$0"` [options]
-java-home <path> alternate JAVA_HOME -java-home <path> alternate JAVA_HOME
# jvm options and output control # jvm options and output control
JAVA_OPTS environment variable, if unset uses "$java_opts" JAVA_OPTS environment variable, if unset uses "$default_java_opts"
.jvmopts if this file exists in the current directory, its contents .jvmopts if this file exists in the current directory, its contents
are appended to JAVA_OPTS are appended to JAVA_OPTS
SBT_OPTS environment variable, if unset uses "$default_sbt_opts" SBT_OPTS environment variable, if unset uses "$default_sbt_opts"
@ -494,11 +495,13 @@ loadConfigFile() {
# Here we pull in the global settings configuration. # Here we pull in the global settings configuration.
[[ -f "$etc_sbt_opts_file" ]] && set -- $(loadConfigFile "$etc_sbt_opts_file") "$@" [[ -f "$etc_sbt_opts_file" ]] && set -- $(loadConfigFile "$etc_sbt_opts_file") "$@"
# Pull in the project-level config file, if it exists. # Pull in the project-level config file, if it exists.
[[ -f "$sbt_opts_file" ]] && set -- $(loadConfigFile "$sbt_opts_file") "$@" [[ -f "$sbt_opts_file" ]] && set -- $(loadConfigFile "$sbt_opts_file") "$@"
# Pull in the project-level java config, if it exists. # Pull in the project-level java config, if it exists.
[[ -f ".jvmopts" ]] && export JAVA_OPTS="$JAVA_OPTS $(loadConfigFile .jvmopts)" [[ -f ".jvmopts" ]] && export JAVA_OPTS="$JAVA_OPTS $(loadConfigFile .jvmopts)"
run "$@" # Pull in default JAVA_OPTS
[[ -z "${JAVA_OPTS// }" ]] && export JAVA_OPTS="$default_java_opts"
run "$@"

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

@ -13,6 +13,8 @@
set SBT_HOME=%~dp0 set SBT_HOME=%~dp0
set SBT_ARGS= set SBT_ARGS=
set DEFAULT_JAVA_OPTS=-Dfile.encoding=UTF-8
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
set CFG_OPTS= set CFG_OPTS=
@ -55,6 +57,8 @@ 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%
if "%_JAVA_OPTS%"=="" set _JAVA_OPTS=%DEFAULT_JAVA_OPTS%
set INIT_SBT_VERSION=_TO_BE_REPLACED set INIT_SBT_VERSION=_TO_BE_REPLACED
:args_loop :args_loop