Commit Graph

76 Commits

Author SHA1 Message Date
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
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 595501304e Refixes #50. Apparently a stealth cd was causing issues here. 2013-07-30 19:27:39 -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 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
Josh Suereth a99f6fffbf Upgrade to in-progress sbt-native-packager plugin, including new support for universal->debian/rpm packages. 2013-06-27 16:43:31 -04:00
Josh Suereth 360428a2eb Modify script for new 0.13 behavior. 2013-06-27 10:28:01 -04:00
Josh Suereth 3b9519b793 Fixes to scripts for working in both cygwin and cmd.exe.
THis basically moves from jline.UnixTerminal to just unix.
2013-06-17 12:56:18 -04:00
Josh Suereth bec43f0a55 Cleanup of launcher package to remove special casing of
JANSI.  This, hopefully, will lead to better compatibility
between the many console-enrichment projects, like:
JLINE-scala, JLINE-1.0, JLINE-2.0 and Jansi itself.

Testing to ensue shortly between 0.12.x + 0.13.x
2013-06-17 12:16:10 -04:00
Josh Suereth f8e4ef438b Merge pull request #43 from cdow/die
Replaced last usage of missing 'die' function.
2013-04-29 10:05:46 -07:00
Christopher Dow 206a1af38b Replaced last usage of missing 'die' function. 2013-04-23 07:00:12 -07:00
Christopher Dow b84d1d5b52 Removed unused options from the Linux man page 2013-04-22 18:41:27 -07:00
Christopher Dow e21e271053 Added missing arguments to the Linux man page 2013-04-22 18:41:26 -07:00
Christopher Dow 831455f602 Documentation typos 2013-04-22 18:41:26 -07:00
Bart Schuller 40f2105070 Use realpath to locate relative files, add sh impl
because Mac OSX doesn't have a realpath binary.

This solves the issue where if you symlink to sbt, it
won't be able to locate the bash library and launcher anymore.

You'd want to do that so you can symlink just sbt to /usr/local/bin
without having to put a bash library file there as well.
In particular, this is what we'd like for Mac homebrew.
2012-11-05 21:24:42 +01:00
Stefan Zeiger feb0ffca08 Load sbtconfig.txt in sbt shell script 2012-10-26 15:39:37 +02:00
Josh Suereth f5a22c9576 Merge pull request #35 from sbt/feature/windows-sbt-config
Feature/windows sbt config
2012-10-26 06:07:54 -07:00
Josh Suereth a934680c8d Merge pull request #24 from Atry/full-packaging
Check $JAVA_HOME, and quote arguments and $JAVA_CMD
2012-10-25 09:30:33 -07:00
Josh Suereth db3413e9c1 Fixed issue where TMP environment variable lead to death. 2012-10-25 12:12:28 -04:00
Josh Suereth 37f9d6bf21 Windows config now works. Still an issue with sbt.bat not setting up paths/temp files correctly.... 2012-09-22 10:12:03 -04:00
杨博 7820d3deea Update src/scripts/sbt
Enable space in arguments.
Like: sbt 'run-main com.myhostname.myproject.Main'
2012-09-02 14:31:59 +08:00
杨博 edecd0f1bd Quote arguments and $JAVA_CMD 2012-08-10 12:15:45 +08:00
杨博 1f600d049b Check JAVA_HOME 2012-08-10 12:14:56 +08:00
Josh Suereth 41c21b9ed7 Modified SBT launcher bat file so it can load a config file with default settings. 2012-07-19 11:12:15 -04:00
Josh Suereth 7b69501c8b Fixes for 0.12.0-RC4 release of launcher package. 2012-07-18 10:40:29 -04:00
Josh Suereth 55e0dfdc65 Removed bad practices from sbt bash script.
* No set XYZ arguments allowed.  BAAD sbt practice.
* No longer swaps launcher.  New SBT launchers can handle old SBT.
* SBT script now uses sbt-launch-lib.bash.
2012-07-17 16:37:19 -04:00
Josh Suereth b8173fc41b Removed autodownload from the scripts. 2012-05-09 09:40:10 -04:00
Josh Suereth 70d0b31904 Bumped version numbers for 0.11.3 2012-05-07 08:19:44 -04:00
Josh Suereth ff05caba8b updated to latest native packager, added universal 'zip' generation to the build. 2012-03-15 14:22:10 -04:00
Josh Suereth 0271bf92e2 Improvements to sbt.bat suggested by @retronym 2012-02-02 15:35:38 -05:00
Josh Suereth cea72e8ca7 Adding a library for launcher scripts.
* Moved sbt into src/linux (for now, to disambiguate from windows)
* Created sbt-launch-lib.bash to help scripts which want to use the SBT Launcher
  but are not SBT, e.g. g8 or cs.
2012-02-02 12:11:23 -05:00
Josh Suereth 084480c57b Merge pull request #2 from szeiger/windows-shell-script
Windows shell script
2012-01-18 09:00:37 -08:00
Stefan Zeiger 7e5b93fbf8 Make sbt/jline work properly in Cygwin's MinTTY terminal 2012-01-18 17:32:39 +01:00
Stefan Zeiger bc12a127ee Add sbt launcher script for Cygwin and MSYS to Windows installer 2012-01-18 16:58:30 +01:00
Stefan Zeiger f889a92c34 Reflow License.rtf to make it more readable in the Windows installer 2012-01-18 16:57:48 +01:00
Stefan Zeiger cf14e6ba7b Add Jansi license file (because it is not contained in jansi.jar) 2012-01-18 16:50:17 +01:00
Josh Suereth 7e27da416e Merge branch 'full-packaging' of github.com:sbt/sbt-launcher-package into full-packaging 2012-01-18 09:49:15 -05:00
Josh Suereth 4d490ccfd1 Added no-global option.
Added -no-global option to point -sbt-dir at local location.  Helps deal with bad global plugins.
2012-01-18 09:49:00 -05:00
Stefan Zeiger 2f19508ae5 Package Jansi plus a bootstrap launcher in the MSI installer 2012-01-17 18:03:26 +01:00