Move helpdata to common #926
Merged
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
The help generation code is used by civmanual, which has to link to libclient (and provide shim implementation of some client functions) because helpdata calls into the client code directly. Start reducing the client dependencies in helpdata by making its header not depend on client code. See longturn#915.
This string was used to distinguish between different clients, but Freeciv21 has only one client. Removes a client dependency from help_data, see longturn#915.
freeciv21-manual doesn't have any notion of a current nation set, so it doesn't make sense to use it from there. See longturn#915.
It was unused. See longturn#915.
This way freeciv21-manual no longer needs client code. Despite preparation in previous commits, I had missed that helpdata.cpp was still referencing tilespec.h, so I had to migrate this on the fly. See longturn#915.
It's no longer needed! See longturn#915.
Keeping includes sorted.
lmoureaux
added
refactoring
jwrober
approved these changes
Mar 2, 2022
lmoureaux
added a commit
to lmoureaux/freeciv21
that referenced
this pull request
Aug 24, 2022
This variable was set when either the client or civmanual was built, to signify that libclient was needed. Since the help text generation was moved to libcommon in longturn#926, civmanual no longer needs libclient. The distinction between libclient and the client is thus moot.
lmoureaux
added a commit
to lmoureaux/freeciv21
that referenced
this pull request
Aug 24, 2022
This variable was set when either the client or civmanual was built, to signify that libclient was needed. Since the help text generation was moved to libcommon in longturn#926, civmanual no longer needs libclient. The distinction between libclient and the client is thus moot.
lmoureaux
added a commit
that referenced
this pull request
Aug 25, 2022
This variable was set when either the client or civmanual was built, to signify that libclient was needed. Since the help text generation was moved to libcommon in #926, civmanual no longer needs libclient. The distinction between libclient and the client is thus moot.
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.
This implements a prerequisite for #915, which is to remove the dependency of
freeciv21-manualon client code. This is achieved by movinghelpdata.handhelpdata.cpptocommon, where they can be picked up by tools. Some refactoring was required to remove hard-coded calls into the client code (with placeholder implementations incivmanual…).The only user-visible change is that the help no longer says
Qt client. But since there is only one client anyway…