D8158: KDevelop: decorate patch version string in development builds

[Kevin Funk]

kfunk requested changes to this revision.
kfunk added inline comments.
This revision now requires changes to proceed.

INLINE COMMENTS

> CMakeLists.txt:133
> +    # Get rid of the leading 'v':
> +    string(SUBSTRING "${GIT_FULL_VERSION}" 1 -1 KDevelop_FULL_VERSION)
> +    message(STATUS "KDevelop_FULL_VERSION=${KDevelop_FULL_VERSION}")

Please just *amend* the version as specified by CMake (that is, re-use VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH). We don't want to fully overwrite the things set in CMakeLists.txt.

Something along:
`set(KDevelop_FULLVERSION_STRING "${KDEVELOP_VERSION_STRING} (git ${SHA1}")`

Please check what Krita does in their CMakeLists.txt, I'd like something similar.

FWIW, they use this to get the SHA1:
`get_git_head_revision(GIT_REFSPEC GIT_SHA1)`

> CMakeLists.txt:134
> +    string(SUBSTRING "${GIT_FULL_VERSION}" 1 -1 KDevelop_FULL_VERSION)
> +    message(STATUS "KDevelop_FULL_VERSION=${KDevelop_FULL_VERSION}")
> +else()

Print this in a more human-readable way, i.e. `Setting KDevelop version to: ...`

> GetGitRevisionDescription.cmake:1
> +# - Returns a version string from Git
> +#

This copy is not current.

I'm getting:

  makeobj[0]: Entering directory `/home/kfunk/devel/build/kf5/kdevelop-5.2'
  [0/1] Re-running CMake...
  CMake Warning at cmake/modules/GetGitRevisionDescription.cmake:121 (message):
    " describe 8bab57d14644f7f1d2a263a243745014bce5745c " failed with exit code
    No such file or directory, out=
  Call Stack (most recent call first):
    CMakeLists.txt:124 (git_describe)

Please use the most recent version from https://github.com/rpavlik/cmake-modules/blob/master (it seems to work fine with that version from there).

> kdevelop-fullversion.h.cmake:1
> +#ifndef KDEVELOP_FULLVERSION_H
> +#define KDEVELOP_FULLVERSION_H

kdevelop-fullversion.h -> kdevelop_fullversion.h. `FULLVERSION` -> `KDevelop_FULLVERSION_STRING`.

Then this is consistent with kdevelop_version.h as generated by `ecm_setup_version()`.

REPOSITORY
  R32 KDevelop

REVISION DETAIL
  https://phabricator.kde.org/D8158

To: rjvbb, #kdevelop, brauch, kfunk
Cc: kossebau, flherne, mwolff, brauch, kdevelop-devel, geetamc, Pilzschaf, akshaydeo, surgenight, arrowdodger
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kdevelop-devel/attachments/20171008/9d0f0dde/attachment-0001.html>