From 2f7bbfce23411fa42725111def89da4be4374ad2 Mon Sep 17 00:00:00 2001 From: "Matthias Huetsch [mhu]" Date: Fri, 18 Jun 2010 19:00:23 +0200 Subject: Update from master repository (DEV300_m82). --- solenv/bin/build.pl | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'solenv/bin/build.pl') diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl index 66afeec6e2c7..e219285e4212 100755 --- a/solenv/bin/build.pl +++ b/solenv/bin/build.pl @@ -2021,6 +2021,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} = $error_code; -- cgit From 57b245f1404069a83a6bde188c88073ab16f3cba Mon Sep 17 00:00:00 2001 From: "Matthias Huetsch [mhu]" Date: Mon, 24 Jan 2011 16:48:05 +0100 Subject: build.pl: fixed ignore errors case. --- solenv/bin/build.pl | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 solenv/bin/build.pl (limited to 'solenv/bin/build.pl') diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl old mode 100644 new mode 100755 -- cgit From 53d0a1320aab1cf761ae512a8da4451e059a9ea7 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Wed, 23 Feb 2011 17:08:45 +0100 Subject: masterfix DEV300: #i10000# INPATH -> OUTPATH --- solenv/bin/build.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'solenv/bin/build.pl') diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl index ad4df2173516..d9befd75d575 100755 --- a/solenv/bin/build.pl +++ b/solenv/bin/build.pl @@ -2237,7 +2237,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}); -- cgit