# HG changeset patch
# User Dario Sestito <darios@symbian.org>
# Date 1249910675 -3600
# Node ID 6661369591af845fac99a0e24d561ad62254ade1
# Parent  d6975a94a89302d67df5ec05620a5c5142800a95
Build console output must be redirected to file but must also go to console

diff -r d6975a94a893 -r 6661369591af build_package.pl
--- a/build_package.pl	Mon Aug 10 12:46:22 2009 +0100
+++ b/build_package.pl	Mon Aug 10 14:24:35 2009 +0100
@@ -168,8 +168,17 @@
 my $sProjectArg = "-Dsf.project.repo=$sFbfProjectRepo";
 $sProjectArg .= " -Dsf.project.rev=$sFbfProjectRev" if ($sFbfProjectRev);
 $sProjectArg = "-Dsf.project.dir=$sFbfProjectDir" if ($sFbfProjectDir);
-print("hlm -f bootstrap.xml $sConfigArg $sProjectArg -Dsf.target.dir=$sJobDir\n");
-system("hlm -f bootstrap.xml $sConfigArg $sProjectArg -Dsf.target.dir=$sJobDir >console_bootstrap_$$.txt 2>&1");
+my $sBootstrapCmd = "hlm -f bootstrap.xml $sConfigArg $sProjectArg -Dsf.target.dir=$sJobDir";
+print("$sBootstrapCmd\n");
+open(LOG, ">console_bootstrap_$$.txt")
+open(PIPE, "$sBootstrapCmd 2>&1 |");
+while(<PIPE>)
+{
+	print LOG $_;
+	print $_;
+}
+close(PIPE);
+close(LOG);
 
 # check that $sNUMBERS_FILE exists, otherwise create it
 if (!-f $sNUMBERS_FILE)
@@ -230,12 +239,30 @@
 print("cd $sJobDir\\sf-config\n");
 chdir("$sJobDir\\sf-config");
 print "###### BUILD PREPARATION ######\n";
-print("hlm sf-prep -Dsf.project.type=package $sSubProjArg -Dsf.spec.job.number=$nJobNumber -Dsf.spec.job.drive=$sDriveLetter: $sTestBuildOpt $sNoPublishOpt $sJobRootDirArg\n");
-system("hlm sf-prep -Dsf.project.type=package $sSubProjArg -Dsf.spec.job.number=$nJobNumber -Dsf.spec.job.drive=$sDriveLetter: $sTestBuildOpt $sNoPublishOpt $sJobRootDirArg >console_sfprep_$$.txt 2>&1");
+my $sPreparationCmd = "hlm sf-prep -Dsf.project.type=package $sSubProjArg -Dsf.spec.job.number=$nJobNumber -Dsf.spec.job.drive=$sDriveLetter: $sTestBuildOpt $sNoPublishOpt $sJobRootDirArg";
+print("$sPreparationCmd\n");
+open(LOG, ">console_sfprep_$$.txt")
+open(PIPE, "$sPreparationCmd 2>&1 |");
+while(<PIPE>)
+{
+	print LOG $_;
+	print $_;
+}
+close(PIPE);
+close(LOG);
 
 print "###### EXECUTE BUILD ######\n";
-print("hlm sf-build-all -Dsf.project.type=package $sSubProjArg -Dsf.spec.job.number=$nJobNumber -Dsf.spec.job.drive=$sDriveLetter: $sTestBuildOpt $sNoPublishOpt $sJobRootDirArg\n");
-system("hlm sf-build-all -Dsf.project.type=package $sSubProjArg -Dsf.spec.job.number=$nJobNumber -Dsf.spec.job.drive=$sDriveLetter: $sTestBuildOpt $sNoPublishOpt $sJobRootDirArg >console_sfbuildall_$$.txt 2>&1");
+my $sBuildallCmd = "hlm sf-build-all -Dsf.project.type=package $sSubProjArg -Dsf.spec.job.number=$nJobNumber -Dsf.spec.job.drive=$sDriveLetter: $sTestBuildOpt $sNoPublishOpt $sJobRootDirArg";
+print("$sBuildallCmd\n");
+open(LOG, ">console_sfbuildall_$$.txt")
+open(PIPE, "$sBuildallCmd 2>&1 |");
+while(<PIPE>)
+{
+	print LOG $_;
+	print $_;
+}
+close(PIPE);
+close(LOG);
 
 # copy console outputs to remote log archive
 if (-d "$sREMOTE_LOG_ARCHIVE\\$sPackage\\builds\\$sPlatform\\$sPackage\_$sPlatform.$nJobNumber\\logs")