From d9d7c85b591baed37e5b670081cc08bef422de81 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Thu, 30 Aug 2012 17:29:00 +0200 Subject: LibreOffice installer does not use child projects Change-Id: Iee968a748406228c116bef26793d74d5712d1f13 --- solenv/bin/modules/installer.pm | 21 ---- solenv/bin/modules/installer/control.pm | 20 ---- solenv/bin/modules/installer/epmfile.pm | 76 ------------ solenv/bin/modules/installer/globals.pm | 1 - solenv/bin/modules/installer/windows/directory.pm | 3 +- solenv/bin/modules/installer/windows/idtglobal.pm | 134 ---------------------- solenv/bin/modules/installer/windows/msiglobal.pm | 21 ---- 7 files changed, 1 insertion(+), 275 deletions(-) (limited to 'solenv/bin') diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm index ebfae1a1b1c1..1e69b4afa3c3 100644 --- a/solenv/bin/modules/installer.pm +++ b/solenv/bin/modules/installer.pm @@ -240,7 +240,6 @@ sub main { # setting global variables #################################################################### - installer::control::set_addchildprojects($allvariableshashref); installer::control::set_addsystemintegration($allvariableshashref); ######################################################## @@ -514,7 +513,6 @@ sub main { if ( $installer::globals::languagepack ) { - $installer::globals::addchildprojects = 0; $installer::globals::addsystemintegration = 0; $installer::globals::addlicensefile = 0; $installer::globals::makedownload = 1; @@ -522,7 +520,6 @@ sub main { if ( $installer::globals::helppack ) { - $installer::globals::addchildprojects = 0; $installer::globals::addsystemintegration = 0; $installer::globals::addlicensefile = 0; $installer::globals::makedownload = 1; @@ -1359,9 +1356,6 @@ sub main { # Adding license and readme into installation set if ($installer::globals::addlicensefile) { installer::worker::put_scpactions_into_installset("."); } - # Adding child projects to installation dynamically - if ($installer::globals::addchildprojects) { installer::epmfile::put_childprojects_into_installset($installer::globals::epmoutpath, $allvariableshashref, $modulesinproductarrayref, $includepatharrayref); } - # Adding license file into setup if ( $allvariableshashref->{'PUT_LICENSE_INTO_SETUP'} ) { installer::worker::put_license_into_setup(".", $includepatharrayref); } @@ -1683,14 +1677,6 @@ sub main { installer::windows::idtglobal::addcustomactions($languageidtdir, $windowscustomactionsarrayref, $filesinproductlanguageresolvedarrayref); - # Adding child projects if specified - - if ($installer::globals::addchildprojects) - { - # Adding child projects to installation dynamically (also in feature table) - installer::windows::idtglobal::add_childprojects($languageidtdir, $filesinproductlanguageresolvedarrayref, $allvariableshashref); - } - # Then the language specific msi database can be created if ( $installer::globals::iswin || $installer::globals::packageformat eq 'msi' ) @@ -1746,13 +1732,6 @@ sub main { if ( ! $installer::globals::fix_number_of_cab_files ) { installer::windows::msiglobal::copy_merge_modules_into_installset($installdir); } - # ... copying the child projects - - if ($installer::globals::addchildprojects) - { - installer::windows::msiglobal::copy_child_projects_into_installset($installdir, $allvariableshashref); - } - installer::logger::print_message( "... creating ddf files ...\n" ); # Creating all needed ddf files and generating a list diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm index 45994b1d7cc0..bbb613a8caf7 100644 --- a/solenv/bin/modules/installer/control.pm +++ b/solenv/bin/modules/installer/control.pm @@ -478,26 +478,6 @@ sub check_oxtfiles } } -#################################################################### -# Setting global variable "$installer::globals::addchildprojects" -#################################################################### - -sub set_addchildprojects -{ - my ($allvariables) = @_; - - if (( $allvariables->{'UREPRODUCT'} ) || - ( $allvariables->{'ADDREQUIREDPACKAGES'} )) { $installer::globals::addchildprojects = 1; } - - if ( $installer::globals::patch ) - { - $installer::globals::addchildprojects = 0; # no child projects for patches - } - - my $infoline = "Value of \$installer::globals::addchildprojects: $installer::globals::addchildprojects\n"; - push( @installer::globals::globallogfileinfo, $infoline); -} - ####################################################################### # Setting global variable "$installer::globals::addsystemintegration" ####################################################################### diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm index 817b449cddbc..7425a780b77d 100644 --- a/solenv/bin/modules/installer/epmfile.pm +++ b/solenv/bin/modules/installer/epmfile.pm @@ -2698,43 +2698,6 @@ sub unpack_tar_gz_file return $packagename; } -###################################################### -# Copying files of child projects. -###################################################### - -sub copy_childproject_files -{ - my ($allmodules, $sopackpath, $destdir, $modulesarrayref, $allvariables, $subdir, $includepatharrayref, $use_sopackpath) = @_; - - for ( my $i = 0; $i <= $#{$allmodules}; $i++ ) - { - my $localdestdir = $destdir; - my $onemodule = ${$allmodules}[$i]; - my $packagename = $onemodule->{'PackageName'}; - my $sourcefile = ""; - if ( $use_sopackpath ) - { - $sourcefile = $sopackpath . $installer::globals::separator . $installer::globals::compiler . $installer::globals::separator . $subdir . $installer::globals::separator . $packagename; - } - else - { - my $sourcepathref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$packagename, $includepatharrayref, 1); - $sourcefile = $$sourcepathref; - } - - if ( ! -f $sourcefile ) { installer::exiter::exit_program("ERROR: File not found: $sourcefile ($packagename) !", "copy_childproject_files"); } - if ( $onemodule->{'Subdir'} ) - { - $localdestdir = $localdestdir . $installer::globals::separator . $onemodule->{'Subdir'}; - if ( ! -d $localdestdir ) { installer::systemactions::create_directory($localdestdir); } - } - 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); } - } - -} - ###################################################### # Copying files for system integration. ###################################################### @@ -2747,45 +2710,6 @@ sub copy_and_unpack_tar_gz_files make_systemcall($systemcall); } -###################################################### -# Including child packages into the -# installation set. -###################################################### - -sub put_childprojects_into_installset -{ - my ($newdir, $allvariables, $modulesarrayref, $includepatharrayref) = @_; - - my $infoline = ""; - - my $sopackpath = ""; - if ( $ENV{'SO_PACK'} ) { $sopackpath = $ENV{'SO_PACK'}; } - else { installer::exiter::exit_program("ERROR: Environment variable SO_PACK not set!", "put_childprojects_into_installset"); } - - my $destdir = "$newdir"; - - # adding Java - - my $sourcefile = ""; - - # Adding additional required packages (freetype). - # This package names are stored in global array @installer::globals::requiredpackages - - if ( $allvariables->{'ADDREQUIREDPACKAGES'} ) - { - # Collect all modules with flag "REQUIREDPACKAGEMODULE" - my $allmodules = collect_modules_with_style("REQUIREDPACKAGEMODULE", $modulesarrayref); - $allmodules = remove_modules_without_package($allmodules); - copy_childproject_files($allmodules, $sopackpath, $destdir, $modulesarrayref, $allvariables, "requiredpackages", $includepatharrayref, 1); - } - - # Collect all modules with flag "USERLANDMODULE" - my $alluserlandmodules = collect_modules_with_style("USERLANDMODULE", $modulesarrayref); - $alluserlandmodules = remove_modules_without_package($alluserlandmodules); - copy_childproject_files($alluserlandmodules, $sopackpath, $destdir, $modulesarrayref, $allvariables, "", $includepatharrayref, 0); - -} - ###################################################### # Checking whether the new content is a directory and # not a package. If it is a directory, the complete diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index 419a8e35b517..7473b31c4a74 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -262,7 +262,6 @@ BEGIN $is_copy_only_project = 0; $is_simple_packager_project = 0; $patch_user_dir = 0; - $addchildprojects = 0; $languagepack = 0; $helppack = 0; $patch = 0; diff --git a/solenv/bin/modules/installer/windows/directory.pm b/solenv/bin/modules/installer/windows/directory.pm index 7e9a9c077ac8..a9c34324e82e 100644 --- a/solenv/bin/modules/installer/windows/directory.pm +++ b/solenv/bin/modules/installer/windows/directory.pm @@ -252,8 +252,7 @@ sub check_sourcedir_addon { my ( $onedir, $allvariableshashref ) = @_; - if (($installer::globals::addchildprojects) || - ($installer::globals::patch) || + if (($installer::globals::patch) || ($installer::globals::languagepack) || ($installer::globals::helppack) || ($allvariableshashref->{'CHANGETARGETDIR'})) diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm b/solenv/bin/modules/installer/windows/idtglobal.pm index 650666bd33c2..325ce11a5d7c 100644 --- a/solenv/bin/modules/installer/windows/idtglobal.pm +++ b/solenv/bin/modules/installer/windows/idtglobal.pm @@ -1419,140 +1419,6 @@ sub include_subdir_into_componenttable } -################################################################################################ -# Including the content for the child installations -# into the tables: -# CustomAc.idt, InstallU.idt, Feature.idt -################################################################################################ - -sub add_childprojects -{ - my ($languageidtdir, $filesref, $allvariables) = @_; - - my $customactiontablename = $languageidtdir . $installer::globals::separator . "CustomAc.idt"; - my $customactiontable = installer::files::read_file($customactiontablename); - my $installuitablename = $languageidtdir . $installer::globals::separator . "InstallU.idt"; - my $installuitable = installer::files::read_file($installuitablename); - my $featuretablename = $languageidtdir . $installer::globals::separator . "Feature.idt"; - my $featuretable = installer::files::read_file($featuretablename); - my $directorytablename = $languageidtdir . $installer::globals::separator . "Director.idt"; - my $directorytable = installer::files::read_file($directorytablename); - my $componenttablename = $languageidtdir . $installer::globals::separator . "Componen.idt"; - my $componenttable = installer::files::read_file($componenttablename); - - my $infoline = ""; - my $line = ""; - - $installer::globals::urefile = installer::worker::return_first_item_with_special_flag($filesref ,"UREFILE"); - - if (( $installer::globals::urefile eq "" ) && ( $allvariables->{'UREPRODUCT'} )) { installer::exiter::exit_program("ERROR: No UREFILE found in files collector!", "add_childprojects"); } - - # Content for Directory table - # SystemFolder TARGETDIR . - - my $contains_systemfolder = 0; - - for ( my $i = 0; $i <= $#{$directorytable}; $i++ ) - { - if ( ${$directorytable}[$i] =~ /^\s*SystemFolder\t/ ) - { - $contains_systemfolder = 1; - last; - } - } - - if ( ! $contains_systemfolder ) - { - $line = "SystemFolder\tTARGETDIR\t\.\n"; - push(@{$directorytable}, $line); - installer::remover::remove_leading_and_ending_whitespaces(\$line); - $infoline = "Added $line into table $directorytablename\n"; - } - else - { - $infoline = "SystemFolder already exists in table $directorytablename\n"; - } - - push(@installer::globals::logfileinfo, $infoline); - - # Additional content for the directory table - # subjava INSTALLLOCATION program:java - # subure INSTALLLOCATION program:ure - - my $dirname = ""; - my $subjavadir = ""; - my $suburedir = ""; - - if ( $allvariables->{'UREPRODUCT'} ) - { - $dirname = get_directory_name_from_file($installer::globals::urefile); - $suburedir = include_subdirname_into_directory_table($dirname, $directorytable, $directorytablename, $installer::globals::urefile); - } - - # Content for the Component table - # The Java and Ada components have new directories - - if ( $allvariables->{'UREPRODUCT'} ) { include_subdir_into_componenttable($suburedir, $installer::globals::urefile, $componenttable); } - - # Content for CustomAction table - - if ( $allvariables->{'UREPRODUCT'} ) - { - $line = "InstallUre\t98\tSystemFolder\t$installer::globals::urefile->{'Subdir'}\\$installer::globals::urefile->{'Name'} /S\n"; - push(@{$customactiontable} ,$line); - installer::remover::remove_leading_and_ending_whitespaces(\$line); - $infoline = "Added $line into table $customactiontablename\n"; - push(@installer::globals::logfileinfo, $infoline); - } - - if ( $allvariables->{'UREPRODUCT'} ) - { - $line = "MaintenanceUre\t82\t$installer::globals::urefile->{'uniquename'}\t\/S\n"; - push(@{$customactiontable} ,$line); - installer::remover::remove_leading_and_ending_whitespaces(\$line); - $infoline = "Added $line into table $customactiontablename\n"; - push(@installer::globals::logfileinfo, $infoline); - } - - # Content for InstallUISequence table - - my $number = ""; - my $featurename = ""; - - if ( $allvariables->{'UREPRODUCT'} ) - { - $number = get_free_number_in_uisequence_table($installuitable) + 8; - $featurename = get_feature_name("_Ure", $featuretable); - if ( $featurename ) { $line = "InstallUre\t\&$featurename\=3 And Not Installed\t$number\n"; } - else { $line = "InstallUre\tNot Installed\t$number\n"; } # feature belongs to root - push(@{$installuitable} ,$line); - installer::remover::remove_leading_and_ending_whitespaces(\$line); - $infoline = "Added $line into table $installuitablename\n"; - push(@installer::globals::logfileinfo, $infoline); - } - - if ( $allvariables->{'UREPRODUCT'} ) - { - $number = get_free_number_in_uisequence_table($installuitable) + 10; - $featurename = get_feature_name("_Ure", $featuretable); - if ( $featurename ) { $line = "MaintenanceUre\t\&$featurename\=3 And Installed\t$number\n"; } - else { $line = "MaintenanceUre\tInstalled\t$number\n"; } # feature belongs to root - push(@{$installuitable} ,$line); - installer::remover::remove_leading_and_ending_whitespaces(\$line); - $infoline = "Added $line into table $installuitablename\n"; - push(@installer::globals::logfileinfo, $infoline); - } - - # Content for Feature table, better from scp (translation) - # gm_o_java gm_optional Java 1.4.2 Description 2 200 - - installer::files::save_file($customactiontablename, $customactiontable); - installer::files::save_file($installuitablename, $installuitable); - installer::files::save_file($featuretablename, $featuretable); - installer::files::save_file($directorytablename, $directorytable); - installer::files::save_file($componenttablename, $componenttable); -} - ################################################################## # Setting the encoding in all idt files. Replacing the # variable WINDOWSENCODINGTEMPLATE diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm index 0847d6e2bec6..243c4897a4f3 100644 --- a/solenv/bin/modules/installer/windows/msiglobal.pm +++ b/solenv/bin/modules/installer/windows/msiglobal.pm @@ -1211,27 +1211,6 @@ sub copy_merge_modules_into_installset } } -################################################################# -# Copying the child projects into the -# installation set -################################################################# - -sub copy_child_projects_into_installset -{ - my ($installdir, $allvariables) = @_; - - my $sourcefile = ""; - my $destdir = ""; - - if ( $allvariables->{'UREPRODUCT'} ) - { - $sourcefile = $installer::globals::urefile->{'sourcepath'}; - $destdir = $installdir . $installer::globals::separator . $installer::globals::urefile->{'Subdir'}; - if ( ! -d $destdir) { installer::systemactions::create_directory($destdir); } - installer::systemactions::copy_one_file($sourcefile, $destdir); - } -} - ################################################################# # Getting a list of GUID using uuidgen.exe. # This works only on Windows -- cgit