-
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
Allow packagers to manually override CUTTER_VERSION_FULL #3421
Conversation
As the git revision check doesn't always work, we should allow packagers to manually override CUTTER_VERSION_FULL.
Marking whole version string variable might have bad sideeffects for user/developer builds where user keeps updating local copy. I will do some tests. I am guessing that Arch is getting wrong commit hash due to build recipe also being stored in git and the command used by build script picking wrong one. Might be worth looking into fixing that, but that's a separate issue. Having a version override would be still useful. @Integral-Tech What if only the suffix part was overridable? Would that be sufficient for package maintainer needs ? Seems like in your example you set the version to plain "2.3.4" in that case it should have been already possible to achieve similar result by setting "GIT_REV" to empty string which should use the other branch of if which doesn't have any git stuff. I can imagine that there would still be value for some override so that packagers can better communicate presence of distro specific customizations or build number. |
You mean in the following set(CUTTER_VERSION_FULL "${CUTTER_VERSION}-${GIT_BRANCH}-${GIT_REV}") Only make |
Sorry didn't saw where the GIT_REV comes from and misunderstood the intention of Anyway the idea was something like this
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Created a new PR #3422 with the approach I described. It should better deal with user/dev builds, while hopefully addressing the main problem you created this PR.
Closed in favor of #3422 . |
Your checklist for this pull request
Detailed description
The git revision check doesn't always work. For example, when building cutter as an Arch Linux package (namely
extra/rz-cutter
in the Arch Linux repository), theCUTTER_VERSION_FULL
is set to a strange value:Therefore we should allow packages to manually override
CUTTER_VERSION_FULL
.Test plan (required)
-DCUTTER_VERSION_FULL=<version>
in cmake command to test changes.Before:

After:

Closing issues