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

184 Commits

Author SHA1 Message Date
Eugene Yokota ffd80f5144 Delete sbt-launch-lib.bash 
The bash files were already merged in #257
 2019-05-08 18:33:38 -04:00
Eugene Yokota a47004e01e add options for timings, traces, supershell, and color 
`--supershell=*` will pass on to `-Dsbt.supershell=*`.
 2019-04-05 11:30:59 -04:00
Eugene Yokota 56f09ef1ec support GNU style double dash options 2019-04-05 10:20:52 -04:00
Eugene Yokota b5cb8b4657 Let -mem take higher precedence 
Fixes #256

JAVA_OPTS and SBT_OPTS are now read into an array first.
If `-mem` is passed, it will evict all memory related options,
and use the calculated memory options instead.
 2019-02-22 22:39:18 -05:00
Eugene Yokota 88b8386d15 Update integration test 2019-02-22 22:39:18 -05:00
Eugene Yokota 3f9e91aa4f Default to -Dfile.encoding=UTF-8 
Fixes #236
 2019-02-22 22:39:18 -05:00
Eugene Yokota 4d772b4745 Concatenate bin/sbt-launch-lib.bash and bin/sbt 2019-02-22 22:39:18 -05:00
Stefan Wachter 9780c6218f unset immediatly exit flag (set +e) in launch script 2019-02-06 17:48:39 +01:00
Eric Peters 2d21c0fd2a Simplify the debug in execRunner and fix the $java_args[@] expansion, fixes #253 2019-02-04 20:38:10 -08:00
fredge 0e8655fd5d fix #248. Move setting JVM's debug option after executing `:copyrt` label, in order to avoid unintended debug string written to `rtext.txt` 2018-12-13 12:25:42 +09:00
Olli Helenius b8b3542339 Fix rsync source path designation in preloaded; fixes #246 2018-12-03 22:13:08 +02:00
Olli Helenius b791da704c
Use `preloaded` from `-sbt-dir` 2018-10-17 13:04:39 +03:00
Eugene Yokota 1d806c9cf3 Revert "Use `preloaded` from `-sbt-dir`" 
This reverts commit b8dbe42ece.
 2018-10-17 01:57:08 -04:00
Eugene Yokota 9c19799b73 Revert "Improve logic for finding preloaded directory" 
This reverts commit c8219f8396.
 2018-10-17 01:56:57 -04:00
Olli Helenius c8219f8396 Improve logic for finding preloaded directory 2018-10-10 09:36:35 +03:00
Olli Helenius b8dbe42ece Use `preloaded` from `-sbt-dir` 
Fixes sbt/sbt#3598.
 2018-10-10 09:36:35 +03:00
Eugene Yokota 53e008a25d Revert "Handle SBT_OPTS in bash" 
This reverts commit ea93158ae3.
 2018-07-30 18:43:53 -04:00
岩松 竜也 ea93158ae3 Handle SBT_OPTS in bash 2018-06-19 01:13:31 +09:00
eugene yokota 34f0b2c4ea
Merge pull request #231 from jiminhsieh/fix-sbt-help-throw-error 
Fix `sbt -help` throw syntax error
 2018-06-14 01:49:15 -04:00
Dale Wijnand 92067eb308
Merge pull request #217 from dkim/sbt-create 
Exit if the current dir is definitely not an sbt dir and neither `-sbt-create` nor `new` was given
 2018-06-01 10:14:33 +01:00
Jimin Hsieh 1277e55c29 Fix `sbt -help` throw `syntax error` 2018-05-30 22:58:45 +08:00
Jimin Hsieh bc8ed20787 Show default sbt memory size: 1024m 2018-05-30 22:46:28 +08:00
Jimin Hsieh 67fec3812c Bump license year 2018-05-30 22:43:16 +08:00
Jean-Luc Deprez d70c78d02b
- Java version detection broken, when path to JDK contains spaces. 
Allways outputs:
    sbt requires at least version 6+, you have
    version 0

- the quoted version word for findstr doesn't seem to work in the for-command statement, quotes not needed for a single word.
 2018-04-10 16:12:28 +02:00
Eugene Yokota 8727faa8b3 forward -debug to sbt 
`-debug` is a legitimate command since 0.13.13, but it's been impossible to use it because Bash eats it. This allows log level to be set to debug level. (similar to `-warn` setting to warn level)

Ref https://github.com/sbt/sbt/pull/2742
 2018-04-06 08:26:28 -04:00
Eugene Yokota b2fdb7685f Fix Java version detection on Windows 
Fixes https://github.com/sbt/sbt/issues/4055
Adds JDK 10 testing on Windows
 2018-04-06 05:24:07 -04:00
Eugene Yokota a638ad49ac Fix bash number comparison 
This adds JDK 10 and 11 testing on Linux
 2018-04-06 05:23:14 -04:00
Deokhwan Kim 94b27fcefa Confirm a user's intent if the current dir doesn't look like an sbt dir 
Fixes #212
 2018-02-19 14:24:18 -05:00
Friedrich von Never 3019b94da0
Fix quotes in sbt.bat 2018-02-17 21:56:09 +07:00
Eugene Yokota 21cf71e384 more portable jdk_version function 
I've reimplemented java version detection as a bash function.
This no longer uses grep.
Also this no longer uses `?` in sed, which doesn't work on macOS.

Fixes https://github.com/sbt/sbt/issues/3873
 2018-02-15 23:04:43 -05:00
Dale Wijnand b50cc6f342
Merge pull request #215 from 2m/wip-no-decimals-2m 
Use only integers for versions
 2018-02-14 14:21:06 +00:00
Martynas Mickevičius 5a0bde442d
Use only integers for versions 2018-02-14 14:00:36 +02:00
TATSUNO Yasuhiro 06420a7c62 Ignore comment in .jvmopts on Windows (#213) 2018-02-14 09:06:22 +00:00
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