Commit Graph

549 Commits

Author SHA1 Message Date
Eugene Yokota b6d6f243d8 Hardcode to OpenJDK 8
Fixes sbt/sbt#2931

java6-runtime-headless is a virtual package. On some distribution it actually installs JDK 9.
2017-01-21 06:57:48 -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
Dale Wijnand 5252119d64 Merge pull request #138 from sbt/wip/java_version2
Fix checkJava function
2017-01-16 08:50:38 +00: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
Dale Wijnand 1ca44177f5 Merge pull request #136 from sbt/wip/java_version
Fix Java version detection
2017-01-11 15:27:00 +00: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
eugene yokota f9f389ec5e Merge pull request #131 from wsargent/patch-1
Add MSYS as a "cygwin" like
2016-11-28 01:08:46 -05:00
Will Sargent 04dfd94ff5 Add MSYS as a "cygwin" like 2016-11-27 20:30:58 -08:00
eugene yokota f9ecf07c77 Merge pull request #129 from cunei/fix_windows_missing_quotes
Missing quotes may cause incorrect PATH expansion
2016-11-16 12:14:09 -05: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
eugene yokota d302cf7d45 Merge pull request #127 from muuki88/fix/packageName
Fix/package name
2016-10-31 16:38:50 -04:00
Nepomuk Seiler 95db5dcb01
Fix package name 2016-10-31 21:30:39 +01:00
Nepomuk Seiler 1148f6f350
Upgrade native-packager 2016-10-31 21:30:31 +01:00
Dale Wijnand d8bf3825c3 Fixup debian changelog (#124) 2016-10-28 15:37:35 +01:00
Dale Wijnand 7b08fadd4a
My arch-enemy, the trailing comma 2016-10-28 14:58:48 +01:00
Dale Wijnand ad3b90bed8 Add the debian changelog, for 0.13.13 release (#123) 2016-10-28 14:54:41 +01:00
Miranda Kastemaa c4aa9052b5 Use more reliable shift loop for processing args 2016-10-17 15:51:53 +03:00
eugene yokota a1dfe86698 Merge pull request #112 from fommil/lunix
add support for .jvmopts to the bash launcher
2016-08-25 16:46:47 -04: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
eugene yokota a6e8d62c19 Merge pull request #111 from fommil/windows
add support for .jvmopts and .java-version to Windows launcher
2016-08-24 16:10:41 -04:00
Sam Halliday daed09b8cd add support for .jvmopts and .java-version to Windows launcher 2016-08-24 20:55:02 +01:00
eugene yokota 18e2fa2f28 Merge pull request #110 from sbt/fix-win-path
Upgrade to sbt-native-packager 1.1.1. Fixes #76.
2016-08-22 11:57:32 -04:00
Dale Wijnand a1e1a570e0 Add sbt.build.version from CONTRIBUTING to Travis config 2016-08-22 12:22:29 +01:00
Dale Wijnand acc734e669 Switch Travis to Oracle JDK 7
.. required by the newer sbt-native-packager.
2016-08-22 12:13:27 +01:00
Dale Wijnand cffb8e0441 Upgrade to sbt-native-packager 1.1.1. Fixes #76.
The upgrade includes this fix https://github.com/sbt/sbt-native-packager/pull/169
2016-08-22 11:37:19 +01:00
Dale Wijnand bea3fac13e Misc email/URL updates 2016-08-22 11:25:30 +01:00
eugene yokota e4e3e54c33 Merge pull request #108 from ipsq/ipsq-patch-1
Corrected spelling mistake in sbt.bat
2016-05-29 13:35:19 -04:00
Martijn Riemers 1705b58fde Corrected spelling mistake in sbt.bat 2016-05-28 12:27:53 +02:00
eugene yokota d60fc0269b Merge pull request #107 from sbt/wip/cross
Preparing cross publishing
2016-05-09 00:44:03 -04:00
Eugene Yokota 289acc3b82 Preparing cross publishing 2016-05-09 00:25:16 -04:00
Eugene Yokota 0e19b83e2e include version in Windws into the projectID 2016-02-22 18:14:42 -05: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 7fd6beeb5b Merge pull request #97 from sbt/wip/windows
Generate product upgrade ID
2016-02-22 02:06:56 -05:00
Eugene Yokota ca0a42b349 Generate product upgrade ID. Fixes sbt/sbt#2181 2016-02-22 02:00:54 -05:00
Eugene Yokota 6ed481346b 0.13.11 2016-02-22 01:13:57 -05:00
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