INTEGRATION: CWS c01v005 (1.21.14); FILE MERGED

2005/03/07 13:32:57 is 1.21.14.1: #119884# aol without adabas
This commit is contained in:
Oliver Bolte 2005-03-15 11:59:07 +00:00
parent 8f9c3f6e5e
commit 6253cee063

View file

@ -1478,7 +1478,7 @@ sub create_new_directory_structure
sub put_childprojects_into_installset
{
my ($newdir) = @_;
my ($newdir, $allvariables) = @_;
my $infoline = "";
@ -1492,34 +1492,40 @@ sub put_childprojects_into_installset
my $sourcefile = "";
if ( $installer::globals::javafilename ne "" )
if ( $allvariables->{'JAVAPRODUCT'} )
{
$sourcefile = $sopackpath . $installer::globals::separator . $installer::globals::compiler . $installer::globals::separator . "jre" . $installer::globals::separator . $installer::globals::javafilename;
if ( ! -f $sourcefile ) { installer::exiter::exit_program("ERROR: Java file not found: $sourcefile !", "put_childprojects_into_installset"); }
installer::systemactions::copy_one_file($sourcefile, $destdir);
}
if ( $installer::globals::javafilename ne "" )
{
$sourcefile = $sopackpath . $installer::globals::separator . $installer::globals::compiler . $installer::globals::separator . "jre" . $installer::globals::separator . $installer::globals::javafilename;
if ( ! -f $sourcefile ) { installer::exiter::exit_program("ERROR: Java file not found: $sourcefile !", "put_childprojects_into_installset"); }
installer::systemactions::copy_one_file($sourcefile, $destdir);
}
if ( $installer::globals::javafilename2 ne "" )
{
$sourcefile = $sopackpath . $installer::globals::separator . $installer::globals::compiler . $installer::globals::separator . "jre" . $installer::globals::separator . $installer::globals::javafilename2;
if ( ! -f $sourcefile ) { installer::exiter::exit_program("ERROR: Java file not found: $sourcefile !", "put_childprojects_into_installset"); }
installer::systemactions::copy_one_file($sourcefile, $destdir);
}
if ( $installer::globals::javafilename2 ne "" )
{
$sourcefile = $sopackpath . $installer::globals::separator . $installer::globals::compiler . $installer::globals::separator . "jre" . $installer::globals::separator . $installer::globals::javafilename2;
if ( ! -f $sourcefile ) { installer::exiter::exit_program("ERROR: Java file not found: $sourcefile !", "put_childprojects_into_installset"); }
installer::systemactions::copy_one_file($sourcefile, $destdir);
}
if ( $installer::globals::javafilename3 ne "" )
{
$sourcefile = $sopackpath . $installer::globals::separator . $installer::globals::compiler . $installer::globals::separator . "jre" . $installer::globals::separator . $installer::globals::javafilename3;
if ( ! -f $sourcefile ) { installer::exiter::exit_program("ERROR: Java file not found: $sourcefile !", "put_childprojects_into_installset"); }
installer::systemactions::copy_one_file($sourcefile, $destdir);
if ( $installer::globals::javafilename3 ne "" )
{
$sourcefile = $sopackpath . $installer::globals::separator . $installer::globals::compiler . $installer::globals::separator . "jre" . $installer::globals::separator . $installer::globals::javafilename3;
if ( ! -f $sourcefile ) { installer::exiter::exit_program("ERROR: Java file not found: $sourcefile !", "put_childprojects_into_installset"); }
installer::systemactions::copy_one_file($sourcefile, $destdir);
}
}
# adding Ada
if ( $installer::globals::adafilename ne "" )
if ( $allvariables->{'ADAPRODUCT'} )
{
$sourcefile = $sopackpath . $installer::globals::separator . $installer::globals::compiler . $installer::globals::separator . "adabas" . $installer::globals::separator . $installer::globals::adafilename;
if ( ! -f $sourcefile ) { installer::exiter::exit_program("ERROR: Ada file not found: $sourcefile !", "put_childprojects_into_installset"); }
installer::systemactions::copy_one_file($sourcefile, $destdir);
if ( $installer::globals::adafilename ne "" )
{
$sourcefile = $sopackpath . $installer::globals::separator . $installer::globals::compiler . $installer::globals::separator . "adabas" . $installer::globals::separator . $installer::globals::adafilename;
if ( ! -f $sourcefile ) { installer::exiter::exit_program("ERROR: Ada file not found: $sourcefile !", "put_childprojects_into_installset"); }
installer::systemactions::copy_one_file($sourcefile, $destdir);
}
}
# unpacking and removing the ada tar.gz file