Skip to content

Package the JDK into jdk.app on macOS #48765

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Oct 31, 2019
Merged

Package the JDK into jdk.app on macOS #48765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b9bc44f
Package the JDK into jdk.app on macOS
jasontedor Oct 30, 2019
b528401
Fix OS name
jasontedor Oct 30, 2019
ae9a921
Merge branch 'master' into jdk.app
elasticmachine Oct 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions distribution/archives/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,14 @@ CopySpec archiveFiles(CopySpec modulesFiles, String distributionType, String pla
with binFiles(distributionType, oss, jdk)
}
if (jdk) {
into('jdk') {
with jdkFiles(project, platform)
if ("darwin".equals(platform)) {
into('jdk.app') {
with jdkFiles(project, platform)
}
} else {
into('jdk') {
with jdkFiles(project, platform)
}
}
}
into('') {
Expand Down
4 changes: 2 additions & 2 deletions distribution/src/bin/elasticsearch-env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ if [ ! -z "$JAVA_HOME" ]; then
JAVA_TYPE="JAVA_HOME"
else
if [ "$(uname -s)" = "Darwin" ]; then
# OSX has a different structure
JAVA="$ES_HOME/jdk/Contents/Home/bin/java"
# macOS has a different structure
JAVA="$ES_HOME/jdk.app/Contents/Home/bin/java"
else
JAVA="$ES_HOME/jdk/bin/java"
fi
Expand Down