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

437 Commits

Author SHA1 Message Date
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
Josh Suereth 2f6c444fd5 Merge remote-tracking branch 'origin/wip/bintray-publishing' into full-bintray 
Conflicts:
	project/build.properties
	project/packaging.scala
 2014-01-06 09:42:08 -05: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 5994a7bec5 Upgrade to sbt 0.13.1 2014-01-06 09:30:02 -05:00
Josh Suereth 44b651d607 Modify publishing to send packages into bintray. 
* Use rpm repository for rpms
* Use debian repository for debians
* Use generic repository for everything else.

Note: we still need to mark a release as public afterwards with an API call.  Need to figure that one out for automation.
 2013-09-04 11:50:58 -04:00
Josh Suereth 089a0efbca Merge pull request #55 from sbt/fix/space-in-path 
Fixes #53
 2013-07-30 16:50:58 -07: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
Josh Suereth 19f9330c32 Fixes #53 - echo disabled after sbt exits. 
Bad flag in bash.  Wish this thing had a compiler....
 2013-07-30 19:38:33 -04:00
Josh Suereth d652699a4e Merge pull request #54 from sbt/fix/space-in-path 
Refixes #50.   Apparently a stealth cd was causing issues here.
 2013-07-30 16:30:36 -07:00
Josh Suereth 595501304e Refixes #50. Apparently a stealth cd was causing issues here. 2013-07-30 19:27:39 -04:00
Josh Suereth 0d06cb0872 Merge branch 'full-packaging' of github.com:sbt/sbt-launcher-package into full-packaging 2013-07-14 15:36:28 -04:00
Josh Suereth 2b462315e5 Reduce necessary memory 2013-07-14 15:36:07 -04:00
U-jsuereth-win\jsuereth d50c597318 Initial fixes for cygwin issues #50 2013-07-14 15:27:26 -04:00
Josh Suereth a381c60485 Merge pull request #48 from ahjohannessen/dry-improvement 
Removed duplicated code with regards to projectID generation.
 2013-07-14 06:35:45 -07:00
Alex Henning Johannessen 08fb68c324 Removed duplicated code with regards to projectID generation. 2013-07-13 13:47:26 +01:00
Josh Suereth e5972108a3 Merge pull request #47 from sbt/wip/windows-jansi-fixes 
Wip/windows jansi fixes
 2013-06-29 07:29:25 -07:00
Josh Suereth 2af99ce0ca Merge remote-tracking branch 'origin/full-packaging' into wip/windows-jansi-fixes 2013-06-29 10:25:40 -04:00
Josh Suereth 2d833ef36e Merge pull request #46 from benevans/shell-expansion 
Perform shell expansion when loading sbtopts files.
 2013-06-29 07:24:40 -07:00
Josh Suereth 18352254e0 Fix config file loading to do shell expansion first. 
from @benevans.
 2013-06-29 10:23:49 -04:00
Josh Suereth d16ab1abd1 Migrate universal windows scripts into universal directory. 
ALso, added back the commented sbtopts settings.
 2013-06-29 10:21:58 -04:00
Josh Suereth 53f9de2735 Migrating to new native packaging plugin abstractions. 
* Use new native packaging abstractions for windows mappings.
* Update universal sbt script to be cygwin friendly
* Modify sbt.bat for universal layout
* Fix some stty icanon (no)echo bugs in launcher script.
 2013-06-29 10:09:42 -04:00