diff options
Diffstat (limited to 'solenv/bin/modules/installer/simplepackage.pm')
| -rw-r--r-- | solenv/bin/modules/installer/simplepackage.pm | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index 5eb3345e854d..93c4e6e0d0cf 100644 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -47,12 +47,8 @@ sub check_simple_packager_project $installer::globals::is_simple_packager_project = 1; $installer::globals::patch_user_dir = 1; } - elsif( $installer::globals::packageformat eq "archive" ) - { - $installer::globals::is_simple_packager_project = 1; - $installer::globals::record_archive_metadata = 1; - } - elsif( $installer::globals::packageformat eq "dmg" ) + elsif(( $installer::globals::packageformat eq "archive" ) || + ( $installer::globals::packageformat eq "dmg" ) ) { $installer::globals::is_simple_packager_project = 1; } @@ -616,9 +612,6 @@ sub create_simple_package # stripping files ?! if (( $installer::globals::strip ) && ( ! $installer::globals::iswindowsbuild )) { strip_libraries($filesref, $languagestringref); } - my @archive_metadata_skip; - my @archive_metadata_cond; - # copy Files installer::logger::print_message( "... copying files ...\n" ); installer::logger::include_header_into_logfile("Copying files:"); @@ -669,18 +662,6 @@ sub create_simple_package } } } - - if ($installer::globals::record_archive_metadata) - { - if ($onefile->{'Styles'} =~ /\b(ASSEMBLY|ASSIGNCOMPONENT|FONT)\b/) - { - push(@archive_metadata_skip, $onefile->{'destination'}); - } - elsif ($onefile->{'modules'} =~ /^gid_Module_(Langpack|Optional)_/) - { - push(@archive_metadata_cond, $onefile->{'destination'}); - } - } } # creating Links @@ -749,14 +730,6 @@ sub create_simple_package create_package($installdir, $installdir, $packagename, $allvariables, $includepatharrayref, $languagestringref, ".dmg"); } - if ($installer::globals::record_archive_metadata) - { - open(HANDLE, '>', "$installer::globals::csp_installdir/../metadata") or die $!; - print HANDLE "skip $_\n" foreach (sort(@archive_metadata_skip)); - print HANDLE "cond $_\n" foreach (sort(@archive_metadata_cond)); - close HANDLE; - } - # Analyzing the log file installer::worker::clean_output_tree(); # removing directories created in the output tree |