Windows: fix java_binary.jvm_flags escaping #7314
Closed
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
laszlocsomor
changed the title
laszlocsomor
force-pushed
the
gh-7072
branch
2 times, most recently
from
6616927 to
f3bc3a1
Compare
laszlocsomor
changed the title
Bazel on Windows now correctly forwards java_binary.jvm_flags to the binary. Bazel Bash-tokenizes java_binary.jvm_flags. On Linux/macOS, this is done by embedding the flags into the Java stub script, which is a Bash script, so Bash itself does the tokenization. On Windows, java_binary is launched by a native C++ binary. Therefore nothing could Bash-tokenize the flags until now. From now on, Bazel itself Bash-tokenizes the flags before embedding them in the launcher. The launcher then escapes these flags for CreateProcessW. This PR also adds a new, CreateProcessW-aware escaping method called CreateProcessEscapeArg, to the launcher. The pre-existing GetEscapedArgument escaped only with Bash semantics in mind. This method is now renamed to BashEscapeArg, and used only for the Bash launcher. For the Python and Java launcher, the new CreateProcessEscapeArg method is used. Fixes bazelbuild#7072
laszlocsomor
requested review from
philwo and
joeleba
and removed request for
philwo
laszlocsomor
added a commit
to laszlocsomor/bazel
that referenced
this pull request
Feb 8, 2019
Fix the quoting logic for command line arguments passed to CreateProcessW. Related to bazelbuild#7314 Fixes bazelbuild#7122
|
I'll break up this PR because it's too complicated. |
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.
Bazel on Windows now correctly forwards
java_binary.jvm_flags to the binary.
Bazel Bash-tokenizes java_binary.jvm_flags.
On Linux/macOS, this is done by embedding the
flags into the Java stub script, which is a Bash
script, so Bash itself does the tokenization.
On Windows, java_binary is launched by a native
C++ binary. Therefore nothing could Bash-tokenize
the flags until now. From now on, Bazel itself
Bash-tokenizes the flags before embedding them in
the launcher. The launcher then escapes these
flags for CreateProcessW.
This PR also adds a new, CreateProcessW-aware
escaping method called CreateProcessEscapeArg, to
the launcher.
The pre-existing GetEscapedArgument escaped only
with Bash semantics in mind. This method is now
renamed to BashEscapeArg, and used only for the
Bash launcher. For the Python and Java launcher,
the new CreateProcessEscapeArg method is used.
Fixes #7072
Change-Id: I48d675fcce39e4f6c95e3bad3e8569f0274f662a