From 61cd94da602a9f0e62678f0a2f6276521461d24b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Mon, 6 Mar 2006 13:00:43 +0000 Subject: [PATCH] INTEGRATION: CWS native36 (1.58.20); FILE MERGED 2006/01/31 14:15:52 is 1.58.20.2: RESYNC: (1.58-1.59); FILE MERGED 2006/01/31 13:29:32 is 1.58.20.1: #i59187# allowing relative pathes in ddf files --- solenv/bin/make_installer.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl index 75f3174c9aff..b84c4e239e2c 100644 --- a/solenv/bin/make_installer.pl +++ b/solenv/bin/make_installer.pl @@ -4,9 +4,9 @@ # # $RCSfile: make_installer.pl,v $ # -# $Revision: 1.60 $ +# $Revision: 1.61 $ # -# last change: $Author: rt $ $Date: 2006-03-06 09:28:21 $ +# last change: $Author: rt $ $Date: 2006-03-06 14:00:43 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -1792,7 +1792,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) my $ddfdir = installer::systemactions::create_directories("ddf", $languagestringref); - $installer::globals::packjobref = installer::windows::msiglobal::generate_cab_file_list($filesinproductlanguageresolvedarrayref, $installdir, $ddfdir); + $installer::globals::packjobref = installer::windows::msiglobal::generate_cab_file_list($filesinproductlanguageresolvedarrayref, $installdir, $ddfdir, $allvariableshashref); # Update and patch reasons the pack order needs to be saved installer::windows::msiglobal::save_packorder($filesinproductlanguageresolvedarrayref); @@ -1817,7 +1817,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) if ( $installer::globals::iswin ) # only possible on a Windows platform { installer::logger::print_message( "... packaging installation set ... \n" ); - installer::windows::msiglobal::execute_packaging($installer::globals::packjobref, $loggingdir); + installer::windows::msiglobal::execute_packaging($installer::globals::packjobref, $loggingdir, $allvariableshashref); if ( $installer::globals::include_cab_in_msi ) { installer::windows::msiglobal::include_cabs_into_msi($installdir); } ####################################