This is an automated email from the ASF dual-hosted git repository.
jimjag pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 9d37da743a Based on discussion and approvals, make trunk AOO5. For
room to spare, baseline trunk as AOO 51X.
9d37da743a is described below
commit 9d37da743abb7db0a497688391f6e55a19f27c44
Author: Jim Jagielski <[email protected]>
AuthorDate: Tue Sep 1 15:10:05 2026 -0400
Based on discussion and approvals, make trunk AOO5. For room to spare,
baseline trunk as AOO 51X.
---
ext_libraries/ratscan/scan/makefile.mk | 2 +-
ext_libraries/ratscan/scan/rat-scan.xml | 2 +-
main/instsetoo_native/util/openoffice.lst | 73 +++++++++++-----------
main/odk/cfgWin.js | 4 +-
main/odk/docs/install.html | 4 +-
main/odk/examples/CLI/CSharp/Spreadsheet/Makefile | 2 +-
main/odk/examples/cpp/custompanel/description.xml | 4 +-
main/odk/setsdkenv_unix.sh.in | 4 +-
main/odk/setsdkenv_windows.template | 8 +--
main/odk/util/makefile.pmk | 2 +-
main/sdext/source/pdfimport/config/description.xml | 4 +-
.../win32/customactions/reg4msdoc/msihelper.hxx | 2 +-
.../source/win32/nsis/downloadtemplate.nsi | 2 +-
main/solenv/bin/modules/installer/download.pm | 2 +-
main/solenv/bin/modules/installer/epmfile.pm | 2 +-
main/solenv/bin/srcrelease.xml | 2 +-
main/solenv/gbuild/platform/freebsd.mk | 2 +-
main/solenv/gbuild/platform/linux.mk | 2 +-
main/solenv/gbuild/platform/macosx.mk | 2 +-
main/solenv/gbuild/platform/os2.mk | 2 +-
main/solenv/gbuild/platform/solaris.mk | 2 +-
main/solenv/gbuild/platform/windows.mk | 2 +-
main/solenv/gbuild/platform/winmingw.mk | 2 +-
main/solenv/inc/installationtest.mk | 2 +-
main/solenv/inc/minor.mk | 6 +-
main/solenv/inc/version.lst | 6 +-
main/swext/mediawiki/src/description.xml | 4 +-
main/sysui/desktop/debian/makefile.mk | 20 +++---
main/sysui/desktop/productversion.mk | 4 +-
main/sysui/desktop/slackware/makefile.mk | 20 +++---
test/build.xml | 8 +--
.../testcommon/source/org/openoffice/test/Run.help | 2 +-
.../org/openoffice/test/common/Installer.java | 14 ++---
33 files changed, 110 insertions(+), 109 deletions(-)
diff --git a/ext_libraries/ratscan/scan/makefile.mk
b/ext_libraries/ratscan/scan/makefile.mk
index f23388fe47..cdf41de5de 100644
--- a/ext_libraries/ratscan/scan/makefile.mk
+++ b/ext_libraries/ratscan/scan/makefile.mk
@@ -25,7 +25,7 @@ PRJ=..
.INCLUDE : settings.mk
-version=4.5.0
+version=5.1.0
.IF "$(RAT_JAR_HOME)"=="BUILD"
rat_jar_home=$(CLASSDIR)
diff --git a/ext_libraries/ratscan/scan/rat-scan.xml
b/ext_libraries/ratscan/scan/rat-scan.xml
index 801432b94b..9261b75fc4 100644
--- a/ext_libraries/ratscan/scan/rat-scan.xml
+++ b/ext_libraries/ratscan/scan/rat-scan.xml
@@ -25,7 +25,7 @@
<description>
Check over Apache OpenOffice source files for license headers.
</description>
- <property name="version" value="AOO 4.5.0"/>
+ <property name="version" value="AOO 5.1.0"/>
<property environment="env"/>
<property name="src-dir" location="${env.SRC_ROOT}/.."/>
diff --git a/main/instsetoo_native/util/openoffice.lst
b/main/instsetoo_native/util/openoffice.lst
index a7cfcb6404..d5fa788480 100644
--- a/main/instsetoo_native/util/openoffice.lst
+++ b/main/instsetoo_native/util/openoffice.lst
@@ -5,9 +5,9 @@ Globals
variables
{
APACHEPROJECTNAME Apache OpenOffice
- OOOBASEVERSION 4.5
- OOOPACKAGEVERSION 4.5.0
- UREPACKAGEVERSION 4.5.0
+ OOOBASEVERSION 5.1
+ OOOPACKAGEVERSION 5.1.0
+ UREPACKAGEVERSION 5.1.0
URELAYERVERSION 1
BASISROOTNAME OpenOffice
UNIXBASISROOTNAME openoffice
@@ -39,9 +39,9 @@ Globals
OOOXMLFILEFORMATNAME OpenOffice.org XML
OOOXMLFILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- SERVICETAG_PRODUCTNAME Apache OpenOffice 4.5
- SERVICETAG_PRODUCTVERSION 4.5
- SERVICETAG_PARENTNAME Apache OpenOffice 4.5
+ SERVICETAG_PRODUCTNAME Apache OpenOffice 5.1
+ SERVICETAG_PRODUCTVERSION 5.1
+ SERVICETAG_PARENTNAME Apache OpenOffice 5.1
SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
SERVICETAG_URN
urn:uuid:500061aa-5666-11e0-8e00-080020a9ed93
REGISTRATION_HOST https://registration.openoffice.org
@@ -59,23 +59,24 @@ Apache_OpenOffice
{
FULLPRODUCTNAME Apache OpenOffice
PRODUCTNAME OpenOffice
- PRODUCTVERSION 4.5.0
+ PRODUCTVERSION 5.1.0
+ PREVIOUS_VERSION 4.1.16
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 4
- USERDIRPRODUCTVERSION 4
- ABOUTBOXPRODUCTVERSION 4.5.0
- BASEPRODUCTVERSION 4.5
+ BRANDPACKAGEVERSION 5
+ USERDIRPRODUCTVERSION 5
+ ABOUTBOXPRODUCTVERSION 5.1.0
+ BASEPRODUCTVERSION 5.1
PCPFILENAME openoffice.pcp
UPDATEURL
https://ooo-updates.apache.org/aoonext/check.Update
ADD_INCLUDE_FILES
cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 1
EVAL
- PACKAGEVERSION 4.5.0
+ PACKAGEVERSION 5.1.0
PACKAGEREVISION {milestone}
LICENSENAME ALv2
GLOBALFILEGID gid_File_Lib_Vcl
@@ -120,7 +121,7 @@ Apache_OpenOffice_Dev
{
FULLPRODUCTNAME Apache OpenOffice Developer Build
PRODUCTNAME OpenOffice Developer Build
- PRODUCTVERSION 4.5.0
+ PRODUCTVERSION 5.1.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -128,10 +129,10 @@ Apache_OpenOffice_Dev
UNIXBASISROOTNAME aoodev
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 4
- USERDIRPRODUCTVERSION 4
- ABOUTBOXPRODUCTVERSION 4.5.0
- BASEPRODUCTVERSION 4.5
+ BRANDPACKAGEVERSION 5
+ USERDIRPRODUCTVERSION 5
+ ABOUTBOXPRODUCTVERSION 5.1.0
+ BASEPRODUCTVERSION 5.1
DEVELOPMENTPRODUCT
BASISPACKAGEPREFIX aoodev
UREPACKAGEPREFIX aoodev
@@ -141,7 +142,7 @@ Apache_OpenOffice_Dev
ADD_INCLUDE_FILES
cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
ADDSYSTEMINTEGRATION 1
EVAL
- PACKAGEVERSION 4.5.0
+ PACKAGEVERSION 5.1.0
PACKAGEREVISION {milestone}
LICENSENAME ALv2
GLOBALFILEGID gid_File_Lib_Vcl
@@ -192,19 +193,19 @@ Apache_OpenOffice_SDK
FULLPRODUCTNAME Apache OpenOffice
PRODUCTNAME OpenOffice
PRODUCTDIRNAME OpenOffice_SDK
- PRODUCTVERSION 4.5.0
+ PRODUCTVERSION 5.1.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
- BRANDPACKAGEVERSION 4
- PACKAGEVERSION 4.5.0
+ BRANDPACKAGEVERSION 5
+ PACKAGEVERSION 5.1.0
PACKAGEREVISION {milestone}
PACK_INSTALLED 1
POOLPRODUCT 0
DMG_VOLUMEEXTENSION SDK
- DATABASENAME openoffice450sdk
+ DATABASENAME openoffice510sdk
NO_README_IN_ROOTDIR 1
LICENSENAME ALv2
IGNOREDIRECTORYLAYER 1
@@ -240,18 +241,18 @@ Apache_OpenOffice_Beta_SDK
FULLPRODUCTNAME Apache OpenOffice Beta
PRODUCTNAME OpenOffice Beta
PRODUCTDIRNAME OpenOffice_SDK_Beta
- PRODUCTVERSION 4.5.0
+ PRODUCTVERSION 5.1.0
PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
- BRANDPACKAGEVERSION 4
- PACKAGEVERSION 4.5.0
+ BRANDPACKAGEVERSION 5
+ PACKAGEVERSION 5.1.0
PACKAGEREVISION {milestone}
PACK_INSTALLED 1
POOLPRODUCT 0
DMG_VOLUMEEXTENSION SDK
- DATABASENAME openoffice450betasdk
+ DATABASENAME openoffice510betasdk
NO_README_IN_ROOTDIR 1
LICENSENAME ALv2
IGNOREDIRECTORYLAYER 1
@@ -287,7 +288,7 @@ Apache_OpenOffice_Dev_SDK
FULLPRODUCTNAME Apache OpenOffice Developer Build
PRODUCTNAME OpenOffice Developer Build
PRODUCTDIRNAME OpenOffice_SDK_Dev
- PRODUCTVERSION 4.5.0
+ PRODUCTVERSION 5.1.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -295,8 +296,8 @@ Apache_OpenOffice_Dev_SDK
UNIXBASISROOTNAME aoodev
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
- BRANDPACKAGEVERSION 4
- PACKAGEVERSION 4.5.0
+ BRANDPACKAGEVERSION 5
+ PACKAGEVERSION 5.1.0
PACKAGEREVISION {milestone}
BASISPACKAGEPREFIX aoodev
UREPACKAGEPREFIX aoodev
@@ -306,7 +307,7 @@ Apache_OpenOffice_Dev_SDK
PACK_INSTALLED 1
POOLPRODUCT 0
DMG_VOLUMEEXTENSION SDK
- DATABASENAME openoffice450devsdk
+ DATABASENAME openoffice510devsdk
NO_README_IN_ROOTDIR 1
LICENSENAME ALv2
IGNOREDIRECTORYLAYER 1
@@ -340,7 +341,7 @@ Apache_OpenOffice_Beta
{
FULLPRODUCTNAME Apache OpenOffice Beta
PRODUCTNAME OpenOffice Beta
- PRODUCTVERSION 4.5.0
+ PRODUCTVERSION 5.1.0
PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
BASISROOTNAME aoobeta
@@ -348,16 +349,16 @@ Apache_OpenOffice_Beta
UREPACKAGEPREFIX aoobeta
SOLSUREPACKAGEPREFIX aoobeta
POSTVERSIONEXTENSION
- BRANDPACKAGEVERSION 4
- USERDIRPRODUCTVERSION 4
- ABOUTBOXPRODUCTVERSION 4.5.0
- BASEPRODUCTVERSION 4.5
+ BRANDPACKAGEVERSION 5
+ USERDIRPRODUCTVERSION 5
+ ABOUTBOXPRODUCTVERSION 5.1.0
+ BASEPRODUCTVERSION 5.1
UPDATEURL
https://ooo-updates.apache.org/aoonextbeta/check.Update
ADD_INCLUDE_FILES
cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 1
EVAL
- PACKAGEVERSION 4.5.0
+ PACKAGEVERSION 5.1.0
PACKAGEREVISION {milestone}
LICENSENAME ALv2
GLOBALFILEGID gid_File_Lib_Vcl
diff --git a/main/odk/cfgWin.js b/main/odk/cfgWin.js
index 816c59d360..cff79bf5fa 100644
--- a/main/odk/cfgWin.js
+++ b/main/odk/cfgWin.js
@@ -922,7 +922,7 @@ function writeBatFile(fdir, file)
"REM are necessary for building the examples of the Office Development
Kit.\n" +
"REM The Script was developed for the operating systems Windows.\n" +
"REM The SDK name\n" +
- "REM Example: @set \"OO_SDK_NAME=openoffice4.0_sdk\"\n" +
+ "REM Example: @set \"OO_SDK_NAME=openoffice5.1_sdk\"\n" +
"@set \"OO_SDK_NAME=" + oo_sdk_name +
"\"\n\n" +
"REM Installation directory of the Software Development Kit.\n" +
@@ -930,7 +930,7 @@ function writeBatFile(fdir, file)
"@set \"OO_SDK_HOME=" + oo_sdk_home +
"\"\n\n" +
"REM Office installation directory.\n" +
- "REM Example: @set \"OFFICE_HOME=C:\\Program Files\\OpenOffice 4\"\n" +
+ "REM Example: @set \"OFFICE_HOME=C:\\Program Files\\OpenOffice 5\"\n" +
"@set \"OFFICE_HOME=" + office_home +
"\"\n\n" +
"REM Directory of the make command.\n" +
diff --git a/main/odk/docs/install.html b/main/odk/docs/install.html
index 45eb880047..e7bf5feb62 100644
--- a/main/odk/docs/install.html
+++ b/main/odk/docs/install.html
@@ -194,7 +194,7 @@
<tr valign="top">
<td class="cell20"><b>OFFICE_HOME</b></td>
<td class="cell80">Path to an existing Apache OpenOffice
- installation, e.g. "/opt/openoffice4". Be sure
+ installation, e.g. "/opt/openoffice5". Be sure
that it is not a user installation only.</td>
</tr>
<tr><a name="oosdkname"></a>
@@ -209,7 +209,7 @@
<tr>
<td class="cell20"><b>OO_SDK_HOME</b></td>
<td class="cell80">Path to the SDK root directory, e.g.
- "/opt/openoffice4/sdk/"</td>
+ "/opt/openoffice5/sdk/"</td>
</tr>
<tr>
<td class="cell20"><b>OO_SDK_JAVA_HOME</b></td>
diff --git a/main/odk/examples/CLI/CSharp/Spreadsheet/Makefile
b/main/odk/examples/CLI/CSharp/Spreadsheet/Makefile
index 219d2c3dce..3ba00451fc 100644
--- a/main/odk/examples/CLI/CSharp/Spreadsheet/Makefile
+++ b/main/odk/examples/CLI/CSharp/Spreadsheet/Makefile
@@ -52,7 +52,7 @@ include $(SETTINGS)/stdtarget.mk
# build executables
-#csc -lib:"d:\OpenOffice 4" does not work. csc does not understand the quotes.
+#csc -lib:"d:\OpenOffice 5" does not work. csc does not understand the quotes.
#but they are needed if the path contains a space. Therefore we use full path
#with the -reference switch
$(SPREADSHEET_OUT)/%.exe : %.cs SpreadsheetDocHelper.cs
diff --git a/main/odk/examples/cpp/custompanel/description.xml
b/main/odk/examples/cpp/custompanel/description.xml
index ee73f70d89..3db48c5bbf 100644
--- a/main/odk/examples/cpp/custompanel/description.xml
+++ b/main/odk/examples/cpp/custompanel/description.xml
@@ -31,7 +31,7 @@
<name>Custom Tool Panel Example</name>
</display-name>
<dependencies>
- <OpenOffice.org-minimal-version value="4.0" d:name="Apache OpenOffice"/>
- <OpenOffice.org-maximal-version value="4.9" d:name="Apache OpenOffice"/>
+ <OpenOffice.org-minimal-version value="5.0" d:name="Apache OpenOffice"/>
+ <OpenOffice.org-maximal-version value="5.9" d:name="Apache OpenOffice"/>
</dependencies>
</description>
diff --git a/main/odk/setsdkenv_unix.sh.in b/main/odk/setsdkenv_unix.sh.in
index d5ad78368c..f9ac1c3a0b 100644
--- a/main/odk/setsdkenv_unix.sh.in
+++ b/main/odk/setsdkenv_unix.sh.in
@@ -29,11 +29,11 @@ OO_SDK_NAME=@OO_SDK_NAME@
export OO_SDK_NAME
# Installation directory of the Software Development Kit.
-# Example: OO_SDK_HOME=/opt/openoffice/basis4.0/sdk
+# Example: OO_SDK_HOME=/opt/openoffice/basis5.1/sdk
OO_SDK_HOME='@OO_SDK_HOME@'
# Office installation directory.
-# Example: OFFICE_HOME=/opt/openoffice4
+# Example: OFFICE_HOME=/opt/openoffice5
OFFICE_HOME='@OFFICE_HOME@'
# Directory of the make command.
diff --git a/main/odk/setsdkenv_windows.template
b/main/odk/setsdkenv_windows.template
index 0bb96d70a2..de4f02828f 100644
--- a/main/odk/setsdkenv_windows.template
+++ b/main/odk/setsdkenv_windows.template
@@ -23,15 +23,15 @@ REM This script sets all environment variables, which
REM are necessary for building the examples of the Office Development Kit.
REM The Script was developed for the operating systems Windows.
REM The SDK name
-REM Example: @set "OO_SDK_NAME=openoffice4.0_sdk"
+REM Example: @set "OO_SDK_NAME=openoffice5.1_sdk"
@set "OO_SDK_NAME=<your_input_here>"
REM Installation directory of the Software Development Kit.
-REM Example: @set "OO_SDK_HOME=C:\Program Files\OpenOffice\4\sdk"
+REM Example: @set "OO_SDK_HOME=C:\Program Files\OpenOffice\5\sdk"
@set "OO_SDK_HOME=<your_input_here>"
REM Office installation directory.
-REM Example: @set "OFFICE_HOME=C:\Program Files\OpenOffice 4"
+REM Example: @set "OFFICE_HOME=C:\Program Files\OpenOffice 5"
@set "OFFICE_HOME=<your_input_here>"
REM Directory of the make command.
@@ -65,7 +65,7 @@ REM Example: @set "OO_SDK_JAVA_HOME=C:\Program
Files\Java\jdk1.6.0_05"
@set "OO_SDK_JAVA_HOME=<your_input_here>"
REM Special output directory
-REM Example: @set "OO_SDK_OUT=C:\openoffice4.0_sdk"
+REM Example: @set "OO_SDK_OUT=C:\openoffice5.1_sdk"
@set "OO_SDK_OUT=<your_input_here>"
REM Automatic deployment
diff --git a/main/odk/util/makefile.pmk b/main/odk/util/makefile.pmk
index 51ff700bc7..a4d27c338f 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.5.0
+PRODUCT_RELEASE=5.1.0
OFFICENAME=OpenOffice
.IF "$(GUI)"=="WNT"
SDKDIRNAME=OpenOffice_$(PRODUCT_RELEASE)_SDK
diff --git a/main/sdext/source/pdfimport/config/description.xml
b/main/sdext/source/pdfimport/config/description.xml
index d7cfa148ac..a6a7e6fe78 100644
--- a/main/sdext/source/pdfimport/config/description.xml
+++ b/main/sdext/source/pdfimport/config/description.xml
@@ -27,8 +27,8 @@
<identifier value="UPDATED_IDENTIFIER" />
<dependencies>
- <OpenOffice.org-minimal-version value="4.0" dep:name="OpenOffice"/>
- <OpenOffice.org-maximal-version value="4.9" dep:name="OpenOffice"/>
+ <OpenOffice.org-minimal-version value="5.0" dep:name="OpenOffice"/>
+ <OpenOffice.org-maximal-version value="5.9" dep:name="OpenOffice"/>
</dependencies>
<registration>
diff --git
a/main/setup_native/source/win32/customactions/reg4msdoc/msihelper.hxx
b/main/setup_native/source/win32/customactions/reg4msdoc/msihelper.hxx
index 1107204709..427d87e697 100644
--- a/main/setup_native/source/win32/customactions/reg4msdoc/msihelper.hxx
+++ b/main/setup_native/source/win32/customactions/reg4msdoc/msihelper.hxx
@@ -133,7 +133,7 @@ std::wstring GetOfficeInstallationPath(MSIHANDLE handle);
@returns
the absolute system path of the office executable (e.g.
- "C:\Program Files (x86)\OpenOffice 4\program\soffice.exe").
+ "C:\Program Files (x86)\OpenOffice 5\program\soffice.exe").
*/
std::wstring GetOfficeExecutablePath(MSIHANDLE handle);
diff --git a/main/setup_native/source/win32/nsis/downloadtemplate.nsi
b/main/setup_native/source/win32/nsis/downloadtemplate.nsi
index 510e0489c9..7d17664fc8 100644
--- a/main/setup_native/source/win32/nsis/downloadtemplate.nsi
+++ b/main/setup_native/source/win32/nsis/downloadtemplate.nsi
@@ -9,7 +9,7 @@ VIAddVersionKey CompanyName "Apache Software Foundation"
VIAddVersionKey LegalCopyright "(c) 2012-2026 The Apache Software Foundation"
VIAddVersionKey FileDescription "Apache PRODUCTNAMEPLACEHOLDER Installer"
VIAddVersionKey ProductVersion "PRODUCTVERSIONPLACEHOLDER"
-VIProductVersion "4.5.9900.500"
+VIProductVersion "5.1.9900.500"
; Enable Unicode
Unicode true
diff --git a/main/solenv/bin/modules/installer/download.pm
b/main/solenv/bin/modules/installer/download.pm
index 53fc106e7e..4c97588c87 100644
--- a/main/solenv/bin/modules/installer/download.pm
+++ b/main/solenv/bin/modules/installer/download.pm
@@ -606,7 +606,7 @@ sub get_download_architecture
{
# iswindowsbuild is true for BOTH Windows architectures, so
testing it
# here named every Windows download x86 -- an x64 build produced
- # Apache_OpenOffice_4.5.0_Win_x86_install_en-US.exe, a filename
+ # Apache_OpenOffice_5.1.0_Win_x86_install_en-US.exe, a filename
# identical to the x86 one and differing only in its contents.
$arch = "x64";
}
diff --git a/main/solenv/bin/modules/installer/epmfile.pm
b/main/solenv/bin/modules/installer/epmfile.pm
index 53fa43dedc..76f5b82ce7 100644
--- a/main/solenv/bin/modules/installer/epmfile.pm
+++ b/main/solenv/bin/modules/installer/epmfile.pm
@@ -492,7 +492,7 @@ sub create_epm_header
{
# refer to the license in the matching AOO installation
# TODO: sync AOO dest license full path with lpacks/sdks/exts
- my $licpath = "openoffice4/program/" . $licensefilename;
+ my $licpath = "openoffice5/program/" . $licensefilename;
$foundlicensefile = 1;
$line = "%license " . $licpath . "\n";
push(@epmheader, $line);
diff --git a/main/solenv/bin/srcrelease.xml b/main/solenv/bin/srcrelease.xml
index b81cecd562..22511c050d 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.5.0"/>
+ <property name="aoo.ver" value="5.1.0"/>
<property name="excludes.list" value="configure, moz/zipped/*.zip, **/.svn,
**/.gitignore, **/.git, **/*.log, 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, -.rej, -.orig,
build_aoo64bit_on_macos.sh" />
<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/gbuild/platform/freebsd.mk
b/main/solenv/gbuild/platform/freebsd.mk
index 0b46726af9..e449708dfb 100644
--- a/main/solenv/gbuild/platform/freebsd.mk
+++ b/main/solenv/gbuild/platform/freebsd.mk
@@ -470,7 +470,7 @@ endef
define gb_JunitTest_JunitTest_platform
$(call gb_JunitTest_get_target,$(1)) : DEFS := \
-
-Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(SRCDIR)/instsetoo_native/$(INPATH)/Apache_OpenOffice/installed/install/en-US/openoffice4/program/soffice}"
\
+
-Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(SRCDIR)/instsetoo_native/$(INPATH)/Apache_OpenOffice/installed/install/en-US/openoffice5/program/soffice}"
\
-Dorg.openoffice.test.arg.env=LD_LIBRARY_PATH \
-Dorg.openoffice.test.arg.user=file://$(call
gb_JunitTest_get_userdir,$(1)) \
diff --git a/main/solenv/gbuild/platform/linux.mk
b/main/solenv/gbuild/platform/linux.mk
index d4ec15cd40..a4c57e51ca 100644
--- a/main/solenv/gbuild/platform/linux.mk
+++ b/main/solenv/gbuild/platform/linux.mk
@@ -441,7 +441,7 @@ endef
define gb_JunitTest_JunitTest_platform
$(call gb_JunitTest_get_target,$(1)) : DEFS := \
-
-Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(SRCDIR)/instsetoo_native/$(INPATH)/Apache_OpenOffice/installed/install/en-US/openoffice4/program/soffice}"
\
+
-Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(SRCDIR)/instsetoo_native/$(INPATH)/Apache_OpenOffice/installed/install/en-US/openoffice5/program/soffice}"
\
-Dorg.openoffice.test.arg.env=LD_LIBRARY_PATH \
-Dorg.openoffice.test.arg.user=file://$(call
gb_JunitTest_get_userdir,$(1)) \
diff --git a/main/solenv/gbuild/platform/macosx.mk
b/main/solenv/gbuild/platform/macosx.mk
index 2c67a83b24..dbce1906a7 100644
--- a/main/solenv/gbuild/platform/macosx.mk
+++ b/main/solenv/gbuild/platform/macosx.mk
@@ -479,7 +479,7 @@ endef
define gb_JunitTest_JunitTest_platform
$(call gb_JunitTest_get_target,$(1)) : DEFS := \
-
-Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(SRCDIR)/instsetoo_native/$(INPATH)/Apache_OpenOffice/installed/install/en-US/openoffice4/program/soffice}"
\
+
-Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(SRCDIR)/instsetoo_native/$(INPATH)/Apache_OpenOffice/installed/install/en-US/openoffice5/program/soffice}"
\
-Dorg.openoffice.test.arg.env=DYLD_LIBRARY_PATH \
-Dorg.openoffice.test.arg.user=file://$(call
gb_JunitTest_get_userdir,$(1)) \
diff --git a/main/solenv/gbuild/platform/os2.mk
b/main/solenv/gbuild/platform/os2.mk
index 246ccf7c6e..4eac1e2a57 100644
--- a/main/solenv/gbuild/platform/os2.mk
+++ b/main/solenv/gbuild/platform/os2.mk
@@ -548,7 +548,7 @@ endef
define gb_JunitTest_JunitTest_platform
$(call gb_JunitTest_get_target,$(1)) : DEFS := \
-
-Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(SRCDIR)/instsetoo_native/$(INPATH)/Apache_OpenOffice/installed/install/en-US/OpenOffice
4/program/soffice.exe}" \
+
-Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(SRCDIR)/instsetoo_native/$(INPATH)/Apache_OpenOffice/installed/install/en-US/OpenOffice
5/program/soffice.exe}" \
-Dorg.openoffice.test.arg.env=PATH \
-Dorg.openoffice.test.arg.user=file:///$(call
gb_JunitTest_get_userdir,$(1)) \
diff --git a/main/solenv/gbuild/platform/solaris.mk
b/main/solenv/gbuild/platform/solaris.mk
index c82e2f0f46..b15cf2c993 100644
--- a/main/solenv/gbuild/platform/solaris.mk
+++ b/main/solenv/gbuild/platform/solaris.mk
@@ -399,7 +399,7 @@ endef
define gb_JunitTest_JunitTest_platform
$(call gb_JunitTest_get_target,$(1)) : DEFS := \
-
-Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(SRCDIR)/instsetoo_native/$(INPATH)/Apache_OpenOffice/installed/install/en-US/openoffice4/program/soffice}"
\
+
-Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(SRCDIR)/instsetoo_native/$(INPATH)/Apache_OpenOffice/installed/install/en-US/openoffice5/program/soffice}"
\
-Dorg.openoffice.test.arg.env=LD_LIBRARY_PATH \
-Dorg.openoffice.test.arg.user=file://$(call
gb_JunitTest_get_userdir,$(1)) \
diff --git a/main/solenv/gbuild/platform/windows.mk
b/main/solenv/gbuild/platform/windows.mk
index 073dd93d43..4ad02c3231 100644
--- a/main/solenv/gbuild/platform/windows.mk
+++ b/main/solenv/gbuild/platform/windows.mk
@@ -798,7 +798,7 @@ endef
define gb_JunitTest_JunitTest_platform
$(call gb_JunitTest_get_target,$(1)) : DEFS := \
-
-Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(SRCDIR)/instsetoo_native/$(INPATH)/Apache_OpenOffice/installed/install/en-US/OpenOffice
4/program/soffice.exe}" \
+
-Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(SRCDIR)/instsetoo_native/$(INPATH)/Apache_OpenOffice/installed/install/en-US/OpenOffice
5/program/soffice.exe}" \
-Dorg.openoffice.test.arg.env=PATH \
-Dorg.openoffice.test.arg.user=file:///$(call
gb_JunitTest_get_userdir,$(1)) \
diff --git a/main/solenv/gbuild/platform/winmingw.mk
b/main/solenv/gbuild/platform/winmingw.mk
index 30db7e3d10..e6c4713fbc 100644
--- a/main/solenv/gbuild/platform/winmingw.mk
+++ b/main/solenv/gbuild/platform/winmingw.mk
@@ -634,7 +634,7 @@ endef
define gb_JunitTest_JunitTest_platform
$(call gb_JunitTest_get_target,$(1)) : DEFS := \
-
-Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(SRCDIR)/instsetoo_native/$(INPATH)/Apache_OpenOffice/installed/install/en-US/OpenOffice
4/program/soffice.exe}" \
+
-Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(SRCDIR)/instsetoo_native/$(INPATH)/Apache_OpenOffice/installed/install/en-US/OpenOffice
5/program/soffice.exe}" \
-Dorg.openoffice.test.arg.env=PATH \
-Dorg.openoffice.test.arg.user=file:///$(call
gb_JunitTest_get_userdir,$(1)) \
diff --git a/main/solenv/inc/installationtest.mk
b/main/solenv/inc/installationtest.mk
index 8731d88525..3ba7614de9 100644
--- a/main/solenv/inc/installationtest.mk
+++ b/main/solenv/inc/installationtest.mk
@@ -63,7 +63,7 @@ my_sofficepath = \
$(SOLARSRC)'/instsetoo_native/$(INPATH)/Apache_OpenOffice/installed/install/en-US/Openoffice
4/program/soffice.exe'
.ELSE
my_sofficepath = \
-
$(SOLARSRC)/instsetoo_native/$(INPATH)/Apache_OpenOffice/installed/install/en-US/openoffice4/program/soffice
+
$(SOLARSRC)/instsetoo_native/$(INPATH)/Apache_OpenOffice/installed/install/en-US/openoffice5/program/soffice
.END
.IF "$(OOO_TEST_SOFFICE)" == ""
diff --git a/main/solenv/inc/minor.mk b/main/solenv/inc/minor.mk
index 5346e6bb6e..5cc8cb3293 100644
--- a/main/solenv/inc/minor.mk
+++ b/main/solenv/inc/minor.mk
@@ -18,8 +18,8 @@
# under the License.
#
# *************************************************************
-RSCVERSION=450
-RSCREVISION=450m1(Build:9900)
+RSCVERSION=510
+RSCREVISION=510m1(Build:9900)
BUILD=9900
LAST_MINOR=m1
-SOURCEVERSION=AOO450
+SOURCEVERSION=AOO510
diff --git a/main/solenv/inc/version.lst b/main/solenv/inc/version.lst
index ce0fe2049d..f12c511ca9 100644
--- a/main/solenv/inc/version.lst
+++ b/main/solenv/inc/version.lst
@@ -19,10 +19,10 @@
#
#**************************************************************
-OOOBASEVERSIONMAJOR=4
-OOOBASEVERSIONMINOR=5
+OOOBASEVERSIONMAJOR=5
+OOOBASEVERSIONMINOR=1
OOOBASEVERSIONMICRO=0
OOOBASEVERSIONDAY=1
-OOOBASEVERSIONMONTH=1
+OOOBASEVERSIONMONTH=9
OOOBASEVERSIONYEAR=2026
diff --git a/main/swext/mediawiki/src/description.xml
b/main/swext/mediawiki/src/description.xml
index 3876839f46..207fd52ac3 100644
--- a/main/swext/mediawiki/src/description.xml
+++ b/main/swext/mediawiki/src/description.xml
@@ -31,8 +31,8 @@
</simple-license>
</registration>
<dependencies>
- <OpenOffice.org-minimal-version value="4.0" d:name="OpenOffice"/>
- <OpenOffice.org-maximal-version value="4.9" d:name="OpenOffice"/>
+ <OpenOffice.org-minimal-version value="5.0" d:name="OpenOffice"/>
+ <OpenOffice.org-maximal-version value="5.9" d:name="OpenOffice"/>
</dependencies>
<publisher>
<name xlink:href="https://www.openoffice.org"; lang="en">Apache
Software Foundation</name>
diff --git a/main/sysui/desktop/debian/makefile.mk
b/main/sysui/desktop/debian/makefile.mk
index ad0565d499..89a8f4ca94 100644
--- a/main/sysui/desktop/debian/makefile.mk
+++ b/main/sysui/desktop/debian/makefile.mk
@@ -41,7 +41,7 @@ TARGET=debian
.IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/deb//)"
-DEBFILES=$(foreach,i,{$(PRODUCTLIST)}
$(PKGDIR)$/$i4.2-$(TARGET)-menus_$(PKGVERSION.$i)-$(PKGREV)_all.deb)
+DEBFILES=$(foreach,i,{$(PRODUCTLIST)}
$(PKGDIR)$/$i5.1-$(TARGET)-menus_$(PKGVERSION.$i)-$(PKGREV)_all.deb)
.ENDIF
@@ -56,22 +56,22 @@ ALLTAR : $(DEBFILES)
%/DEBIAN/control : $$(@:f)
@$(MKDIRHIER) $(@:d) $*$/etc $*$/usr/share/applnk/Office
$*$/usr/lib/menu
- ln -sf /opt/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/4.2//)) $*$/etc$/
- /bin/sh -c -x "cd $(COMMONMISC)$/$(*:f:s/-/ /:1:s/4.2//) &&
DESTDIR=$(shell @cd $*; pwd) ICON_PREFIX=$(ICONPREFIX) KDEMAINDIR=/usr
GNOMEDIR=/usr ./create_tree.sh"
- @cat openoffice.org-debian-menus | sed -e
's/%PRODUCTNAME/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/4.2//))
$(PRODUCTVERSION.$(*:f:s/-/ /:1:s/4.2//))/' -e
's/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/4.2//))/' -e
's/%ICONPREFIX/$(ICONPREFIX.$(*:f:s/-/ /:1:s/4.2//))/' >
$*$/usr/lib/menu/$(*:f:s/_/ /:1:s/4.2//)
- echo "Package: $(*:f:s/_/ /:1:s/4.2//)" > $@
- cat $(@:f) | tr -d "\015" | sed
"s/%productname/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/4.2//))/" >> $@
- echo "Version: $(PKGVERSION.$(*:f:s/-/ /:1:s/4.2//))-$(PKGREV)" >> $@
+ ln -sf /opt/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/5.1//)) $*$/etc$/
+ /bin/sh -c -x "cd $(COMMONMISC)$/$(*:f:s/-/ /:1:s/5.1//) &&
DESTDIR=$(shell @cd $*; pwd) ICON_PREFIX=$(ICONPREFIX) KDEMAINDIR=/usr
GNOMEDIR=/usr ./create_tree.sh"
+ @cat openoffice.org-debian-menus | sed -e
's/%PRODUCTNAME/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/5.1//))
$(PRODUCTVERSION.$(*:f:s/-/ /:1:s/5.1//))/' -e
's/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/5.1//))/' -e
's/%ICONPREFIX/$(ICONPREFIX.$(*:f:s/-/ /:1:s/5.1//))/' >
$*$/usr/lib/menu/$(*:f:s/_/ /:1:s/5.1//)
+ echo "Package: $(*:f:s/_/ /:1:s/5.1//)" > $@
+ cat $(@:f) | tr -d "\015" | sed
"s/%productname/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/5.1//))/" >> $@
+ echo "Version: $(PKGVERSION.$(*:f:s/-/ /:1:s/5.1//))-$(PKGREV)" >> $@
@du -k -s $* | awk -F ' ' '{ printf "Installed-Size: %s\n", $$1 ; }' >>
$@
%/DEBIAN/postinst : $$(@:f)
- @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/
/:1:s/4.2//))/g" > $@
+ @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/
/:1:s/5.1//))/g" > $@
%/DEBIAN/postrm : $$(@:f)
- @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/
/:1:s/4.2//))/g" > $@
+ @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/
/:1:s/5.1//))/g" > $@
%/DEBIAN/prerm : $$(@:f)
- @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/
/:1:s/4.2//))/g" > $@
+ @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/
/:1:s/5.1//))/g" > $@
# --- packaging ---------------------------------------------------
diff --git a/main/sysui/desktop/productversion.mk
b/main/sysui/desktop/productversion.mk
index 11879a6583..7548b3931c 100644
--- a/main/sysui/desktop/productversion.mk
+++ b/main/sysui/desktop/productversion.mk
@@ -48,10 +48,10 @@ PRODUCTLIST = openoffice
# default values to minimize maintenance effort
# CAUTION! $(OOOBASEVERSION) from openoffice.lst NOT available (!)
-PRODUCTVERSION = 4.5
+PRODUCTVERSION = 5.1
# CAUTION! $(BRANDPACKAGEVERSION) from openoffice.lst NOT available (!)
-PRODUCTVERSIONSHORT = 4
+PRODUCTVERSIONSHORT = 5
PKGVERSION = $(PRODUCTVERSION)
# gnome-vfs treats everything behind the last '.' as an icon extension,
diff --git a/main/sysui/desktop/slackware/makefile.mk
b/main/sysui/desktop/slackware/makefile.mk
index 7db1c7c46d..f830bd60cf 100644
--- a/main/sysui/desktop/slackware/makefile.mk
+++ b/main/sysui/desktop/slackware/makefile.mk
@@ -36,7 +36,7 @@ TARGET=slackware
# --- Files --------------------------------------------------------
-MENUFILES=$(PKGDIR)$/{$(PRODUCTLIST)}4.2-$(TARGET)-menus-$(PKGVERSION)-noarch-$(PKGREV).tgz
+MENUFILES=$(PKGDIR)$/{$(PRODUCTLIST)}5.1-$(TARGET)-menus-$(PKGVERSION)-noarch-$(PKGREV).tgz
# --- Targets -------------------------------------------------------
@@ -55,26 +55,26 @@ $(MISC)/$(TARGET)/usr/share/applications/ :
# FIXME: removal of *-extension.* only to create identical packages to OOF680
%/usr/share/applications :
@$(MKDIRHIER) $@
- /bin/sh -c "cd $(COMMONMISC)$/$(*:b:s/-/ /:1:s/4.2//); DESTDIR=$(shell
@cd $*; pwd) GNOMEDIR="" ICON_PREFIX=$(ICONPREFIX.$(*:b:s/-/ /:1:s/4.2//))
KDEMAINDIR=/opt/kde .$/create_tree.sh"
+ /bin/sh -c "cd $(COMMONMISC)$/$(*:b:s/-/ /:1:s/5.1//); DESTDIR=$(shell
@cd $*; pwd) GNOMEDIR="" ICON_PREFIX=$(ICONPREFIX.$(*:b:s/-/ /:1:s/5.1//))
KDEMAINDIR=/opt/kde .$/create_tree.sh"
$(RM) $*$/opt$/kde$/share$/icons$/*$/*$/*$/*-extension.png
$(RM) $*$/opt$/kde$/share$/mimelnk$/application$/*-extension.desktop
$(RM) $*$/usr$/share$/applications$/*.desktop
$(RM) $*$/usr$/bin$/soffice
%$/install$/doinst.sh : update-script
- @echo "( cd etc ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/4.2//)) )" > $@
- @echo "( cd etc ; ln -snf /opt/$(UNIXFILENAME.$(*:b:s/-/
/:1:s/4.2//):s/-//) $(UNIXFILENAME.$(*:b:s/-/ /:1:s/4.2//)) )" >> $@
+ @echo "( cd etc ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/5.1//)) )" > $@
+ @echo "( cd etc ; ln -snf /opt/$(UNIXFILENAME.$(*:b:s/-/
/:1:s/5.1//):s/-//) $(UNIXFILENAME.$(*:b:s/-/ /:1:s/5.1//)) )" >> $@
@echo "( cd usr/bin ; rm -rf soffice )" >> $@
- @echo "( cd usr/bin ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/
/:1:s/4.2//))/program/soffice soffice )" >> $@
- @echo -e $(foreach,i,$(shell @cat $(COMMONMISC)$/$(*:b:s/-/
/:1:s/4.2//)/launcherlist) "\n( cd usr/share/applications ; rm -rf
$(UNIXFILENAME.$(*:b:s/-/ /:1:s/4.2//))-$i )\n( cd usr/share/applications ; ln
-sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/4.2//))/share/xdg/$i
$(UNIXFILENAME.$(*:b:s/-/ /:1:s/4.2//))-$i )") >> $@
+ @echo "( cd usr/bin ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/
/:1:s/5.1//))/program/soffice soffice )" >> $@
+ @echo -e $(foreach,i,$(shell @cat $(COMMONMISC)$/$(*:b:s/-/
/:1:s/5.1//)/launcherlist) "\n( cd usr/share/applications ; rm -rf
$(UNIXFILENAME.$(*:b:s/-/ /:1:s/5.1//))-$i )\n( cd usr/share/applications ; ln
-sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/5.1//))/share/xdg/$i
$(UNIXFILENAME.$(*:b:s/-/ /:1:s/5.1//))-$i )") >> $@
@cat $< >> $@
%$/install$/slack-desc : slack-desc
@$(MKDIRHIER) $(@:d)
- @sed -e "s/PKGNAME/$(*:b:s/-/ /:1:s/4.2//)-$(TARGET)-menus/g" -e
"s/PKGVERSION/$(PKGVERSION.$(*:b:s/-/ /:1:s/4.2//))/g" \
- -e "s/LONGPRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/4.2//))
$(PRODUCTVERSION.$(*:b:s/-/ /:1:s/4.2//))/g" \
- -e "s/PRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/4.2//))/g" \
- -e "s/UNIXFILENAME/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/4.2//))/g"
$< > $@
+ @sed -e "s/PKGNAME/$(*:b:s/-/ /:1:s/5.1//)-$(TARGET)-menus/g" -e
"s/PKGVERSION/$(PKGVERSION.$(*:b:s/-/ /:1:s/5.1//))/g" \
+ -e "s/LONGPRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/5.1//))
$(PRODUCTVERSION.$(*:b:s/-/ /:1:s/5.1//))/g" \
+ -e "s/PRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/5.1//))/g" \
+ -e "s/UNIXFILENAME/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/5.1//))/g"
$< > $@
# needed to satisfy the slackware package tools - they need
# the entries like this
diff --git a/test/build.xml b/test/build.xml
index c51557ddec..77a35be75c 100644
--- a/test/build.xml
+++ b/test/build.xml
@@ -163,13 +163,13 @@
</condition>
<!-- Next try the internal install path that the
with-package-format=installed option to configure uses -->
- <available type="dir"
file="${env.SRC_ROOT}/instsetoo_native/${env.INPATH}/Apache_OpenOffice/installed/install/en-US/openoffice4"
- property="internalInstalledDirNix"
value="${env.SRC_ROOT}/instsetoo_native/${env.INPATH}/Apache_OpenOffice/installed/install/en-US/openoffice4"/>
+ <available type="dir"
file="${env.SRC_ROOT}/instsetoo_native/${env.INPATH}/Apache_OpenOffice/installed/install/en-US/openoffice5"
+ property="internalInstalledDirNix"
value="${env.SRC_ROOT}/instsetoo_native/${env.INPATH}/Apache_OpenOffice/installed/install/en-US/openoffice5"/>
<condition property="test.arg0"
value="-Dopenoffice.home=${internalInstalledDirNix}">
<isset property="internalInstalledDirNix" />
</condition>
- <available type="dir"
file="${env.SRC_ROOT}/instsetoo_native/${env.INPATH}/Apache_OpenOffice/installed/install/en-US/OpenOffice
4"
- property="internalInstalledDirWin"
value="${env.SRC_ROOT}/instsetoo_native/${env.INPATH}/Apache_OpenOffice/installed/install/en-US/OpenOffice
4"/>
+ <available type="dir"
file="${env.SRC_ROOT}/instsetoo_native/${env.INPATH}/Apache_OpenOffice/installed/install/en-US/OpenOffice
5"
+ property="internalInstalledDirWin"
value="${env.SRC_ROOT}/instsetoo_native/${env.INPATH}/Apache_OpenOffice/installed/install/en-US/OpenOffice
5"/>
<condition property="test.arg0"
value="-Dopenoffice.home=${internalInstalledDirWin}">
<isset property="internalInstalledDirWin" />
</condition>
diff --git a/test/testcommon/source/org/openoffice/test/Run.help
b/test/testcommon/source/org/openoffice/test/Run.help
index a3fae18964..df432bd81a 100644
--- a/test/testcommon/source/org/openoffice/test/Run.help
+++ b/test/testcommon/source/org/openoffice/test/Run.help
@@ -19,4 +19,4 @@ System Property
Example
run -Dopenoffice.home=/Applications/OpenOffice.org.app/Contents -tp bvt
run -Dopenoffice.home=/Applications/OpenOffice.org.app/Contents -tc
bvt:bvt.gui.BasicFunctionTest,bvt.gui.FileTypeTest
- run
-Dopenoffice.pack=http://ci.apache.org/projects/openoffice/install/linux64/Apache_OpenOffice_4.0.0_Linux_x86-64_install-arc_en-US.tar.gz
-tp bvt
+ run
-Dopenoffice.pack=http://ci.apache.org/projects/openoffice/install/linux64/Apache_OpenOffice_5.1.0_Linux_x86-64_install-arc_en-US.tar.gz
-tp bvt
diff --git a/test/testcommon/source/org/openoffice/test/common/Installer.java
b/test/testcommon/source/org/openoffice/test/common/Installer.java
index e724006fcf..8ce2d61f08 100644
--- a/test/testcommon/source/org/openoffice/test/common/Installer.java
+++ b/test/testcommon/source/org/openoffice/test/common/Installer.java
@@ -136,16 +136,16 @@ public class Installer implements Runnable {
final File install = new File(installed, "install");
final File enUs = new File(install, "en-US");
// *nix:
- File openoffice4 = new File(enUs, "openoffice4");
- if (!openoffice4.exists()) {
+ File openoffice5 = new File(enUs, "openoffice5");
+ if (!openoffice5.exists()) {
// Windows:
- openoffice4 = new File(enUs, "OpenOffice 4");
+ openoffice5 = new File(enUs, "OpenOffice 5");
}
- if (!openoffice4.exists()) {
- throw new RuntimeException("Neither openoffice.home nor
openoffice.pack were specified, and could not find OpenOffice in " +
openoffice4.getAbsolutePath());
+ if (!openoffice5.exists()) {
+ throw new RuntimeException("Neither openoffice.home nor
openoffice.pack were specified, and could not find OpenOffice in " +
openoffice5.getAbsolutePath());
}
- validateOpenOfficeInstallation(openoffice4);
- return openoffice4.getAbsolutePath();
+ validateOpenOfficeInstallation(openoffice5);
+ return openoffice5.getAbsolutePath();
}
private static void validateOpenOfficeInstallation(File directory) {
