<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">2013/6/4 Emil Velikov <<a href="mailto:emil.l.velikov@gmail.com" target="_blank">emil.l.velikov@gmail.com</a>> <blockquote class="gmail_quote" style="margin:0pt 0pt 0pt 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> <div class="im">On 04/06/13 21:42, Andreas Boll wrote: > 2013/6/4 Brian Paul <<a href="mailto:brianp@vmware.com">brianp@vmware.com</a>> > >> 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. >>> >>> --- >>> <a href="http://Android.common.mk" target="_blank">Android.common.mk</a> | 2 +- >>> Makefile.am | 2 +- >>> SConstruct | 2 +- >>> <a href="http://configure.ac" target="_blank">configure.ac</a> | 2 +- >>> 4 files changed, 4 insertions(+), 4 deletions(-) >>> >>> diff --git a/<a href="http://Android.common.mk" target="_blank">Android.common.mk</a> b/<a href="http://Android.common.mk" target="_blank">Android.common.mk</a> >>> index 215c640..c6ee4e1 100644 >>> --- a/<a href="http://Android.common.mk" target="_blank">Android.common.mk</a> >>> +++ b/<a href="http://Android.common.mk" target="_blank">Android.common.mk</a> >>> @@ -35,7 +35,7 @@ LOCAL_C_INCLUDES += \ >>> >>> # define ANDROID_VERSION (e.g., 4.0.x => 0x0400) >>> LOCAL_CFLAGS += \ </div>>>> - -DPACKAGE_VERSION=\"9.2-devel\**" \ >>> + -DPACKAGE_VERSION=\"9.2.0-**devel\" \ >>> -DPACKAGE_BUGREPORT=\"https://**<a href="http://bugs.freedesktop.org/enter_**" target="_blank">bugs.freedesktop.org/enter_**</a> >>> bug.cgi?product=Mesa\<<a href="https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa%5C" target="_blank">https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa%5C</a>>" >>> \ >>> -DANDROID_VERSION=0x0$(MESA_**ANDROID_MAJOR_VERSION)0$(MESA_** <div class="im">>>> 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\\"'), </div>>>> ('PACKAGE_BUGREPORT', '\\"<a href="https://bugs.freedesktop." target="_blank">https://bugs.freedesktop.</a>** >>> org/enter_bug.cgi?product=**Mesa\\<<a href="https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa%5C%5C" target="_blank">https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa%5C%5C</a>> <div class="im">>>> "'), >>> ]) >>> >>> diff --git a/<a href="http://configure.ac" target="_blank">configure.ac</a> b/<a href="http://configure.ac" target="_blank">configure.ac</a> >>> index bccab0a..b0daf25 100644 >>> --- a/<a href="http://configure.ac" target="_blank">configure.ac</a> >>> +++ b/<a href="http://configure.ac" target="_blank">configure.ac</a> >>> @@ -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], </div>>>> [<a href="https://bugs.freedesktop.org/**enter_bug.cgi?product=Mesa" target="_blank">https://bugs.freedesktop.org/**enter_bug.cgi?product=Mesa</a><<a href="https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa" target="_blank">https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa</a>> <div class="im">>>> ]) >>> 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 <<a href="mailto:brianp@vmware.com">brianp@vmware.com</a>> >> >> >> > Thanks for the review! > > docs/devinfo.html lists all these files already. > See <a href="http://cgit.freedesktop.org/mesa/mesa/tree/docs/devinfo.html#n196" target="_blank">http://cgit.freedesktop.org/mesa/mesa/tree/docs/devinfo.html#n196</a> > </div>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 </blockquote><div> </div></div>Sounds good to me. In the meantime I've posted another patch [1] to reduce the files to edit from 4 to 3. Andreas. [1] <a href="http://lists.freedesktop.org/archives/mesa-dev/2013-June/040219.html">http://lists.freedesktop.org/archives/mesa-dev/2013-June/040219.html</a> </div></div>