Commit Graph

117 Commits

Author SHA1 Message Date
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
eugene yokota 86afaaebb4 Merge pull request #134 from Atry/patch-2
Don't set MaxMetaspaceSize on Java 8 by default
2017-01-11 10:29:38 -05:00
Eugene Yokota f14b165523 Fix java version detection
Previously awk was used to grab the full Java version such as 1.8.0_91.
While this is more accurate, 1.8.0_91 is not a number that can be compared by bash, and thus JDK8 detection logics were failing.
Fixes #135
2017-01-11 00:20:38 -05:00
杨博 (Yang Bo) e1d64533f3 Don't set MaxMetaspaceSize on Java 8 by default 2017-01-11 12:00:34 +08:00
eugene yokota 697e1239cb Merge pull request #122 from ahihi/master
Fix handling of arguments with asterisks on Windows
2016-12-31 02:09:58 -05:00
Will Sargent 04dfd94ff5 Add MSYS as a "cygwin" like 2016-11-27 20:30:58 -08:00
Antonio Cunei 345890880e Missing quotes may cause incorrect PATH expansion, fixed
If PATH contains ampersands etc, PATH may be
incorrectly expanded.
2016-11-16 14:26:39 +01:00
Miranda Kastemaa c4aa9052b5 Use more reliable shift loop for processing args 2016-10-17 15:51:53 +03:00
Sam Halliday d9da67979a -java-home should set PATH for javac usage 2016-08-25 20:16:35 +01:00
Sam Halliday 45badebcee add support for .jvmopts to the bash launcher 2016-08-25 20:16:35 +01:00
Sam Halliday daed09b8cd add support for .jvmopts and .java-version to Windows launcher 2016-08-24 20:55:02 +01:00
Martijn Riemers 1705b58fde Corrected spelling mistake in sbt.bat 2016-05-28 12:27:53 +02:00
eugene yokota 55628f6437 Merge pull request #96 from TLmaK0/fix_git_for_windows_interactive
Allow to run sbt interactive mode in git for windows bash
2016-02-22 02:07:52 -05:00
eugene yokota a4a32340d1 Merge pull request #98 from DarrenBishop/master
-jvm-debug for Windows launch script
2016-02-22 02:07:44 -05:00
Eugene Yokota 843a60734b Fixes #104. Allow individual memory options to be controlled
When a `-J` option is passed in such as `-J-XX:MaxPermSize=1001M`, it
will override only that option.
2016-02-19 17:46:05 -05:00
Mihai Capotă 0d9806b9ff Check memory options in JAVA_TOOL_OPTIONS
JAVA_TOOL_OPTIONS is used by the JVM [1] so it must also be checked for memory options that conflict with the ones set in get_mem_opts.

[1] https://docs.oracle.com/javase/8/docs/technotes/guides/troubleshoot/envvars002.html
2016-02-17 11:26:13 -08:00
Eugene Yokota 40167af167 Handle SBT_OPTS
Fixes sbt/sbt-launcher-package#99 formerly known as sbt/sbt#2194.
get_mem_opts() is a bash function that generates memory related
options. This change makes it return `""` the SBT_OPTS variable
contains memory-related options already.
2016-01-21 23:26:25 -05:00
Darren Bishop dc4a56c2e0 Updated the MS Windows SBT launcher script to get the same/similar behaviour for -jvm-debug as implemented in the *nix shell script launcher.
http://stackoverflow.com/questions/4150776/debugging-scala-code-with-simple-build-tool-sbt-and-intellij/28236830#28236830
2016-01-12 14:50:37 +00:00
Hugo Freire 92a06fc5da Allow to run sbt interactive mode in git for windows bash 2015-12-06 12:56:51 +01:00
William Waites 892de8e7d7 Set resource limit for ${java_cmd} -version in sbt initialisation
Java is a little anti-social and attempts to lazily allocate all
of system memory, even for simple operations such as printing out
the version. This causes sbt to fail to start in environments
where resources are limited (i.e. ulimit(1)). This setup is common
on shared infrastructure such as scientific computing clusters
where because of the resource limit not being specified sbt cannot
be used.

The limit is set to 512MB which ought to be ample and is in any case
the default from sbtconfig.txt. A better patch would use the limit
specified there but it isn't clear that that is worth the effort.
2015-01-20 13:16:33 +00:00
Kousuke Saruta 477f271d45 Fixed wrong debug option 2014-11-21 01:10:48 +09:00
Josh Suereth 09d906de4b Merge pull request #84 from KaiXinXiaoLei/master
Delete unnecessary function
2014-11-20 09:55:27 -05:00
KaiXinXiaoLei bb06511109 Delete unnecessary function 2014-11-13 20:33:20 +08:00
Kousuke Saruta be20baace0 Fixed debug option 2014-11-07 15:02:02 -08:00
Stephen Nancekivell 10e95ef240 use JAVA_OPTS instead of java_opts. 2014-11-02 12:52:56 +11:00
Vladimir Matveev 4334c8672d Fixed incorrect sbtopts lines processing
It used `for` loop which is known to work incorrectly with spaces. This
commit changes it to `while read` loop. This allows more complex options
to be specified in sbtopts files.

Fixes #80
2014-10-30 18:08:57 +03:00
Josh Suereth 7c5bf6f5f6 Merge pull request #75 from raboof/remove_unused_variable_mergable
Remove unused variable script_dir
2014-10-30 11:03:05 -04:00
Roberto Tyley cb12ec1eaa Use MaxMetaspaceSize rather than MaxPermSize on Java 8
@jroper points out that class metadata has to go somewhere, and it's new
name is 'Metaspace' - not 'PermGen':

https://github.com/sbt/sbt-launcher-package/pull/66#issuecomment-57407643

http://java.dzone.com/articles/java-8-permgen-metaspace
2014-10-01 09:24:01 +01:00
Arnout Engelen bb21b9ce09 Remove unused variable script_dir
This variable used to be set based on either $HOME or $script_path. However,
$script_path is no longer set, so when $HOME is unset there will be an
'dirname: missing operand' error message. $script_dir is no longer used
either, so we can safely remove it entirely.
2014-09-11 17:01:54 +02:00
Roberto Tyley f716915f52 Don't pass MaxPermSize to Java 8+
This change stops this annoying message being written to stderr (which can
cause IntelliJ to freak):

```
Java HotSpot(TM) 64-Bit Server VM warning: ignoring option MaxPermSize=256m; support was removed in 8.0
```

See also:

https://bugs.openjdk.java.net/browse/JDK-6964458
https://github.com/sbt/sbt-native-packager/issues/203
https://github.com/typesafehub/activator/issues/422
2014-04-23 00:24:17 +01:00
Roberto Tyley c2deacbcbb Only calculate memory opts if we need them...
...don't bother if won't use them due to them already being defined.
2014-04-23 00:02:12 +01:00
Jason M Ray af97d53ec7 Fixing exit code handling
The endlocal statement will wipe out the ERROR_CODE variable, so we cannot access %ERROR_CODE% after endlocal.
2014-03-06 19:18:16 -08:00
Josh Suereth 8e4dbbaf0c -mem options only used if not otherwise specified directly. 2014-01-06 09:39:29 -05:00
Josh Suereth 163c822ff3 Removing debugging of loading bin helper. 2014-01-06 09:36:50 -05:00
Josh Suereth 1a07150560 Turns out the cygwin fix involved a bit more work.
We can't exec bash, because we can't give over our process to sbt
if we want to turn echo back on later.
2013-07-30 19:49:17 -04:00