SF.net SVN: gar:[23255] csw/mgar/pkg/buildbot/trunk

[dmichelsen at users.sourceforge.net]

Revision: 23255
          http://sourceforge.net/p/gar/code/23255
Author:   dmichelsen
Date:     2014-03-20 10:37:16 +0000 (Thu, 20 Mar 2014)
Log Message:
-----------
buildbot/trunk: Add wrapper for PYTHONPATH

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

Added Paths:
-----------
    csw/mgar/pkg/buildbot/trunk/files/buildbot

Removed Paths:
-------------
    csw/mgar/pkg/buildbot/trunk/files/0001-Use-private-version-of-sqlalchemy.patch

Modified: csw/mgar/pkg/buildbot/trunk/Makefile
===================================================================
--- csw/mgar/pkg/buildbot/trunk/Makefile	2014-03-19 17:49:47 UTC (rev 23254)
+++ csw/mgar/pkg/buildbot/trunk/Makefile	2014-03-20 10:37:16 UTC (rev 23255)
@@ -24,9 +24,9 @@
 
 MASTER_SITES = $(PYPI_MIRROR)
 DISTFILES += $(DISTNAME).tar.gz
+# Wrapper
+DISTFILES += buildbot
 
-PATCHFILES += 0001-Use-private-version-of-sqlalchemy.patch
-
 PACKAGES += CSWbuildbot
 SPKG_DESC_CSWbuildbot = A system to automate the compile/test cycle
 # PKGFILES is catchall
@@ -65,3 +65,10 @@
 SKIPTEST ?= 1
 
 include gar/category.mk
+
+post-install:
+	ginstall -d $(DESTDIR)$(libexecdir)
+	mv $(DESTDIR)$(bindir)/buildbot $(DESTDIR)$(libexecdir)/buildbot
+	ginstall -m 0755 $(WORKDIR)/buildbot $(DESTDIR)$(bindir)/buildbot
+	@$(MAKECOOKIE)
+	

Deleted: csw/mgar/pkg/buildbot/trunk/files/0001-Use-private-version-of-sqlalchemy.patch
===================================================================
--- csw/mgar/pkg/buildbot/trunk/files/0001-Use-private-version-of-sqlalchemy.patch	2014-03-19 17:49:47 UTC (rev 23254)
+++ csw/mgar/pkg/buildbot/trunk/files/0001-Use-private-version-of-sqlalchemy.patch	2014-03-20 10:37:16 UTC (rev 23255)
@@ -1,23 +0,0 @@
-From 05c10c10c31f60c4c7cce17c846616d69589b349 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Wed, 19 Mar 2014 16:05:53 +0100
-Subject: [PATCH] Use private version of sqlalchemy
-
----
- bin/buildbot | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/bin/buildbot b/bin/buildbot
-index 7295b00..8d5d21f 100755
---- a/bin/buildbot
-+++ b/bin/buildbot
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
- 
- from buildbot.scripts import runner
-+import sys
-+sys.path.insert(0,'/opt/csw/share/buildbot/lib/python2.7/site-packages/')
- runner.run()
--- 
-1.8.4.1
-

Added: csw/mgar/pkg/buildbot/trunk/files/buildbot
===================================================================
--- csw/mgar/pkg/buildbot/trunk/files/buildbot	                        (rev 0)
+++ csw/mgar/pkg/buildbot/trunk/files/buildbot	2014-03-20 10:37:16 UTC (rev 23255)
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+PYTHONPATH=/opt/csw/share/buildbot/lib/python2.7/site-packages
+export PYTHONPATH
+exec /opt/csw/libexec/buildbot "$@"


Property changes on: csw/mgar/pkg/buildbot/trunk/files/buildbot
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.