[Libreoffice-commits] .: Branch 'libreoffice-3-3' - bin/setup.in configure.in distro-configs/CommonLinux.conf.in distro-configs/CommonMac.conf.in distro-configs/CommonWin32.conf.in

[Petr Mladek]

 bin/setup.in                       |    2 +-
 configure.in                       |    4 ++++
 distro-configs/CommonLinux.conf.in |    2 +-
 distro-configs/CommonMac.conf.in   |    2 +-
 distro-configs/CommonWin32.conf.in |    2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit b1f6122618c80038e74375f30c2256999c0a0780
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Dec 16 14:39:32 2010 +0100

    better build identification in the about dialog
    
    mention "tag <git_tag>" in about dialog instead of build version;
    also use the tag "libreoffice-<version>" instead of the historic
    "LIBREOFFICE_VERSION"
    
    it has been requested and discussed on the libreoffice mailing list
    
    Signed off my Michael Meeks

diff --git a/bin/setup.in b/bin/setup.in
index f6c6ac6..99c2a77 100755
--- a/bin/setup.in
+++ b/bin/setup.in
@@ -18,7 +18,7 @@ OOO_GIT='@OOO_GIT@'
 OOO_SOURCEDIRNAME='@OOO_SOURCEDIRNAME@'
 CLONEDIR='@CLONEDIR@'
 RAWBUILDDIR='@RAWBUILDDIR@'
-GITTAG="ooo/`echo $OOO_SOURCEDIRNAME | tr '[[:lower:]]-' '[[:upper:]]_'`"
+GITTAG='@GITTAG@'
 APPLY_DIR='@APPLY_DIR@'
 BUILD_NCPUS='@BUILD_NCPUS@'
 ENABLE_CCACHE='@ENABLE_CCACHE@'
diff --git a/configure.in b/configure.in
index b6a2e0c..79dbe58 100755
--- a/configure.in
+++ b/configure.in
@@ -629,6 +629,10 @@ AC_SUBST(OOO_SOURCEVERSION)
 OOO_SOURCEDIRNAME=libreoffice-$OOO_SOURCEVERSION
 AC_SUBST(OOO_SOURCEDIRNAME)
 
+# git tag name
+GITTAG=$OOO_SOURCEDIRNAME
+AC_SUBST(GITTAG)
+
 AC_MSG_CHECKING([for split sources])
 if test "$with_split" = "no" ; then
     SPLIT=
diff --git a/distro-configs/CommonLinux.conf.in b/distro-configs/CommonLinux.conf.in
index 286b742..0ed4670 100644
--- a/distro-configs/CommonLinux.conf.in
+++ b/distro-configs/CommonLinux.conf.in
@@ -1,6 +1,6 @@
 --disable-epm
 --with-openldap
---with-build-version=\"libreoffice-build @OOO_BUILDVERSION@\"
+--with-build-version=\"tag @GITTAG@\"
 --without-fonts
 --with-system-jpeg
 --with-system-libxml
diff --git a/distro-configs/CommonMac.conf.in b/distro-configs/CommonMac.conf.in
index a39e3e9..9983178 100644
--- a/distro-configs/CommonMac.conf.in
+++ b/distro-configs/CommonMac.conf.in
@@ -1,2 +1,2 @@
 --disable-gtk
---with-build-version=\"libreoffice-build @OOO_BUILDVERSION@\"
+--with-build-version=\"tag @GITTAG@\"
diff --git a/distro-configs/CommonWin32.conf.in b/distro-configs/CommonWin32.conf.in
index a641993..4edfec8 100644
--- a/distro-configs/CommonWin32.conf.in
+++ b/distro-configs/CommonWin32.conf.in
@@ -1,2 +1,2 @@
 --with-ant-home=$BUILDDIR/$APACHE_ANT
---with-build-version=\"libreoffice-build @OOO_BUILDVERSION@\"
+--with-build-version=\"tag @GITTAG@\"