msiglobal.pm (fb67933c) msiglobal.pm (d1fa6344)
1#**************************************************************
2#
3# Licensed to the Apache Software Foundation (ASF) under one
4# or more contributor license agreements. See the NOTICE file
5# distributed with this work for additional information
6# regarding copyright ownership. The ASF licenses this file
7# to you under the Apache License, Version 2.0 (the
8# "License"); you may not use this file except in compliance

--- 159 unchanged lines hidden (view full) ---

168
169 if (( $installer::globals::fix_number_of_cab_files ) && ( $installer::globals::updatedatabase ))
170 {
171 my $sequenceorder = get_sequenceorder($filesref);
172
173 my $counter = 1;
174 my $currentcabfile = "";
175
1#**************************************************************
2#
3# Licensed to the Apache Software Foundation (ASF) under one
4# or more contributor license agreements. See the NOTICE file
5# distributed with this work for additional information
6# regarding copyright ownership. The ASF licenses this file
7# to you under the Apache License, Version 2.0 (the
8# "License"); you may not use this file except in compliance

--- 159 unchanged lines hidden (view full) ---

168
169 if (( $installer::globals::fix_number_of_cab_files ) && ( $installer::globals::updatedatabase ))
170 {
171 my $sequenceorder = get_sequenceorder($filesref);
172
173 my $counter = 1;
174 my $currentcabfile = "";
175
176 while ( ( exists($sequenceorder->{$counter}) ) || ( exists($installer::globals::allmergemodulefilesequences{$counter}) ) ) # Taking care of files from merge modules
176 while ( exists($sequenceorder->{$counter}) )
177 {
177 {
178# if ( exists($installer::globals::allmergemodulefilesequences{$counter}) )
179# {
180# # Skipping this sequence, it is not included in $filesref, because it is assigned to a file from a merge module.\n";
181# $counter++;
182# next;
183# }
184
185 my $onefile = ${$filesref}[$sequenceorder->{$counter}];
186 $counter++;
187
188 my $cabinetfile = $onefile->{'cabinet'};
189 my $sourcepath = $onefile->{'sourcepath'};
190 if ( $^O =~ /cygwin/i ) { $sourcepath = $onefile->{'cyg_sourcepath'}; }
191 my $uniquename = $onefile->{'uniquename'};
192

--- 1051 unchanged lines hidden (view full) ---

1244
1245 $destfile = $installdir . $installer::globals::separator . $destfile;
1246
1247 installer::systemactions::copy_one_file($$sourcefileref, $destfile);
1248 }
1249}
1250
1251#################################################################
178 my $onefile = ${$filesref}[$sequenceorder->{$counter}];
179 $counter++;
180
181 my $cabinetfile = $onefile->{'cabinet'};
182 my $sourcepath = $onefile->{'sourcepath'};
183 if ( $^O =~ /cygwin/i ) { $sourcepath = $onefile->{'cyg_sourcepath'}; }
184 my $uniquename = $onefile->{'uniquename'};
185

--- 1051 unchanged lines hidden (view full) ---

1237
1238 $destfile = $installdir . $installer::globals::separator . $destfile;
1239
1240 installer::systemactions::copy_one_file($$sourcefileref, $destfile);
1241 }
1242}
1243
1244#################################################################
1252# Copying MergeModules for the Windows installer into the
1253# installation set. The list of MergeModules is located
1254# in %installer::globals::copy_msm_files
1255#################################################################
1256
1257sub copy_merge_modules_into_installset
1258{
1259 my ($installdir) = @_;
1260
1261 installer::logger::include_header_into_logfile("Copying Merge files into installation set");
1262
1263 my $cabfile;
1264 foreach $cabfile ( keys %installer::globals::copy_msm_files )
1265 {
1266 my $sourcefile = $installer::globals::copy_msm_files{$cabfile};
1267 my $destfile = $installdir . $installer::globals::separator . $cabfile;
1268
1269 installer::systemactions::copy_one_file($sourcefile, $destfile);
1270 }
1271}
1272
1273#################################################################
1274# Copying the child projects into the
1275# installation set
1276#################################################################
1277
1278sub copy_child_projects_into_installset
1279{
1280 my ($installdir, $allvariables) = @_;
1281

--- 952 unchanged lines hidden --- 		1245# Copying the child projects into the
1246# installation set
1247#################################################################
1248
1249sub copy_child_projects_into_installset
1250{
1251 my ($installdir, $allvariables) = @_;
1252

--- 952 unchanged lines hidden ---