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.

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

[MACOS] Resolve embedded JDK with simlink #250

Merged
merged 1 commit into from
Jul 10, 2024
Merged

[MACOS] Resolve embedded JDK with simlink #250

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion travis/zip_withjdk.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ for targetPlatform in "linux.gtk.x86_64" "win32.win32.x86_64" "macosx.cocoa.x86_
jdkLocation=$RUNNER_TMP
if [[ "$os" == "macosx"* ]]; then
jdkLocation=$RUNNER_TMP/Gama.app/Contents
# Create symlink of jdk next to GAMA's executable
# Fix #229
ln -sf ../jdk $RUNNER_TMP/Gama.app/Contents/MacOS/jdk
fi

#
Expand All @@ -78,7 +81,7 @@ for targetPlatform in "linux.gtk.x86_64" "win32.win32.x86_64" "macosx.cocoa.x86_
# Make GAMA use embedded JDK
sed -i '1s/^/-vm\n/' $folderEclipse/Gama.ini
if [[ "$os" == "macosx"* ]]; then
sed -i '2s/^/..\/jdk\/Contents\/Home\/bin\/java\n/' $folderEclipse/Gama.ini
sed -i '2s/^/.\/jdk\/Contents\/Home\/bin\/java\n/' $folderEclipse/Gama.ini
elif [[ "$os" == "win32"* ]]; then
sed -i '2s/^/.\/jdk\/bin\/javaw\n/' $folderEclipse/Gama.ini
else
Expand Down