Skip to content

cmake: do not pollute sourcetree with untracked files#767

Merged
pstorz merged 3 commits intobareos:masterfrom
arogge:dev/arogge/master/generated-files
Apr 16, 2021
Merged

cmake: do not pollute sourcetree with untracked files#767
pstorz merged 3 commits intobareos:masterfrom
arogge:dev/arogge/master/generated-files

Conversation

@arogge
Copy link
Member

@arogge arogge commented Mar 22, 2021

previously two files showed up that were generated by cmake. This patch
adds the debian install-file to .gitignore and changes the global
configure_file not to pick up files from core/ but only from core/src
which will disable creation of CTestScript.cmake in core/ as it is
already generated to ${CMAKE_BINARY_DIR}/CTestScript.cmake

Thank you for contributing to the Bareos Project!

Please check

  • Short description and the purpose of this PR is present above this paragraph
  • Your name is present in the AUTHORS file (optional)

If you have any questions or problems, please give a comment in the PR.

Helpful documentation and best practices

Checklist for the reviewer of the PR (will be processed by the Bareos team)

General
  • PR name is meaningful
  • Purpose of the PR is understood
  • Separate commit for this PR in the CHANGELOG.md, PR number referenced is same
  • Commit descriptions are understandable and well formatted
Source code quality
  • Source code changes are understandable
  • Variable and function names are meaningful
  • Code comments are correct (logically and spelling)
  • Required documentation changes are present and part of the PR
  • check-sources --since-merge does not report any problems
  • git status should not report modifications in the source tree after building and testing

@pstorz pstorz self-requested a review March 22, 2021 15:53
Copy link
Member

@pstorz pstorz left a comment

Choose a reason for hiding this comment

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

The title is not easily understandable to me. How about
"cmake: do not pollute sourcetree with untracked files"

Unfortunately the builds fail as we also have .in files in core/scripts and core/platforms.

@arogge arogge changed the title cmake: fix files showing up after configure cmake: do not pollute sourcetree with untracked files Mar 24, 2021
@arogge arogge force-pushed the dev/arogge/master/generated-files branch from 9e113c9 to cd9ff72 Compare March 24, 2021 08:40
@pstorz pstorz force-pushed the dev/arogge/master/generated-files branch from cf6f8b5 to cd9ff72 Compare March 26, 2021 09:07
arogge added 2 commits April 16, 2021 12:08
previously two files showed up that were generated by cmake. This patch
adds the debian install-file to .gitignore and changes the global
configure_file not to pick up files from  core/ but only from core/src
which will disable creation of CTestScript.cmake in core/ as it is
already generated to ${CMAKE_BINARY_DIR}/CTestScript.cmake
Previously core/ could be configured and built on its own. As this has
become more and more of a maintenance burden, we disable support for
that now.
@arogge arogge force-pushed the dev/arogge/master/generated-files branch from 7d53f6f to cff044a Compare April 16, 2021 10:08
@pstorz pstorz self-requested a review April 16, 2021 10:38
Copy link
Member

@pstorz pstorz left a comment

Choose a reason for hiding this comment

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

Looks very good. Good work!

@pstorz pstorz merged commit 8e7d624 into bareos:master Apr 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants