Commit Graph

203 Commits

Author SHA1 Message Date
Anil Kumar Myla 2946025d75
Capture double dashes in process args 2019-09-13 19:56:39 -07:00
Tuomas Lappeteläinen 5165b9fd51 universal/bin/sbt: enclose arrays in quotes
Fixes https://github.com/sbt/sbt/issues/5076. Arrays should be enclosed in
quotes, or otherwise elements with spaces will be broken, e.g. `-Dfoobar="foo
bar"` will become `-Dfoobar=foo` and `bar`.
2019-09-13 12:19:39 +03:00
Eugene Yokota b629c92391 Fix -XX:MaxPermSize getting emitted for JDK 11
Fixes sbt/sbt#5031
2019-09-05 23:09:59 -04:00
Eugene Yokota 91b71b39d3 Reproduce JDK 11 warning
Ref https://github.com/sbt/sbt/issues/5031
2019-09-05 22:53:03 -04:00
eugene yokota 10693a800a
Merge pull request #276 from exoego/fix-4833-print-sbtVersion
Add -V|-version to print sbtVersion.
2019-07-19 23:09:36 -04:00
exoego c57c950e92 Improve message since sbtVersion may vary for different projects 2019-07-20 10:42:24 +09:00
exoego 88976ad23f Print only the last line containig sbt version 2019-07-18 16:47:22 +09:00
exoego 16f5b638df Add -V|-version to print sbtVersion. 2019-07-18 16:23:14 +09:00
Christian Lachner 4a61c27538 Add --java-home to sbt.bat
In contrast to the unix version of the sbt launcher, the windows
version lacks the functionality of specifying JAVA_HOME via launch
parameters. This commit adds the missing --java-home parameter to
sbt.bat.
2019-06-30 14:14:57 +02:00
Christian Lachner 53f847d703 Fix JVM_DEBUG in sbt.bat
JVM_DEBUG was broken due to a copy-pasta error in sbt.bat. This
commit corrects the value assignment to the variable and therefore
fixes the problem.
2019-06-30 11:19:18 +02:00
Eugene Yokota 79e13bb39c Reinstate realpath
Fixes #269
Ref #149

There were two implementations of `realpath`-like things the scripts. One in `sbt` called `realpath` contributed in #27, and another using ls in sbt-launch-lib.bash that I added in #155 because at some point I got confused by the fact macOS doesn't have [realpath(1)](https://linux.die.net/man/1/realpath).

In #257 `sbt` and `sbt-launcher-lib.bash` were merged and the emulated `realpath` was removed.

dcsobral noticed this and raised #269. This commit reinstates the emulated `realpath` as `realpathish` to avoid the future confusion, and removes the inferior version that uses `ls`.

Co-authored-by: Bart Schuller <schuller@lunatech.com>
Co-authored-by: Eugene Yokota <eed3si9n@gmail.com>
2019-05-29 17:05:34 -04:00
Eugene Yokota 8015e9f1a9 Remove reference to get_mem_opts 2019-05-22 23:40:10 -04:00
Eugene Yokota bd32204c21 Bump stack size
Ref https://github.com/scala/bug/issues/10870
2019-05-22 23:38:50 -04:00
Eugene Yokota 8a3a7c2b7d Remove MaxMetaspaceSize
Ref https://github.com/sbt/sbt/issues/4686
2019-05-22 23:36:52 -04:00
Eugene Yokota e39a139042 Remove -XX:MaxPermSize out of Windows default
Fixes #223
2019-05-22 17:32:13 -04:00
Eugene Yokota 05ea7eedc5 whitespace fix 2019-05-22 17:22:03 -04:00
eugene yokota a85b486b4c
export repo using Coursier (#267)
export repo using Coursier

Ref https://github.com/sbt/sbt/issues/4661
2019-05-15 10:52:39 -04:00
cia-rana c94af60119 Fix typo in execRunner() 2019-05-10 12:19:28 +09:00
Eugene Yokota 88dc416932 expand -no-colors alias in SBT_OPTS
Fixes #260

This expands the JVM flag aliaes in SBT_OPTS, so `-no-colors` etc would work.
2019-05-09 01:13:45 -04:00
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