CMake: Further fix amalgamation file gen on change #6854
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The previous PR (osquery#6832) was not enough to cover all type of changes to the inputs of the generation of the amalgamation file. The previous PR was only fixing the case where a spec file would change (it's mtime would be newer than the output, to be specific), but not if the dependency list itself would change. So if a new spec file was added or one was removed, it would not rerun. Moreover, with build systems that are not Ninja, any generated artifact that due to a config change is not generated anymore, will remain in the build folder, affecting the amalgamation file generation. Specifically if a table is disabled and its .cpp is not generated anymore, but previously it was generated, the amalgamate script will still pick it up because it doesn't receive a list of files to use, but uses the content of a folder. Finally, better express the dependency of the amalgamation file, so that it depends on the output of the targets/commands that generate the table source code, not the spec files (which are already input/dependency of the custom commands generating the tables source code) and not the tables source code generating target names (which would only express the need to run those targets before the amalgamation file generation, not the need to rerun the generation).
theopolis
approved these changes
Dec 28, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The previous PR (#6832) was not enough to cover all type of changes
to the inputs of the generation of the amalgamation file.
The previous PR was only fixing the case where a spec file would change
(it's mtime would be newer than the output, to be specific),
but not if the dependency list itself would change.
So if a new spec file was added or one was removed, it would not rerun.
Moreover, with build systems that are not Ninja,
any generated artifact that due to a config change is not generated anymore,
will remain in the build folder, affecting the amalgamation file
generation.
Specifically if a table is disabled and its .cpp is not generated
anymore, but previously it was generated, the amalgamate script
will still pick it up because it doesn't receive a list of files
to use, but uses the content of a folder.
Finally, better express the dependency of the amalgamation file,
so that it depends on the output of the targets/commands that
generate the table source code, not the spec files
(which are already input/dependency of the custom commands generating
the tables source code) and not the tables source code generating target names
(which would only express the need to run those targets before the
amalgamation file generation, not the need to rerun the generation).
As an additional info, the first issue doesn't appear if the inputs the custom command depends on appear on the COMMAND, generating a command line change whenever a dependency is added/removed/changes name.