Commit Graph

599 Commits

Author SHA1 Message Date
Eugene Yokota d35fe3aeaf rsync flags
Fixes https://github.com/sbt/sbt/issues/5035

Currently `sbt` calls `rsync -a`, which expands to `-rlptgoD`, including `--group` and `--owner` flag that preserves the group and owner of the files. This drops the requirement since we just need to copy files around with the right timestamp.
2019-12-24 21:35:01 -05:00
eugene yokota c0af7e91bb
Merge pull request #315 from eed3si9n/wip/sync
Fix rsync check path
2019-12-24 15:37:53 -05:00
Eugene Yokota 8d06d14019 Fix rsync check path
Starting sbt 1.3.x we use Coursier to build the preloaded local repo using Maven layout.
2019-12-24 15:12:30 -05:00
eugene yokota 7863bd28f6
Merge pull request #313 from eed3si9n/wip/exec
don't use execRunner to copy rt.jar
2019-12-23 14:48:01 -05:00
Eugene Yokota 5559440739 don't use execRunner to copy rt.jar
Ref https://github.com/sbt/sbt-launcher-package/pull/308
Fixes https://github.com/sbt/sbt/issues/5270

The first time `sbt` runs on JDK 11, it copies the `rt.jar` by calling `execRunner java`.. it seems like the control never comes back from it and `sbt` just ends there. This fixes the problem by not calling `execRunner` for that operation.
2019-12-23 01:50:37 -05:00
eugene yokota 2df05c5bfb
Merge pull request #311 from er1c/jvm-debug
Tweak sbt.bat to parse the -debug arguments first
2019-12-20 09:32:30 -05:00
Eric Peters 29548d7628 Tweak sbt.bat to parse the -debug arguments first 2019-12-19 16:15:25 -08:00
eugene yokota d528d0734e
Merge pull request #310 from eed3si9n/wip/offline
Fix Coursier export by adding missing artifacts
2019-12-13 11:25:04 -05:00
Eugene Yokota 595bf0fc2d Fix Coursier export by adding missing artifacts
Ref https://github.com/sbt/sbt-launcher-package/pull/145
Ref https://github.com/sbt/sbt-launcher-package/pull/267
2019-12-13 10:45:13 -05:00
eugene yokota aa6ce25a86
Merge pull request #308 from esamson/master
Use exec to launch when not in cygwin
2019-11-20 21:49:36 +02:00
Edward Samson a362c964de Use exec to launch when not in cygwin
This allows, for example, capturing the correct PID when launching sbt
from within a bash script. The original change from
1a07150560 was to address an issue
specific to cygwin.
2019-11-20 13:57:33 +08:00
eugene yokota 031021cea0
Merge pull request #307 from er1c/script-version-no-copy
Update sbt.bat --script-version to execute early and avoid java check/robocopy bootstrap
2019-11-18 07:49:17 +02:00
Eric Peters 8122bd7020 Update citest to use 1.3.0 release 2019-11-17 11:49:58 -08:00
Eric Peters 63eabf3c8f Update sbt.bat --script-version to execute early and avoid java check/robocopy bootstrap - Fixes #5220 2019-11-17 08:35:30 -08:00
eugene yokota 98aac0a413
Merge pull request #306 from michaelh0911/master
Add special handling for -XX
2019-11-13 09:00:06 +02:00
Michael Hsu 1318c0f594 Add special handling for -XX, -XX:+ and -XX:0 2019-11-11 10:59:06 +08:00
Michael Hsu cb19634350 Fix tests for -XX, then add test for -XX:+ and -XX:- 2019-11-11 10:56:10 +08:00
Michael Hsu 34ca729719 Fix Travis CI error: find: '=': No such file or directory 2019-11-10 20:46:55 +08:00
Michael Hsu c742f66dd8 Add tests for -XX and mutiple -D 2019-11-09 22:44:13 +08:00
Michael Hsu fe43d0b975 Add special handling for -XX
Fix special handling for -D where > null should be > nul
Fix the problem that only the first option of SBT_OPTS and JAVA_OPTS got processed
2019-11-08 10:23:53 +08:00
eugene yokota 9f9dd66336
Merge pull request #305 from er1c/sbt-jar-win
Add --sbt-jar test and windows sbt.bat support
2019-10-20 09:56:13 -04:00
Eric Peters 978ea39676 Make the script version regex test more windows-friendly 2019-10-19 21:01:03 -07:00
Eric Peters 5991e803af Add --sbt-jar test and windows sbt.bat support 2019-10-19 20:29:09 -07:00
eugene yokota d97d9e66ff
Merge pull request #304 from er1c/deprecated-args
Remove unimplemented --sbt-rc and --sbt-snapshot arguments from docs and scripts
2019-10-19 23:02:19 -04:00
Eric Peters 819ee47071 Remove unimplemented --sbt-rc and --sbt-snapshot arguments from docs and scripts 2019-10-19 18:34:13 -07:00
eugene yokota f1f114b15f
Merge pull request #303 from er1c/update-target-java-8
Update javacOptions to target 1.8 & Add IntelliJ integrationTest/test run configuration
2019-10-19 17:54:12 -04:00
eugene yokota 832d94739b
Merge pull request #301 from er1c/osx-tests
Run the full integrationTest/test on OSX
2019-10-19 17:28:13 -04:00
Eric Peters d7d780e16e Add IntelliJ run configuration for integrationTest/test 2019-10-19 12:21:35 -07:00
Eric Peters b04ecd9427 Update javacOptions to target 1.8 2019-10-19 12:13:08 -07:00
Eric Peters 1249bf4d8e Run the full integrationTest/test on OSX 2019-10-19 11:51:31 -07:00
eugene yokota ead69fe395
Merge pull request #300 from eed3si9n/wip/d
Fix -D with quotes
2019-10-16 15:23:47 -04:00
Eugene Yokota 9471fab91b Remove debug echo 2019-10-16 13:18:58 -04:00
Eugene Yokota 689fdd682a remove unnecessary /I 2019-10-16 12:00:47 -04:00
eugene yokota 3953c80c73
Update src/universal/bin/sbt.bat
Co-Authored-By: Eric Peters <eric@peters.org>
2019-10-16 11:56:43 -04:00
eugene yokota 7d7e01015f
Update src/universal/bin/sbt.bat
Co-Authored-By: Eric Peters <eric@peters.org>
2019-10-16 11:54:22 -04:00
Eugene Yokota 00e5224fde Add debugging for -D parsing 2019-10-16 10:53:49 -04:00
Eric Peters 6ebad1cffc Add a test for -D arguments (e.g. -Dsbt.supershell=false) 2019-10-16 10:49:59 -04:00
Eugene Yokota 71a216c037 Fix -D with quotes
Fixe https://github.com/sbt/sbt/issues/5192
2019-10-16 10:48:11 -04:00
Eugene Yokota 546a8b8949 Fix verbose output for SBT_ARGS 2019-10-16 10:45:33 -04:00
eugene yokota cbe96663e2
Merge pull request #298 from sbt/eed3si9n-patch-1
Fix typo around continue/quit
2019-10-15 12:51:49 -04:00
eugene yokota ab001f5597
Fix typo around continue/quit
Fixes https://github.com/sbt/sbt/issues/5188
2019-10-15 12:21:07 -04:00
eugene yokota d43357144b
Merge pull request #297 from eed3si9n/wip/bump
bump JAnsi
2019-10-14 10:29:14 -04:00
Eugene Yokota c2bac898df bump JAnsi 2019-10-14 02:59:34 -04:00
eugene yokota 2c8fc74aec
Merge pull request #296 from er1c/debug-inc-usage
Add usage for --debug-inc to bash sbt, add impl to sbt.bat
2019-10-11 23:27:47 +02:00
Eric Peters f3b9d7572e Add usage for --debug-inc to bash sbt, add impl to sbt.bat 2019-10-11 09:49:43 -07:00
eugene yokota 4f7d84d999
Merge pull request #285 from er1c/sbt-bat
Update sbt.bat to match bash sbt command line usage
2019-10-10 06:14:03 +02:00
Eric Peters b5fd78f74b Intial sbt.bat refactor to match the universal bash script - implement --help, --verbose, --version, --script-verion, --numeric-version, .sbtopts, .jvmopts, -D 2019-10-09 19:47:49 -07:00
Alex Zolotko a9d85c6df6 Detect more memory settings
Fixes sbt/sbt#5135
2019-10-09 19:47:45 -07:00
Eric Peters d272ab1a1f Fix No compatible version found for adopt@1.8.212-04 2019-10-09 19:47:44 -07:00
eugene yokota 7540fac248
Merge pull request #295 from azolotko/5135-detect-more-memory-settings
Detect more memory settings
2019-09-30 15:35:24 -04:00