diff options
| author | Petr Spacek <pspacek@redhat.com> | 2016-11-10 10:55:59 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-11-11 10:41:38 +0100 |
| commit | 8c81c6c5b8ea62addbc175308a4e357c75d65ef0 (patch) | |
| tree | b3dc74227cee400d4ceef122a6931165caf0fe51 /VERSION.m4 | |
| parent | 0023fb59240cb53a541763a89db038c186312154 (diff) | |
| download | freeipa-8c81c6c5b8ea62addbc175308a4e357c75d65ef0.tar.gz freeipa-8c81c6c5b8ea62addbc175308a4e357c75d65ef0.tar.xz freeipa-8c81c6c5b8ea62addbc175308a4e357c75d65ef0.zip | |
Build: update IPA_VERSION_IS_GIT_SNAPSHOT to comply with PEP440
Python setuptools started to warn about forward incompatibility.
Now we are following PEP440 so it should not cause any problems
with future versions of setuptools.
https://fedorahosted.org/freeipa/ticket/6418
Reviewed-By: Tomas Krizek <tkrizek@redhat.com>
Diffstat (limited to 'VERSION.m4')
| -rw-r--r-- | VERSION.m4 | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/VERSION.m4 b/VERSION.m4 index 75326fb25..7d9e1079c 100644 --- a/VERSION.m4 +++ b/VERSION.m4 @@ -5,7 +5,7 @@ # 1.0.x New production series # # 1.0.x{alpha,beta,rc}y Alpha/Preview/Testing, Beta, # # Release Candidate # -# 1.0.0.20170102030405.GITabcdefg Build from GIT # +# 1.0.0.dev20170102030405+gitabcdefg Build from GIT # # # ######################################################## @@ -38,10 +38,10 @@ define(IPA_VERSION_PRE_RELEASE, ) # in the development BRANCH, and set to 'no' only in # # the IPA_X_X_RELEASE BRANCH # # # -# <MAJOR>.<MINOR>.<RELEASE>.<TIMESTAMP>.GIT<hash> # +# <MAJOR>.<MINOR>.<RELEASE>.dev<TIMESTAMP>+git<hash> # # # # e.g. define(IPA_VERSION_IS_GIT_SNAPSHOT, yes) # -# -> "1.0.0.20170102030405.GITabcdefg" # +# -> "1.0.0.dev20170102030405+gitabcdefg" # # # # This option works only with GNU m4: # # it requires esyscmd m4 macro. # @@ -105,11 +105,12 @@ dnl helper for translit in IPA_VERSION define(NEWLINE,` ') -dnl Git snapshot: 20170102030405.GITabcdefg +dnl Git snapshot: dev20170102030405+gitabcdefg define(IPA_GIT_VERSION, translit(dnl remove new lines from version (from esyscmd) ifelse(IPA_VERSION_IS_GIT_SNAPSHOT, yes,dnl +dev esyscmd(date -u +'%Y%m%d%H%M')dnl 20170102030405 -.GIT ++git esyscmd(git log -1 --format="%h" HEAD),dnl abcdefg ), NEWLINE)) dnl IPA_GIT_VERSION end @@ -118,7 +119,7 @@ define(IPA_VERSION, translit(dnl remove new lines from version (from esyscmd) dnl 1.0.0 IPA_VERSION_MAJOR.IPA_VERSION_MINOR.IPA_VERSION_RELEASE IPA_VERSION_PRE_RELEASE -dnl version with Git snapshot: 1.0.0.20170102030405.GITabcdefg +dnl version with Git snapshot: 1.0.0.dev20170102030405+gitabcdefg ifelse(IPA_VERSION_IS_GIT_SNAPSHOT, yes, . IPA_GIT_VERSION), |