[csw-devel] SF.net SVN: gar:[6052] csw/mgar/pkg/buildbot/trunk

[wahwah at users.sourceforge.net]

Revision: 6052
          http://gar.svn.sourceforge.net/gar/?rev=6052&view=rev
Author:   wahwah
Date:     2009-08-19 11:24:28 +0000 (Wed, 19 Aug 2009)

Log Message:
-----------
buildbot: Adapting the package version and revision numbers to the guidelines

Modified Paths:
--------------
    csw/mgar/pkg/buildbot/trunk/Makefile
    csw/mgar/pkg/buildbot/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/buildbot/trunk/files/debug-0.7.11p1.patch

Modified: csw/mgar/pkg/buildbot/trunk/Makefile
===================================================================
--- csw/mgar/pkg/buildbot/trunk/Makefile	2009-08-19 09:05:07 UTC (rev 6051)
+++ csw/mgar/pkg/buildbot/trunk/Makefile	2009-08-19 11:24:28 UTC (rev 6052)
@@ -3,7 +3,8 @@
 # $Id$
 
 GARNAME = buildbot
-GARVERSION = 0.7.11p1
+GARVERSION = 0.7.11
+PATCHLEVEL = p1
 CATEGORIES = utils
 
 DESCRIPTION = A system to automate the compile/test cycle
@@ -17,12 +18,13 @@
   to test their changes everywhere before checkin will at least know shortly
   afterwards whether they have broken the build or not. Warning counts, lint
   checks, image size, compile time, and other build parameters can be tracked
-  over time, are more visible, and are therefore easier to improve. 
+  over time, are more visible, and are therefore easier to improve.
 endef
 
 MASTER_SITES = $(SF_MIRROR)
-PATCHFILES = tail-$(GARVERSION).patch
-DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz $(PATCHFILES)
+PATCHFILES  = tail-$(GARVERSION)$(PATCHLEVEL).patch
+PATCHFILES += debug-$(GARVERSION)$(PATCHLEVEL).patch
+DISTFILES  = $(GARNAME)-$(GARVERSION)$(PATCHLEVEL).tar.gz $(PATCHFILES)
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
@@ -32,19 +34,29 @@
 REQUIRED_PKGS = CSWcswclassutils CSWpython CSWtwisted CSWzope CSWtextutils
 
 ARCHALL = 1
-CONFIGURE_SCRIPTS = 
+CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS = buildbot
-TEST_SCRIPTS = 
+TEST_SCRIPTS =
 INSTALL_SCRIPTS = buildbot
 
 PROTOTYPE_FILTER = awk ' \
-  $$$$3 ~/.*\.py$$$$/ { $$$$2 = "pycompile" } \
+  $$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } \
   { print }'
 
+WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)$(PATCHLEVEL)
+
 build-buildbot:
 	(cd $(WORKSRC); python setup.py build)
+	@$(MAKECOOKIE)
 
 install-buildbot:
 	(cd $(WORKSRC); python setup.py install --root=$(DESTDIR))
+	@$(MAKECOOKIE)
 
+post-install-modulated:
+	gfind $(DESTDIR) -type f -name '*.pyc' -exec rm {} \;
+	@$(MAKECOOKIE)
+
 include gar/category.mk
+
+SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(PATCHLEVEL)

Modified: csw/mgar/pkg/buildbot/trunk/checksums
===================================================================
--- csw/mgar/pkg/buildbot/trunk/checksums	2009-08-19 09:05:07 UTC (rev 6051)
+++ csw/mgar/pkg/buildbot/trunk/checksums	2009-08-19 11:24:28 UTC (rev 6052)
@@ -1,2 +1,3 @@
 2f83cd6562f0288ec4f4d77027f3090f  download/buildbot-0.7.11p1.tar.gz
+4c70db04b3514157aa746370ad282eeb  download/debug-0.7.11p1.patch
 a39720c9a13d73bbda054938d6a98c47  download/tail-0.7.11p1.patch

Added: csw/mgar/pkg/buildbot/trunk/files/debug-0.7.11p1.patch
===================================================================
--- csw/mgar/pkg/buildbot/trunk/files/debug-0.7.11p1.patch	                        (rev 0)
+++ csw/mgar/pkg/buildbot/trunk/files/debug-0.7.11p1.patch	2009-08-19 11:24:28 UTC (rev 6052)
@@ -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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.