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

Merge pull request #112 from fommil/lunix 

add support for .jvmopts to the bash launcher
This commit is contained in:
eugene yokota 2016-08-25 16:46:47 -04:00 committed by GitHub
parent a6e8d62c19 d9da67979a
commit a1dfe86698
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/linux/usr/share/man/man1/sbt.1
View File

@ -72,10 +72,15 @@ add -X to sbt's scalacOptions (-S is stripped)
.RS .RS
The user configuration file. The user configuration file.
.RE .RE
.I ".jvmopts"
.RS
if this file exists in the current directory, its contents are appended
to the JAVA_OPTS.
.RE
.I ".sbtopts" .I ".sbtopts"
.RS .RS
if this file exists in the current directory, it is prepended to the if this file exists in the current directory, its contents are prepended
runner args. to the runner args.
.RE .RE
.I "/etc/sbt/sbtopts" .I "/etc/sbt/sbtopts"
.RS .RS

12
src/universal/bin/sbt
View File

@ -94,9 +94,11 @@ Usage: $script_name [options]
# 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 "$java_opts"
.jvmopts if this file exists in the current directory, its contents
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"
.sbtopts if this file exists in the current directory, it is .sbtopts if this file exists in the current directory, its contents
prepended to the runner args are prepended to the runner args
/etc/sbt/sbtopts if this file exists, it is prepended to the runner args /etc/sbt/sbtopts if this file exists, it is prepended to the runner args
-Dkey=val pass -Dkey=val directly to the java runtime -Dkey=val pass -Dkey=val directly to the java runtime
-J-X pass option -X directly to the java runtime -J-X pass option -X directly to the java runtime
@ -137,16 +139,14 @@ loadConfigFile() {
done done
} }
# TODO - Pull in config based on operating system... (MSYS + cygwin should pull in txt file).
# 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") "$@"
# -- Windows behavior stub'd
# JAVA_OPTS=$(cat "$WDIR/sbtconfig.txt" | sed -e 's/\r//g' -e 's/^#.*$//g' | sed ':a;N;$!ba;s/\n/ /g')
# 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.
[[ -f ".jvmopts" ]] && export JAVA_OPTS="$JAVA_OPTS $(loadConfigFile .jvmopts)"
run "$@" run "$@"

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

@ -128,7 +128,12 @@ process_args () {
-sbt-jar) require_arg path "$1" "$2" && sbt_jar="$2" && shift 2 ;; -sbt-jar) require_arg path "$1" "$2" && sbt_jar="$2" && shift 2 ;;
-sbt-version) require_arg version "$1" "$2" && sbt_version="$2" && shift 2 ;; -sbt-version) require_arg version "$1" "$2" && sbt_version="$2" && shift 2 ;;
-java-home) require_arg path "$1" "$2" && java_cmd="$2/bin/java" && shift 2 ;; -java-home) require_arg path "$1" "$2" &&
java_cmd="$2/bin/java" &&
export JAVA_HOME="$2" &&
export JDK_HOME="$2" &&
export PATH="$2/bin:$PATH" &&
shift 2 ;;
-D*) addJava "$1" && shift ;; -D*) addJava "$1" && shift ;;
-J*) addJava "${1:2}" && shift ;; -J*) addJava "${1:2}" && shift ;;