Expand also openoffice.lst for version numbers from configury
Change-Id: I7bad1639488616db3823e25d6508e8e57f2212ef
This commit is contained in:
13
configure.ac
13
configure.ac
@@ -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
|
||||
# periods. Some parts of the code requires the first one to be less than 128 and the others to be less
|
||||
# than 256.
|
||||
AC_INIT([LibreOffice],[4.1.0.0],[],[],[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".
|
||||
AC_INIT([LibreOffice],[4.1.0.0.alpha0],[],[],[http://documentfoundation.org/])
|
||||
|
||||
AC_PREREQ([2.59])
|
||||
save_CC=$CC
|
||||
@@ -4205,6 +4206,7 @@ if test "$cross_compiling" = "yes"; then
|
||||
solenv/inc/langlist.mk \
|
||||
solenv/inc/postset.mk \
|
||||
solenv/inc/minor.mk.in \
|
||||
instsetoo_native/util/openoffice.lst.in \
|
||||
| (cd CONF-FOR-BUILD && tar xf -)
|
||||
(
|
||||
unset COM GUI GUIBASE OS CPU CPUNAME
|
||||
@@ -4330,10 +4332,15 @@ 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
|
||||
test -n "$LIBO_VERSION_SUFFIX" && LIBO_VERSION_SUFFIX=".$LIBO_VERSION_SUFFIX"
|
||||
|
||||
AC_SUBST(LIBO_VERSION_MAJOR)
|
||||
AC_SUBST(LIBO_VERSION_MINOR)
|
||||
AC_SUBST(LIBO_VERSION_MICRO)
|
||||
AC_SUBST(LIBO_VERSION_PATCH)
|
||||
AC_SUBST(LIBO_VERSION_SUFFIX)
|
||||
|
||||
AC_DEFINE_UNQUOTED(LIBO_VERSION_MAJOR,$LIBO_VERSION_MAJOR)
|
||||
AC_DEFINE_UNQUOTED(LIBO_VERSION_MINOR,$LIBO_VERSION_MINOR)
|
||||
@@ -12456,7 +12463,7 @@ else
|
||||
echo > config_host.mk.last
|
||||
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_global.h])
|
||||
AC_CONFIG_HEADERS([config/config_graphite.h])
|
||||
|
@@ -4,13 +4,13 @@ Globals
|
||||
{
|
||||
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
|
||||
REFERENCEOOOMAJORMINOR 3.4
|
||||
UNIXBASISROOTNAME libreoffice4.1
|
||||
SERVICETAG_PRODUCTNAME LibreOffice 4.1
|
||||
SERVICETAG_PRODUCTVERSION 4.1
|
||||
SERVICETAG_PARENTNAME LibreOffice 4.1
|
||||
UNIXBASISROOTNAME libreoffice@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
|
||||
SERVICETAG_PRODUCTNAME LibreOffice @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
|
||||
SERVICETAG_PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
|
||||
SERVICETAG_PARENTNAME LibreOffice @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
|
||||
SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
|
||||
SERVICETAG_URN urn:uuid:0187debd-e458-11de-82d6-080020a9ed93
|
||||
HIDELICENSEDIALOG 1
|
||||
@@ -47,17 +47,17 @@ LibreOffice
|
||||
variables
|
||||
{
|
||||
PRODUCTNAME LibreOffice
|
||||
PRODUCTVERSION 4.1
|
||||
PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
|
||||
PRODUCTEXTENSION
|
||||
LONG_PRODUCTEXTENSION
|
||||
SHORT_PRODUCTEXTENSION .0.0.alpha0
|
||||
SHORT_PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
|
||||
POSTVERSIONEXTENSION
|
||||
POSTVERSIONEXTENSIONUNIX
|
||||
BRANDPACKAGEVERSION 4.1
|
||||
USERDIRPRODUCTVERSION 4
|
||||
ABOUTBOXPRODUCTVERSION 4.1.0.0.alpha0
|
||||
BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
|
||||
USERDIRPRODUCTVERSION @LIBO_VERSION_MAJOR@
|
||||
ABOUTBOXPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
|
||||
ABOUTBOXPRODUCTVERSIONSUFFIX +
|
||||
BASEPRODUCTVERSION 4.1
|
||||
BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
|
||||
PCPFILENAME libreoffice.pcp
|
||||
UPDATEURL http://update.libreoffice.org/check.php
|
||||
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk
|
||||
@@ -65,7 +65,7 @@ LibreOffice
|
||||
FILEFORMATNAME OpenOffice.org
|
||||
FILEFORMATVERSION 1.0
|
||||
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}
|
||||
LICENSENAME LGPL
|
||||
GLOBALFILEGID gid_File_Lib_Vcl
|
||||
@@ -99,18 +99,18 @@ LibreOffice_Dev
|
||||
variables
|
||||
{
|
||||
PRODUCTNAME LOdev
|
||||
PRODUCTVERSION 4.1
|
||||
PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
|
||||
PRODUCTEXTENSION
|
||||
LONG_PRODUCTEXTENSION
|
||||
SHORT_PRODUCTEXTENSION .0.0.alpha0
|
||||
UNIXBASISROOTNAME lodev4.1
|
||||
SHORT_PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
|
||||
UNIXBASISROOTNAME lodev@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
|
||||
POSTVERSIONEXTENSION
|
||||
POSTVERSIONEXTENSIONUNIX
|
||||
BRANDPACKAGEVERSION 4.1
|
||||
USERDIRPRODUCTVERSION 4
|
||||
ABOUTBOXPRODUCTVERSION 4.1.0.0.alpha0
|
||||
BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
|
||||
USERDIRPRODUCTVERSION @LIBO_VERSION_MAJOR@
|
||||
ABOUTBOXPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
|
||||
ABOUTBOXPRODUCTVERSIONSUFFIX +
|
||||
BASEPRODUCTVERSION 4.1
|
||||
BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
|
||||
DEVELOPMENTPRODUCT 1
|
||||
BASISPACKAGEPREFIX lodevbasis
|
||||
UREPACKAGEPREFIX lodev
|
||||
@@ -123,7 +123,7 @@ LibreOffice_Dev
|
||||
FILEFORMATNAME OpenOffice.org
|
||||
FILEFORMATVERSION 1.0
|
||||
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}
|
||||
LICENSENAME LGPL
|
||||
GLOBALFILEGID gid_File_Lib_Vcl
|
||||
@@ -160,13 +160,13 @@ URE
|
||||
variables
|
||||
{
|
||||
PRODUCTNAME URE
|
||||
PRODUCTVERSION 4.1
|
||||
PACKAGEVERSION 4.1.0.0.alpha0
|
||||
PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
|
||||
PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
|
||||
PACKAGEREVISION 1
|
||||
PRODUCTEXTENSION
|
||||
BRANDPACKAGEVERSION 4.1
|
||||
BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
|
||||
LONG_PRODUCTEXTENSION
|
||||
SHORT_PRODUCTEXTENSION .0.0.alpha0
|
||||
SHORT_PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
|
||||
LICENSENAME LGPL
|
||||
NOVERSIONINDIRNAME 1
|
||||
PCPFILENAME ure.pcp
|
||||
@@ -195,14 +195,14 @@ LibreOffice_SDK
|
||||
variables
|
||||
{
|
||||
PRODUCTNAME LibreOffice
|
||||
PRODUCTVERSION 4.1
|
||||
PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
|
||||
PRODUCTEXTENSION
|
||||
LONG_PRODUCTEXTENSION
|
||||
SHORT_PRODUCTEXTENSION .0.0.alpha0
|
||||
SHORT_PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
|
||||
POSTVERSIONEXTENSION SDK
|
||||
POSTVERSIONEXTENSIONUNIX sdk
|
||||
BRANDPACKAGEVERSION 4.1
|
||||
PACKAGEVERSION 4.1.0.0.alpha0
|
||||
BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
|
||||
PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
|
||||
PACKAGEREVISION {buildid}
|
||||
PACK_INSTALLED 1
|
||||
DMG_VOLUMEEXTENSION SDK
|
||||
@@ -236,15 +236,15 @@ LibreOffice_Dev_SDK
|
||||
variables
|
||||
{
|
||||
PRODUCTNAME LOdev
|
||||
PRODUCTVERSION 4.1
|
||||
PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
|
||||
PRODUCTEXTENSION
|
||||
LONG_PRODUCTEXTENSION
|
||||
SHORT_PRODUCTEXTENSION .0.0.alpha0
|
||||
UNIXBASISROOTNAME lodev4.1
|
||||
SHORT_PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
|
||||
UNIXBASISROOTNAME lodev@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
|
||||
POSTVERSIONEXTENSION SDK
|
||||
POSTVERSIONEXTENSIONUNIX sdk
|
||||
BRANDPACKAGEVERSION 4.1
|
||||
PACKAGEVERSION 4.1.0.0.alpha0
|
||||
BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
|
||||
PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
|
||||
PACKAGEREVISION {buildid}
|
||||
BASISPACKAGEPREFIX lodevbasis
|
||||
UREPACKAGEPREFIX lodev
|
||||
@@ -283,14 +283,14 @@ LibreOffice_Test
|
||||
variables
|
||||
{
|
||||
PRODUCTNAME LibreOffice
|
||||
PRODUCTVERSION 4.1
|
||||
PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
|
||||
PRODUCTEXTENSION
|
||||
LONG_PRODUCTEXTENSION
|
||||
SHORT_PRODUCTEXTENSION .0.0.alpha0
|
||||
SHORT_PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
|
||||
POSTVERSIONEXTENSION TEST
|
||||
POSTVERSIONEXTENSIONUNIX test
|
||||
BRANDPACKAGEVERSION 4.1
|
||||
PACKAGEVERSION 4.1.0.0.alpha0
|
||||
BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
|
||||
PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
|
||||
PACKAGEREVISION {buildid}
|
||||
PACK_INSTALLED 1
|
||||
DMG_VOLUMEEXTENSION TEST
|
||||
@@ -324,15 +324,15 @@ LibreOffice_Dev_Test
|
||||
variables
|
||||
{
|
||||
PRODUCTNAME LOdev
|
||||
PRODUCTVERSION 4.1
|
||||
PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
|
||||
PRODUCTEXTENSION
|
||||
LONG_PRODUCTEXTENSION
|
||||
SHORT_PRODUCTEXTENSION .0.0.alpha0
|
||||
UNIXBASISROOTNAME lodev4.1
|
||||
SHORT_PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
|
||||
UNIXBASISROOTNAME lodev@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
|
||||
POSTVERSIONEXTENSION TEST
|
||||
POSTVERSIONEXTENSIONUNIX test
|
||||
BRANDPACKAGEVERSION 4.1
|
||||
PACKAGEVERSION 4.1.0.0.alpha0
|
||||
BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
|
||||
PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
|
||||
PACKAGEREVISION {buildid}
|
||||
BASISPACKAGEPREFIX lodevbasis
|
||||
UREPACKAGEPREFIX lodev
|
||||
@@ -370,17 +370,17 @@ OxygenOffice
|
||||
variables
|
||||
{
|
||||
PRODUCTNAME OxygenOffice
|
||||
PRODUCTVERSION 4.1
|
||||
PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
|
||||
PRODUCTEXTENSION
|
||||
LONG_PRODUCTEXTENSION
|
||||
SHORT_PRODUCTEXTENSION .0.0.alpha0
|
||||
SHORT_PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
|
||||
POSTVERSIONEXTENSION
|
||||
POSTVERSIONEXTENSIONUNIX
|
||||
BRANDPACKAGEVERSION 4.1
|
||||
USERDIRPRODUCTVERSION 4
|
||||
ABOUTBOXPRODUCTVERSION 4.1.0.0.alpha0
|
||||
BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
|
||||
USERDIRPRODUCTVERSION @LIBO_VERSION_MAJOR@
|
||||
ABOUTBOXPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
|
||||
ABOUTBOXPRODUCTVERSIONSUFFIX +
|
||||
BASEPRODUCTVERSION 4.1
|
||||
BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
|
||||
PCPFILENAME openoffice.pcp
|
||||
UPDATEURL http://update.libreoffice.org/check.php
|
||||
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk
|
||||
@@ -388,7 +388,7 @@ OxygenOffice
|
||||
FILEFORMATNAME OpenOffice.org
|
||||
FILEFORMATVERSION 1.0
|
||||
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}
|
||||
LICENSENAME LGPL
|
||||
SERVICESPROJEKT 1
|
Reference in New Issue
Block a user