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

8294317: Insufficient build rules for tzdb.dat #10415

Closed
wants to merge 2 commits into from

Conversation

naotoj
Copy link
Member

@naotoj naotoj commented Sep 23, 2022

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

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

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

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 23, 2022

👋 Welcome back naoto! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Sep 23, 2022

@naotoj The following labels will be automatically applied to this pull request:

  • build
  • core-libs

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added build build-dev@openjdk.org core-libs core-libs-dev@openjdk.org labels Sep 23, 2022
@naotoj naotoj marked this pull request as ready for review September 23, 2022 22:27
@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 23, 2022
@mlbridge
Copy link

mlbridge bot commented Sep 23, 2022

Webrevs

@openjdk
Copy link

openjdk bot commented Sep 24, 2022

@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:

8294317: Insufficient build rules for tzdb.dat

Reviewed-by: joehw, erikj

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 master branch:

  • 1f521a1: 8225012: sanity/client/SwingSet/src/ToolTipDemoTest.java fails on Windows
  • 5ae6bc2: 8234262: Unmask SIGQUIT in a child process
  • 968af74: 8293567: AbstractSplittableWithBrineGenerator: salt has digits that duplicate the marker
  • 36b61c5: 8293872: Make runtime/Thread/ThreadCountLimit.java more robust
  • 2be3158: 4797982: Setting negative size of JSplitPane divider leads to unexpected results.
  • 050eebf: 8294245: Make Compile::print_inlining_stream stack allocated
  • 91a23d7: 8294142: make test should report only on executed tests
  • 169a5d4: 8294193: Files.createDirectories throws FileAlreadyExistsException for a symbolic link whose target is an existing directory
  • 3675f4c: 8293252: Shenandoah: ThreadMXBean synchronizer tests crash with aggressive heuristics
  • 543851d: 8289607: Change hotspot/jtreg tests to not use Thread.suspend/resume
  • ... and 70 more: https://git.openjdk.org/jdk/compare/4020ed53dd6e45cafa1d86432274700f0d4a67ca...master

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 master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Sep 24, 2022
@@ -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)/*
Copy link
Member

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.

Suggested change
TZDATA_TZFILES := $(TZDATA_DIR)/*
TZDATA_TZFILES := $(wildcard $(TZDATA_DIR)/*)

Copy link
Member Author

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.

Copy link
Member

@erikj79 erikj79 Sep 26, 2022

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.

@naotoj
Copy link
Member Author

naotoj commented Sep 27, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Sep 27, 2022

Going to push as commit 7151128.
Since your change was applied there have been 96 commits pushed to the master branch:

  • fb4979c: 8290401: Support dump all phases and print nodes in ascending order of index
  • 112ca2b: 8293964: Unused check_for_duplicates parameter in ClassLoaderExt::process_jar_manifest
  • 99017b0: 8293064: Remove unused NET_xxx functions
  • 3419363: 8294361: Cleanup usages of StringBuffer in SQLOutputImpl
  • 1abf971: 8249627: Degrade Thread.suspend and Thread.resume
  • bc12e95: 8292969: Bad Thread Utilization in ForkJoinPool
  • dd51f7e: 8293996: C2: fix and simplify IdealLoopTree::do_remove_empty_loop
  • 14c6ac4: 8293998: [PPC64] JfrGetCallTrace: assert(_pc != nullptr) failed: must have PC
  • 02ea338: 8293887: AArch64 build failure with GCC 12 due to maybe-uninitialized warning in libfdlibm k_rem_pio2.c
  • 49a7347: 8294408: Problemlist runtime/handshake/HandshakeSuspendExitTest.java
  • ... and 86 more: https://git.openjdk.org/jdk/compare/4020ed53dd6e45cafa1d86432274700f0d4a67ca...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Sep 27, 2022
@openjdk openjdk bot closed this Sep 27, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Sep 27, 2022
@openjdk
Copy link

openjdk bot commented Sep 27, 2022

@naotoj Pushed as commit 7151128.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build build-dev@openjdk.org core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants