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

Record version info #443

Merged
merged 9 commits into from
Sep 16, 2024
Merged

Conversation

NQNStudios
Copy link
Collaborator

@NQNStudios NQNStudios commented Sep 13, 2024

Close #440

I found a bug where scons builds defined GIT_TAG as empty because of a trailing blank line in the subprocess output.

Fixed that, and am now recording a root element like this:

<actions SHA="f411a46" Tag="v0.0.4" Status="modified" Repo="[email protected]:NQNStudios/cboe.git">

The CI will show whether my changes to gitrev.sh work for the Xcode build.

@NQNStudios
Copy link
Collaborator Author

Seems like Visual Studio builds don't generate tools/gitrev.hpp

@NQNStudios
Copy link
Collaborator Author

wait, there's a ClInclude for it...

@CelticMinstrel
Copy link
Member

What's v0.0.4?

@NQNStudios
Copy link
Collaborator Author

v0.0.4 is a tag in my fork.

@NQNStudios
Copy link
Collaborator Author

Wow, I added this guard which is the same as other places gitrev.hpp is included:

#ifndef MSBUILD_GITREV
#include "tools/gitrev.hpp"
#endif

and it didn't work!

@CelticMinstrel
Copy link
Member

Maybe the project file is configured to only define MSBUILD_GITREV in one file?

@NQNStudios NQNStudios force-pushed the record-version branch 2 times, most recently from 03c876c to 329accf Compare September 15, 2024 13:45
@NQNStudios
Copy link
Collaborator Author

I think it's because I thought the Visual Studio build had a special way of defining the values that I hadn't implemented the new ones for. But now I'm pretty sure Visual Studio builds just don't have any of the values defined. I do need to extend the no-git-repo case in the SConstruct to define blank strings for the new values though, then this can be a single ifdef

@NQNStudios
Copy link
Collaborator Author

NQNStudios commented Sep 15, 2024

or maybe each one should have its own guard. i don't know.

Or the one guard could be an #ifndef MSBUILD_GITREV.

@NQNStudios
Copy link
Collaborator Author

@CelticMinstrel Is there anything else you want to see from this one?

@CelticMinstrel
Copy link
Member

Hmm… does the Visual Studio build have this information at all? Does it show the commit hash on the startup screen?

@NQNStudios
Copy link
Collaborator Author

It does not.

@CelticMinstrel
Copy link
Member

CelticMinstrel commented Sep 16, 2024

That is quite unfortunate… but I'm not sure fixing that is in scope for a PR whose purpose is just to add that info to the replay…

It's possible to code the generation of this information directly into the Visual Studio project file. I'm not sure if this approach would survive saving the project from Visual Studio, though.

I guess we should just open a new issue for this.

@CelticMinstrel CelticMinstrel merged commit 33a2df5 into calref:master Sep 16, 2024
6 checks passed
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.

Record the Blades of Exile version producing the action log
2 participants