[csw-devel] SF.net SVN: gar:[9704] csw/mgar/pkg/buildbot/trunk
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Mon Apr 19 11:53:09 CEST 2010
Revision: 9704
http://gar.svn.sourceforge.net/gar/?rev=9704&view=rev
Author: wahwah
Date: 2010-04-19 09:53:08 +0000 (Mon, 19 Apr 2010)
Log Message:
-----------
buildbot: 0.7.12, depending on CSWcoreutils
Modified Paths:
--------------
csw/mgar/pkg/buildbot/trunk/Makefile
csw/mgar/pkg/buildbot/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/buildbot/trunk/files/buildbot-debug.patch
csw/mgar/pkg/buildbot/trunk/files/buildbot-tail.patch
Removed Paths:
-------------
csw/mgar/pkg/buildbot/trunk/files/debug-0.7.11p3.patch
csw/mgar/pkg/buildbot/trunk/files/tail-0.7.11p3.patch
Modified: csw/mgar/pkg/buildbot/trunk/Makefile
===================================================================
--- csw/mgar/pkg/buildbot/trunk/Makefile 2010-04-19 07:56:39 UTC (rev 9703)
+++ csw/mgar/pkg/buildbot/trunk/Makefile 2010-04-19 09:53:08 UTC (rev 9704)
@@ -3,9 +3,9 @@
# $Id$
GARNAME = buildbot
-GARVERSION = 0.7.11
-PATCHLEVEL = p3
-CATEGORIES = utils
+GARVERSION = 0.7.12
+PATCHLEVEL =
+CATEGORIES = python
DESCRIPTION = A system to automate the compile/test cycle
define BLURB
@@ -23,15 +23,17 @@
endef
MASTER_SITES = $(SF_MIRROR)
-PATCHFILES = tail-$(GARVERSION)$(PATCHLEVEL).patch
-PATCHFILES += debug-$(GARVERSION)$(PATCHLEVEL).patch
+PATCHFILES = buildbot-tail.patch
+PATCHFILES += buildbot-debug.patch
DISTFILES = $(GARNAME)-$(GARVERSION)$(PATCHLEVEL).tar.gz $(PATCHFILES)
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-SPKG_CLASSES = none cswpycompile
+PYCOMPILE = 1
-RUNTIME_DEP_PKGS = CSWcswclassutils CSWpython CSWtwisted CSWzope CSWtextutils
+RUNTIME_DEP_PKGS += CSWcoreutils
+RUNTIME_DEP_PKGS += CSWtwisted
+RUNTIME_DEP_PKGS += CSWzope
ARCHALL = 1
CONFIGURE_SCRIPTS =
@@ -39,12 +41,13 @@
TEST_SCRIPTS =
INSTALL_SCRIPTS = buildbot
-PROTOTYPE_FILTER = awk ' \
- $$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } \
- { print }'
-
WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)$(PATCHLEVEL)
+CHECKPKG_OVERRIDES_CSWbuildbot += unidentified-dependency|CSWcoreutils
+CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWtwisted
+CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWzope
+CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWcoreutils
+
build-buildbot:
(cd $(WORKSRC); python setup.py build)
@$(MAKECOOKIE)
@@ -58,5 +61,3 @@
@$(MAKECOOKIE)
include gar/category.mk
-
-SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(PATCHLEVEL)
Modified: csw/mgar/pkg/buildbot/trunk/checksums
===================================================================
--- csw/mgar/pkg/buildbot/trunk/checksums 2010-04-19 07:56:39 UTC (rev 9703)
+++ csw/mgar/pkg/buildbot/trunk/checksums 2010-04-19 09:53:08 UTC (rev 9704)
@@ -1,3 +1,3 @@
-6e4ef001d11caf270e2ed7d1d7d43318 download/buildbot-0.7.11p3.tar.gz
-4c70db04b3514157aa746370ad282eeb download/debug-0.7.11p3.patch
-a39720c9a13d73bbda054938d6a98c47 download/tail-0.7.11p3.patch
+5ba9559e2ef0d4e34a26815d95fc2d68 buildbot-0.7.12.tar.gz
+4c70db04b3514157aa746370ad282eeb buildbot-debug.patch
+a39720c9a13d73bbda054938d6a98c47 buildbot-tail.patch
Copied: csw/mgar/pkg/buildbot/trunk/files/buildbot-debug.patch (from rev 9324, csw/mgar/pkg/buildbot/trunk/files/debug-0.7.11p3.patch)
===================================================================
--- csw/mgar/pkg/buildbot/trunk/files/buildbot-debug.patch (rev 0)
+++ csw/mgar/pkg/buildbot/trunk/files/buildbot-debug.patch 2010-04-19 09:53:08 UTC (rev 9704)
@@ -0,0 +1,25 @@
+diff -ru buildbot-0.7.11p1.orig/buildbot/changes/changes.py buildbot-0.7.11p1/buildbot/changes/changes.py
+--- buildbot-0.7.11p1.orig/buildbot/changes/changes.py 2009-07-15 20:09:30.000000000 +0100
++++ buildbot-0.7.11p1/buildbot/changes/changes.py 2009-07-30 13:30:01.632031291 +0100
+@@ -73,6 +73,9 @@
+ self.files = files[:]
+ self.files.sort()
+
++ def __repr__(self):
++ return "branch(%s) at %s by %s" % (self.branch, self.revision, self.who)
++
+ def asText(self):
+ data = ""
+ data += self.getFileContents()
+diff -ru buildbot-0.7.11p1.orig/buildbot/scheduler.py buildbot-0.7.11p1/buildbot/scheduler.py
+--- buildbot-0.7.11p1.orig/buildbot/scheduler.py 2009-07-15 20:09:30.000000000 +0100
++++ buildbot-0.7.11p1/buildbot/scheduler.py 2009-07-30 16:56:59.195283110 +0100
+@@ -287,6 +287,8 @@
+
+ def addChange(self, change):
+ branch = change.branch
++ log.msg("branch = %s" % repr(branch))
++ log.msg("self.branches = %s" % repr(self.branches))
+ if self.branches is not None and branch not in self.branches:
+ log.msg("%s ignoring off-branch %s" % (self, change))
+ return
Copied: csw/mgar/pkg/buildbot/trunk/files/buildbot-tail.patch (from rev 9324, csw/mgar/pkg/buildbot/trunk/files/tail-0.7.11p3.patch)
===================================================================
--- csw/mgar/pkg/buildbot/trunk/files/buildbot-tail.patch (rev 0)
+++ csw/mgar/pkg/buildbot/trunk/files/buildbot-tail.patch 2010-04-19 09:53:08 UTC (rev 9704)
@@ -0,0 +1,12 @@
+diff -ru buildbot-0.7.11p1.orig/buildbot/scripts/logwatcher.py buildbot-0.7.11p1/buildbot/scripts/logwatcher.py
+--- buildbot-0.7.11p1.orig/buildbot/scripts/logwatcher.py 2009-03-02 18:13:03.000000000 +0100
++++ buildbot-0.7.11p1/buildbot/scripts/logwatcher.py 2009-07-29 18:00:44.304903854 +0200
+@@ -43,7 +43,7 @@
+ # been seen within 10 seconds, and with ReconfigError if the error
+ # line was seen. If the logfile could not be opened, it errbacks with
+ # an IOError.
+- self.p = reactor.spawnProcess(self.pp, "/usr/bin/tail",
++ self.p = reactor.spawnProcess(self.pp, "/opt/csw/bin/gtail",
+ ("tail", "-f", "-n", "0", self.logfile),
+ env=os.environ,
+ )
Deleted: csw/mgar/pkg/buildbot/trunk/files/debug-0.7.11p3.patch
===================================================================
--- csw/mgar/pkg/buildbot/trunk/files/debug-0.7.11p3.patch 2010-04-19 07:56:39 UTC (rev 9703)
+++ csw/mgar/pkg/buildbot/trunk/files/debug-0.7.11p3.patch 2010-04-19 09:53:08 UTC (rev 9704)
@@ -1,25 +0,0 @@
-diff -ru buildbot-0.7.11p1.orig/buildbot/changes/changes.py buildbot-0.7.11p1/buildbot/changes/changes.py
---- buildbot-0.7.11p1.orig/buildbot/changes/changes.py 2009-07-15 20:09:30.000000000 +0100
-+++ buildbot-0.7.11p1/buildbot/changes/changes.py 2009-07-30 13:30:01.632031291 +0100
-@@ -73,6 +73,9 @@
- self.files = files[:]
- self.files.sort()
-
-+ def __repr__(self):
-+ return "branch(%s) at %s by %s" % (self.branch, self.revision, self.who)
-+
- def asText(self):
- data = ""
- data += self.getFileContents()
-diff -ru buildbot-0.7.11p1.orig/buildbot/scheduler.py buildbot-0.7.11p1/buildbot/scheduler.py
---- buildbot-0.7.11p1.orig/buildbot/scheduler.py 2009-07-15 20:09:30.000000000 +0100
-+++ buildbot-0.7.11p1/buildbot/scheduler.py 2009-07-30 16:56:59.195283110 +0100
-@@ -287,6 +287,8 @@
-
- def addChange(self, change):
- branch = change.branch
-+ log.msg("branch = %s" % repr(branch))
-+ log.msg("self.branches = %s" % repr(self.branches))
- if self.branches is not None and branch not in self.branches:
- log.msg("%s ignoring off-branch %s" % (self, change))
- return
Deleted: csw/mgar/pkg/buildbot/trunk/files/tail-0.7.11p3.patch
===================================================================
--- csw/mgar/pkg/buildbot/trunk/files/tail-0.7.11p3.patch 2010-04-19 07:56:39 UTC (rev 9703)
+++ csw/mgar/pkg/buildbot/trunk/files/tail-0.7.11p3.patch 2010-04-19 09:53:08 UTC (rev 9704)
@@ -1,12 +0,0 @@
-diff -ru buildbot-0.7.11p1.orig/buildbot/scripts/logwatcher.py buildbot-0.7.11p1/buildbot/scripts/logwatcher.py
---- buildbot-0.7.11p1.orig/buildbot/scripts/logwatcher.py 2009-03-02 18:13:03.000000000 +0100
-+++ buildbot-0.7.11p1/buildbot/scripts/logwatcher.py 2009-07-29 18:00:44.304903854 +0200
-@@ -43,7 +43,7 @@
- # been seen within 10 seconds, and with ReconfigError if the error
- # line was seen. If the logfile could not be opened, it errbacks with
- # an IOError.
-- self.p = reactor.spawnProcess(self.pp, "/usr/bin/tail",
-+ self.p = reactor.spawnProcess(self.pp, "/opt/csw/bin/gtail",
- ("tail", "-f", "-n", "0", self.logfile),
- env=os.environ,
- )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list