[Libreoffice-commits] .: 2 commits - configure.ac instsetoo_native/util
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Jan 16 02:29:11 PST 2013
configure.ac | 17 +++++++++++++----
instsetoo_native/util/openoffice.lst.in | 21 +++------------------
2 files changed, 16 insertions(+), 22 deletions(-)
New commits:
commit 47a95b1f165169034402f9df0179776c4001e415
Author: Tor Lillqvist <tml at iki.fi>
Date: Wed Jan 16 12:28:30 2013 +0200
Generate also the ABOUTBOXPRODUCTVERSIONSUFFIX from the AC_INIT
Change-Id: I9b7ce03daac7ae223cba1b8741042431aabe7f59
diff --git a/configure.ac b/configure.ac
index 5bb9c33..a5f423f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,9 +4,12 @@ dnl in order to create a configure script.
# The version number in the second argumemnt to AC_INIT should be four numbers separated by
# periods. Some parts of the code requires the first one to be less than 128 and the others to be less
-# than 256. The four numbers can optionally be followed by a period and a free-form string containing no
-# spaces or periods, like "frobozz-mumble-42" or "alpha0".
-AC_INIT([LibreOffice],[4.1.0.0.alpha0],[],[],[http://documentfoundation.org/])
+# than 256. The four numbers can optionally be followed by a period and a free-form string containing
+# no spaces or periods, like "frobozz-mumble-42" or "alpha0". If the free-form string ends with one or
+# several non-alphanumeric characters, those are split off and used only for the
+# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea.
+
+AC_INIT([LibreOffice],[4.1.0.0.alpha0+],[],[],[http://documentfoundation.org/])
AC_PREREQ([2.59])
save_CC=$CC
@@ -4332,8 +4335,13 @@ LIBO_VERSION_MINOR=$2
LIBO_VERSION_MICRO=$3
LIBO_VERSION_PATCH=$4
-# Note that LIBO_VERSION_SUFFIX, if non-empty, includes the period separator
LIBO_VERSION_SUFFIX=$5
+# Split out LIBO_VERSION_SUFFIX_SUFFIX... horrible crack. But apparently wanted separately in
+# openoffice.lst as ABOUTBOXPRODUCTVERSIONSUFFIX. Note that the double brackets are for m4's sake,
+# they get undoubled before actually passed to sed.
+LIBO_VERSION_SUFFIX_SUFFIX=`echo "$LIBO_VERSION_SUFFIX" | sed -e 's/.*[[a-zA-Z0-9]]\([[^a-zA-Z0-9]]*\)$/\1/'`
+test -n "$LIBO_VERSION_SUFFIX_SUFFIX" && LIBO_VERSION_SUFFIX="${LIBO_VERSION_SUFFIX%${LIBO_VERSION_SUFFIX_SUFFIX}}"
+# LIBO_VERSION_SUFFIX, if non-empty, should include the period separator
test -n "$LIBO_VERSION_SUFFIX" && LIBO_VERSION_SUFFIX=".$LIBO_VERSION_SUFFIX"
AC_SUBST(LIBO_VERSION_MAJOR)
@@ -4341,6 +4349,7 @@ AC_SUBST(LIBO_VERSION_MINOR)
AC_SUBST(LIBO_VERSION_MICRO)
AC_SUBST(LIBO_VERSION_PATCH)
AC_SUBST(LIBO_VERSION_SUFFIX)
+AC_SUBST(LIBO_VERSION_SUFFIX_SUFFIX)
AC_DEFINE_UNQUOTED(LIBO_VERSION_MAJOR,$LIBO_VERSION_MAJOR)
AC_DEFINE_UNQUOTED(LIBO_VERSION_MINOR,$LIBO_VERSION_MINOR)
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 758193b..5609eb8 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -54,7 +54,7 @@ LibreOffice
BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR@
USERDIRPRODUCTVERSION @LIBO_VERSION_MAJOR@
ABOUTBOXPRODUCTVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR at .@LIBO_VERSION_MICRO at .@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
- ABOUTBOXPRODUCTVERSIONSUFFIX +
+ ABOUTBOXPRODUCTVERSIONSUFFIX @LIBO_VERSION_SUFFIX_SUFFIX@
BASEPRODUCTVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR@
PCPFILENAME libreoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
@@ -105,7 +105,7 @@ LibreOffice_Dev
BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR@
USERDIRPRODUCTVERSION @LIBO_VERSION_MAJOR@
ABOUTBOXPRODUCTVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR at .@LIBO_VERSION_MICRO at .@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
- ABOUTBOXPRODUCTVERSIONSUFFIX +
+ ABOUTBOXPRODUCTVERSIONSUFFIX @LIBO_VERSION_SUFFIX_SUFFIX@
BASEPRODUCTVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR@
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX lodevbasis
@@ -364,7 +364,7 @@ OxygenOffice
BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR@
USERDIRPRODUCTVERSION @LIBO_VERSION_MAJOR@
ABOUTBOXPRODUCTVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR at .@LIBO_VERSION_MICRO at .@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
- ABOUTBOXPRODUCTVERSIONSUFFIX +
+ ABOUTBOXPRODUCTVERSIONSUFFIX @LIBO_VERSION_SUFFIX_SUFFIX@
BASEPRODUCTVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR@
PCPFILENAME openoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
commit c59d3710605d2ad97c3aa6da2298d5d6a4004d67
Author: Tor Lillqvist <tml at iki.fi>
Date: Wed Jan 16 11:50:38 2013 +0200
Remove unused variables
POSTVERSIONEXTENSIONUNIX and LONG_PRODUCTEXTENSION are not used anywhere
Change-Id: Id1f2db293fff134075b6658b738dc3be8d17a279
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 66e70f5..758193b 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -49,10 +49,8 @@ LibreOffice
PRODUCTNAME LibreOffice
PRODUCTVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR@
PRODUCTEXTENSION
- LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION . at LIBO_VERSION_MICRO@. at LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
POSTVERSIONEXTENSION
- POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR@
USERDIRPRODUCTVERSION @LIBO_VERSION_MAJOR@
ABOUTBOXPRODUCTVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR at .@LIBO_VERSION_MICRO at .@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
@@ -101,11 +99,9 @@ LibreOffice_Dev
PRODUCTNAME LOdev
PRODUCTVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR@
PRODUCTEXTENSION
- LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION . at LIBO_VERSION_MICRO@. at LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
UNIXBASISROOTNAME lodev at LIBO_VERSION_MAJOR@. at LIBO_VERSION_MINOR@
POSTVERSIONEXTENSION
- POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR@
USERDIRPRODUCTVERSION @LIBO_VERSION_MAJOR@
ABOUTBOXPRODUCTVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR at .@LIBO_VERSION_MICRO at .@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
@@ -165,7 +161,6 @@ URE
PACKAGEREVISION 1
PRODUCTEXTENSION
BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR@
- LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION . at LIBO_VERSION_MICRO@. at LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
LICENSENAME LGPL
NOVERSIONINDIRNAME 1
@@ -197,10 +192,8 @@ LibreOffice_SDK
PRODUCTNAME LibreOffice
PRODUCTVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR@
PRODUCTEXTENSION
- LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION . at LIBO_VERSION_MICRO@. at LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
POSTVERSIONEXTENSION SDK
- POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR@
PACKAGEVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR at .@LIBO_VERSION_MICRO at .@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
PACKAGEREVISION {buildid}
@@ -238,11 +231,9 @@ LibreOffice_Dev_SDK
PRODUCTNAME LOdev
PRODUCTVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR@
PRODUCTEXTENSION
- LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION . at LIBO_VERSION_MICRO@. at LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
UNIXBASISROOTNAME lodev at LIBO_VERSION_MAJOR@. at LIBO_VERSION_MINOR@
POSTVERSIONEXTENSION SDK
- POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR@
PACKAGEVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR at .@LIBO_VERSION_MICRO at .@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
PACKAGEREVISION {buildid}
@@ -285,10 +276,8 @@ LibreOffice_Test
PRODUCTNAME LibreOffice
PRODUCTVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR@
PRODUCTEXTENSION
- LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION . at LIBO_VERSION_MICRO@. at LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
POSTVERSIONEXTENSION TEST
- POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR@
PACKAGEVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR at .@LIBO_VERSION_MICRO at .@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
PACKAGEREVISION {buildid}
@@ -326,11 +315,9 @@ LibreOffice_Dev_Test
PRODUCTNAME LOdev
PRODUCTVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR@
PRODUCTEXTENSION
- LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION . at LIBO_VERSION_MICRO@. at LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
UNIXBASISROOTNAME lodev at LIBO_VERSION_MAJOR@. at LIBO_VERSION_MINOR@
POSTVERSIONEXTENSION TEST
- POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR@
PACKAGEVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR at .@LIBO_VERSION_MICRO at .@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
PACKAGEREVISION {buildid}
@@ -372,10 +359,8 @@ OxygenOffice
PRODUCTNAME OxygenOffice
PRODUCTVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR@
PRODUCTEXTENSION
- LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION . at LIBO_VERSION_MICRO@. at LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
POSTVERSIONEXTENSION
- POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR@
USERDIRPRODUCTVERSION @LIBO_VERSION_MAJOR@
ABOUTBOXPRODUCTVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR at .@LIBO_VERSION_MICRO at .@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
More information about the Libreoffice-commits
mailing list