Cleanup versioning strategy #989
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
baylesj
requested review from
BillyDonahue and
hjmjohnson
and removed request for
BillyDonahue
Currently, versioning is a mess. CMake and Meson have seperate build version number storage locations, with no way of knowing you need to have both. Plus, due to recent revisions the amalgamate script is broken unless you build first, and may still be broken afterwards. This PR fixes some issues with versioning, and adds comments clarifying what has to be done when doing a release.
|
Failures are due to us overusing resources. I guess I'll wait? |
baylesj
force-pushed
the
cleanup-versioning
branch
from
082e37f to
f300478
Compare
| ((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) | \ | ||
| (JSONCPP_VERSION_PATCH << 8)) | ||
|
|
||
| #ifdef JSONCPP_USING_SECURE_MEMORY |
There was a problem hiding this comment.
What's this stuff about JSONCPP_USING_SECURE_MEMORY ?
It has nothing to do with version.
Actually JSONCPP_VERSION_HEXA and JSONCPP_VERSION_STRING are derivatives and should be elsewhere. I would like it if version.h were just the number tuple and that's about it.
| # 2. /include/json/version.h | ||
| # 3. /CMakeLists.txt | ||
| # IMPORTANT: also update the SOVERSION!! | ||
| VERSION 1.9.2 # <major>[.<minor>[.<patch>[.<tweak>]]] |
There was a problem hiding this comment.
CMake's file command can read a variable from a file.
file (STRINGS "version.txt" JSONCPP_VERSION)
file (STRINGS "soversion.txt" JSONCPP_SOVERSION)
I don't know how to do it in meson.
I guess a worst-case would be invoking cat.
r = run_command('cat','version.txt')
JSONCPP_VERSION=r.stdout()
r = run_command('cat','soversion.txt')
JSONCPP_SOVERSION=r.stdout()
I don't know meson. It feels like we should be able to do this though!
There was a problem hiding this comment.
I'll spend some time this week looking into that, I definitely agree with you.
baylesj
added a commit
that referenced
this pull request
Jul 31, 2019
baylesj
added a commit
that referenced
this pull request
Jul 31, 2019
* Cleanup versioning strategy Currently, versioning is a mess. CMake and Meson have seperate build version number storage locations, with no way of knowing you need to have both. Plus, due to recent revisions the amalgamate script is broken unless you build first, and may still be broken afterwards. This PR fixes some issues with versioning, and adds comments clarifying what has to be done when doing a release. * Run clang format * Update SOVERSION....
baylesj
added a commit
that referenced
this pull request
Aug 14, 2019
* Cleanup versioning strategy Currently, versioning is a mess. CMake and Meson have seperate build version number storage locations, with no way of knowing you need to have both. Plus, due to recent revisions the amalgamate script is broken unless you build first, and may still be broken afterwards. This PR fixes some issues with versioning, and adds comments clarifying what has to be done when doing a release. * Run clang format * Update SOVERSION....
dota17
pushed a commit
to dota17/jsoncpp
that referenced
this pull request
Aug 19, 2019
* Cleanup versioning strategy Currently, versioning is a mess. CMake and Meson have seperate build version number storage locations, with no way of knowing you need to have both. Plus, due to recent revisions the amalgamate script is broken unless you build first, and may still be broken afterwards. This PR fixes some issues with versioning, and adds comments clarifying what has to be done when doing a release. * Run clang format * Update SOVERSION....
dota17
pushed a commit
to dota17/jsoncpp
that referenced
this pull request
Aug 19, 2019
dota17
pushed a commit
to dota17/jsoncpp
that referenced
this pull request
Aug 19, 2019
…-source-parsers#997) * Cleanup versioning strategy Currently, versioning is a mess. CMake and Meson have seperate build version number storage locations, with no way of knowing you need to have both. Plus, due to recent revisions the amalgamate script is broken unless you build first, and may still be broken afterwards. This PR fixes some issues with versioning, and adds comments clarifying what has to be done when doing a release. * Run clang format * Update SOVERSION....
res2k
pushed a commit
to res2k/jsoncpp
that referenced
this pull request
Aug 21, 2019
* Cleanup versioning strategy Currently, versioning is a mess. CMake and Meson have seperate build version number storage locations, with no way of knowing you need to have both. Plus, due to recent revisions the amalgamate script is broken unless you build first, and may still be broken afterwards. This PR fixes some issues with versioning, and adds comments clarifying what has to be done when doing a release. * Run clang format * Update SOVERSION....
res2k
pushed a commit
to res2k/jsoncpp
that referenced
this pull request
Aug 21, 2019
res2k
pushed a commit
to res2k/jsoncpp
that referenced
this pull request
Aug 21, 2019
…-source-parsers#997) * Cleanup versioning strategy Currently, versioning is a mess. CMake and Meson have seperate build version number storage locations, with no way of knowing you need to have both. Plus, due to recent revisions the amalgamate script is broken unless you build first, and may still be broken afterwards. This PR fixes some issues with versioning, and adds comments clarifying what has to be done when doing a release. * Run clang format * Update SOVERSION....
dawesc
pushed a commit
to EFTlab/jsoncpp
that referenced
this pull request
Sep 25, 2019
* Cleanup versioning strategy Currently, versioning is a mess. CMake and Meson have seperate build version number storage locations, with no way of knowing you need to have both. Plus, due to recent revisions the amalgamate script is broken unless you build first, and may still be broken afterwards. This PR fixes some issues with versioning, and adds comments clarifying what has to be done when doing a release. * Run clang format * Update SOVERSION....
dawesc
pushed a commit
to EFTlab/jsoncpp
that referenced
this pull request
Sep 25, 2019
dawesc
pushed a commit
to EFTlab/jsoncpp
that referenced
this pull request
Sep 25, 2019
…-source-parsers#997) * Cleanup versioning strategy Currently, versioning is a mess. CMake and Meson have seperate build version number storage locations, with no way of knowing you need to have both. Plus, due to recent revisions the amalgamate script is broken unless you build first, and may still be broken afterwards. This PR fixes some issues with versioning, and adds comments clarifying what has to be done when doing a release. * Run clang format * Update SOVERSION....
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.
Currently, versioning is a mess. CMake and Meson have seperate build
version number storage locations, with no way of knowing you need to
have both. Plus, due to recent revisions the amalgamate script is broken
unless you build first, and may still be broken afterwards.
This PR fixes some issues with versioning, and adds comments clarifying
what has to be done when doing a release.
#988