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

INTEGRATION: CWS socsprod_SRC680 (1.64.68); FILE MERGED

Browse source 
2006/08/15 15:54:43 abi 1.64.68.3: RESYNC: (1.64-1.67); FILE MERGED
2006/07/06 16:25:49 is 1.64.68.2: #137700# pdf converter detects office
2006/07/04 14:46:35 is 1.64.68.1: #137700# pdf converter product
This commit is contained in:
Ivo Hinkelmann 2006-08-28 10:20:50 +00:00
parent cbc17adfc8
commit 55566268b2
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
solenv/bin/make_installer.pl
View file

@ -4,9 +4,9 @@
#
# $RCSfile: make_installer.pl,v $
#
# $Revision: 1.67 $
# $Revision: 1.68 $
#
# last change: $Author: kz $ $Date: 2006-07-19 09:52:50 $
# last change: $Author: ihi $ $Date: 2006-08-28 11:20:50 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@ -668,7 +668,8 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles10c.log", $filesinproductlanguageresolvedarrayref); }
}
if ( ! $installer::globals::islanguagepackinunixmulti )
if (( ! $installer::globals::islanguagepackinunixmulti ) && ( ! $allvariableshashref->{'NO_README_IN_ROOTDIR'} ))
{
$filesinproductlanguageresolvedarrayref = installer::scriptitems::add_License_Files_into_Installdir($filesinproductlanguageresolvedarrayref, $languagesarrayref);
if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles10b.log", $filesinproductlanguageresolvedarrayref); }
@ -1735,7 +1736,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
# setting patch codes to detect installed products
if (( $installer::globals::patch ) || ( $installer::globals::languagepack )) { installer::windows::patch::update_patch_tables($languageidtdir, $allvariableshashref); }
if (( $installer::globals::patch ) || ( $installer::globals::languagepack ) || ( $allvariableshashref->{'PDFCONVERTER'} )) { installer::windows::patch::update_patch_tables($languageidtdir, $allvariableshashref); }
# Adding Windows Installer CustomActions