summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2012-12-01 11:43:10 +0100
committerLuboš Luňák <l.lunak@suse.cz>2012-12-01 15:05:58 +0000
commitb30bfddc2b75aa5a540c4eadfc4f7eca90a8d67f (patch)
treed46ef117c238644be9dadf539a603f5f3d014597 /solenv
parent3066167ff05cc78ac21dbb9173264dda3f91550e (diff)
do not redirect output in build.pl, i.e. dump build_error.log and other logs
Given that nowadays almost everything builds inside tail_build, this feature is somewhat pointless, as this almost everything is in that one tail_build log. Moreover: - stdout is never a tty, breaking compiler output colorization - for some obscure reason I do not get, this makes 'make python3.all' work with msvc2010, whereas previously the invocation of MSBuild.exe somehow prevented the rest of make rules from running. Plain 'make python3' that does not go via build.pl works though. No idea if the problem is in gbuild, build.pl, cygwin, make, MSBuild.exe or somewhere else, Change-Id: Ibe6e11109e2eefaa65646071c2db01871e5e751f Reviewed-on: https://gerrit.libreoffice.org/1216 Reviewed-by: Luboš Luňák <l.lunak@suse.cz> Tested-by: Luboš Luňák <l.lunak@suse.cz>
Diffstat (limited to 'solenv')
-rwxr-xr-xsolenv/bin/build.pl31
1 files changed, 3 insertions, 28 deletions
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index c8e62ee91171..5893669723e1 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -1570,11 +1570,9 @@ sub cancel_build {
print STDERR " please re-run build inside each one to isolate the problem.\n";
} else {
print STDERR " it seems that the error is inside '$module', please re-run build\n";
- print STDERR " inside this module to isolate the error and/or test your fix:\n";
+ print STDERR " inside this module to isolate the error and/or test your fix.\n";
}
print STDERR "\n";
- print STDERR "build_error.log should contain the captured output of the failed module(s)\n";
- print STDERR "\n";
print STDERR "-----------------------------------------------------------------------\n";
print STDERR "To rebuild a specific module:\n";
print STDERR "\n";
@@ -1887,10 +1885,6 @@ sub run_job {
chdir $path;
getcwd();
- my $log_file = $jobs_hash{$registered_name}->{LONG_LOG_PATH};
-
- my $log_dir = File::Basename::dirname($log_file);
-
if ( $source_config->is_gbuild($jobs_hash{$registered_name}->{MODULE}) )
{
if ( $job eq 'deliver' )
@@ -1900,7 +1894,6 @@ sub run_job {
else
{
return 1 if (! $path =~ /prj$/ );
- mkpath("$workdir/Logs");
my $gbuild_flags = '-j' . $ENV{PARALLELISM};
my $gbuild_target = 'all slowcheck';
if ($registered_name =~ /tail_build\/prj$/ )
@@ -1916,26 +1909,8 @@ sub run_job {
print "gbuild module $make_path: $job_to_do\n";
}
}
- else
- {
- if (!-d $log_dir)
- {
- system("$perl $mkout");
- };
- }
- open (MAKE, "$job_to_do 2>&1 |") or return 8;
- open (LOGFILE, "> $log_file") or return 8;
- while (<MAKE>) { print LOGFILE $_; print $_ }
- close MAKE;
- $error_code = $?;
- close LOGFILE;
- if ( $error_code != 0)
- {
- system("echo \"log for $path\" >> $build_error_log");
- system("cat $log_file >> $build_error_log");
- }
-
- return $error_code;
+ system("$job_to_do");
+ return $?;
};
sub do_custom_job {