build: Unify PACKAGE_VERSION on autotools, scons and Android

This patch unifies mesa's PACKAGE_VERSION on autotools, scons and
Android build systems.

Current behaviour is:
 - Autotools uses 9.2.0 as PACKAGE_VERSION
 - Scons and Android use 9.2-devel as PACKAGE_VERSION

With this patch all three build systems use 9.2.0-devel as
PACKAGE_VERSION.

Reviewed-by: Brian Paul <brianp@vmware.com>

diff --git a/Android.common.mk b/Android.common.mk
index 215c640fbc03cc4b001583e0fff44b18b602d6b1..c6ee4e1dbea9c8043232cfe3c7709e5cee8e727b 100644 (file)
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -35,7 +35,7 @@ LOCAL_C_INCLUDES += \
 
 # define ANDROID_VERSION (e.g., 4.0.x => 0x0400)
 LOCAL_CFLAGS += \
-       -DPACKAGE_VERSION=\"9.2-devel\" \
+       -DPACKAGE_VERSION=\"9.2.0-devel\" \
        -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 0ce94557ebe83a447711538a42f9e3957f85cbf8..92b792d60c22bd5ad31f3612ecc38c95644f8b36 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,7 +36,7 @@ check-local:
 
 # Rules for making release tarballs
 
-PACKAGE_VERSION=9.2-devel
+PACKAGE_VERSION=9.2.0-devel
 PACKAGE_DIR = Mesa-$(PACKAGE_VERSION)
 PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION)
 

diff --git a/SConstruct b/SConstruct
index 1807ff8353984f38396516634daeb0fdacaafb14..834e9d58a89f95afaf54891334cf60b67cb6ac1d 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -70,7 +70,7 @@ if env['gles']:
 # Environment setup
 
 env.Append(CPPDEFINES = [
-    ('PACKAGE_VERSION', '\\"9.2-devel\\"'),
+    ('PACKAGE_VERSION', '\\"9.2.0-devel\\"'),
     ('PACKAGE_BUGREPORT', '\\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\\"'),
 ])
 

diff --git a/configure.ac b/configure.ac
index bccab0aa1f6a7076f5a6de0c9bcd0a3a9efc65e2..b0daf251d1392bbd496b9412434028796d53668e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ 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.2.0],
+AC_INIT([Mesa], [9.2.0-devel],
     [https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa])
 AC_CONFIG_AUX_DIR([bin])
 AC_CONFIG_MACRO_DIR([m4])