Simplify version support #2191
Merged
Simplify version support #2191
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 function was bad for translators and not really needed.
It was always equal to freeciv21_version().
It was always equal to freeciv21_version().
When the version system was designed, we envisioned two types of release: * Stable releases 3.0, 3.1, 3.2, etc. * Pre-releases 3.0-alpha.1 etc. In addition, we wanted to show a commit id in various places for intermediate builds. The code was written to change the C++ side of things as little as possible, which resulted in some hacks being used. In practice, we don't strictly follow this scheme since we publish patch releases to the stable, e.g. 3.0.2. This patch removes a hack and code we don't need: * Support for emergency versions (we just release a new minor if needed) * Support for commit SHAs (it was hacky) The release documentation is also updated with the new expected tag format (three digits without -stable for stable releases).
jwrober
approved these changes
Feb 4, 2024
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.
When the version system was designed, we envisioned two types of release:
In addition, we wanted to show a commit id in various places for intermediate builds. The code was written to change the C++ side of things as little as possible, which resulted in some hacks being used. Also, we don't strictly follow this scheme in practice since we publish patch releases to the stable, e.g. 3.0.2.
This PR removes a hack and code we don't need:
This allows some simplification to the CMake logic constructing the version.
The release documentation is also updated with the new expected tag format (three digits without -stable for stable releases).