luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
376 Commits 23 Branches 320 Tags 103 MiB
Commit Graph

79 Commits

Author SHA1 Message Date
Brett Randall da02335261 Changed references to downloading/installing/updating Java (JRE?) to refer to JDK. 
Updated download URLs. Fixed #115.
 2017-11-10 19:48:05 +00:00
Michael Stringer 97f38b5a1d
Set -XX:+UseParallelGC on Java 9 2017-09-28 20:00:33 +01:00
eugene yokota 470da7bd9e Merge pull request #182 from smarter/java10 
Support Java 10
 2017-09-26 18:32:55 -04:00
Tim Harper d251388f53 OS X compatible line-ending stripping 
BSD sed interprets sed 's/\r//' as "replace the literal letter r". A more compatible approach delegates the interpretation of this sequence to bash.

Fixes #186
 2017-09-26 15:30:03 -06:00
Guillaume Martres 32e8859df6 Support Java 10 
In bash, "10" < "1.6" returns false, because it's a string comparison.
Use bc instead to compare decimal numbers.
 2017-09-19 13:33:07 +02:00
eugene yokota 206ccb675a Merge branch 'master' into wip/sbtopts-crlf 2017-09-18 12:55:40 -04:00
Iurii Malchenko 3d194ebdbe Use /etc/sbt/sbtopts file if exists. 2017-08-26 02:23:26 +03:00
Jason Zaugg c487e3166e Fix java version detection in bash script 
`java -version` can include an extra line of output
if `_JAVA_OPTTIONS` is set.

This commit adds a grep step before sed to harden
against this possibility.

Before:
```
⚡ (export _JAVA_OPTIONS=-Dfoo.bar; java -version 2>&1 | sed 's/.*version "\([0-9]*\)\(\.[0-9]*\)\{0,1\}\(.*\)*"/\1\2/; 1q')
Picked up _JAVA_OPTIONS: -Dfoo.bar
```

After:
```
⚡ (export _JAVA_OPTIONS=-Dfoo.bar; java -version 2>&1 | grep ' version "' | sed 's/.*version "\([0-9]*\)\(\.[0-9]*\)\{0,1\}\(.*\)*"/\1\2/; 1q')
1.8
```
 2017-07-26 14:57:58 +10:00
Iulian Dragos a616031ca3 Read last line of config files without EOL 
The last line in a configuration file may not have a terminating EOL character. This commit fixes the launcher script to read that line as well.

Inspiration: https://stackoverflow.com/questions/10929453/read-a-file-line-by-line-assigning-the-value-to-a-variable
 2017-06-30 16:31:28 +02:00
Jason Steenstra-Pickens 11edc53335 Remove carriage return characters when loading configuration files. 
Issue: sbt/sbt-launcher-package#165
 2017-06-01 22:46:06 +12:00
tksk b66b0ff7f6 Fix: multiple execution of universal:stage task produces duplicated version strings 2017-05-05 15:45:20 +09:00
tksk a602ed760e Fix missing placeholder `INIT_SBT_VERSION' 2017-05-05 00:29:52 +09:00
tksk ab3de739d7 detect $init_sbt_version 2017-04-28 02:28:16 +09:00
tksk fb30f81f89 fix: recursive copying needs "/E" option 2017-04-28 02:27:48 +09:00
tksk ef8011df0d fix: least java version check for syncing "preloaded" 2017-04-28 02:26:49 +09:00
eugene yokota d5f8aff4c2 Merge pull request #156 from sbt/wip/150 
Workaround for brew test sbt
 2017-04-12 20:20:57 -04:00
Eugene Yokota 36e8246825 Workaround for brew test sbt 
brew test sbt doesn't detect java version correctly. This change makes the script a bit more safer.

Fixes #150
 2017-04-12 07:57:27 -04:00
Eugene Yokota 226c34a7bf Replace realpath with something Mac compat 
Mac by default doesn't have realpath(1).
This replaces it with an equivalent bash script, so we can reduce script replacements on Homebrew.

Fixes #149
 2017-04-12 07:53:43 -04:00
eugene yokota bd18a0c2c6 Fix Windows script 2017-04-08 23:35:20 -07:00
eugene yokota 70ad35ebb6 Minor Windows fixes 2017-04-07 22:13:12 -07:00
Eugene Yokota 0f8b3b0ffb Fix bash script 2017-04-07 04:13:13 -04:00
Eugene Yokota 2fad446e67 Make offline installer optional 2017-04-07 00:56:55 -04:00
Eugene Yokota d3ca77a95d mkdir before rsync 
Fixes sbt/sbt#3005
 2017-04-07 00:32:16 -04:00
Eugene Yokota 1ea1f5d52d mkdir -p 
Fixes sbt/sbt#3005
 2017-03-17 16:54:04 -04:00
monktastic c7f3be3b58 Preserve quotes in system properties 
Today you cannot have spaces in system properties:

$ sbt -Dfoo="bar baz" ...

It passes [-Dfoo=bar] and [baz] to java (see https://github.com/sbt/sbt/issues/2787).

This change allows you to do:

$ sbt "-Dfoo=bar baz"

which will pass ["-Dfoo=bar baz"]. And both of these two:

$ sbt "-Dfoo=bar"
$ sbt -Dfoo=bar

still work, passing [-Dfoo=bar].
 2017-03-16 17:01:57 -07:00
Eugene Yokota e4dae9a120 Fix Java 9 support 2017-03-11 16:34:10 -05:00
Eugene Yokota cea5d178d8 add offline installtion 
To utilize local preloaded repo, this will create lib/ directory with all artifacts required for sbt. This can be rsynced to the preloaded repo.
 2017-03-10 16:56:00 -05:00
Eugene Yokota 39d8504045 --rt-ext-dir returns a dir specific to JDK 9 ver 2017-03-09 20:10:59 -05:00
Eugene Yokota 605a17d949 move JDK9 logic within copyRt 2017-02-19 09:16:40 +01:00
Eugene Yokota 1b9f618efa Implement JDK 9 support for Windows 2017-02-15 12:18:51 -05:00
Eugene Yokota e8670ba78f Change to Windows lineending 2017-02-15 12:17:23 -05:00
Eugene Yokota f77c15496b add JDK 9 support 2017-02-15 04:57:47 -05:00
Eugene Yokota acd610be67 Fix checkJava function 2017-01-16 03:09:29 -05:00
eugene yokota 86afaaebb4 Merge pull request #134 from Atry/patch-2 
Don't set MaxMetaspaceSize on Java 8 by default
 2017-01-11 10:29:38 -05:00
Eugene Yokota f14b165523 Fix java version detection 
Previously awk was used to grab the full Java version such as 1.8.0_91.
While this is more accurate, 1.8.0_91 is not a number that can be compared by bash, and thus JDK8 detection logics were failing.
Fixes #135
 2017-01-11 00:20:38 -05:00
杨博 (Yang Bo) e1d64533f3 Don't set MaxMetaspaceSize on Java 8 by default 2017-01-11 12:00:34 +08:00
eugene yokota 697e1239cb Merge pull request #122 from ahihi/master 
Fix handling of arguments with asterisks on Windows
 2016-12-31 02:09:58 -05:00
Will Sargent 04dfd94ff5 Add MSYS as a "cygwin" like 2016-11-27 20:30:58 -08:00
Antonio Cunei 345890880e Missing quotes may cause incorrect PATH expansion, fixed 
If PATH contains ampersands etc, PATH may be
incorrectly expanded.
 2016-11-16 14:26:39 +01:00
Miranda Kastemaa c4aa9052b5 Use more reliable shift loop for processing args 2016-10-17 15:51:53 +03:00
Sam Halliday d9da67979a -java-home should set PATH for javac usage 2016-08-25 20:16:35 +01:00
Sam Halliday 45badebcee add support for .jvmopts to the bash launcher 2016-08-25 20:16:35 +01:00
Sam Halliday daed09b8cd add support for .jvmopts and .java-version to Windows launcher 2016-08-24 20:55:02 +01:00
Martijn Riemers 1705b58fde Corrected spelling mistake in sbt.bat 2016-05-28 12:27:53 +02:00
eugene yokota 55628f6437 Merge pull request #96 from TLmaK0/fix_git_for_windows_interactive 
Allow to run sbt interactive mode in git for windows bash
 2016-02-22 02:07:52 -05:00
eugene yokota a4a32340d1 Merge pull request #98 from DarrenBishop/master 
-jvm-debug for Windows launch script
 2016-02-22 02:07:44 -05:00
Eugene Yokota 843a60734b Fixes #104. Allow individual memory options to be controlled 
When a `-J` option is passed in such as `-J-XX:MaxPermSize=1001M`, it
will override only that option.
 2016-02-19 17:46:05 -05:00
Mihai Capotă 0d9806b9ff Check memory options in JAVA_TOOL_OPTIONS 
JAVA_TOOL_OPTIONS is used by the JVM [1] so it must also be checked for memory options that conflict with the ones set in get_mem_opts.

[1] https://docs.oracle.com/javase/8/docs/technotes/guides/troubleshoot/envvars002.html
 2016-02-17 11:26:13 -08:00
Eugene Yokota 40167af167 Handle SBT_OPTS 
Fixes sbt/sbt-launcher-package#99 formerly known as sbt/sbt#2194.
get_mem_opts() is a bash function that generates memory related
options. This change makes it return `""` the SBT_OPTS variable
contains memory-related options already.
 2016-01-21 23:26:25 -05:00
Darren Bishop dc4a56c2e0 Updated the MS Windows SBT launcher script to get the same/similar behaviour for -jvm-debug as implemented in the *nix shell script launcher. 
http://stackoverflow.com/questions/4150776/debugging-scala-code-with-simple-build-tool-sbt-and-intellij/28236830#28236830
 2016-01-12 14:50:37 +00:00