diff options
| -rw-r--r-- | instsetoo_native/util/openoffice.lst.in | 6 | ||||
| -rw-r--r-- | solenv/bin/modules/installer.pm | 3 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/setupscript.pm | 25 | ||||
| -rw-r--r-- | solenv/bin/modules/t/installer-setupscript.t | 1 |
4 files changed, 0 insertions, 35 deletions
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index 79113e45fa79..a6c79120af4f 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -8,11 +8,6 @@ Globals URELAYERVERSION 1 REFERENCEOOOMAJORMINOR 3.4 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 PACKAGEPREFIX BASISPACKAGEPREFIX libobasis @@ -112,7 +107,6 @@ LibreOffice_Dev UREPACKAGEPREFIX lodev SOLSUREPACKAGEPREFIX lodev REGISTRYLAYERNAME LayerDev - SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93 UPDATEURL http://update.libreoffice.org/check.php ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk ADDSYSTEMINTEGRATION 1 diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm index 4df3bc759b42..91b3ef0c5eed 100644 --- a/solenv/bin/modules/installer.pm +++ b/solenv/bin/modules/installer.pm @@ -280,9 +280,6 @@ sub run { installer::setupscript::add_installationobject_to_variables($allvariableshashref, $allscriptvariablesref); - # Adding also all variables, that must be included into the $allvariableshashref. - installer::setupscript::add_forced_properties($allvariableshashref); - # Replacing preset properties, not using the default mechanisms (for example for UNIXPRODUCTNAME) installer::setupscript::replace_preset_properties($allvariableshashref); diff --git a/solenv/bin/modules/installer/setupscript.pm b/solenv/bin/modules/installer/setupscript.pm index 53590d34bc92..08d20cf4c3b6 100644 --- a/solenv/bin/modules/installer/setupscript.pm +++ b/solenv/bin/modules/installer/setupscript.pm @@ -37,7 +37,6 @@ use installer::scriptitems; use installer::ziplist; our @EXPORT_OK = qw( - add_forced_properties add_installationobject_to_variables add_lowercase_productname_setupscriptvariable add_predefined_folder @@ -463,30 +462,6 @@ sub add_installationobject_to_variables } ##################################################################################### -# Adding all variables, that must be defined, but are not defined until now. -##################################################################################### - -sub add_forced_properties -{ - my ($allvariables) = @_; - - my @forced_properties = qw( - SERVICETAG_PRODUCTNAME - SERVICETAG_PRODUCTVERSION - SERVICETAG_PARENTNAME - SERVICETAG_SOURCE - SERVICETAG_URN - ); - - for my $property (@forced_properties) - { - if ( ! exists($allvariables->{$property}) ) { - $allvariables->{$property} = ""; - } - } -} - -##################################################################################### # Some properties are created automatically. It should be possible to # overwrite them, with PRESET properties. For example UNIXPRODUCTNAME # with PRESETUNIXPRODUCTNAME, if this is defined and the automatic process diff --git a/solenv/bin/modules/t/installer-setupscript.t b/solenv/bin/modules/t/installer-setupscript.t index 1320d7f4282f..2079efea6aff 100644 --- a/solenv/bin/modules/t/installer-setupscript.t +++ b/solenv/bin/modules/t/installer-setupscript.t @@ -32,7 +32,6 @@ use lib '.'; BEGIN { use_ok('installer::setupscript', qw( - add_forced_properties add_installationobject_to_variables add_lowercase_productname_setupscriptvariable add_predefined_folder |