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.

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

fix zip64_test to work with absolute $(JAVABASE) #8034

Closed
wants to merge 3 commits into from

Conversation

buchgr
Copy link
Contributor

@buchgr buchgr commented Apr 15, 2019

Tested with an absolute $(JAVABASE) and --(no)legacy_external_runfiles.

Progress towards #8033

Tested with an absolute $(JAVABASE) and --(no)legacy_external_runfiles.

Progress towards bazelbuild#8033
@@ -53,7 +53,15 @@ else
fi

singlejar="$(rlocation "io_bazel/src/tools/singlejar/singlejar${EXE_EXT}")"
jartool="$(rlocation "local_jdk/bin/jar${EXE_EXT}")"
javabase="$1"
if [[ $javabase = /* ]]; then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code assumes $1 is Unix-style path. What about Windows paths?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am happy to add a code snippet for Windows to this change if you tell me what I should add :-). I don't think it's a necessary part of this PR though.

Copy link
Contributor

@laszlocsomor laszlocsomor Apr 15, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if [[ $javabase = /* || $javabase =~ [A-Za-z]:[/\\] ]]; then

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks! done

src/tools/singlejar/zip64_test.sh Outdated Show resolved Hide resolved
src/tools/singlejar/zip64_test.sh Show resolved Hide resolved
@buchgr buchgr mentioned this pull request Apr 15, 2019
26 tasks
@bazel-io bazel-io closed this in 8fe5479 Apr 15, 2019
buchgr added a commit to buchgr/bazel that referenced this pull request Apr 15, 2019
Tested with an absolute $(JAVABASE) and --(no)legacy_external_runfiles.

Progress towards bazelbuild#8033

Closes bazelbuild#8034.

PiperOrigin-RevId: 243604034
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants