Refine selection of binary bundle for macOS based on OS version #54
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…en-plugin * 'master' of https://github.com/lukaszlenart/launch4j-maven-plugin: (91 commits) Adds example wit opts Adds version notes [maven-release-plugin] prepare for next development iteration [maven-release-plugin] prepare release launch4j-maven-plugin-1.7.8 Migrates to new Tarvis infrastructure Use ProcessBuilder to launch 'chmod' Corrects small type Adds additional info about changes in 1.7.7 [maven-release-plugin] prepare for next development iteration [maven-release-plugin] prepare release launch4j-maven-plugin-1.7.7 Adds version notes for 1.7.7 Uses the latest stable version of Launch4j Closes orphan-oss#21 Adds support for bundledJreAsFallback property Closes orphan-oss#23 Upgrades to latest snapshot version of Launch4j fixes for runtime scoped jars issue#5 [maven-release-plugin] prepare for next development iteration [maven-release-plugin] prepare release launch4j-maven-plugin-1.7.6 Adds version notes of 1.7.6 Includes all direct dependencies closes orphan-oss#5 Adds 1.7.5 version notes ... # Conflicts: # .gitignore # .travis.yml # README # README.md # pom.xml # src/main/java/com/akathist/maven/plugins/launch4j/ClassPath.java # src/main/java/com/akathist/maven/plugins/launch4j/Jre.java # src/main/java/com/akathist/maven/plugins/launch4j/Launch4jMojo.java # src/main/resources/README # src/main/resources/README.adoc
…en-plugin * 'master' of https://github.com/lukaszlenart/launch4j-maven-plugin: (31 commits) Adds ability to save config into a file Drops languageIndex as this just a fallback, using language itself should be sufficient Adds 1.7.15 version notes [maven-release-plugin] prepare for next development iteration [maven-release-plugin] prepare release launch4j-maven-plugin-1.7.15 Updates version notes to add info about 1.7.14 [maven-release-plugin] prepare for next development iteration [maven-release-plugin] prepare release launch4j-maven-plugin-1.7.14 Fixes issue with setting Language Index Closes orphan-oss#50 overwrite several properties analogous to the ANT task fix debug logging / also take config options from InFile into account Fixes small typo Adds version notes about 1.7.13 [maven-release-plugin] prepare for next development iteration [maven-release-plugin] prepare release launch4j-maven-plugin-1.7.13 [pom] Update assembly goal to single [pom] Update maven-surefire-plugin to 2.19.1 [pom] Update maven-javadoc-plugin to 2.10.4 [pom] Update maven-compiler-plugin to 3.6.0 [pom] Update maven-assembly-plugin to 3.0.0 ...
| @@ -617,6 +606,16 @@ private Artifact chooseBinaryBits() throws MojoExecutionException { | |||
| getLaunch4jVersion(), "jar", "workdir-" + plat); | |||
| } | |||
|
|
|||
| private static boolean isBelow10_8(String version) { | |||
There was a problem hiding this comment.
Can you name this isBelowMacOSX_10_8 or something?
|
To avoid problems with updating a fork and all those merge commits, read this it allows to create a pure PRs without need to sync the fork ;-) |
|
Do you prefer an entirely new Pull Request or should I continue with this one?
… Am 12.03.2017 um 17:57 schrieb Lukasz Lenart ***@***.***>:
To avoid problems with updating a fork and all those merge commits, read this
http://struts.apache.org/submitting-patches.html#contributing-with-github <http://struts.apache.org/submitting-patches.html#contributing-with-github>
it allows to create a pure PRs without need to sync the fork ;-)
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub <#54 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ABU7__Bew3OV-AeFJGKerGi3lr8NTImiks5rlCPigaJpZM4MajDX>.
--
Thomas Scheithauer
IT-Berater
Benrodestr. 78, 40597 Düsseldorf
Tel.: +49 211 7184531
|
|
Continue, just for future reference |
|
LGTM 👍 |
tofi86
reviewed
Mar 15, 2017
| @@ -608,7 +597,7 @@ private Artifact chooseBinaryBits() throws MojoExecutionException { | |||
| } else if ("Solaris".equals(os) || "SunOS".equals(os)) { | |||
| plat = "solaris"; | |||
| } else if ("Mac OS X".equals(os) || "Darwin".equals(os)) { | |||
| plat = "mac"; | |||
| plat = isBelowMacOSX_10_8() ? "mac" : "osx"; | |||
There was a problem hiding this comment.
Isn't that in contrary to what Grzegorz wrote at https://sourceforge.net/p/launch4j/bugs/160/#95fd ?!
launch4j-3.9-workdir-mac.jarandlaunch4j-3.9-workdir-osx.jar. osx is the 10.8 version.
But you're using the mac version for isBelowMacOSX_10_8() ?!
There was a problem hiding this comment.
I think the issue is that there is just one package for OSX
https://sourceforge.net/p/launch4j/bugs/160/#59fc
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There are two bundle identifiers for macOS: "mac" and "osx", the latter meant for macOS starting with version 10.8.