OpenOffice › Development

Re: [openoffice] branch AOO419 updated: bump rev to 4.1.9

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

Marcus (OOo)

Re: [openoffice] branch AOO419 updated: bump rev to 4.1.9

As Jim is bumping the version numbers for a new release.

I know we have a script to increase the version number for a new build /
release. And the 4.1.x releases up to now are a good proof that it works.

However, when looking at the code I think there are too many places (5
different files with countless lines where it needs to be adjusted).
Therefore it's somehow error-prone and it should be stripped-down to a
minimum of files and places.

@all:
Do you also think this way?
Or is it just me?

Thanks

Marcus

Am 26.12.20 um 22:06 schrieb [hidden email]:

> This is an automated email from the ASF dual-hosted git repository.
>
> jim pushed a commit to branch AOO419
> in repository https://gitbox.apache.org/repos/asf/openoffice.git
>
>
> The following commit(s) were added to refs/heads/AOO419 by this push:
> new 30f2cd9 bump rev to 4.1.9
> new 96ef350 Merge branch 'AOO419' of https://gitbox.apache.org/repos/asf/openoffice into AOO419
> 30f2cd9 is described below
>
> commit 30f2cd9a04dc52522341372a9eff85674a7e9f73
> Author: Jim Jagielski <[hidden email]>
> AuthorDate: Sat Dec 26 16:06:23 2020 -0500
>
> bump rev to 4.1.9
> ---
> main/instsetoo_native/util/openoffice.lst | 42 +++++++++++++++----------------
> main/odk/util/makefile.pmk | 2 +-
> main/solenv/bin/srcrelease.xml | 2 +-
> main/solenv/inc/minor.mk | 10 ++++----
> main/sysui/desktop/productversion.mk | 2 +-
> 5 files changed, 29 insertions(+), 29 deletions(-)
>
> diff --git a/main/instsetoo_native/util/openoffice.lst b/main/instsetoo_native/util/openoffice.lst
> index 004c619..b7be746 100644
> --- a/main/instsetoo_native/util/openoffice.lst
> +++ b/main/instsetoo_native/util/openoffice.lst
> @@ -6,8 +6,8 @@ Globals
> {
> APACHEPROJECTNAME Apache OpenOffice
> OOOBASEVERSION 4.1
> - OOOPACKAGEVERSION 4.1.8
> - UREPACKAGEVERSION 4.1.8
> + OOOPACKAGEVERSION 4.1.9
> + UREPACKAGEVERSION 4.1.9
> URELAYERVERSION 1
> BASISROOTNAME OpenOffice
> UNIXBASISROOTNAME openoffice
> @@ -59,8 +59,8 @@ Apache_OpenOffice
> {
> FULLPRODUCTNAME Apache OpenOffice
> PRODUCTNAME OpenOffice
> - PRODUCTVERSION 4.1.8
> - PREVIOUS_VERSION 4.1.7
> + PRODUCTVERSION 4.1.9
> + PREVIOUS_VERSION 4.1.8
> PRODUCTEXTENSION
> LONG_PRODUCTEXTENSION
> SHORT_PRODUCTEXTENSION
> @@ -68,7 +68,7 @@ Apache_OpenOffice
> POSTVERSIONEXTENSIONUNIX
> BRANDPACKAGEVERSION 4
> USERDIRPRODUCTVERSION 4
> - ABOUTBOXPRODUCTVERSION 4.1.8
> + ABOUTBOXPRODUCTVERSION 4.1.9
> BASEPRODUCTVERSION 4.1
> PCPFILENAME openoffice.pcp
> UPDATEURL https://ooo-updates.apache.org/aoo418/check.Update
> @@ -76,7 +76,7 @@ Apache_OpenOffice
> REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
> ADDSYSTEMINTEGRATION 1
> EVAL
> - PACKAGEVERSION 4.1.8
> + PACKAGEVERSION 4.1.9
> PACKAGEREVISION {milestone}
> LICENSENAME ALv2
> GLOBALFILEGID gid_File_Lib_Vcl
> @@ -120,7 +120,7 @@ Apache_OpenOffice_wJRE
> {
> FULLPRODUCTNAME Apache OpenOffice
> PRODUCTNAME OpenOffice
> - PRODUCTVERSION 4.1.8
> + PRODUCTVERSION 4.1.9
> PRODUCTEXTENSION
> LONG_PRODUCTEXTENSION
> SHORT_PRODUCTEXTENSION
> @@ -128,14 +128,14 @@ Apache_OpenOffice_wJRE
> POSTVERSIONEXTENSIONUNIX
> BRANDPACKAGEVERSION 4
> USERDIRPRODUCTVERSION 4
> - ABOUTBOXPRODUCTVERSION 4.1.8
> + ABOUTBOXPRODUCTVERSION 4.1.9
> BASEPRODUCTVERSION 4.1
> UPDATEURL https://ooo-updates.apache.org/aoo418/check.Update
> ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
> REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
> ADDSYSTEMINTEGRATION 1
> EVAL
> - PACKAGEVERSION 4.1.8
> + PACKAGEVERSION 4.1.9
> PACKAGEREVISION {milestone}
> LICENSENAME ALv2
> WITHJREPRODUCT 1
> @@ -180,7 +180,7 @@ Apache_OpenOffice_Dev
> {
> FULLPRODUCTNAME AOO-Developer-Build
> PRODUCTNAME AOO-Developer-Build
> - PRODUCTVERSION 4.1.8
> + PRODUCTVERSION 4.1.9
> PRODUCTEXTENSION
> LONG_PRODUCTEXTENSION
> SHORT_PRODUCTEXTENSION
> @@ -190,7 +190,7 @@ Apache_OpenOffice_Dev
> POSTVERSIONEXTENSIONUNIX
> BRANDPACKAGEVERSION 4
> USERDIRPRODUCTVERSION 4
> - ABOUTBOXPRODUCTVERSION 4.1.8
> + ABOUTBOXPRODUCTVERSION 4.1.9
> BASEPRODUCTVERSION 4.1
> DEVELOPMENTPRODUCT 1
> BASISPACKAGEPREFIX aoodev
> @@ -200,7 +200,7 @@ Apache_OpenOffice_Dev
> UPDATEURL https://ooo-updates.apache.org/aoo418/check.Update
> ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
> EVAL
> - PACKAGEVERSION 4.1.8
> + PACKAGEVERSION 4.1.9
> PACKAGEREVISION {milestone}
> LICENSENAME ALv2
> GLOBALFILEGID gid_File_Lib_Vcl
> @@ -251,14 +251,14 @@ Apache_OpenOffice_SDK
> FULLPRODUCTNAME Apache OpenOffice
> PRODUCTNAME OpenOffice
> PRODUCTDIRNAME OpenOffice_SDK
> - PRODUCTVERSION 4.1.8
> + PRODUCTVERSION 4.1.9
> PRODUCTEXTENSION
> LONG_PRODUCTEXTENSION
> SHORT_PRODUCTEXTENSION
> POSTVERSIONEXTENSION SDK
> POSTVERSIONEXTENSIONUNIX sdk
> BRANDPACKAGEVERSION 4
> - PACKAGEVERSION 4.1.8
> + PACKAGEVERSION 4.1.9
> PACKAGEREVISION {milestone}
> PACK_INSTALLED 1
> POOLPRODUCT 0
> @@ -299,13 +299,13 @@ Apache_OpenOffice_Beta_SDK
> FULLPRODUCTNAME Apache OpenOffice Beta
> PRODUCTNAME OpenOffice Beta
> PRODUCTDIRNAME OpenOffice_SDK_Beta
> - PRODUCTVERSION 4.1.8
> + PRODUCTVERSION 4.1.9
> PRODUCTEXTENSION
> SHORT_PRODUCTEXTENSION
> POSTVERSIONEXTENSION SDK
> POSTVERSIONEXTENSIONUNIX sdk
> BRANDPACKAGEVERSION 4
> - PACKAGEVERSION 4.1.8
> + PACKAGEVERSION 4.1.9
> PACKAGEREVISION {milestone}
> PACK_INSTALLED 1
> POOLPRODUCT 0
> @@ -345,7 +345,7 @@ Apache_OpenOffice_Dev_SDK
> {
> FULLPRODUCTNAME AOO-Developer-Build
> PRODUCTNAME AOO-Developer-Build
> - PRODUCTVERSION 4.1.8
> + PRODUCTVERSION 4.1.9
> PRODUCTEXTENSION
> LONG_PRODUCTEXTENSION
> SHORT_PRODUCTEXTENSION
> @@ -354,7 +354,7 @@ Apache_OpenOffice_Dev_SDK
> POSTVERSIONEXTENSION SDK
> POSTVERSIONEXTENSIONUNIX sdk
> BRANDPACKAGEVERSION 4
> - PACKAGEVERSION 4.1.8
> + PACKAGEVERSION 4.1.9
> PACKAGEREVISION {milestone}
> BASISPACKAGEPREFIX aoodev
> UREPACKAGEPREFIX aoodev
> @@ -398,7 +398,7 @@ Apache_OpenOffice_Beta
> {
> FULLPRODUCTNAME Apache OpenOffice Beta
> PRODUCTNAME OpenOffice Beta
> - PRODUCTVERSION 4.1.8
> + PRODUCTVERSION 4.1.9
> PRODUCTEXTENSION
> SHORT_PRODUCTEXTENSION
> BASISROOTNAME AOOBeta
> @@ -408,14 +408,14 @@ Apache_OpenOffice_Beta
> POSTVERSIONEXTENSION
> BRANDPACKAGEVERSION 4
> USERDIRPRODUCTVERSION 4
> - ABOUTBOXPRODUCTVERSION 4.1.8
> + ABOUTBOXPRODUCTVERSION 4.1.9
> BASEPRODUCTVERSION 4.1
> UPDATEURL https://ooo-updates.apache.org/aoo418/check.Update
> ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
> REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
> ADDSYSTEMINTEGRATION 0
> EVAL
> - PACKAGEVERSION 4.1.8
> + PACKAGEVERSION 4.1.9
> PACKAGEREVISION {milestone}
> LICENSENAME ALv2
> GLOBALFILEGID gid_File_Lib_Vcl
> diff --git a/main/odk/util/makefile.pmk b/main/odk/util/makefile.pmk
> index 003214e..a9fae48 100644
> --- a/main/odk/util/makefile.pmk
> +++ b/main/odk/util/makefile.pmk
> @@ -22,7 +22,7 @@
>
>
> # used for sdk common files
> -PRODUCT_RELEASE=4.1.8
> +PRODUCT_RELEASE=4.1.9
> OFFICENAME=OpenOffice
> .IF "$(GUI)"=="WNT"
> SDKDIRNAME=OpenOffice_$(PRODUCT_RELEASE)_SDK
> diff --git a/main/solenv/bin/srcrelease.xml b/main/solenv/bin/srcrelease.xml
> index 1635baf..68d4f3e 100644
> --- a/main/solenv/bin/srcrelease.xml
> +++ b/main/solenv/bin/srcrelease.xml
> @@ -27,7 +27,7 @@
> <property name="out.dir" value="."/>
> <property name="aoo.name" value="apache-openoffice"/>
> <property name="aoo.short.name" value="aoo"/>
> - <property name="aoo.ver" value="4.1.8"/>
> + <property name="aoo.ver" value="4.1.9"/>
>
> <property name="excludes.list" value="configure, moz/zipped/*.zip, **/.svn **/.gitignore, **/.git, warn, set_soenv, solver/**, makefile.mk, config.log, config.parms, config.status, bootstrap, autom4te.cache/**, LinuxX86Env.*, LinuxX86-64Env.*, MacOSXX86Env.*, MacOSXX64Env.*, winmingw.*, winenv.*, external/unowinreg/unowinreg.dll" />
> <property name="excludes.executables" value="solenv/bin/macosx-create-bundle, solenv/bin/linkoo, solenv/bin/localize, solenv/bin/createpdbrelocators, solenv/bin/langwrap, solenv/bin/makedepn, solenv/bin/packmodule, solenv/bin/rpm-wrapper, solenv/bin/relocate, solenv/bin/receditor, solenv/bin/subsequenttests, **/*.sh, **/*.bat, **/*.exe, configure.cmd, oowintool, config.sub, config.guess, **/*.pl"/>
> diff --git a/main/solenv/inc/minor.mk b/main/solenv/inc/minor.mk
> index 5442a1c..2574ed3 100644
> --- a/main/solenv/inc/minor.mk
> +++ b/main/solenv/inc/minor.mk
> @@ -18,8 +18,8 @@
> # under the License.
> #
> # *************************************************************
> -RSCVERSION=418
> -RSCREVISION=418m3(Build:9803)
> -BUILD=9803
> -LAST_MINOR=m3
> -SOURCEVERSION=AOO418
> +RSCVERSION=419
> +RSCREVISION=419m1(Build:9805)
> +BUILD=9805
> +LAST_MINOR=m1
> +SOURCEVERSION=AOO419
> diff --git a/main/sysui/desktop/productversion.mk b/main/sysui/desktop/productversion.mk
> index fe61a56..563db85 100644
> --- a/main/sysui/desktop/productversion.mk
> +++ b/main/sysui/desktop/productversion.mk
> @@ -47,7 +47,7 @@ PRODUCTLIST = openoffice
> # default values to minimize maintainance effort
>
> # CAUTION! $(OOOBASEVERSION) from openoffice.lst NOT available (!)
> -PRODUCTVERSION = 4.1.8
> +PRODUCTVERSION = 4.1.9
>
> # CAUTION! $(BRANDPACKAGEVERSION) from openoffice.lst NOT available (!)
> PRODUCTVERSIONSHORT = 4

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]