diff options
author | Vladimir Glazunov <vg@openoffice.org> | 2010-04-29 16:14:28 +0200 |
---|---|---|
committer | Vladimir Glazunov <vg@openoffice.org> | 2010-04-29 16:14:28 +0200 |
commit | cd3128953c0d364ee6a70ea9ab860d778a509c3e (patch) | |
tree | 1c1020ed2f06726bb9252376a16fe0a592b3668c /solenv/bin/build.pl | |
parent | 60458a1093d335264a11838bd4d0fa595e54924e (diff) |
#i111239# write html status file in the parent directory of the workspace modules
Diffstat (limited to 'solenv/bin/build.pl')
-rwxr-xr-x | solenv/bin/build.pl | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl index 6430cf33c755..b56745402c5d 100755 --- a/solenv/bin/build.pl +++ b/solenv/bin/build.pl @@ -167,8 +167,8 @@ $html_last_updated = 0; %jobs_hash = (); $html_path = undef; - $html_file = CorrectPath($ENV{SOLARSRC} . '/' . $ENV{INPATH}. '.build.html'); $build_finished = 0; + $html_file = ''; %had_error = (); # hack for misteriuos windows problems - try run dmake 2 times if first time there was an error $mkout = CorrectPath("$ENV{SOLARENV}/bin/mkout.pl"); %weights_hash = (); # hash contains info about how many modules are dependent from one module @@ -209,7 +209,6 @@ get_options(); - $html_file = CorrectPath($html_path . '/' . $ENV{INPATH}. '.build.html') if (defined $html_path); # my $temp_html_file = CorrectPath($tmp_dir. '/' . $ENV{INPATH}. '.build.html'); get_build_modes(); %deliver_env = (); @@ -225,12 +224,17 @@ $deliver_env{'OUTPATH'}++; $deliver_env{'L10N_framework'}++; }; + $StandDir = get_stand_dir(); # This also sets $initial_module + if (defined $html_path) { + $html_file = CorrectPath($html_path . '/' . $ENV{INPATH}. '.build.html'); + } else { + $html_file = CorrectPath($ENV{SOLARSRC} . '/../' . $ENV{INPATH}. '.build.html'); + }; if ($generate_config && ($clear_config || (scalar keys %remove_from_config)||(scalar keys %add_to_config))) { generate_config_file(); exit 0; } - $StandDir = get_stand_dir(); # This also sets $initial_module get_module_and_buildlist_paths(); provide_consistency() if (defined $ENV{CWS_WORK_STAMP} && defined($ENV{COMMON_ENV_TOOLS})); |