strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS native36 (1.58.20); FILE MERGED

Browse source 
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
This commit is contained in:
Rüdiger Timm 2006-03-06 13:00:43 +00:00
parent 5888692af0
commit 61cd94da60
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
solenv/bin/make_installer.pl
View file

@ -4,9 +4,9 @@
# #
# $RCSfile: make_installer.pl,v $ # $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 Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1. # 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); 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 # Update and patch reasons the pack order needs to be saved
installer::windows::msiglobal::save_packorder($filesinproductlanguageresolvedarrayref); 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 if ( $installer::globals::iswin ) # only possible on a Windows platform
{ {
installer::logger::print_message( "... packaging installation set ... \n" ); 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); } if ( $installer::globals::include_cab_in_msi ) { installer::windows::msiglobal::include_cabs_into_msi($installdir); }
#################################### ####################################