remove obsolete/duplicated entries from openoffice.lst.in

The xml configuration related stuff is no longer (since 2013, with
89ac3c4aca) done in installer code, but by
postprocess/CustomTarget_registry.mk

openoffice.lst is only used for package generation itself, and by
extension for the replacement of values used in scp2 (those are replaced
by "replace_all_ziplistvariables_in_file" (for the ${NAME} style ones) in
solenv/bin/modules/installer/scpzipfiles.pm and (for the <name> style) by
replace_setup_variables in solenv/bin/modules/installer/scriptitems.pm

the files that would be created by scp2 in case for an installation set
(e.g versionrc, bootstraprc) are created by
instsetoo_native/CustomTarget_setup.mk for plain instdir

Change-Id: I761ea25aa98bbdcc310836257e288322fbfc437b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116128
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
This commit is contained in:
Christian Lohmaier
2021-05-26 00:29:21 +02:00
parent 15ab55c092
commit d4f5299fd2
2 changed files with 10 additions and 22 deletions
+10 -6
View File
@@ -19,8 +19,16 @@
Some documentation for the variables specified in file openoffice.lst.
FIXME: quite a few of these variables are duplicated in
postprocess/CustomTarget_registry.mk, this needs to be consolidated
It contains values used by the creation of installation packages themselves,
and as part of that contain subsitutions for variables used in scp2 (those will
be handled by the perl installer code)
NOTE: For instdir, the corresponding files are created by
instsetoo_native/CustomTarget_setup.mk instead.
It used to contain variables that were replaced in the xcu configuration files,
but those are handled by postprocess/CustomTarget_registry.mk (and there's no
difference for those between an installation set and the instdir method)
VARIABLE NAME USAGE
-------------------------------------------------------------------------------
@@ -31,10 +39,6 @@ UREPACKAGEPREFIX name prefix for the URE installation packages
SOLSUREPACKAGEPREFIX name prefix for the URE installation packages
for Solaris platforms
STARTCENTER_ADDFEATURE_URL URL in start center to link to extension website
STARTCENTER_INFO_URL URL in start center to link to product homepage
STARTCENTER_TEMPLREP_URL URL in start center to link to templates website
UPDATEURL URL for the application update functionality
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-16
View File
@@ -51,8 +51,6 @@ LibreOffice
BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@
BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
USERDIRPRODUCTVERSION 4
ABOUTBOXPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
ABOUTBOXPRODUCTVERSIONSUFFIX @LIBO_VERSION_SUFFIX_SUFFIX@
BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
PCPFILENAME libreoffice.pcp
UPDATEURL https://update.libreoffice.org/check.php
@@ -66,9 +64,6 @@ LibreOffice
SPELLCHECKERFILE spellchecker_selection.txt
CHANGETARGETDIR 1
PATCHCODEFILE ooo_patchcodes.txt
STARTCENTER_ADDFEATURE_URL https://extensions.libreoffice.org/
STARTCENTER_INFO_URL https://www.libreoffice.org/
STARTCENTER_TEMPLREP_URL https://templates.libreoffice.org/
}
active 1
compression 5
@@ -95,8 +90,6 @@ LibreOfficeDev
BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@
BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
USERDIRPRODUCTVERSION 4
ABOUTBOXPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
ABOUTBOXPRODUCTVERSIONSUFFIX @LIBO_VERSION_SUFFIX_SUFFIX@
BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX lodevbasis
@@ -116,9 +109,6 @@ LibreOfficeDev
PATCHCODEFILE ooodev_patchcodes.txt
CODEFILENAME codes_ooodev.txt
LOCALUSERDIR $ORIGIN/..
STARTCENTER_ADDFEATURE_URL https://extensions.libreoffice.org/
STARTCENTER_INFO_URL https://www.libreoffice.org/
STARTCENTER_TEMPLREP_URL https://templates.libreoffice.org/
}
active 1
compression 5
@@ -156,9 +146,6 @@ LibreOffice_SDK
NOSHORTDIRECTORYNAMES 1
CHANGETARGETDIR 1
DONTUSESTARTMENUFOLDER 1
STARTCENTER_ADDFEATURE_URL https://extensions.libreoffice.org/
STARTCENTER_INFO_URL https://www.libreoffice.org/
STARTCENTER_TEMPLREP_URL https://templates.libreoffice.org/
}
active 1
compression 5
@@ -200,9 +187,6 @@ LibreOfficeDev_SDK
NOSHORTDIRECTORYNAMES 1
CHANGETARGETDIR 1
DONTUSESTARTMENUFOLDER 1
STARTCENTER_ADDFEATURE_URL https://extensions.libreoffice.org/
STARTCENTER_INFO_URL https://www.libreoffice.org/
STARTCENTER_TEMPLREP_URL https://templates.libreoffice.org/
}
active 1
compression 5