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

Remove ObjectCreator from main cdda solution #61274

Merged
merged 1 commit into from
Sep 27, 2022

Conversation

akrieger
Copy link
Member

@akrieger akrieger commented Sep 26, 2022

Summary

None

Purpose of change

@ZhilkinSerg made a comment in #60385 which made me go back and verify some assumptions I'd made when adding ccache support. I thought the only way to get rid of the separate ObjectCreator build would be to add it to the main cdda solution because Visual Studio wouldn't reuse artifacts between solutions, even for the same project. MSBuild, however, is not Visual Studio and will happily do so, as I found out earlier when playing with some changes. Removing ObjectCreator from the main solution helps in the general case because it reduces the disk space usage and overhead of the easy 'build solution' button and other ways one can accidentally trigger building ObjectCreator from VS.

Describe the solution

Remove ObjectCreator from the main cdda solution. In the msvc-full-features workflow, call msbuild twice to build first cdda & tests, and secondly ObjectCreator itself from its own solution. This works A-OK.

Describe alternatives you've considered

Testing

https://github.com/akrieger/Cataclysm-DDA/actions/runs/3124402835/jobs/5067727146 passed and did the sensible thing when pushed to my repo.

Additional context

@github-actions github-actions bot added Code: Tooling Tooling that is not part of the main game but is part of the repo. json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels Sep 26, 2022
@NetSysFire NetSysFire added Code: Build Issues regarding different builds and build environments OS: Windows Issues related to Windows operating system labels Sep 26, 2022
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Sep 26, 2022
@dseguin dseguin merged commit 89e65dd into CleverRaven:master Sep 27, 2022
captainego pushed a commit to captainego/Cataclysm-DDA that referenced this pull request Oct 9, 2022
captainego pushed a commit to captainego/Cataclysm-DDA that referenced this pull request Oct 9, 2022
@akrieger akrieger deleted the fewer_creators_more_objects branch December 3, 2022 18:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions Code: Build Issues regarding different builds and build environments Code: Tooling Tooling that is not part of the main game but is part of the repo. json-styled JSON lint passed, label assigned by github actions OS: Windows Issues related to Windows operating system
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants