diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:58:44 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:58:44 +0100 |
| commit | 5f08d6e5a4383db99a1ed314181b594a338200dc (patch) | |
| tree | 12fda47cee050e541880785f349cb98438ce1972 /solenv/bin/build.pl | |
| parent | faae793ae86558e42f948b89920665be402db1f8 (diff) | |
| parent | e3511dc343c944530c6c48e6990b4f4f8d522535 (diff) | |
Merge commit 'ooo/DEV300_m103'
Conflicts:
configure
configure.in
instsetoo_native/util/openoffice.lst
set_soenv.in
solenv/bin/cws.pl
solenv/bin/modules/installer/simplepackage.pm
solenv/gbuild/LinkTarget.mk
solenv/gbuild/extensions/post_PackModule.mk
solenv/gbuild/platform/linux.mk
solenv/gbuild/platform/macosx.mk
solenv/gbuild/platform/windows.mk
solenv/inc/installationtest.mk
solenv/inc/minor.mk
soltools/cpp/_eval.c
Diffstat (limited to 'solenv/bin/build.pl')
| -rwxr-xr-x | solenv/bin/build.pl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl index 995214217269..a840923b6e0f 100755 --- a/solenv/bin/build.pl +++ b/solenv/bin/build.pl @@ -2051,6 +2051,10 @@ sub do_custom_job { $error_code = run_job($job, $module_paths{$module}, $module_job); }; }; + if ($error_code && $ignore) { + push(@ignored_errors, $module_job); + $error_code = 0; + }; if ($error_code) { $modules_with_errors{$dependencies_hash}++; # $broken_build{$module_job} = $error_code; @@ -2285,7 +2289,7 @@ sub retrieve_build_list { my $old_fh = select(STDOUT); # Try to get global depencies from solver's build.lst if such exists - my $solver_inc_dir = "$ENV{SOLARVER}/$ENV{INPATH}"; + my $solver_inc_dir = "$ENV{SOLARVER}/$ENV{OUTPATH}"; $solver_inc_dir .= $ENV{PROEXT} if (defined $ENV{PROEXT}); $solver_inc_dir .= '/inc'; $solver_inc_dir .= $ENV{UPDMINOREXT} if (defined $ENV{UPDMINOREXT}); |