Closed
Conversation
oracle-contributor-agreement
bot
added
the
OCA Verified
horakivo
changed the title
steve-s
reviewed
Sep 10, 2025
| String extraJavaOptions = String.join(" ", GraalPyRunner.getExtraJavaOptions()); | ||
| if (!IS_WINDOWS) { | ||
| if (IS_MAC) { | ||
| var script = formatMultiline(""" |
Member
There was a problem hiding this comment.
Could you share this code with the Windows branch? Seems like only this line in the script would need parametrization:
vl = os.path.join(venv.__path__[0], 'scripts', 'macos', 'graalpy')
otherwise it is the same?
On Windows we try to avoid regenerating the launcher to speed up the build:
(!Files.exists(launcherArgs.launcherPath)
|| !checkWinLauncherJavaPath(launcherArgs.launcherPath.getParent().resolve("pyenv.cfg"), java)) {
do you see any issue with doing that on MacOS? checkWinLauncherJavaPath should be renamed, but what it does inside should apply just fine to the MacOS launcher AFAICS.
Up to your consideration: since we now have more conditions, I would find this if-else structure more readable:
if (IS_WINDOWS || IS_MAC_OS) {
if (...condition if we need to regenerate the launcher...) {
...
}
} else {
// we do not bother checking if it exists and has correct java home, since it is
// simple to regenerate the launcher
...
}
Member
|
Please disregard GitHub actions for now, I am working on fixing them |
steve-s
reviewed
Sep 12, 2025
| } catch (IOException e) { | ||
| throw new IOException("failed to create tmp launcher", e); | ||
| } | ||
| System.out.println("Created temporary launcher file: " + tmp); |
…vo/graalpy-extensions into ih/add-support-for-macos-launcher
Member
|
Integration continues in #31 |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
No description provided.