Skip to content

generate *.vcxproj file lists with dmake #4652

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

Merged
merged 7 commits into from
Jan 21, 2023
Merged

Conversation

firewave
Copy link
Collaborator

@firewave firewave commented Dec 17, 2022

cli.vcxproj and testrunner.vcxproj are changed completely since the newlines were wrong (CR instead of CRLF). We need a proper .gitattributes file which enforces those. To view those changes you need to enable the Hide whitespace option in the diff viewer (accessible via the "gear" icon).

The added Label attribute is allowed - it is simply not used by Visual Studio in those files. It does allow use to define marker and the file lists in question so we can rewrite them.

I have no added writing of the *.vcxproj.filters yet but that is simply for grouping in the IDE and has no effect on the builds. Will add that in a later PR.

@firewave firewave marked this pull request as ready for review December 17, 2022 18:43
@firewave
Copy link
Collaborator Author

The dmake.vcxproj is also lacking x64 build configurations and is not aligned with the settings of our other projects - will do that in a different PR but that is not really necessary since it is not used in production/CI or being shipped. It is also not build by default. I mainly added it so I can debug it on Windows as well as pulling it out of obscurity (I wasn't even aware there was a Visual Studio project for it until a few weeks ago).

@firewave firewave marked this pull request as draft December 30, 2022 18:35
@firewave firewave marked this pull request as ready for review December 30, 2022 20:42
@firewave
Copy link
Collaborator Author

With the files normalized we no longer need the hack in the CI and this PR will now properly show all the changes without adjusting the viewer options.

@danmar
Copy link
Owner

danmar commented Dec 31, 2022

I think your approach is reasonable 👍

To read the existing vcxproj file and just replace the file lists.

@firewave
Copy link
Collaborator Author

Anything left to do to get this merged?

@danmar danmar merged commit 41849b1 into danmar:main Jan 21, 2023
@firewave firewave deleted the dmake-vcx branch January 21, 2023 14:12
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