From ec612eea8101b3106a92ff47b5b1400f86847701 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Tue, 6 Jul 2004 14:00:03 +0000 Subject: [PATCH] INTEGRATION: CWS nativesmoker (1.2.50); FILE MERGED 2004/06/30 17:34:17 is 1.2.50.1: #i30826# removing content of output tree Issue number: Submitted by: Reviewed by: --- solenv/bin/modules/installer/strip.pm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/solenv/bin/modules/installer/strip.pm b/solenv/bin/modules/installer/strip.pm index b7ebc0989a51..8ac6c2b614b2 100644 --- a/solenv/bin/modules/installer/strip.pm +++ b/solenv/bin/modules/installer/strip.pm @@ -2,9 +2,9 @@ # # $RCSfile: strip.pm,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: svesik $ $Date: 2004-04-20 12:30:42 $ +# last change: $Author: rt $ $Date: 2004-07-06 15:00:03 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -63,6 +63,7 @@ package installer::strip; use installer::converter; +use installer::existence; use installer::globals; use installer::logger; use installer::pathanalyzer; @@ -126,8 +127,12 @@ sub strip_libraries installer::logger::include_header_into_logfile("Stripping files:"); - my $strippeddirbase = installer::systemactions::create_directories("stripped", ""); - $strippeddirbase = installer::converter::make_path_conform($strippeddirbase); + my $strippeddirbase = installer::systemactions::create_directories("stripped", $languagestringref); + + if (! installer::existence::exists_in_array($strippeddirbase, \@installer::globals::removedirs)) + { + push(@installer::globals::removedirs, $strippeddirbase); + } for ( my $i = 0; $i <= $#{$filelist}; $i++ ) {