[Libreoffice-commits] .: Branch 'tinderbox' - 2 commits - local_conf/Error_Parse.pm local_conf/TreeData.pm
Christian Lohmaier
cloph at kemper.freedesktop.org
Mon Dec 6 06:37:10 PST 2010
local_conf/Error_Parse.pm | 5 ++
local_conf/TreeData.pm | 97 ++++++++++++++++++++++------------------------
2 files changed, 53 insertions(+), 49 deletions(-)
New commits:
commit c0318f8e9d395a4efd922cdfd5735d9f571fb6b9
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date: Mon Dec 6 15:34:57 2010 +0100
around 150 bogus errors caused by "exception filenames" (mostly boost)
diff --git a/local_conf/Error_Parse.pm b/local_conf/Error_Parse.pm
index b79b4a1..8ae1621 100644
--- a/local_conf/Error_Parse.pm
+++ b/local_conf/Error_Parse.pm
@@ -272,6 +272,11 @@ sub line_type {
($line =~ m#^\s*\[echo\]\s*Log4j 1\.2 not found: Cannot Build Log4JLogger#) ||
($line =~ m#^\s*\[echo\]\s*LogKit not found: Cannot Build LogKitLogger#) ||
($line =~ m#^\s*\[echo\]\s*Avalon-Framework not found: Cannot Build AvalonLogger#) ||
+ # some more filenames that cause a false trigger
+ ($line =~ m#^/bin/sh \.\./\.\./libtool --tag=CXX.*DynamicLibraryManagerException\.lo Exception\.lo#) ||
+ ($line =~ m#^boost_1_39_0/(boost(/tr1/tr1(/sun)?)?|libs(/unordered/test)?)/exception/#) ||
+ ($line =~ m#^commons-lang-2\.3-src/src/(java|test)/org/apache/commons/lang/exception/#) ||
+ ($line =~ m#^commons-httpclient-3\.1/docs/exception-handling\.html#) ||
0);
commit 8d0435add6f68b8afa19f98ac23e867cc064528f
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date: Mon Dec 6 15:08:01 2010 +0100
OOO3[3-9] is in hg / tab vs whitespace
diff --git a/local_conf/TreeData.pm b/local_conf/TreeData.pm
index 076ae46..566480b 100644
--- a/local_conf/TreeData.pm
+++ b/local_conf/TreeData.pm
@@ -245,67 +245,65 @@ $VERSION = '#tinder_version#';
);
my %count_trees_by_master = ();
-sub addTreesFromFile($)
-{
+sub addTreesFromFile($) {
my $FileName = shift;
my $group = 'new'; #default group
my $cwsstate = 'Open'; #default state
if ($FileName =~ /qa/ or $FileName =~ /master/) {
- $group = 'ready_for_QA';
- $cwsstate = 'Closed';
+ $group = 'ready_for_QA';
+ $cwsstate = 'Closed';
} elsif ($FileName =~ /approved/) {
- $group = 'approved';
- $cwsstate = 'Restricted';
+ $group = 'approved';
+ $cwsstate = 'Restricted';
} elsif ($FileName =~ /nominated/) {
- $group = 'nominated';
- $cwsstate = 'Metered';
+ $group = 'nominated';
+ $cwsstate = 'Metered';
}
my $OtherTrees;
if (open ($OtherTrees, $FileName)) {
while (<$OtherTrees>) {
- /^\#/ && next;
- chomp;
- my $tree;
- my $master;
- my $codeline;
- my $branch;
- my ($modules, $new_modules, $vcs);
- my $svnurl = 'svn://svn.services.openoffice.org/ooo';
- ($tree, $master, $branch, $modules, $new_modules, $vcs) = split(/\s*:\s*/);
-# $tree =~ s/\s*:.*//g;
-# print STDERR "Add tree '$tree' from file $FileName\n";
- next if $tree eq "";
- if ($tree =~ /^[A-Z]+/) {
- $svnurl=$svnurl."/tags/".$tree;
- $vcs='SVN' if ($tree =~ /^OOO3[2-9]/ || $tree =~ /^DEV/); # assume svn for all milestones
- # DEV300_m64 and later, OOO320_m13 and later in hg
- my $treenum =$tree;
- $vcs='HG' if ( ($treenum =~ s/^DEV300_m//) && ($treenum >= 64));
- $vcs='HG' if ( ($treenum =~ s/^OOO320_m//) && ($treenum >= 13));
- } else {
- $svnurl=$svnurl."/cws/".$tree;
- }
- # untaint the svnurl
- if ($svnurl =~ m%^(svn://svn.services.openoffice.org/ooo/(tags|cws)/([-\w]+))$% ) {
- $svnurl=$1;
- } else {
- die "Bad data in '$svnurl'"; # log this somewhere
- }
-
- $codeline = $master;
- $codeline =~ s/_.*//;
- #svnbackup $VC_TREE{$tree} = { root => '/home/ooweb/cvsup',
- $VC_TREE{$tree} = { root => $svnurl,
- module => 'all',
- codeline => $codeline,
- cwsstate => $cwsstate,
- branch => $branch };
- $VC_TREE{$tree}{'VCS'} = $vcs if (defined $vcs);
- # add the tree to the treegroup (creates seperate summaries)
- $VC_TREE_GROUPS{$group}{$tree} = 1;
- $count_trees_by_master{$master}{$tree} = 1;
+ /^\#/ && next;
+ chomp;
+ my $tree;
+ my $master;
+ my $codeline;
+ my $branch;
+ my ($modules, $new_modules, $vcs);
+ my $svnurl = 'svn://svn.services.openoffice.org/ooo';
+ ($tree, $master, $branch, $modules, $new_modules, $vcs) = split(/\s*:\s*/);
+ next if $tree eq "";
+ if ($tree =~ /^[A-Z]+/) {
+ $svnurl=$svnurl."/tags/".$tree;
+ $vcs='SVN' if ($tree =~ /^OOO32/ || $tree =~ /^DEV/); # assume svn for all milestones
+ # DEV300_m64 and later, OOO320_m13 and later in hg
+ my $treenum =$tree;
+ $vcs='HG' if ( ($treenum =~ s/^DEV300_m//) && ($treenum >= 64));
+ $vcs='HG' if ( ($treenum =~ s/^OOO320_m//) && ($treenum >= 13));
+ $vcs='HG' if ( $treenum =~ s/^OOO3[3-9][0-9]_m//);
+ } else {
+ $svnurl=$svnurl."/cws/".$tree;
+ }
+ # untaint the svnurl
+ if ($svnurl =~ m%^(svn://svn.services.openoffice.org/ooo/(tags|cws)/([-\w]+))$% ) {
+ $svnurl=$1;
+ } else {
+ die "Bad data in '$svnurl'"; # log this somewhere
+ }
+
+ $codeline = $master;
+ $codeline =~ s/_.*//;
+ #svnbackup $VC_TREE{$tree} = { root => '/home/ooweb/cvsup',
+ $VC_TREE{$tree} = { root => $svnurl,
+ module => 'all',
+ codeline => $codeline,
+ cwsstate => $cwsstate,
+ branch => $branch };
+ $VC_TREE{$tree}{'VCS'} = $vcs if (defined $vcs);
+ # add the tree to the treegroup (creates seperate summaries)
+ $VC_TREE_GROUPS{$group}{$tree} = 1;
+ $count_trees_by_master{$master}{$tree} = 1;
}
close ($OtherTrees);
}
@@ -555,3 +553,4 @@ sub VCName2MailAddress {
}
1;
+# vim: set ts=4 sw=4 et :
More information about the Libreoffice-commits
mailing list