luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
410 Commits 29 Branches 319 Tags 97 MiB
Commit Graph

151 Commits

Author SHA1 Message Date
Ethan Atkins 09a7152b1d Whitelist java9-rt-ext- output in rt export process 
If -verbose:gc is set, there can be gc log output in this process that
prevents the directory from being properly extracted. Rather than
blacklist possible output strings, I think it makes more sense to
whitelist the specific output line that we're looking for.
 2018-02-12 09:20:30 -08:00
Martynas Mickevičius e15633064b
Handle JDK 10 version string 2018-02-03 18:19:24 +01:00
Eugene Yokota 3b39ff0554 Use more delayed expansion 
Fixes #206

When I use unzipped sbt.bat it seems to runs ok, but using the msi installer version, this variable seems to expand and causes:

```
\sbt\bin\java9-rt-export.jar was unexpected at this time.
```
 2018-01-08 10:06:04 -05:00
Phil 13f2bafdf8 remove invisible carriage-return appended to java_version under cygwin 2018-01-05 14:36:17 -07:00
Dale Wijnand 901e5794b8
Set both Xms & Xmx when running java -version 
See the comments in #203.

My choice of minimum memory is basically arbitrary.
 2018-01-04 10:18:18 +00:00
Marcos Pereira f9295a6715
Remove -Xmx512M flag when detecting java version 
The flag can cause problems when there is another configuration
adding -Xms with a value bigger than 512M. The `java -version`
command will fail and no java version will be detected, causing
a failure in `checkJava`.
 2018-01-02 18:15:07 -02:00
Eugene Yokota 0e59118ded Remove double quotes around rtexport 
See https://github.com/sbt/sbt/issues/3804#issuecomment-352602666
 2017-12-18 22:27:19 -05:00
Eugene Yokota f9b9d082f6 use delayed expansion 
Fixes sbt/sbt#3804

Inside the if, it seems like bunch of variables were set to blank.
Using delayed expansion seems to fix this. This is confirmed by the newly added test.
 2017-12-14 02:30:02 -05:00
Fulvio Valente 6ad16c2b74 Use expr instead of bc when checking Java versions. 
Because expr is in coreutils, we can expect it to be present on systems unlike bc.

Fixes #198
Fixes #192
 2017-11-16 15:11:19 +00:00
Matthias Kurz 006a5eee23
Ignore debug output when getting runtime jar path 2017-11-15 11:55:12 +01:00
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
Eugene Yokota ec086a891a changelog 2017-08-10 22:33:19 -04: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
eugene yokota ace1846e36 Merge pull request #160 from tksk/master 
Fix syncing preloaded bugs
 2017-05-30 13:07:27 -04:00
Eugene Yokota 080bd0d92f package signer 2017-05-11 00:11:11 -04: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 70c725fc3b workaround sbt-native-packager issue 2017-04-12 23:41:28 -04: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 21b7fdbd0f Merge branch 'master' into wip/linux 2017-03-09 23:32:47 -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 965b96acc6 Update the build 2017-01-21 06:36:33 -05:00
Eugene Yokota 3235fd1bf1 Update copyright and license 2017-01-21 05:56:55 -05:00
Eugene Yokota acd610be67 Fix checkJava function 2017-01-16 03:09:29 -05:00