On 04/06/13 21:42, Andreas Boll wrote: > 2013/6/4 Brian Paul <bri...@vmware.com> > >> On 06/04/2013 11:40 AM, Andreas Boll wrote: >> >>> 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. >>> >>> --- >>> Android.common.mk | 2 +- >>> Makefile.am | 2 +- >>> SConstruct | 2 +- >>> configure.ac | 2 +- >>> 4 files changed, 4 insertions(+), 4 deletions(-) >>> >>> diff --git a/Android.common.mk b/Android.common.mk >>> index 215c640..c6ee4e1 100644 >>> --- 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\<https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa%5C>" >>> \ >>> -DANDROID_VERSION=0x0$(MESA_**ANDROID_MAJOR_VERSION)0$(MESA_** >>> ANDROID_MINOR_VERSION) >>> >>> diff --git a/Makefile.am b/Makefile.am >>> index 0ce9455..92b792d 100644 >>> --- 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 1807ff8..834e9d5 100644 >>> --- 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\\<https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa%5C%5C> >>> "'), >>> ]) >>> >>> diff --git a/configure.ac b/configure.ac >>> index bccab0a..b0daf25 100644 >>> --- 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<https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa> >>> ]) >>> AC_CONFIG_AUX_DIR([bin]) >>> AC_CONFIG_MACRO_DIR([m4]) >>> >>> >> We should probably beef-up the documentation for setting/bumping the >> version number in docs/devinfo.html. It would be easy for someone to miss >> one of these locations. >> >> Otherwise, Reviewed-by: Brian Paul <bri...@vmware.com> >> >> >> > Thanks for the review! > > docs/devinfo.html lists all these files already. > See http://cgit.freedesktop.org/mesa/mesa/tree/docs/devinfo.html#n196 > After adding the note about Android and scons I was thinking about having a single file containing the version, and every build system parsing it - something like what wine is doing.
I.e. you change the version once and forget about it, regardless how many build systems you have - one, two or ... Any thoughts on this ? Emil > Andreas. > > > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-dev > _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev