luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
408 Commits 29 Branches 311 Tags 68 MiB
Commit Graph

408 Commits

Author SHA1 Message Date
eugene yokota d3c5bb4fa9 Merge pull request #105 from sbt/wip/104 
Allow individual memory options to be controlled
 2016-02-19 22:56:15 -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
eugene yokota ab22123728 Merge pull request #103 from mihaic/patch-1 
Check memory options in JAVA_TOOL_OPTIONS
 2016-02-19 16:49:24 -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 56666016e0 Merge pull request #101 from sbt/wip/99 
Handle SBT_OPTS
 2016-01-22 14:14:07 -05:00
Eugene Yokota cd57c59372 Workaround for travis-ci/travis-ci#5227 2016-01-21 23:43:17 -05: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
Josh Suereth 97a6ec053d Merge pull request #89 from sbt/wip/new-bintray 
0.13.9 + use bintray-sbt to release to Bintray
 2015-08-11 07:49:26 -04:00
Eugene Yokota 597c309e65 Adds CONTRIBUTING.md 2015-08-11 01:40:27 -04:00
Eugene Yokota 0e92999125 Update description 2015-08-11 01:34:13 -04:00
Eugene Yokota b55237f1ad Refactor to use bintray-sbt 2015-08-11 01:30:16 -04:00
Eugene Yokota c49ea8cfc4 Refactored to sbt 0.13 multi-project build.sbt 2015-08-11 00:39:53 -04:00
Josh Suereth a80410996f Merge pull request #87 from edinburgh-rbm/master 
Set resource limit for ${java_cmd} -version in sbt initialisation
 2015-03-19 11:42:38 -07: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
Josh Suereth 1735b0b7ec Merge pull request #85 from sarutak/debug-option-modification 
Fix wrong debug option
 2014-12-01 08:21:15 -05:00
Kousuke Saruta 477f271d45 Fixed wrong debug option 2014-11-21 01:10:48 +09:00
Josh Suereth 9b2a1fa24a bump to sbt 0.13.7 2014-11-20 10:07:08 -05:00
Josh Suereth 09d906de4b Merge pull request #84 from KaiXinXiaoLei/master 
Delete unnecessary function
 2014-11-20 09:55:27 -05:00
Josh Suereth c48d5d9b51 Merge pull request #83 from sarutak/debug-option-modifiation 
Fix debug option in sbt-launch-lib.bash to respect Java5+
 2014-11-20 09:51:50 -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
Josh Suereth a9d435664a Merge pull request #79 from stephennancekivell/master 
use JAVA_OPTS instead of java_opts.
 2014-11-03 11:55:38 -05:00
Stephen Nancekivell 10e95ef240 use JAVA_OPTS instead of java_opts. 2014-11-02 12:52:56 +11:00
Josh Suereth 80616ea412 Merge pull request #82 from netvl/lines-loop-fix 
Fixed incorrect sbtopts lines processing
 2014-10-30 20:26:19 -04: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
Josh Suereth 08c81aaa91 Merge pull request #78 from rtyley/add-metaspace-support 
Use MaxMetaspaceSize rather than MaxPermSize on Java 8
 2014-10-30 11:02:44 -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
Josh Suereth 9c296f96fb Fix typo. 2014-05-01 14:10:35 -04:00
Josh Suereth debe03e0c7 Merge branch 'master' of github.com:sbt/sbt-launcher-package 2014-05-01 14:09:01 -04:00
Josh Suereth c627388102 Bump for bintray publishing. 2014-05-01 14:08:27 -04:00
Josh Suereth 09b4ae7711 Merge pull request #66 from rtyley/only-specify-permgen-pre-java-8 
Don't pass MaxPermSize to Java 8+
 2014-04-29 08:38:17 -04: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
Josh Suereth 0981c0a5e5 Merge pull request #65 from jasonmray/master 
Fixing exit code handling
 2014-04-02 08:44:07 -04: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 d5be7069e2 Fix debian metadata. Fixes #51 
* Move to java6-runtime-headless metapackage
* Remove curl requirement (missed when removing that feature)
 2014-02-20 08:31:19 -05:00
Josh Suereth 899635bf41 Merge pull request #64 from sbt/wip/travis-ci 
Adding travis configuration to the build.
 2014-01-21 05:20:35 -08:00
Josh Suereth 67648b7626 Add rpmbuld to travis-ci config. 2014-01-21 08:17:24 -05:00
Josh Suereth c2fcf34896 Adding travis configuration to the build. 2014-01-21 08:09:21 -05:00
Josh Suereth a16832acd3 Merge pull request #62 from braoru/rpm-deps 
Added rpm dependencies to the rpm package
 2014-01-21 05:01:40 -08:00
Sébastien Pasche b360b59f5a Cleaning version number 2014-01-13 16:46:32 +01:00
Sébastien Pasche cdf2f4d89d Removing useless depsm thx to mighty sbt resolver 2014-01-13 16:46:17 +01:00
Sébastien Pasche 4d1d5c0a3d Updating minor version 2014-01-13 15:35:41 +01:00
Sébastien Pasche d880e93192 Adding rpm dependencies Requirements and Provides 2014-01-13 15:35:24 +01:00
Josh Suereth 60298ded12 Merge pull request #61 from sbt/full-bintray 
Full bintray publishing
 2014-01-06 07:43:16 -08:00
Josh Suereth f51c51edbe Fix publishing to bintray to automatically make artifacts available after succesful upload. 2014-01-06 10:41:23 -05:00