mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Expand also openoffice.lst for version numbers from configury

Browse Source 
Change-Id: I7bad1639488616db3823e25d6508e8e57f2212ef
This commit is contained in:
Tor Lillqvist
2013-01-12 14:33:37 +02:00
parent 4a478876e2
commit e1a467e618
2 changed files with 59 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
configure.ac
View File

@@ -4,8 +4,9 @@ dnl in order to create a configure script.
# The version number in the second argumemnt to AC_INIT should be four numbers separated by # 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 # periods. Some parts of the code requires the first one to be less than 128 and the others to be less
# than 256. # than 256. The four numbers can optionally be followed by a period and a free-form string containing no
AC_INIT([LibreOffice],[4.1.0.0],[],[],[http://documentfoundation.org/]) # spaces or periods, like "frobozz-mumble-42" or "alpha0".
AC_INIT([LibreOffice],[4.1.0.0.alpha0],[],[],[http://documentfoundation.org/])
AC_PREREQ([2.59]) AC_PREREQ([2.59])
save_CC=$CC save_CC=$CC
@@ -4205,6 +4206,7 @@ if test "$cross_compiling" = "yes"; then
solenv/inc/langlist.mk \ solenv/inc/langlist.mk \
solenv/inc/postset.mk \ solenv/inc/postset.mk \
solenv/inc/minor.mk.in \ solenv/inc/minor.mk.in \
instsetoo_native/util/openoffice.lst.in \
| (cd CONF-FOR-BUILD && tar xf -) | (cd CONF-FOR-BUILD && tar xf -)
( (
unset COM GUI GUIBASE OS CPU CPUNAME unset COM GUI GUIBASE OS CPU CPUNAME
@@ -4330,10 +4332,15 @@ LIBO_VERSION_MINOR=$2
LIBO_VERSION_MICRO=$3 LIBO_VERSION_MICRO=$3
LIBO_VERSION_PATCH=$4 LIBO_VERSION_PATCH=$4
# Note that LIBO_VERSION_SUFFIX, if non-empty, includes the period separator
LIBO_VERSION_SUFFIX=$5
test -n "$LIBO_VERSION_SUFFIX" && LIBO_VERSION_SUFFIX=".$LIBO_VERSION_SUFFIX"
AC_SUBST(LIBO_VERSION_MAJOR) AC_SUBST(LIBO_VERSION_MAJOR)
AC_SUBST(LIBO_VERSION_MINOR) AC_SUBST(LIBO_VERSION_MINOR)
AC_SUBST(LIBO_VERSION_MICRO) AC_SUBST(LIBO_VERSION_MICRO)
AC_SUBST(LIBO_VERSION_PATCH) AC_SUBST(LIBO_VERSION_PATCH)
AC_SUBST(LIBO_VERSION_SUFFIX)
AC_DEFINE_UNQUOTED(LIBO_VERSION_MAJOR,$LIBO_VERSION_MAJOR) AC_DEFINE_UNQUOTED(LIBO_VERSION_MAJOR,$LIBO_VERSION_MAJOR)
AC_DEFINE_UNQUOTED(LIBO_VERSION_MINOR,$LIBO_VERSION_MINOR) AC_DEFINE_UNQUOTED(LIBO_VERSION_MINOR,$LIBO_VERSION_MINOR)
@@ -12456,7 +12463,7 @@ else
echo > config_host.mk.last echo > config_host.mk.last
fi fi
AC_CONFIG_FILES([config_host.mk Makefile solenv/inc/minor.mk]) AC_CONFIG_FILES([config_host.mk Makefile solenv/inc/minor.mk instsetoo_native/util/openoffice.lst])
AC_CONFIG_HEADERS([config/config_clang.h]) AC_CONFIG_HEADERS([config/config_clang.h])
AC_CONFIG_HEADERS([config/config_global.h]) AC_CONFIG_HEADERS([config/config_global.h])
AC_CONFIG_HEADERS([config/config_graphite.h]) AC_CONFIG_HEADERS([config/config_graphite.h])

98
instsetoo_native/util/openoffice.lst → instsetoo_native/util/openoffice.lst.in
View File

@@ -4,13 +4,13 @@ Globals
{ {
variables variables
{ {
UREPACKAGEVERSION 4.1.0.0.alpha0 UREPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
URELAYERVERSION 1 URELAYERVERSION 1
REFERENCEOOOMAJORMINOR 3.4 REFERENCEOOOMAJORMINOR 3.4
UNIXBASISROOTNAME libreoffice4.1 UNIXBASISROOTNAME libreoffice@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
SERVICETAG_PRODUCTNAME LibreOffice 4.1 SERVICETAG_PRODUCTNAME LibreOffice @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
SERVICETAG_PRODUCTVERSION 4.1 SERVICETAG_PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
SERVICETAG_PARENTNAME LibreOffice 4.1 SERVICETAG_PARENTNAME LibreOffice @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid}) SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
SERVICETAG_URN urn:uuid:0187debd-e458-11de-82d6-080020a9ed93 SERVICETAG_URN urn:uuid:0187debd-e458-11de-82d6-080020a9ed93
HIDELICENSEDIALOG 1 HIDELICENSEDIALOG 1
@@ -47,17 +47,17 @@ LibreOffice
variables variables
{ {
PRODUCTNAME LibreOffice PRODUCTNAME LibreOffice
PRODUCTVERSION 4.1 PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
PRODUCTEXTENSION PRODUCTEXTENSION
LONG_PRODUCTEXTENSION LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION .0.0.alpha0 SHORT_PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
POSTVERSIONEXTENSION POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.1 BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
USERDIRPRODUCTVERSION 4 USERDIRPRODUCTVERSION @LIBO_VERSION_MAJOR@
ABOUTBOXPRODUCTVERSION 4.1.0.0.alpha0 ABOUTBOXPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
ABOUTBOXPRODUCTVERSIONSUFFIX + ABOUTBOXPRODUCTVERSIONSUFFIX +
BASEPRODUCTVERSION 4.1 BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
PCPFILENAME libreoffice.pcp PCPFILENAME libreoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php UPDATEURL http://update.libreoffice.org/check.php
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk
@@ -65,7 +65,7 @@ LibreOffice
FILEFORMATNAME OpenOffice.org FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0 FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
PACKAGEVERSION 4.1.0.0.alpha0 PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
PACKAGEREVISION {buildid} PACKAGEREVISION {buildid}
LICENSENAME LGPL LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl GLOBALFILEGID gid_File_Lib_Vcl
@@ -99,18 +99,18 @@ LibreOffice_Dev
variables variables
{ {
PRODUCTNAME LOdev PRODUCTNAME LOdev
PRODUCTVERSION 4.1 PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
PRODUCTEXTENSION PRODUCTEXTENSION
LONG_PRODUCTEXTENSION LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION .0.0.alpha0 SHORT_PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
UNIXBASISROOTNAME lodev4.1 UNIXBASISROOTNAME lodev@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
POSTVERSIONEXTENSION POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.1 BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
USERDIRPRODUCTVERSION 4 USERDIRPRODUCTVERSION @LIBO_VERSION_MAJOR@
ABOUTBOXPRODUCTVERSION 4.1.0.0.alpha0 ABOUTBOXPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
ABOUTBOXPRODUCTVERSIONSUFFIX + ABOUTBOXPRODUCTVERSIONSUFFIX +
BASEPRODUCTVERSION 4.1 BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
DEVELOPMENTPRODUCT 1 DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX lodevbasis BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev UREPACKAGEPREFIX lodev
@@ -123,7 +123,7 @@ LibreOffice_Dev
FILEFORMATNAME OpenOffice.org FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0 FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
PACKAGEVERSION 4.1.0.0.alpha0 PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
PACKAGEREVISION {buildid} PACKAGEREVISION {buildid}
LICENSENAME LGPL LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl GLOBALFILEGID gid_File_Lib_Vcl
@@ -160,13 +160,13 @@ URE
variables variables
{ {
PRODUCTNAME URE PRODUCTNAME URE
PRODUCTVERSION 4.1 PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
PACKAGEVERSION 4.1.0.0.alpha0 PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
PACKAGEREVISION 1 PACKAGEREVISION 1
PRODUCTEXTENSION PRODUCTEXTENSION
BRANDPACKAGEVERSION 4.1 BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
LONG_PRODUCTEXTENSION LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION .0.0.alpha0 SHORT_PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
LICENSENAME LGPL LICENSENAME LGPL
NOVERSIONINDIRNAME 1 NOVERSIONINDIRNAME 1
PCPFILENAME ure.pcp PCPFILENAME ure.pcp
@@ -195,14 +195,14 @@ LibreOffice_SDK
variables variables
{ {
PRODUCTNAME LibreOffice PRODUCTNAME LibreOffice
PRODUCTVERSION 4.1 PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
PRODUCTEXTENSION PRODUCTEXTENSION
LONG_PRODUCTEXTENSION LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION .0.0.alpha0 SHORT_PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4.1 BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
PACKAGEVERSION 4.1.0.0.alpha0 PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
PACKAGEREVISION {buildid} PACKAGEREVISION {buildid}
PACK_INSTALLED 1 PACK_INSTALLED 1
DMG_VOLUMEEXTENSION SDK DMG_VOLUMEEXTENSION SDK
@@ -236,15 +236,15 @@ LibreOffice_Dev_SDK
variables variables
{ {
PRODUCTNAME LOdev PRODUCTNAME LOdev
PRODUCTVERSION 4.1 PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
PRODUCTEXTENSION PRODUCTEXTENSION
LONG_PRODUCTEXTENSION LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION .0.0.alpha0 SHORT_PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
UNIXBASISROOTNAME lodev4.1 UNIXBASISROOTNAME lodev@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4.1 BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
PACKAGEVERSION 4.1.0.0.alpha0 PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
PACKAGEREVISION {buildid} PACKAGEREVISION {buildid}
BASISPACKAGEPREFIX lodevbasis BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev UREPACKAGEPREFIX lodev
@@ -283,14 +283,14 @@ LibreOffice_Test
variables variables
{ {
PRODUCTNAME LibreOffice PRODUCTNAME LibreOffice
PRODUCTVERSION 4.1 PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
PRODUCTEXTENSION PRODUCTEXTENSION
LONG_PRODUCTEXTENSION LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION .0.0.alpha0 SHORT_PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 4.1 BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
PACKAGEVERSION 4.1.0.0.alpha0 PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
PACKAGEREVISION {buildid} PACKAGEREVISION {buildid}
PACK_INSTALLED 1 PACK_INSTALLED 1
DMG_VOLUMEEXTENSION TEST DMG_VOLUMEEXTENSION TEST
@@ -324,15 +324,15 @@ LibreOffice_Dev_Test
variables variables
{ {
PRODUCTNAME LOdev PRODUCTNAME LOdev
PRODUCTVERSION 4.1 PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
PRODUCTEXTENSION PRODUCTEXTENSION
LONG_PRODUCTEXTENSION LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION .0.0.alpha0 SHORT_PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
UNIXBASISROOTNAME lodev4.1 UNIXBASISROOTNAME lodev@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 4.1 BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
PACKAGEVERSION 4.1.0.0.alpha0 PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
PACKAGEREVISION {buildid} PACKAGEREVISION {buildid}
BASISPACKAGEPREFIX lodevbasis BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev UREPACKAGEPREFIX lodev
@@ -370,17 +370,17 @@ OxygenOffice
variables variables
{ {
PRODUCTNAME OxygenOffice PRODUCTNAME OxygenOffice
PRODUCTVERSION 4.1 PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
PRODUCTEXTENSION PRODUCTEXTENSION
LONG_PRODUCTEXTENSION LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION .0.0.alpha0 SHORT_PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
POSTVERSIONEXTENSION POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.1 BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
USERDIRPRODUCTVERSION 4 USERDIRPRODUCTVERSION @LIBO_VERSION_MAJOR@
ABOUTBOXPRODUCTVERSION 4.1.0.0.alpha0 ABOUTBOXPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
ABOUTBOXPRODUCTVERSIONSUFFIX + ABOUTBOXPRODUCTVERSIONSUFFIX +
BASEPRODUCTVERSION 4.1 BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
PCPFILENAME openoffice.pcp PCPFILENAME openoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php UPDATEURL http://update.libreoffice.org/check.php
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk
@@ -388,7 +388,7 @@ OxygenOffice
FILEFORMATNAME OpenOffice.org FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0 FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
PACKAGEVERSION 4.1.0.0.alpha0 PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
PACKAGEREVISION {buildid} PACKAGEREVISION {buildid}
LICENSENAME LGPL LICENSENAME LGPL
SERVICESPROJEKT 1 SERVICESPROJEKT 1