bin/get-latest-master.pl | 143 ---------------------------------------------- bin/get-taglists.pl | 39 ------------ bin/tinderupdate.sh | 2 lib/TinderDB/VC_OOo.pm | 15 ---- local_conf/Error_Parse.pm | 21 ++++++ local_conf/TreeData.pm | 103 +++++---------------------------- 6 files changed, 37 insertions(+), 286 deletions(-)
New commits: commit 0661bfa636e93d73fdb9c8a1eb47c48a286080de Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> Date: Wed Dec 14 19:09:11 2011 +0100 add some more false positives diff --git a/local_conf/Error_Parse.pm b/local_conf/Error_Parse.pm index ee6e232..fcfe5ae 100644 --- a/local_conf/Error_Parse.pm +++ b/local_conf/Error_Parse.pm @@ -275,10 +275,31 @@ sub line_type { # 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#^boost_1_44_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#) || # annoying configure messages ($line =~ m#^checking (if|whether).*/bin/rm: cannot remove `conftest\*´: No such file or directory$#) || + ($line =~ m#^checking for -Bsymbolic-functions linker support \.\.\. not found#) || + # gettext related + ($line =~ m#^checking where term(info|cap) library functions come from\.\.\. not found, consider installing GNU ncurses#) || + ($line =~ m#^ CC (error-progname|fatal-signal).lo#) || + ($line =~ m#^ CCLD (gdbus-)?error#) || + # libgsf related + ($line =~ m#^configure: WARNING: thumbnailer will not be built, unable to find gconftool-2#) || + # rules in instsetoo_native/util/makefile.mk + ($line =~ m#^dmake: makefile\.mk: line (222|277): Warning: -- Prior to dmake 4\.5 only one#) || + # odk - subclass copying where no subclass exists + ($line =~ m#^cp: .*/class/com/sun/star/lib/loader/WinRegKey(Exception)?\$\*\.class'?: No such file or directory#) || + # gbuildified modules - filenames + ($line =~ m#^\[ build IDL \] udkapi/com/sun/star/uno/Exception\.urd#) || + # gentoo-box + ($line =~ m#^checking dynamic linker characteristics\.\.\. cat: ld\.so\.conf\.d/\*\.conf: No such file or directory#) || + ($line =~ m#^((\.\./)?\.)?\./libtool: line [0-9]+: cd: \.\./lib: No such file or directory#) || + # SuSE box + ($line =~ m#\.\./\.\./dist/include/xpcom_obsolete/nsFileStream\.h: In member function 'PRBool nsErrorProne::failed\(\) const':$#) || + # system-libs + ($line =~ m#^Therefore the version provided here does not need to be built in addition\.#) || 0); commit 30a6484aa57db139c699bcb2b020df73cef381db Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> Date: Wed Dec 14 16:30:02 2011 +0100 no need for grouping by cws-status anymore, create LibreOffice group instead diff --git a/local_conf/TreeData.pm b/local_conf/TreeData.pm index 9551abc..dd99d52 100644 --- a/local_conf/TreeData.pm +++ b/local_conf/TreeData.pm @@ -226,11 +226,23 @@ $VERSION = '#tinder_version#'; branch => 'trunk', }, 'MASTER' => { - root => 'git://anongit.freedesktop.org/git/libreoffice/bootstrap', + root => 'git://anongit.freedesktop.org/git/libreoffice/core', module => 'all', branch => 'master', VCS => 'GIT', }, + 'libreoffice-3-5' => { + root => 'git://anongit.freedesktop.org/git/libreoffice/core', + module => 'all', + branch => 'libreoffice-3-5', + VCS => 'GIT', + }, + 'libreoffice-3-4' => { + root => 'git://anongit.freedesktop.org/git/libreoffice/core', + module => 'all', + branch => 'libreoffice-3-4', + VCS => 'GIT', + }, ); # We group trees into sets so that individual managers can get a page @@ -250,96 +262,13 @@ $VERSION = '#tinder_version#'; # }, ); -my %count_trees_by_master = (); -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'; - } elsif ($FileName =~ /approved/) { - $group = 'approved'; - $cwsstate = 'Restricted'; - } elsif ($FileName =~ /nominated/) { - $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*/); - 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); - } -} - -# create default groups, to have the status pages cleared when there are no entries -%{$VC_TREE_GROUPS{'new'}}=(); -%{$VC_TREE_GROUPS{'ready_for_QA'}}=(); -%{$VC_TREE_GROUPS{'approved'}}=(); -%{$VC_TREE_GROUPS{'nominated'}}=(); -addTreesFromFile("/srv/www/tinderbox.libreoffice.org/tags/tag-list-qa"); -addTreesFromFile("/srv/www/tinderbox.libreoffice.org/tags/tag-list-new"); -addTreesFromFile("/srv/www/tinderbox.libreoffice.org/tags/tag-list-approved"); -addTreesFromFile("/srv/www/tinderbox.libreoffice.org/tags/tag-list-nominated"); -addTreesFromFile("/srv/www/tinderbox.libreoffice.org/tags/tag-latest-master-list"); -addTreesFromFile("/srv/www/tinderbox.libreoffice.org/tags/temp-list"); # We always want there to be one summary pages showing all trees. - foreach $tree (keys %VC_TREE) { $VC_TREE_GROUPS{'all_trees'}{$tree} =1; + $VC_TREE_GROUPS{'LibreOffice'}{$tree} =1; } -## add summaries for master-milestones with at least 3 cws, create -## the group "other_milestones" for the rest -foreach $master (keys %count_trees_by_master) { - my $group = "other_milestones"; - $group = $master if ( (keys %{$count_trees_by_master{$master}}) >= 3); - foreach $tree (keys %{$count_trees_by_master{$master}}) { - $VC_TREE_GROUPS{$group}{$tree}=1; - } -} +# remove HEAD (pseudo tree (ab)used for bookkeeping of build-stats) +delete($VC_TREE_GROUPS{'LibreOffice'}{'HEAD'}); # what to append to a user name from the VC system to turn it into a # mail address. The Mozilla/Netscape people do not need this because commit 3611312ce1d71a22968e83326a70875e42ff029e Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> Date: Wed Dec 14 16:25:30 2011 +0100 no need for double checking info no longer queried diff --git a/lib/TinderDB/VC_OOo.pm b/lib/TinderDB/VC_OOo.pm index af20ca2..f41c8bb 100644 --- a/lib/TinderDB/VC_OOo.pm +++ b/lib/TinderDB/VC_OOo.pm @@ -101,8 +101,6 @@ $VC_BUGNUM_REGEXP = $TinderConfig::VC_BUGNUM_REGEXP || '(\d\d\d+)'; $NOTICE = TinderDB::Notice->new(); $DEBUG = 1; -my %SVNTREES = (); - sub parse_svn_time { # convert svn times into unix times. # timestamp is passed in as "2005-06-02 01:38:15 -0400 (Thu, 02 Jun 2005)" @@ -472,15 +470,6 @@ sub apply_db_updates { my ($self, $tree,) = @_; - unless (%SVNTREES) { - # create list of cws tracked in svn - #print "getting trees tracked in svn\n"; - my @svnlist = main::cache_cmd("svn list svn://svn.services.openoffice.org/ooo/tags svn://svn.services.openoffice.org/ooo/cws"); - foreach my $cws (@svnlist) { - chomp $cws; chop $cws; # remove trailing slash - $SVNTREES{$cws}=0; - } - } return 0 unless defined($TreeData::VC_TREE{$tree}{'VCS'}); my $vcs = $TreeData::VC_TREE{$tree}{'VCS'}; @@ -530,10 +519,6 @@ sub apply_db_updates { my ($num_updates) = 0; if ($vcs eq 'SVN') { - unless (defined $SVNTREES{$tree}) { - print "Wrong status for: $tree - claims to be in SVN but is not available!\n"; - return 0; - } my ($svn_date_str) = time2svnformat($last_svn_data, DEBUGFILE); $svn_date_str = "{$svn_date_str}:HEAD"; commit cd83edd876770e0c98c8bd5644248a9c83ad27db Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> Date: Wed Dec 14 16:19:13 2011 +0100 no need for getting tag & masterlists from no longer existing infrastructure diff --git a/bin/get-latest-master.pl b/bin/get-latest-master.pl deleted file mode 100755 index 3d94c64..0000000 --- a/bin/get-latest-master.pl +++ /dev/null @@ -1,143 +0,0 @@ -#!/usr/bin/perl -w - -use strict; -use utf8; -# Global cvstmp location. Edit here -my $CVS_TMPDIR="/tmp/cvstmp"; -my $CVS_ROOT=":pserver:anoncvs\@anoncvs.services.openoffice.org:/cvs"; -my $SVN_URL="svn://svn.services.openoffice.org/ooo/tags"; -my $hg_cmd = 'hg'; -my $hgrepodir = '/var/mercurial/DEV300-repo'; -my $hgrepodir_maint = '/var/mercurial/OOO320-repo'; -my $HG_URL = 'http://hg.services.openoffice.org/DEV300'; -# add corresponding pull command in case more release clones are added -my $HG_URL_MAINT32 = 'http://hg.services.openoffice.org/OOO320'; -my $HG_URL_MAINT33 = 'http://hg.services.openoffice.org/OOO330'; - -my $DEFAULT_MASTER='DEV300'; -my $RELEASE_MASTER='OOO330'; # 3.3 -my $OLD_MASTER='OOO320'; # 3.2 -my $OLD_RELEASE_MASTER='OOH680'; # 2.4 -# end of config section - shouldn't be necessary to touch code below - -sub min($$) { - my($x, $y) = @_; - return $x < $y ? $x : $y; -} - -my $CvsRoot; -my $SvnTags; -my $HgTags; - -my @latestmasters=(); -my @default=(); -my @release=(); -my @old=(); -my @oldrelease=(); - - -my $defcount=0; -my $oldcount=0; -my $relcount=0; -my $oldrelcount=0; - -`$hg_cmd --cwd $hgrepodir pull -q $HG_URL`; -`$hg_cmd --cwd $hgrepodir pull -q $HG_URL_MAINT32`; -`$hg_cmd --cwd $hgrepodir pull -q $HG_URL_MAINT33`; - -open ($HgTags, "$hg_cmd --cwd $hgrepodir tags |") || return 0; -while (<$HgTags>) { - chomp; - s/\s+.*$//; - next unless /^[A-Z]+.*_m[0-9]+/; - push @default, $_ if (/^$DEFAULT_MASTER/); - push @release, $_ if (/^$RELEASE_MASTER/); - push @old, $_ if (/^$OLD_MASTER/); - #$defcount++; - #last if ($defcount == 3); -} -close $HgTags; - -#open ($HgTags, "$hg_cmd --cwd $hgrepodir tags |") || return 0; -#while (<$HgTags>) { -# chomp; -# s/\s+.*$//; -# next unless /^[A-Z]+.*_m[0-9]+/; -# push @release, $_ if (/^$RELEASE_MASTER/); -# push @old, $_ if (/^$OLD_MASTER/); -#} -#close $HgTags; - -open ($SvnTags, "svn list $SVN_URL |") || return 0; -while (<$SvnTags>) { - chomp; - s|/||; -# push @old, $_ if (/^$OLD_MASTER/); - push @oldrelease, $_ if (/^$OLD_RELEASE_MASTER/); -} - -# set counts to the minimum -# don't try to include more than we actually have, and not more than we actually want -$defcount = min(@default, 3); # 2-> allow to add one from cvs -$relcount = min(@release, 2); -$oldcount = min(@old, 2); -$oldrelcount = min(@oldrelease, 1); - -push @latestmasters, (sort { (split "_m", $a,2)[1] <=> (split "_m", $b,2)[1] } @default)[-$defcount...-1] if ($defcount > 0); -push @latestmasters, (sort { (split "_m", $a,2)[1] <=> (split "_m", $b,2)[1] } @release)[-$relcount...-1] if ($relcount > 0); -push @latestmasters, (sort { (split "_m", $a,2)[1] <=> (split "_m", $b,2)[1] } @old)[-$oldcount...-1] if ($oldcount > 0); -push @latestmasters, (sort { (split "_m", $a,2)[1] <=> (split "_m", $b,2)[1] } @oldrelease)[-$oldrelcount...-1] if ($oldrelcount > 0); - - -`mkdir -p $CVS_TMPDIR`; -`cd $CVS_TMPDIR && cvs -d $CVS_ROOT co -A solenv/inc/minor.mk`; -open ($CvsRoot, "cd $CVS_TMPDIR && cvs -d $CVS_ROOT status -v solenv/inc/minor.mk |") || return 0; -while (<$CvsRoot>) { - if (/^\t$DEFAULT_MASTER/) { - next if ($defcount == 3); - $defcount++; - } elsif (/^\t$OLD_MASTER/) { - next if ($oldcount == 2); - $oldcount++; - } elsif (/^\t$RELEASE_MASTER/) { - next if ($relcount == 2); - $relcount++; - } elsif (/^\t$OLD_RELEASE_MASTER/) { - next if ($oldrelcount == 1); - $oldrelcount++; - } else { - next; - } - s/^\t([^\s]+).*$/$1/; - chomp; - push @latestmasters, $_; - last if ( $defcount+$oldcount+$relcount+$oldrelcount == 8); -} - -my @modules = (); -my $reading_modules = 0; -open ($CvsRoot, "cvs -d $CVS_ROOT co -c 2>&1 |") || return 0; -while (<$CvsRoot>) { - $reading_modules = 0 if (/^\S/); - $reading_modules = '1' if (/^OpenOffice3\s+\-a\s+/ or /^Extensions3\s+\-a\s+/); - if ($reading_modules) { - chomp; - s/^.*\-a//; - for my $elem (split (/ +/, $_)) { - push @modules, $elem if ($elem ne ''); - } - } -} -close ($CvsRoot) || return 0; - -die "couldn't determine master-list!" unless ( @latestmasters ); -die "couldn't determine modules!" unless ( @modules ); - -open (MASTER_LIST, ">/srv/www/tinderbox.libreoffice.org/tags/tag-latest-master-list"); -print MASTER_LIST "# List of the last three master workspaces\n"; -print MASTER_LIST "# <name> : <master-tag> : <master-tag> : <modules>\n"; - -for my $mastermod (sort @latestmasters) { - print MASTER_LIST "$mastermod : $mastermod : $mastermod : @modules\n"; -} -close MASTER_LIST; diff --git a/bin/get-taglists.pl b/bin/get-taglists.pl deleted file mode 100755 index 2b8f7cd..0000000 --- a/bin/get-taglists.pl +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/perl -w -# query EIS for the tag-lists via SOAP -use strict; -use utf8; -use lib '/srv/tinderbox/bin/modules'; -use Cws; -use Eis; - -sub print_tags($$) -{ - my $ft = shift; - my $taglist = shift; - - open(MYOUT, ">$ft"); - print(MYOUT $taglist); - close(MYOUT); - - return 0; -} - -my $eis = Eis->new( uri => Cws::eis_uri(), - proxy_list => Cws::eis_proxy_list(), - net_proxy => Cws::net_proxy() - ); - -my $nominated = $eis->getTinderboxTagList('nominated'); -my $approved_by_QA = $eis->getTinderboxTagList('approved by QA'); -my $ready_for_QA = $eis->getTinderboxTagList('ready for QA'); -my $new = $eis->getTinderboxTagList('new'); - -die "EIS not reachable?!" unless (defined($new) and defined($ready_for_QA) and defined($approved_by_QA) and defined($nominated)); - -print_tags("/srv/www/tinderbox.libreoffice.org/tags/tag-list-nominated", $nominated); -print_tags("/srv/www/tinderbox.libreoffice.org/tags/tag-list-approved", $approved_by_QA); -print_tags("/srv/www/tinderbox.libreoffice.org/tags/tag-list-qa", $ready_for_QA); -print_tags("/srv/www/tinderbox.libreoffice.org/tags/tag-list-new", $new); - -print_tags("/srv/www/tinderbox.libreoffice.org/tags/tag-list", $nominated.$approved_by_QA.$ready_for_QA.$new); - diff --git a/bin/tinderupdate.sh b/bin/tinderupdate.sh index e05027a..0160da2 100755 --- a/bin/tinderupdate.sh +++ b/bin/tinderupdate.sh @@ -11,8 +11,6 @@ cd /srv/tinderbox echo starting update at $(date -u) >> $TINDERBOX_LOG # update the tag-lists touch $TINDERBOX_WWW/tags/tag-list.tstamp -$TINDERBOX_BIN/get-taglists.pl -$TINDERBOX_BIN/get-latest-master.pl # parse mails with attachment that accumulated in the meantime $TINDERBOX_BIN/bypass_postfixlimit.sh >> $TINDERBOX_LOG 2>&1
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits