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

Some refinements and fixes (#63, trilinos/Trilinos#11976) #585

Merged
merged 9 commits into from
Jun 27, 2023

Conversation

bartlettroscoe
Copy link
Member

@KyleFromKitware

Description

This PR branch addresses a few issues related to #63 and some other things:

  • Updated tests and address case of dirty partially removed package directory and robust handling for ignoring missing packages when building for reduced tarball (see Tribits: make package_source creates tarballs with missing BuildStatsWrappers.cmake trilinos/Trilinos#11976)

  • Do some cleanup of code related to (source) packaging and reduced tarball creation. Also added documentation for directly setting CPACK_SOURCE_IGNORE_FILES

  • Factored out code for doing configure timing

  • Print out found <Package>_DIR and assert it is set for TriBITS-compliant external packages

Instructions for reviewers

  • This PR branch contains moves of larger chunks of code and should not be reviewed as a single patch
  • Please review this PR one commit at a time

…ilinos#11976)

This failing test demonstrates a corner case that results in a failed
configure for a partally removed package.  See trilinos/Trilinos#11976.
…ke file (trilinos/Trilinos#11976)

This fixes cases where a dirty/incomplete source directory for a package
remains but does not contain the Dependencies.cmake file.  This was a use case
I hit while experimenting with how to fix trilinos/Trilinos#11976.

This replaces a temp commit made to the Trilinos 'develop' branch.
…ages' (#63)

After some more thought, the term "minimally" seems to be a better adjective
and it sounds better than "non-fully".
…make (#63)

I also removed the unused macro tribits_exclude_autotools_files() which is not
used in Trilinos anymore.
This checks that the timing in the correct format is printed (but can't check
the actual times). This will allow for trying to use updated CMake feature to
get the raw seconds.
…#11976)

The updated test ensures that excludes set CPACK_SOURCE_IGNORE_FILES as a
cache var are respected.

This also officially documents that you can set CPACK_SOURCE_IGNORE_FILES as a
cache variable.
This provides useful info about TriBITS-compliant external packages that are
found and it also asserts that <Package>_DIR is non-empty.  It should be
impossible for this to happen but this was observed on a user's machine as
described in:

  https://gitlab.kitware.com/cmake/cmake/-/issues/24667

I was not able to reproduce this issue myself but having this check would have
saved us at least 4 FTE hours and a lot of frustration.
@bartlettroscoe
Copy link
Member Author

@KyleFromKitware, if you have a few minutes today, could you please do a quick review of this PR? This should not take long to review it commit-by-commit. See "Instructions for reviewers" above.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants