Generate Version.h from current tag name #1610
Conversation
Remove the major/minor/patch version from the package name, since the "git describe" output has the same numbers, and that is now part of the package name
|
Test tag is here: https://github.com/kduske/TrenchBroom/releases/tag/v0.0.0-test |
I think there are two separate cases:
|
This will never happen, though, unless someone starts a fresh git history with no tags. So IMO we can just make it fail.
Ok, I'll adjust that. |
|
I think we can also remove
and the rules to generate those from the cmake scripts. All future releases will be done on github and I'm going to retire the old site entirely. |
| LIST(GET VERSION_PARTS 1 ${VERSION_MINOR}) | ||
| LIST(GET VERSION_PARTS 2 ${VERSION_MAINTENANCE}) | ||
| MACRO(GET_APP_VERSION GIT_DESCRIBE VERSION_MAJOR VERSION_MINOR VERSION_MAINTENANCE) | ||
| STRING(REGEX MATCH "v([0-9]+)[.]([0-9]+)[.]([0-9]+)" GIT_DESCRIBE_MATCH ${GIT_DESCRIBE}) |
There was a problem hiding this comment.
I suppose that you can't use \d and \d? Because this will also match 0x3#2, it doesn't enforce the dots, right?
There was a problem hiding this comment.
I don't think cmake has predefined character classes like \d, at least it's not documented: https://cmake.org/cmake/help/v3.0/command/string.html
However, at first I tried using \. to match a literal ., and it seems that using backslashes in this regex cause visual studio to break with a "can't parse escape sequence" error... typical cmake nonsense!
I think the [.] bit will only match literal . characters though, which is what we want. Characters that normally have special meanings like . are just literals when used in a character class ,the only special one is - for ranges.
| SET(${VERSION_MINOR} ${CMAKE_MATCH_2}) | ||
| SET(${VERSION_MAINTENANCE} ${CMAKE_MATCH_3}) | ||
| ELSE() | ||
| MESSAGE(WARNING "Couldn't parse major/minor/maintenance versions from git describe output '${GIT_DESCRIBE}'") |
There was a problem hiding this comment.
Please let it fail in this case.
| LIST(GET VERSION_PARTS 1 ${VERSION_MINOR}) | ||
| LIST(GET VERSION_PARTS 2 ${VERSION_MAINTENANCE}) | ||
| MACRO(GET_APP_VERSION GIT_DESCRIBE VERSION_MAJOR VERSION_MINOR VERSION_MAINTENANCE) | ||
| STRING(REGEX MATCH "v([0-9]+)[.]([0-9]+)[.]([0-9]+)" GIT_DESCRIBE_MATCH ${GIT_DESCRIBE}) |
There was a problem hiding this comment.
Check if ${GIT_DESCRIBE} is empty and set to a default of 0.0.0.
| #define BUILD_TYPE "@APP_BUILD_TYPE@" | ||
| #define BUILD_ID_STR "@GIT_DESCRIBE@ [@APP_BUILD_TYPE@]" |
There was a problem hiding this comment.
Please get rid of the square brackets. Now that I saw them in the welcome frame, I think they look out of place.
Fixes #1601
Falls back to a version of
0.0.1if the tag can't be parsed. We could just fail the build, alternatively, although in that case we'd need to tag some older commit in order to merge this without breaking the build.The package file names changed, now looks like
TrenchBroom-MacOSX-test-1571-26-g4c54a3c7-Debug.dmg(wheretest-1571-26-g4c54a3c7is thegit describeoutput. So with a proper tag it would be something likeTrenchBroom-MacOSX-v2.0.0-rc1-Debug.dmg)I tested on VS2015 and Xcode so far. I think I'll push a temporary tag to this branch to check all of the CI builds and Linux in particular.