From e6121708e5d1297f92fcecfa4025b222e805c743 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sat, 21 Feb 2015 23:45:21 -0600 Subject: [PATCH] Let's try setting up the version number via configure.ac Why not? --- .gitignore | 1 + configure.ac | 12 +++++++++++- mediagoblin/{_version.py => _version.py.in} | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) rename mediagoblin/{_version.py => _version.py.in} (96%) diff --git a/.gitignore b/.gitignore index 4f9b4cb2..a38c65a9 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,7 @@ # pyconfigure/automake generated files /Makefile +/mediagoblin/_version.py /autom4te.cache/ /config.log /config.status diff --git a/configure.ac b/configure.ac index 99484906..b4438d5c 100644 --- a/configure.ac +++ b/configure.ac @@ -46,6 +46,16 @@ dnl 2) package version (i.e. 1.2) dnl 3) bug/info/project email address (i.e. bug-foo@gnu.org) dnl---- dnl + +dnl # valid version formats: +dnl # * x.y - final release +dnl # * x.ya1 - alpha 1 +dnl # * x.yb1 - beta 1 +dnl # * x.yrc1 - release candidate 1 +dnl # * x.y.dev - dev +dnl +dnl # see http://www.python.org/dev/peps/pep-0386/ + AC_INIT([mediagoblin], [0.8.1.dev], [cwebber@gnu.org]) @@ -145,7 +155,7 @@ dnl Finish # dnl######### dnl Define the files to be configured -AC_CONFIG_FILES([Makefile]) +AC_CONFIG_FILES([Makefile] [mediagoblin/_version.py]) dnl Generate config.status AC_OUTPUT diff --git a/mediagoblin/_version.py b/mediagoblin/_version.py.in similarity index 96% rename from mediagoblin/_version.py rename to mediagoblin/_version.py.in index b82f3f1f..d180f750 100644 --- a/mediagoblin/_version.py +++ b/mediagoblin/_version.py.in @@ -23,4 +23,4 @@ # see http://www.python.org/dev/peps/pep-0386/ -__version__ = "0.7.2.dev" +__version__ = "@PACKAGE_VERSION@" -- 2.25.1