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

Added -S option. 

Analogous to -J, passes an argument to scalac (by way of
adding it to sbt's scalacOptions.)

Example, sbt -S-Xlint .
This commit is contained in:
Paul Phillips 2011-12-09 23:28:09 -08:00
parent 7472c2f603
commit 0afdf8cd48
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sbt
View File

@ -66,6 +66,7 @@ unset verbose debug
# pull -J and -D options to give to java. # pull -J and -D options to give to java.
declare -a residual_args declare -a residual_args
declare -a java_args declare -a java_args
declare -a scalac_args
declare -a sbt_commands declare -a sbt_commands
build_props_sbt () { build_props_sbt () {
@ -243,6 +244,7 @@ Usage: $script_name [options]
.sbtopts if this file exists in the sbt root, it is prepended to the runner args .sbtopts if this file exists in the sbt root, 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 is stripped) -J-X pass option -X directly to the java runtime (-J is stripped)
-S-X add -X to sbt's scalacOptions (-J is stripped)
In the case of duplicated or conflicting options, the order above In the case of duplicated or conflicting options, the order above
shows precedence: JAVA_OPTS lowest, command line options highest. shows precedence: JAVA_OPTS lowest, command line options highest.
@ -257,6 +259,10 @@ addSbt () {
dlog "[addSbt] arg = '$1'" dlog "[addSbt] arg = '$1'"
sbt_commands=( "${sbt_commands[@]}" "$1" ) sbt_commands=( "${sbt_commands[@]}" "$1" )
} }
addScalac () {
dlog "[addScalac] arg = '$1'"
scalac_args=( "${scalac_args[@]}" "$1" )
}
addResidual () { addResidual () {
dlog "[residual] arg = '$1'" dlog "[residual] arg = '$1'"
residual_args=( "${residual_args[@]}" "$1" ) residual_args=( "${residual_args[@]}" "$1" )
@ -311,6 +317,7 @@ process_args ()
-D*) addJava "$1" && shift ;; -D*) addJava "$1" && shift ;;
-J*) addJava "${1:2}" && shift ;; -J*) addJava "${1:2}" && shift ;;
-S*) addScalac "${1:2}" && shift ;;
-28) addSbt "++ $latest_28" && shift ;; -28) addSbt "++ $latest_28" && shift ;;
-29) addSbt "++ $latest_29" && shift ;; -29) addSbt "++ $latest_29" && shift ;;
-210) addSnapshotRepo ; addSbt "++ $latest_210" && shift ;; -210) addSnapshotRepo ; addSbt "++ $latest_210" && shift ;;
@ -335,6 +342,9 @@ process_args "$@"
set -- "${residual_args[@]}" set -- "${residual_args[@]}"
argumentCount=$# argumentCount=$#
# set scalacOptions if we were given any -S opts
[[ ${#scalac_args[@]} -eq 0 ]] || addSbt "set scalacOptions in ThisBuild += \"${scalac_args[@]}\""
# figure out the version # figure out the version
[[ "$sbt_version" ]] || sbt_version=$(build_props_sbt) [[ "$sbt_version" ]] || sbt_version=$(build_props_sbt)
[[ "$sbt_version" = *-SNAPSHOT* || "$sbt_version" = *-RC* ]] && sbt_snapshot=1 [[ "$sbt_version" = *-SNAPSHOT* || "$sbt_version" = *-RC* ]] && sbt_snapshot=1