aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-10-10 19:49:45 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-10-10 19:49:45 +0000
commit69c4f009e42005324fea01399e7370b7fa520bdb (patch)
treed2b5d8c6e2e8e36b2350184d116c07b4617631ff
parentef978b927a86cfba4fb18a12e0304f5646758484 (diff)
downloadpaludis-69c4f009e42005324fea01399e7370b7fa520bdb.tar.gz
paludis-69c4f009e42005324fea01399e7370b7fa520bdb.tar.xz
Add PALUDIS_VERSION_SUFFIX, for _alpha etc
-rw-r--r--configure.ac4
-rw-r--r--doc/examples/example_about.cc2
-rw-r--r--doc/examples/example_command_line.cc2
-rw-r--r--paludis/about.hh.in7
-rw-r--r--src/clients/paludis/paludis.cc2
5 files changed, 13 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index fe60400..6945848 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,8 @@ AC_CONFIG_AUX_DIR(config)
VERSION_MAJOR=0
VERSION_MINOR=25
VERSION_MICRO=0
-VERSION_FULL="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_MICRO"
+VERSION_SUFFIX=
+VERSION_FULL="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_MICRO$VERSION_SUFFIX"
VERSION="$VERSION_FULL"
VERSION_LIB_CURRENT=`expr 100 '*' $VERSION_MAJOR + $VERSION_MINOR`
VERSION_LIB_REVISION="$VERSION_MICRO"
@@ -17,6 +18,7 @@ AC_SUBST([VERSION_MAJOR])
AC_SUBST([VERSION_MINOR])
AC_SUBST([VERSION_MICRO])
AC_SUBST([VERSION_FULL])
+AC_SUBST([VERSION_SUFFIX])
AC_SUBST([VERSION_LIB_CURRENT])
AC_SUBST([VERSION_LIB_REVISION])
diff --git a/doc/examples/example_about.cc b/doc/examples/example_about.cc
index 84c52cc..2ef9156 100644
--- a/doc/examples/example_about.cc
+++ b/doc/examples/example_about.cc
@@ -22,7 +22,7 @@ using std::endl;
int main(int, char *[])
{
cout << "Built using Paludis " << PALUDIS_VERSION_MAJOR << "." << PALUDIS_VERSION_MINOR
- << "." << PALUDIS_VERSION_MICRO;
+ << "." << PALUDIS_VERSION_MICRO << PALUDIS_VERSION_SUFFIX;
if (! std::string(PALUDIS_SUBVERSION_REVISION).empty())
cout << " " << PALUDIS_SUBVERSION_REVISION;
diff --git a/doc/examples/example_command_line.cc b/doc/examples/example_command_line.cc
index 07d6dd9..08ef3d5 100644
--- a/doc/examples/example_command_line.cc
+++ b/doc/examples/example_command_line.cc
@@ -70,7 +70,7 @@ void
examples::show_version_and_exit()
{
cout << PALUDIS_PACKAGE << " " << PALUDIS_VERSION_MAJOR << "."
- << PALUDIS_VERSION_MINOR << "." << PALUDIS_VERSION_MICRO;
+ << PALUDIS_VERSION_MINOR << "." << PALUDIS_VERSION_MICRO << PALUDIS_VERSION_SUFFIX;
if (! std::string(PALUDIS_SUBVERSION_REVISION).empty())
cout << " svn " << PALUDIS_SUBVERSION_REVISION;
cout << endl;
diff --git a/paludis/about.hh.in b/paludis/about.hh.in
index 5e3a101..58a4deb 100644
--- a/paludis/about.hh.in
+++ b/paludis/about.hh.in
@@ -62,6 +62,13 @@
#define PALUDIS_VERSION_MICRO @VERSION_MICRO@
/**
+ * The version suffix (eg "_alpha1"), often an empty string.
+ *
+ * \ingroup g_about
+ */
+#define PALUDIS_VERSION_SUFFIX "@VERSION_SUFFIX@"
+
+/**
* The version, two digits per part (eg 1.3.5 -> 10305).
*
* \ingroup g_about
diff --git a/src/clients/paludis/paludis.cc b/src/clients/paludis/paludis.cc
index 3658dfb..5522bc2 100644
--- a/src/clients/paludis/paludis.cc
+++ b/src/clients/paludis/paludis.cc
@@ -70,7 +70,7 @@ namespace
void display_version()
{
cout << PALUDIS_PACKAGE << " " << PALUDIS_VERSION_MAJOR << "."
- << PALUDIS_VERSION_MINOR << "." << PALUDIS_VERSION_MICRO;
+ << PALUDIS_VERSION_MINOR << "." << PALUDIS_VERSION_MICRO << PALUDIS_VERSION_SUFFIX;
if (! std::string(PALUDIS_SUBVERSION_REVISION).empty())
cout << " svn " << PALUDIS_SUBVERSION_REVISION;
cout << endl;