Resource.dat fixxors. #759
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
This does a lot of things. On a high level, it changes the resource.dat file generation such that it properly gets marked as a GENERATED dependency of plClient. Further, we correctly chain the vector graphics and scripts as dependencies of resource.dat such that resource.dat will only be regenerated by modifying these files. H-uru#745 unintentionally broke this by removing the default definition of `CMAKE_RUNTIME_OUTPUT_DIRECTORY` -- CI didn't detect it because it it defines that variable in the cache. More sneakily, we now see the beginnings of more automated dependency management in that our CMake can now install the python packages for building resource.dat. For now, it is OFF by default - it seems rude to unilaterally install packages in a system Python install. Future work to enable a submodule based vcpkg toolchain would use this facility however.
OK, so, Python 2.7 would have never been used anyway because a call to `Python3_EXECUTABLE` has been hardcoded for some time now. So, let's use this as an opportunity to test our auto pip install facillity.
Deledrius
requested changes
Dec 21, 2020
Co-authored-by: Joseph Davies <[email protected]>
zrax
reviewed
Dec 21, 2020
Hoikas
force-pushed
the
moar-resource-dat
branch
from
79f025f to
c709d4f
Compare
Deledrius
approved these changes
Dec 23, 2020
zrax
reviewed
Dec 23, 2020
zrax
approved these changes
Dec 23, 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.
This fixes an issue reported by @Deledrius in that since #745, the resource.dat file is always regenerated at build time. Also, it introduces the ability for our cmake to automatically install the dependency packages for this process. This is off by default because it seems inappropriate to
pip installanything into someone's system Python. Future work when adding the vcpkg submodule will be to selectively enable the facility.Also fixes an issue in which CI has not tested resource.dat in quite some time...