-
Notifications
You must be signed in to change notification settings - Fork 5.8k
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
8294317: Insufficient build rules for tzdb.dat #10415
Conversation
👋 Welcome back naoto! A progress list of the required criteria for merging this PR into |
Webrevs
|
@naotoj This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be:
You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 80 new commits pushed to the
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details. ➡️ To integrate this PR with the above commit message to the |
@@ -30,7 +30,7 @@ GENDATA_TZDB := | |||
# | |||
TZDATA_DIR := $(MODULE_SRC)/share/data/tzdata | |||
TZDATA_TZFILE := africa antarctica asia australasia europe northamerica southamerica backward etcetera gmt jdk11_backward | |||
TZDATA_TZFILES := $(addprefix $(TZDATA_DIR)/,$(TZDATA_TZFILE)) | |||
TZDATA_TZFILES := $(TZDATA_DIR)/* |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Have you verified that this works? I would expect a wildcard call to be needed.
TZDATA_TZFILES := $(TZDATA_DIR)/* | |
TZDATA_TZFILES := $(wildcard $(TZDATA_DIR)/*) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I confirmed the fix worked, on my local mac and mach5. However, your suggestion does seem the right way. Modified the fix as suggested.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hm, yes, I think there are some cases where wildcards will be resolved without a call to wildcard. I'm also not sure that kind of expansion works the same across make versions, and if you ever needed to use that file list for anything else, it would be easy to trip up. I think this was expanded in the rule evaluation itself, not in the assignment. By being explicit with the call, we know what we are getting.
/integrate |
Going to push as commit 7151128.
Your commit was automatically rebased without conflicts. |
The current makefile for
tzdb.dat
won't recompile if some dependent files (e.g.VERSION
) are updated. Adding all files under the tzdb directory to the dependency will fix this issue.Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/10415/head:pull/10415
$ git checkout pull/10415
Update a local copy of the PR:
$ git checkout pull/10415
$ git pull https://git.openjdk.org/jdk pull/10415/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 10415
View PR using the GUI difftool:
$ git pr show -t 10415
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/10415.diff