build: unify mesa version by using a VERSION file

Rather than having to keep track of all the build systems and their respecitve
definition of the mesa version, use a single top file VERSION. Every build
system is responsible for reading/parsing the file and using it

v2:
* remove useless bulletpoint from the documentation, suggested by Matt
* "Androing is Linux. Use '/' in stead of '\'", spotted by Chad V
* use cleaner code to get the version in scons, suggested by Chad V

v3:
* ensure leading and trailing whitespace characters are stripped while parsing
* android: handle GNU shell commands approapriately

Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>

diff --git a/Android.common.mk b/Android.common.mk
index dd37104b08e73ee2afb3e6ba58dff68e14a6179f..3e6d4c398911a3747a5e048f2d82a3c1c3f46e74 100644 (file)
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -33,9 +33,10 @@ endif
 LOCAL_C_INCLUDES += \
        $(MESA_TOP)/include
 
+MESA_VERSION=$(shell cat $(MESA_TOP)/VERSION)
 # define ANDROID_VERSION (e.g., 4.0.x => 0x0400)
 LOCAL_CFLAGS += \
-       -DPACKAGE_VERSION=\"9.3.0-devel\" \
+       -DPACKAGE_VERSION=\"$(MESA_VERSION)\" \
        -DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\" \
        -DANDROID_VERSION=0x0$(MESA_ANDROID_MAJOR_VERSION)0$(MESA_ANDROID_MINOR_VERSION)
 

diff --git a/Makefile.am b/Makefile.am
index 63e02c6a0f84ad8db4b09ed78a02d564ed5a8dee..ce391c409a47c4c2a03f745410b9b452e31c95a8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,6 +36,7 @@ PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION)
 EXTRA_FILES = \
        aclocal.m4                                      \
        configure                                       \
+       VERSION                                 \
        bin/ar-lib                                      \
        bin/compile                                     \
        bin/config.sub                                  \

diff --git a/SConstruct b/SConstruct
index b00a7fe1c989fdf4fffa70e10f2ba8a7a292711f..de735e94c34f18713d5aaa42535ea35153317663 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -69,8 +69,10 @@ if env['gles']:
 #######################################################################
 # Environment setup
 
+with open("VERSION") as f:
+  mesa_version = f.read().strip()
 env.Append(CPPDEFINES = [
-    ('PACKAGE_VERSION', '\\"9.3.0-devel\\"'),
+    ('PACKAGE_VERSION', '\\"%s\\"' % mesa_version),
     ('PACKAGE_BUGREPORT', '\\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\\"'),
 ])
 

diff --git a/VERSION b/VERSION
new file mode 100644 (file)
index 0000000..b260649
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+9.3.0-devel

diff --git a/configure.ac b/configure.ac
index 425b6eef79d250bc3096fc577def11d508520f53..62d06e0357fdd65a01d659c328ba24138c95b0ac 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,8 @@ dnl Tell the user about autoconf.html in the --help output
 m4_divert_once([HELP_END], [
 See docs/autoconf.html for more details on the options for Mesa.])
 
-AC_INIT([Mesa], [9.3.0-devel],
+m4_define(MESA_VERSION, m4_normalize(m4_include(VERSION)))
+AC_INIT([Mesa], [MESA_VERSION],
     [https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa])
 AC_CONFIG_AUX_DIR([bin])
 AC_CONFIG_MACRO_DIR([m4])

diff --git a/docs/devinfo.html b/docs/devinfo.html
index bd11e5ccc1fa0dce764336aadd4b56e9a132ec3e..bf7725961ce4333e6b0ed00333f03ecef9f53aea 100644 (file)
--- a/docs/devinfo.html
+++ b/docs/devinfo.html
@@ -193,15 +193,7 @@ branch is relevant.
 </p>
 
 
-<h3>Verify and update version info</h3>
-
-<dl>
-  <dt>SConstruct</dt>
-  <dt>Android.common.mk</dt>
-  <dd>PACKAGE_VERSION</dd>
-  <dt>configure.ac</dt>
-  <dd>AC_INIT</dd>
-</dl>
+<h3>Verify and update version info in VERSION</h3>
 
 <p>
 Create a docs/relnotes/x.y.z.html file.