Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added translation of jvmopts contents and enhanced example app. #494

Merged
merged 4 commits into from
Feb 16, 2015

Conversation

metasim
Copy link
Member

@metasim metasim commented Feb 15, 2015

Added this so standard JVM options encoded in the con/jvmopts file are translated and passed on to javapackager.

Simeon H.K. Fitch added 4 commits February 14, 2015 16:16
* master:
  Update README.md
  Replace chmod call
  More comprehensive tests
  Adding documentation
  FIX sbt#276 creating directories as necessary and specify top level dir and sadly realizing that apache commons compress is still the best bet
  Adding documentation, examples and tests.
  Initial refactoring on sbt#453
  Revert "[fix sbt#472] /etc/default/<package-name> should be shell script setting envars"
  FIX sbt#489: Small fix in documentation
  Upgrading to java 7 and using posix nio API

Conflicts:
	src/main/scala/com/typesafe/sbt/packager/jdkpackager/JDKPackagerHelper.scala
// val cp = classpath.map(p ⇒ "lib/" + p)
// val cpStr = cp.mkString(cpSep)
// Make a setting?
val jvmOptsFile = (sourceDir ** "jvmopts").getPaths.headOption.map(file)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jvmOpts, etc-default and so forth have been part of a lot of discussions now.
We still need some work here, but this affects sbt-native-packager as a whole

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My vote would be for a setting that specifies the JVM options as a Seq[String], and not rely on some external source file with some one-off format (fine with me if it's converted to a source file as a part of universal:packageBin.) Almost went that route with this plugin, but I worked hard to avoid introducing any new constructs here.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but I worked hard to avoid introducing any new constructs here
And you have done a great job here :)

The application configuration has a real big scope. Hopefully there is some time
to finish the discussion in #82 and find a proper solution. I like your idea of generating
the jvmopts or etc-default files from build settings.

@muuki88
Copy link
Contributor

muuki88 commented Feb 16, 2015

LGTM. Currently I have a lot more time, so I hope to get this released soon.

muuki88 added a commit that referenced this pull request Feb 16, 2015
Added translation of `jvmopts` contents and enhanced example app.
@muuki88 muuki88 merged commit 4a94ec7 into sbt:master Feb 16, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants