diff options
| author | Vladimir Glazunov <vg@openoffice.org> | 2010-05-26 14:04:33 +0200 |
|---|---|---|
| committer | Vladimir Glazunov <vg@openoffice.org> | 2010-05-26 14:04:33 +0200 |
| commit | a67693196fa1efba50bcebf2019e2d3e256870a2 (patch) | |
| tree | 67852ce6516225a5c47b29f502ccd365718ba914 /solenv/bin/build.pl | |
| parent | fa35aefa9a0d93c37653e6db76076a758e5ebcf3 (diff) | |
#i111239# put html page in the log directory
Diffstat (limited to 'solenv/bin/build.pl')
| -rwxr-xr-x | solenv/bin/build.pl | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl index acc8f69d6614..a37edfa3d074 100755 --- a/solenv/bin/build.pl +++ b/solenv/bin/build.pl @@ -227,10 +227,18 @@ }; $StandDir = get_stand_dir(); # This also sets $initial_module $source_config = SourceConfig -> new($StandDir); - if (defined $html_path) { - $html_file = CorrectPath($html_path . '/' . $ENV{INPATH}. '.build.html'); - } else { - $html_file = CorrectPath($StandDir . '/../' . $ENV{INPATH}. '.build.html'); + + if ($html) { + if (defined $html_path) { + $html_file = CorrectPath($html_path . '/' . $ENV{INPATH}. '.build.html'); + } else { + my $log_directory = Cwd::realpath(CorrectPath($StandDir . '/../log')); + if ((!-d $log_directory) && (!mkdir($log_directory))) { + print_error("Cannot create $log_directory for writing html file\n"); + }; + $html_file = $log_directory . '/' . $ENV{INPATH}. '.build.html'; + print "\nPath to html status page: $html_file\n"; + }; }; if ($generate_config && ($clear_config || (scalar keys %remove_from_config)||(scalar keys %add_to_config))) { @@ -1255,7 +1263,7 @@ sub check_deps_hash { $jobs_hash{$key} = { SHORT_NAME => $string, BUILD_NUMBER => $build_number, STATUS => 'waiting', - LOG_PATH => $source_config->get_module_repository($module) . "/$module/$ENV{INPATH}/misc/logs/$log_name", + LOG_PATH => '../' . $source_config->get_module_repository($module) . "/$module/$ENV{INPATH}/misc/logs/$log_name", LONG_LOG_PATH => CorrectPath($module_paths{$module} . "/$ENV{INPATH}/misc/logs/$log_name"), START_TIME => 0, FINISH_TIME => 0, |