Commit Graph

653 Commits

Author SHA1 Message Date
eugene yokota 87bd4027b0
Merge pull request #336 from eatkins/sbt-script
Set sbt script when running sbtn
2020-10-24 17:49:14 -04:00
Ethan Atkins d4156d3ed7 Set sbt script when running sbtn
There are scenarios where sbt is not on the path and may be invoked as
an absolute path from the shell. When this is the case, sbtn will fail
to start a server because of the missing sbt on the path. We can fix
this by setting the --sbt-script parameter.
2020-10-24 12:40:26 -07:00
eugene yokota fb5961427e
Merge pull request #334 from eed3si9n/wip/java_version
Fix sbt --client slowness
2020-10-19 15:48:50 -04:00
Eugene Yokota 75257e759b Fix sbt --client slowness
Before:

```
$ time sbt --client exit
[info] entering *experimental* thin client - BEEP WHIRR
[info] terminate the server with `shutdown`
sbt --client exit  0.16s user 0.15s system 101% cpu 0.303 total
```

sbt --client was running around 303ms (median out of 5) on my machine.

```
$ time sbtn exit
[info] entering *experimental* thin client - BEEP WHIRR
[info] terminate the server with `shutdown`
sbtn exit  0.05s user 0.05s system 112% cpu 0.085 total
```

On the other hand, sbtn ran in 85ms (median out of 5).

After:

```
$ time ~/work/sbt-modules/sbt-launcher-package/target/universal/stage/bin/sbt --client exit
[info] entering *experimental* thin client - BEEP WHIRR
[info] terminate the server with `shutdown`
~/work/sbt-modules/sbt-launcher-package/target/universal/stage/bin/sbt  exit  0.06s user 0.08s system 111% cpu 0.127 total
```

By delaying the java version detection, I got it down to 127ms.
2020-10-19 15:13:23 -04:00
Eugene Yokota 8237eff942 sbtn 1.4.0 2020-10-04 20:13:49 -04:00
eugene yokota d9a9a705a0
Merge pull request #332 from avdv/fix-launcher-option-handling
Fix launcher option handling
2020-10-01 21:26:59 -04:00
Claudio Bley 57cf5231ab CI: piccolo.link is broken, switch to direct github link
It returns a 500 internal server error.
2020-10-01 21:23:45 +02:00
Claudio Bley eb38ac57e7 Split up integration tests
Separate them into those that do not need to run a JVM, using
the newly added `java` script, and those that really need to run
the sbt-launch.jar
2020-10-01 21:23:45 +02:00
Claudio Bley a108c46851 Add `java` mock scripts to avoid running a JVM during tests
The script simply prints out each argument in an unambigous form on a single
line and handles to the `--version` option.

For windows, add `java.cmd` script which simply calls the former `java` script.
2020-10-01 21:21:03 +02:00
Claudio Bley 234273db41 Handle `--ivy` option in `SBT_OPTS` too
Fixes sbt/sbt#5885
2020-10-01 21:21:03 +02:00
Claudio Bley a7c034aa99 Fix handling of `--no-share` option
Using `--no-share` as a command line option resulted in a single additional
argument added to the java command:

`-Dsbt.global.base=project/.sbtboot -Dsbt.boot.directory=project/.boot -Dsbt.ivy.home=project/.ivy`

Actually, three separate arguments need to be added.
2020-10-01 21:21:03 +02:00
eugene yokota f170d29481
Merge pull request #333 from eed3si9n/wip/rtexport
Fix fetching of RT Export
2020-09-26 07:29:44 -04:00
Eugene Yokota 0e459fc9f3 Resolve Coursier first? 2020-09-26 07:13:49 -04:00
Eugene Yokota 55cd02be03 Fix fetching of RT Export
Previously it was depending on the side effect of export repo.
This doesn't work when we don't construct offline installer.
2020-09-26 07:02:00 -04:00
eugene yokota ea440e5987
Merge pull request #331 from eed3si9n/wip/bump
Update sbtn
2020-09-23 15:16:50 -04:00
Eugene Yokota adbd541c97 Update sbtn 2020-09-23 02:53:13 -04:00
eugene yokota 80f8323234
Merge pull request #328 from eed3si9n/wip/sbtn
sbtn support
2020-09-20 21:21:56 -04:00
Eugene Yokota 8559b0ece7 Exclude sbtn from RPM file 2020-09-20 21:02:55 -04:00
Eugene Yokota e880829762 Use the real sbt 2020-09-20 20:15:35 -04:00
Eugene Yokota 2def5ef636 sbtn support
Ref https://github.com/sbt/sbt/issues/5665

This implements `--client` option to use `sbt` script as the sbtn runner. The build user can also set the env variable `SBT_NATIVE_CLIENT` to `true`.

The script will attempt to parse `project/build.properties` and use sbtn only when it's sbt 1.4 or above.
2020-09-20 17:13:04 -04:00
eugene yokota 50f44c7ac8
Merge pull request #326 from er1c/java9rtexport
Use java9rtexport library
2020-09-20 14:01:00 -04:00
eugene yokota 3ac3f8479c
Merge branch 'master' into java9rtexport 2020-09-20 13:34:58 -04:00
eugene yokota 78c04dae19
Merge pull request #330 from eed3si9n/wip/sbtversion
Bump 1.3 version used for testing
2020-09-20 13:33:30 -04:00
Eugene Yokota 2514a25013 Bump 1.3 version used for testing 2020-09-20 13:13:19 -04:00
eugene yokota 6934784b77
Merge pull request #329 from eed3si9n/wip/https
Use HTTPS
2020-09-19 22:45:14 -04:00
Eugene Yokota cfc8ca7d67 Use HTTPS 2020-09-19 22:18:49 -04:00
Eric Peters 19da0b75e9 Use java9rtexport library 2020-07-15 14:51:27 -07:00
eugene yokota 7d75936b02
Merge pull request #325 from er1c/robocopy-silent
Make robocopy output silent in sbt.bat to match bash bootstrap copy output
2020-06-27 17:40:43 -04:00
eugene yokota 1e71ba13b6
Merge pull request #322 from henricook/debug-in-sbt-opts
Support the -debug flag in SBT_OPTS
2020-06-19 16:26:23 -04:00
Henri Cook 1bc60adbe7 Tidy up -debug in SBT_OPTS for submission 2020-06-19 17:38:23 +01:00
Eric Peters 1769f23b3c Add metals project files to .gitignore 2020-06-19 08:13:52 -07:00
Eric Peters 4e5e3fbb29 Make robocopy output silent in sbt.bat to match bash bootstrap copy output 2020-06-19 08:07:48 -07:00
eugene yokota 5e5e3c1929
Merge pull request #324 from l-konov/patch-1
Fix issue https://github.com/sbt/sbt/issues/5420
2020-06-11 10:45:07 -04:00
l-konov 5ce1b4b61b
Fix issue https://github.com/sbt/sbt/issues/5420 2020-06-11 16:40:10 +03:00
eugene yokota 76d3c88ad9
Merge pull request #323 from eed3si9n/wip/dont_use_homebrew
Remove Homebrew from CI
2020-05-29 12:20:30 -04:00
Eugene Yokota c55cccd4d5 Remove Homebrew from CI
Ref https://github.com/Homebrew/homebrew-core/issues/50649
2020-05-29 01:52:58 -04:00
Henri Cook 4872ddf3ef Add tests for supporting -debug flag in SBT_OPTSs 2020-05-25 19:39:54 +01:00
Henri Cook b7558e11b9 Support debug flags in SBT_OPTs 2020-05-25 18:57:53 +01:00
eugene yokota 25c1b96dae
Merge pull request #321 from XenonAbe/sbtIssue5223
Fix --jvm-debug not working on Windows
2020-03-03 22:42:17 -05:00
abe 2242091012 Add test for --jvm-debug 2020-03-04 12:05:41 +09:00
abe bcf5f020fe Fix --verbose output with --jvm-debug on Windows 2020-03-04 11:48:56 +09:00
abe 8143bbfc24 Fix --jvm-debug not working on Windows 2020-03-03 14:39:00 +09:00
Eugene Yokota c6ac5619ed BINTRAY_USER 2020-01-24 15:03:40 -05:00
Eugene Yokota 2b5ed6529b Add sbt.build.patch 2020-01-24 11:56:29 -05:00
eugene yokota cfb278b17b
Merge pull request #320 from heksesang/master
Fixed expansion of args with whitespace in JDK 9+.
2020-01-13 12:54:20 -05:00
Gunnar Lilleaasen 415e566577
Fixed expansion of args with whitespace in JDK 9+.
Solves the issue where providing sbt_options and java_args containing whitespaces on Java 9 and higher would fail. Expansion of sbt_options and java_args containing whitespaces would not expand correctly in copyRt(), but instead would create an invalid java command due to missing quotes.
2020-01-13 10:44:28 +01:00
eugene yokota 43498a2e08
Merge pull request #319 from eed3si9n/wip/space
Fix unintended glob expansion
2020-01-08 12:53:26 -05:00
Eugene Yokota 1a2ca2610b Fix unintended glob expansion
Fixes https://github.com/sbt/sbt/issues/5343
2020-01-08 10:10:09 -05:00
eugene yokota 269533c160
Merge pull request #317 from eed3si9n/wip/star
Fixes quoted argument with whitespace
2020-01-04 15:31:11 -05:00
Eugene Yokota d281886584 consolidate Travis CI build jobs 2020-01-04 15:12:31 -05:00