Skip to content

C
core
Kaydet (Commit) d03aead7 authored tarafından Andras Timar's avatar Andras Timar
Dosyalara gözat
Seçenekler

remove unused xpdinstaller module

üst e516f134
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 374 deletions
instsetoo_native/util/openoffice.lst
Dosyayı görüntüle @ d03aead7
......@@ -62,7 +62,7 @@ LibreOffice
BASEPRODUCTVERSION 3.6
PCPFILENAME libreoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 1
FILEFORMATNAME OpenOffice.org
......@@ -75,7 +75,6 @@ LibreOffice
GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
SPELLCHECKERFILE spellchecker_selection.txt
OOODOWNLOADNAME 1
XPDINSTALLER 0
BETAUPGRADECODE
STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
CHANGETARGETDIR 1
......@@ -124,7 +123,7 @@ LibreOffice_Dev
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,userland.txt
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk
ADDSYSTEMINTEGRATION 1
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
......@@ -136,7 +135,6 @@ LibreOffice_Dev
GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
SPELLCHECKERFILE spellchecker_selection.txt
OOODOWNLOADNAME 1
XPDINSTALLER 0
BETAUPGRADECODE
STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
CHANGETARGETDIR 1
......@@ -392,7 +390,7 @@ OxygenOffice
BASEPRODUCTVERSION 3.6
PCPFILENAME openoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 1
FILEFORMATNAME OpenOffice.org
......@@ -406,7 +404,6 @@ OxygenOffice
GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
SPELLCHECKERFILE spellchecker_selection.txt
OOODOWNLOADNAME 1
XPDINSTALLER 0
BETAUPGRADECODE
STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
CHANGETARGETDIR 1
......
scp2/source/ooo/module_hidden_ooo.scp
Dosyayı görüntüle @ d03aead7
......@@ -785,15 +785,3 @@ Module gid_Module_Oo_Linguistic
gid_File_Lib_Lnth,
gid_File_Share_Registry_Lingucomponent_Xcd);
End
#ifdef LINUX
Module gid_Module_Root_Userland
ParentID = gid_Module_Root;
InstallOrder = "5";
Name = "gid_Module_Root_Userland";
Description = "gid_Module_Root_Userland";
Subdir = "userland";
Styles = (HIDDEN_ROOT,USERLANDMODULE,USERINSTALLONLY,NOTRELOCATABLE,XPD_ONLY,INSTALLCANFAIL);
PackageName = "${USERLANDPACKAGENAME}";
End
#endif
scp2/source/ooo/scpaction_ooo.scp
Dosyayı görüntüle @ d03aead7
......@@ -68,220 +68,6 @@ End
#endif
#endif
ScpAction scp_Copy_Xpd_Javaloader
Copy = "javaloader.sh";
Name = "setup";
Styles = (XPD_ONLY);
UnixRights = 775;
End
ScpAction scp_Copy_Xpd_Javajarfile
Copy = "JavaSetup.jar";
Name = "JavaSetup.jar";
Styles = (XPD_ONLY);
End
// #ifdef SOLARIS
// ScpAction scp_Copy_Xpd_Getuidso
// Copy = "getuid.so";
// Name = "getuid.so";
// Styles = (XPD_ONLY);
// Subdir = "installdata/getuid";
// End
// #endif
// Setup image
ScpAction scp_Copy_Xpd_Gif_Setup
Copy = "Setup.gif";
Name = "Setup.gif";
Styles = (XPD_ONLY);
Subdir = "installdata/images";
End
// Setup help files
ScpAction scp_Copy_Xpd_Help_Html_Acceptlicense
README_TXT_ALL_LANG(Copy, AcceptLicense, html);
README_TXT_ALL_LANG(Name, AcceptLicense, html);
Styles = (XPD_ONLY);
Subdir = "installdata/html";
End
ScpAction scp_Copy_Xpd_Help_Html_Acceptlicense_En_Us
Copy = "AcceptLicense_en-US.html";
Name = "AcceptLicense.html";
Styles = (XPD_ONLY);
Subdir = "installdata/html";
End
ScpAction scp_Copy_Xpd_Help_Html_Choosecomponents
README_TXT_ALL_LANG(Copy, ChooseComponents, html);
README_TXT_ALL_LANG(Name, ChooseComponents, html);
Styles = (XPD_ONLY);
Subdir = "installdata/html";
End
ScpAction scp_Copy_Xpd_Help_Html_Choosecomponents_En_Us
Copy = "ChooseComponents_en-US.html";
Name = "ChooseComponents.html";
Styles = (XPD_ONLY);
Subdir = "installdata/html";
End
ScpAction scp_Copy_Xpd_Help_Html_Choosedirectory
README_TXT_ALL_LANG(Copy, ChooseDirectory, html);
README_TXT_ALL_LANG(Name, ChooseDirectory, html);
Styles = (XPD_ONLY);
Subdir = "installdata/html";
End
ScpAction scp_Copy_Xpd_Help_Html_Choosedirectory_En_Us
Copy = "ChooseDirectory_en-US.html";
Name = "ChooseDirectory.html";
Styles = (XPD_ONLY);
Subdir = "installdata/html";
End
ScpAction scp_Copy_Xpd_Help_Html_Chooseinstallationtype
README_TXT_ALL_LANG(Copy, ChooseInstallationType, html);
README_TXT_ALL_LANG(Name, ChooseInstallationType, html);
Styles = (XPD_ONLY);
Subdir = "installdata/html";
End
ScpAction scp_Copy_Xpd_Help_Html_Chooseinstallationtype_En_Us
Copy = "ChooseInstallationType_en-US.html";
Name = "ChooseInstallationType.html";
Styles = (XPD_ONLY);
Subdir = "installdata/html";
End
// ScpAction scp_Copy_Xpd_Help_Html_Chooselanguage
// README_TXT_ALL_LANG(Copy, ChooseLanguage, html);
// README_TXT_ALL_LANG(Name, ChooseLanguage, html);
// Styles = (XPD_ONLY);
// Subdir = "installdata/html";
// End
// ScpAction scp_Copy_Xpd_Help_Html_Chooselanguage_En_Us
// Copy = "ChooseLanguage_en-US.html";
// Name = "ChooseLanguage.html";
// Styles = (XPD_ONLY);
// Subdir = "installdata/html";
// End
ScpAction scp_Copy_Xpd_Help_Html_Chooseuninstallationcomponents
README_TXT_ALL_LANG(Copy, ChooseUninstallationComponents, html);
README_TXT_ALL_LANG(Name, ChooseUninstallationComponents, html);
Styles = (XPD_ONLY);
Subdir = "installdata/html";
End
ScpAction scp_Copy_Xpd_Help_Html_Chooseuninstallationcomponents_En_Us
Copy = "ChooseUninstallationComponents_en-US.html";
Name = "ChooseUninstallationComponents.html";
Styles = (XPD_ONLY);
Subdir = "installdata/html";
End
ScpAction scp_Copy_Xpd_Help_Html_Chooseuninstallationtype
README_TXT_ALL_LANG(Copy, ChooseUninstallationType, html);
README_TXT_ALL_LANG(Name, ChooseUninstallationType, html);
Styles = (XPD_ONLY);
Subdir = "installdata/html";
End
ScpAction scp_Copy_Xpd_Help_Html_Chooseuninstallationtype_En_Us
Copy = "ChooseUninstallationType_en-US.html";
Name = "ChooseUninstallationType.html";
Styles = (XPD_ONLY);
Subdir = "installdata/html";
End
ScpAction scp_Copy_Xpd_Help_Html_Installationimminent
README_TXT_ALL_LANG(Copy, InstallationImminent, html);
README_TXT_ALL_LANG(Name, InstallationImminent, html);
Styles = (XPD_ONLY);
Subdir = "installdata/html";
End
ScpAction scp_Copy_Xpd_Help_Html_Installationimminent_En_Us
Copy = "InstallationImminent_en-US.html";
Name = "InstallationImminent.html";
Styles = (XPD_ONLY);
Subdir = "installdata/html";
End
ScpAction scp_Copy_Xpd_Help_Html_Installationongoing
README_TXT_ALL_LANG(Copy, InstallationOngoing, html);
README_TXT_ALL_LANG(Name, InstallationOngoing, html);
Styles = (XPD_ONLY);
Subdir = "installdata/html";
End
ScpAction scp_Copy_Xpd_Help_Html_Installationongoing_En_Us
Copy = "InstallationOngoing_en-US.html";
Name = "InstallationOngoing.html";
Styles = (XPD_ONLY);
Subdir = "installdata/html";
End
ScpAction scp_Copy_Xpd_Help_Html_Prologue
README_TXT_ALL_LANG(Copy, Prologue, html);
README_TXT_ALL_LANG(Name, Prologue, html);
Styles = (XPD_ONLY);
Subdir = "installdata/html";
End
ScpAction scp_Copy_Xpd_Help_Html_Prologue_En_Us
Copy = "Prologue_en-US.html";
Name = "Prologue.html";
Styles = (XPD_ONLY);
Subdir = "installdata/html";
End
ScpAction scp_Copy_Xpd_Help_Html_Uninstallationimminent
README_TXT_ALL_LANG(Copy, UninstallationImminent, html);
README_TXT_ALL_LANG(Name, UninstallationImminent, html);
Styles = (XPD_ONLY);
Subdir = "installdata/html";
End
ScpAction scp_Copy_Xpd_Help_Html_Uninstallationimminent_En_Us
Copy = "UninstallationImminent_en-US.html";
Name = "UninstallationImminent.html";
Styles = (XPD_ONLY);
Subdir = "installdata/html";
End
ScpAction scp_Copy_Xpd_Help_Html_Uninstallationongoing
README_TXT_ALL_LANG(Copy, UninstallationOngoing, html);
README_TXT_ALL_LANG(Name, UninstallationOngoing, html);
Styles = (XPD_ONLY);
Subdir = "installdata/html";
End
ScpAction scp_Copy_Xpd_Help_Html_Uninstallationongoing_En_Us
Copy = "UninstallationOngoing_en-US.html";
Name = "UninstallationOngoing.html";
Styles = (XPD_ONLY);
Subdir = "installdata/html";
End
ScpAction scp_Copy_Xpd_Help_Html_Uninstallationprologue
README_TXT_ALL_LANG(Copy, UninstallationPrologue, html);
README_TXT_ALL_LANG(Name, UninstallationPrologue, html);
Styles = (XPD_ONLY);
Subdir = "installdata/html";
End
ScpAction scp_Copy_Xpd_Help_Html_Uninstallationprologue_En_Us
Copy = "UninstallationPrologue_en-US.html";
Name = "UninstallationPrologue.html";
Styles = (XPD_ONLY);
Subdir = "installdata/html";
End
#ifdef MACOSX
ScpAction scp_Copy_Dmg_Background_Image
Copy = "osxdndinstall.png";
......
setup_native/scripts/userland.txt deleted 100644 → 0
Dosyayı görüntüle @ e516f134
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License version 3
# only, as published by the Free Software Foundation.
#
# OpenOffice.org is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License version 3 for more details
# (a copy is included in the LICENSE file that accompanied this code).
#
# You should have received a copy of the GNU Lesser General Public License
# version 3 along with OpenOffice.org. If not, see
# <http://www.openoffice.org/license.html>
# for a copy of the LGPLv3 License.
#
#*************************************************************************
USERLANDPACKAGENAME=libreoffice-userland-1.0-0.noarch.rpm
solenv/bin/make_installer.pl
Dosyayı görüntüle @ d03aead7
......@@ -87,7 +87,6 @@ use installer::windows::strip;
use installer::windows::update;
use installer::windows::upgrade;
use installer::worker;
use installer::xpdinstaller;
use installer::ziplist;
#################################################
......@@ -313,12 +312,6 @@ if ( $installer::globals::iswindowsbuild ) { installer::control::read_encodingli
if ( $allvariableshashref->{'ADD_INCLUDE_FILES'} ) { installer::worker::add_variables_from_inc_to_hashref($allvariableshashref, $includepatharrayref); }
################################################
# Disable xpd installer, if SOLAR_JAVA not set
################################################
installer::control::check_java_for_xpd($allvariableshashref);
#####################################
# Analyzing the setup script
#####################################
......@@ -424,13 +417,6 @@ installer::logger::print_message( "... analyzing scpactions ... \n" );
my $scpactionsinproductarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "ScpAction");
# Note: Don't clean away XPD installer stuff before verified whether
# OxygenOffice still uses it or not, see insesetoo_native/util/openoffice.lst
if (( ! $allvariableshashref->{'XPDINSTALLER'} ) || ( ! $installer::globals::isxpdplatform ))
{
$scpactionsinproductarrayref = installer::scriptitems::remove_Xpdonly_Items($scpactionsinproductarrayref);
}
if ( $installer::globals::languagepack ) { installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref); }
if ( $installer::globals::helppack ) { installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref); }
if ( $allvariableshashref->{'PRODUCTNAME'} eq "LibO-dev" ) { installer::scriptitems::use_devversion_copy_scpaction($scpactionsinproductarrayref); }
......@@ -499,11 +485,6 @@ if (!($installer::globals::is_copy_only_project))
$modulesinproductarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "Module");
if (( ! $allvariableshashref->{'XPDINSTALLER'} ) || ( ! $installer::globals::isxpdplatform ))
{
$modulesinproductarrayref = installer::scriptitems::remove_Xpdonly_Items($modulesinproductarrayref);
}
installer::scriptitems::resolve_assigned_modules($modulesinproductarrayref);
$modulesinproductarrayref = installer::scriptitems::remove_template_modules($modulesinproductarrayref);
......@@ -1444,25 +1425,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
} # end of "if ( ! $installer::globals::simple )
###########################################
# xpd installation mechanism
###########################################
# Creating the xpd file for the package. This has to happen always
if ( $installer::globals::isxpdplatform )
{
if (( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack ) && ( ! $installer::globals::patch ))
{
if (( $allvariableshashref->{'XPDINSTALLER'} ) && ( $installer::globals::call_epm != 0 ))
{
installer::xpdinstaller::create_xpd_file($onepackage, $packages, $languagestringref, $allvariableshashref, $modulesinproductarrayref, $installdir, $installer::globals::epmoutpath, $linkpackage, \%installer::globals::xpdpackageinfo);
$installer::globals::xpd_files_prepared = 1;
%installer::globals::xpdpackageinfo = ();
}
}
}
if ( $installer::globals::makelinuxlinkrpm ) { $k--; } # decreasing the counter to create the link rpm!
} # end of "for ( my $k = 0; $k <= $#{$packages}; $k++ )"
......@@ -1499,12 +1461,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
if (( $installer::globals::patch ) && ( $installer::globals::issolarispkgbuild )) { installer::epmfile::finalize_patch($installer::globals::epmoutpath, $allvariableshashref); }
if (( $installer::globals::patch ) && ( $installer::globals::isrpmbuild )) { installer::epmfile::finalize_linux_patch($installer::globals::epmoutpath, $allvariableshashref, $includepatharrayref); }
# Copying the xpd installer into the installation set
if (( $allvariableshashref->{'XPDINSTALLER'} ) && ( $installer::globals::isxpdplatform ) && ( $installer::globals::xpd_files_prepared ))
{
installer::xpdinstaller::create_xpd_installer($installdir, $allvariableshashref, $languagestringref);
}
chdir($currentdir); # changing back into start directory
}
......
solenv/bin/modules/installer/control.pm
Dosyayı görüntüle @ d03aead7
......@@ -464,17 +464,6 @@ sub check_oxtfiles
}
}
#############################################################
# Check if Java is available to create xpd installer
#############################################################
sub check_java_for_xpd
{
my ( $allvariables ) = @_;
if ( ! $installer::globals::solarjavaset ) { $allvariables->{'XPDINSTALLER'} = 0; }
}
####################################################################
# Setting global variable "$installer::globals::addchildprojects"
####################################################################
......
solenv/bin/modules/installer/epmfile.pm
Dosyayı görüntüle @ d03aead7
......@@ -2802,11 +2802,6 @@ sub copy_childproject_files
installer::systemactions::copy_one_file($sourcefile, $localdestdir);
# Solaris: unpacking tar.gz files and setting new packagename
if ( $installer::globals::issolarispkgbuild ) { $packagename = unpack_tar_gz_file($packagename, $localdestdir); }
if (( $installer::globals::isxpdplatform ) && ( $allvariables->{'XPDINSTALLER'} ))
{
installer::xpdinstaller::create_xpd_file_for_childproject($onemodule, $localdestdir, $packagename, $allvariableshashref, $modulesarrayref);
}
}
}
......@@ -2917,9 +2912,7 @@ sub put_systemintegration_into_installset
# Getting name of package from scp-Module
# Search package in list off all include files
# Copy file into installation set and unpack it (always tar.gz)
# Create xpd file and put it into xpd directory
# tar.gz can contain a different number of packages -> automatically create hidden sub modules
# xpd file has to be created completely from module and package itself (-> no packagelist!)
# Collect all modules with flag "SYSTEMMODULE"
my $allmodules = collect_modules_with_style("SYSTEMMODULE", $modulesarrayref);
......@@ -2950,11 +2943,6 @@ sub put_systemintegration_into_installset
# Adding license content into Solaris packages
if (( $installer::globals::issolarispkgbuild ) && ( $installer::globals::englishlicenseset ) && ( ! $variableshashref->{'NO_LICENSE_INTO_COPYRIGHT'} )) { installer::worker::add_license_into_systemintegrationpackages($destdir, $newcontent); }
if (( $installer::globals::isxpdplatform ) && ( $allvariables->{'XPDINSTALLER'} ))
{
installer::xpdinstaller::create_xpd_file_for_systemintegration($onemodule, $newcontent, $modulesarrayref, $subdir);
}
}
}
......
solenv/bin/modules/installer/globals.pm
Dosyayı görüntüle @ d03aead7
......@@ -274,7 +274,6 @@ BEGIN
$infodirectory = "";
@currentcontent = ();
@installsetcontent = ();
%xpdpackageinfo = ();
$signfiles_checked = 0;
$dosign = 0;
$pwfile = "";
......@@ -291,14 +290,7 @@ BEGIN
$lastsequence_before_merge = 0;
$lastcabfilename = "";
$createdxpddefaultlang = 0;
$xpddir = "";
$productxpdfile = "setup.xpd";
$xpd_files_prepared = 0;
$defaultlanguage = "";
@createdxpdfiles = ();
@allxpdfiles = ();
$isxpdplatform = 0;
$javalanguagepath = "";
$javasettozero = 0;
$addlicensefile = 1;
......
solenv/bin/modules/installer/parameter.pm
Dosyayı görüntüle @ d03aead7
......@@ -271,7 +271,6 @@ sub setglobalvariables
{
$installer::globals::issolarispkgbuild = 1;
$installer::globals::epmoutpath = "packages";
$installer::globals::isxpdplatform = 1;
}
}
......@@ -310,7 +309,6 @@ sub setglobalvariables
if ( $installer::globals::packageformat eq "rpm" )
{
$installer::globals::isrpmbuild = 1;
$installer::globals::isxpdplatform = 1;
$installer::globals::epmoutpath = "RPMS";
}
if ( $installer::globals::rpm eq "" ) { installer::exiter::exit_program("ERROR: Environment variable \"\$RPM\" has to be defined!", "setglobalvariables"); }
......@@ -322,7 +320,6 @@ sub setglobalvariables
if ( $installer::globals::packageformat eq "rpm" )
{
$installer::globals::isrpmbuild = 1;
$installer::globals::isxpdplatform = 1;
$installer::globals::epmoutpath = "RPMS";
if ( $installer::globals::compiler =~ /unxlngi/ )
{
......
solenv/bin/modules/installer/scriptitems.pm
Dosyayı görüntüle @ d03aead7
......@@ -1678,42 +1678,6 @@ sub change_keys_of_scpactions
}
}
############################################################################
# Removing all xpd only items from installation set (scpactions with
# the style XPD_ONLY), except an xpd installation set is created
############################################################################
sub remove_Xpdonly_Items
{
my ($itemsarrayref) = @_;
my $infoline;
my @newitemsarray = ();
for ( my $i = 0; $i <= $#{$itemsarrayref}; $i++ )
{
my $oneitem = ${$itemsarrayref}[$i];
my $styles = "";
if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; }
if ( $styles =~ /\bXPD_ONLY\b/ )
{
$infoline = "Removing \"xpd only\" item $oneitem->{'gid'} from the installation set.\n";
push( @installer::globals::globallogfileinfo, $infoline);
next;
}
push(@newitemsarray, $oneitem);
}
$infoline = "\n";
push( @installer::globals::globallogfileinfo, $infoline);
return \@newitemsarray;
}
############################################################################
# Removing all language pack files from installation set (files with
# the style LANGUAGEPACK), except this is a language pack.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment