From 40cfc6455c65d0ca4778da4839282d6b9080b883 Mon Sep 17 00:00:00 2001 From: Evangelos Foutras Date: Fri, 10 Apr 2015 12:55:59 +0300 Subject: [PATCH] configure.in.in: specify version in component form This makes it possible to differentiate between source revisions without having to manually adjust orage_version in configure.in.in. During development orage_version_tag is set to 'git' which, after running ./autogen.sh, sets the package version to something like: 4.12.0git-97fc5c9 When a new release is made, orage_version_tag is set to an empty string so that a proper version gets generated (e.g. 4.12.0). After the release has been made, orage_version_tag is changed back to 'git' and development can resume. The benefit of doing versioning this way is easier maintenance as well as reduced noise in the configure.in.in file's history. --- configure.in.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/configure.in.in b/configure.in.in index 6020d86..c383111 100644 --- a/configure.in.in +++ b/configure.in.in @@ -9,7 +9,13 @@ dnl Written for Xfce by Juha Kautto dnl dnl Version information -m4_define([orage_version], [4.12.0.2-git]) +m4_define([orage_version_major], [4]) +m4_define([orage_version_minor], [12]) +m4_define([orage_version_micro], [0]) +m4_define([orage_version_nano], []) dnl leave this empty to have no nano version +m4_define([orage_version_build], [@REVISION@]) +m4_define([orage_version_tag], [git]) +m4_define([orage_version], [orage_version_major().orage_version_minor().orage_version_micro()ifelse(orage_version_nano(), [], [], [.orage_version_nano()])ifelse(orage_version_tag(), [git], [orage_version_tag()-orage_version_build()], [orage_version_tag()])]) m4_define([gtk_minimum_version], [2.14.0]) m4_define([xfce_minimum_version], [4.8.0]) -- 2.3.5