[csw-devel] SF.net SVN: gar:[3715] csw/mgar/pkg

valholla at users.sourceforge.net valholla at users.sourceforge.net
Wed Mar 11 18:38:38 CET 2009


Revision: 3715
          http://gar.svn.sourceforge.net/gar/?rev=3715&view=rev
Author:   valholla
Date:     2009-03-11 17:38:37 +0000 (Wed, 11 Mar 2009)

Log Message:
-----------
commit working copy

Modified Paths:
--------------
    csw/mgar/pkg/mysql-python/trunk/Makefile
    csw/mgar/pkg/mysql-python/trunk/checksums
    csw/mgar/pkg/pydocutils/trunk/Makefile
    csw/mgar/pkg/pygobject/trunk/Makefile
    csw/mgar/pkg/pyorbit/trunk/trunk/Makefile
    csw/mgar/pkg/pysetuptools/trunk/Makefile
    csw/mgar/pkg/pysqlite/trunk/Makefile
    csw/mgar/pkg/pysqlite/trunk/checksums
    csw/mgar/pkg/pysqlite2/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/pygobject/Makefile

Removed Paths:
-------------
    csw/mgar/pkg/pysqlite/trunk/files/CSWpysqlite.gspec

Property Changed:
----------------
    csw/mgar/pkg/pygobject/

Modified: csw/mgar/pkg/mysql-python/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mysql-python/trunk/Makefile	2009-03-11 16:35:13 UTC (rev 3714)
+++ csw/mgar/pkg/mysql-python/trunk/Makefile	2009-03-11 17:38:37 UTC (rev 3715)
@@ -12,7 +12,7 @@
 
 PACKAGES = CSWpymysql
 REQUIRED_PKGS_CSWpymysql = CSWmysql5rt CSWpython CSWosslrt CSWzlib
-CATALOGNAME_CSWpymysql = py_mysql5
+CATALOGNAME_CSWpymysql = pymysql5
 SPKG_DESC = MySQL Support for Python
 
 # We define upstream file regex so we can be notifed of new upstream software release
@@ -20,6 +20,9 @@
 UPSTREAM_USE_SF = 1
 UFILES_REGEX = (\d+(?:\.\d+)*)
 
+DISTFILES += setuptools-0.6c9-py2.6.egg
+PATCHFILES = setup.diff
+
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS = $(WORKSRC)/setup.py
 TEST_SCRIPTS =
@@ -33,6 +36,10 @@
 mysql_prefix = $(prefix)/mysql5
 mysql_bindir = $(mysql_prefix)/bin
 
+post-extract-modulated:
+	@(gcp $(DOWNLOADDIR)/setuptools-0.6c9-py2.6.egg $(WORKSRC))
+
+
 LD_OPTIONS := -R/opt/csw/mysql5/lib/mysql/\$$ISALIST $(LD_OPTIONS)
 PATH       := $(mysql_bindir):$(PATH)
 export LD_OPTIONS PATH

Modified: csw/mgar/pkg/mysql-python/trunk/checksums
===================================================================
--- csw/mgar/pkg/mysql-python/trunk/checksums	2009-03-11 16:35:13 UTC (rev 3714)
+++ csw/mgar/pkg/mysql-python/trunk/checksums	2009-03-11 17:38:37 UTC (rev 3715)
@@ -1 +1,3 @@
 532268f02870bea18c1d465e88afff30  download/MySQL-python-1.2.2.tar.gz
+ca37b1ff16fa2ede6e19383e7b59245a  download/setuptools-0.6c9-py2.6.egg
+fba3b56e42a61b562ea4b9a5eb37a1d3  download/setup.diff

Modified: csw/mgar/pkg/pydocutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pydocutils/trunk/Makefile	2009-03-11 16:35:13 UTC (rev 3714)
+++ csw/mgar/pkg/pydocutils/trunk/Makefile	2009-03-11 17:38:37 UTC (rev 3715)
@@ -12,7 +12,7 @@
 
 PACKAGES = CSWpydocutils
 REQUIRED_PKGS_CSWpydocutils = CSWpython
-CATALOGNAME_CSWpydocutils = py_docutils
+CATALOGNAME_CSWpydocutils = pydocutils
 SPKG_DESC = Documentation Utiltiies for Python
 
 # We define upstream file regex so we can be notifed of new upstream software release


Property changes on: csw/mgar/pkg/pygobject
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2


Added: csw/mgar/pkg/pygobject/Makefile
===================================================================
--- csw/mgar/pkg/pygobject/Makefile	                        (rev 0)
+++ csw/mgar/pkg/pygobject/Makefile	2009-03-11 17:38:37 UTC (rev 3715)
@@ -0,0 +1,15 @@
+# vim: ft=make ts=4 sw=4 noet
+
+default:
+	@echo "You are in the pkg/ directory."
+
+%:
+	$(MAKE) -C trunk $* 
+
+paranoid-%:
+	$(MAKE) -C trunk $* || exit 2 
+
+export BUILDLOG ?= $(shell pwd)/buildlog.txt
+
+report-%:
+	$(MAKE) -C trunk $* || echo "	*** make $* in $$i failed ***" >> $(BUILDLOG) 

Modified: csw/mgar/pkg/pygobject/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pygobject/trunk/Makefile	2009-03-11 16:35:13 UTC (rev 3714)
+++ csw/mgar/pkg/pygobject/trunk/Makefile	2009-03-11 17:38:37 UTC (rev 3715)
@@ -14,8 +14,7 @@
 PACKAGES = CSWpygobject
 REQUIRED_PKGS_CSWpygobject  = CSWpython CSWggettextrt CSWglib2
 
-
-CATALOGNAME_CSWpygobject = py_gobject
+CATALOGNAME_CSWpygobject = pygobject
 SPKG_DESC_CSWpygobject = pygobject support for Python
 
 ## patch to change zero sized struct to zero-sized sub-object
@@ -24,6 +23,8 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = (\d+(?:\.\d+)*)
 
+CONFIGURE_ARGS  = $(DIRPATHS)
+
 ## Tests require gtk, but gtk requries gobject
 #TEST_TARGET = check
 TEST_SCRIPTS = 

Modified: csw/mgar/pkg/pyorbit/trunk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pyorbit/trunk/trunk/Makefile	2009-03-11 16:35:13 UTC (rev 3714)
+++ csw/mgar/pkg/pyorbit/trunk/trunk/Makefile	2009-03-11 17:38:37 UTC (rev 3715)
@@ -15,7 +15,7 @@
 REQUIRED_PKGS_CSWpyorbit  = CSWpython CSWggettextrt CSWglib2
 REQUIRED_PKGS_CSWpyorbit += CSWlibidl CSWorbit2
 
-CATALOGNAME_CSWpyorbit = py_orbit
+CATALOGNAME_CSWpyorbit = pyorbit
 SPKG_DESC_CSWpyorbit = ORBit2 CORBA support for Python
 
 # We define upstream file regex so we can be notifed of new upstream software release

Modified: csw/mgar/pkg/pysetuptools/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pysetuptools/trunk/Makefile	2009-03-11 16:35:13 UTC (rev 3714)
+++ csw/mgar/pkg/pysetuptools/trunk/Makefile	2009-03-11 17:38:37 UTC (rev 3715)
@@ -14,7 +14,7 @@
 
 REQUIRED_PKGS_CSWpysetuptools = CSWpython
 PACKAGES = CSWpysetuptools
-CATALOGNAME_CSWpysetuptools = py_setuptools
+CATALOGNAME_CSWpysetuptools = pysetuptools
 SPKG_DESC_CSWpysetuptools = Distribution Utiltiies for Python
 
 
@@ -23,9 +23,12 @@
 
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS = $(WORKSRC)/setup.py
-TEST_SCRIPTS = $(WORKSRC)/setup.py
+TEST_SCRIPTS = skip
 INSTALL_SCRIPTS = $(WORKSRC)/setup.py
 
+test-skip:
+	$(DONADA)
+
 INSTALL_ARGS += --root=$(DESTDIR)
 INSTALL_ARGS += --prefix=$(prefix)
 

Modified: csw/mgar/pkg/pysqlite/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pysqlite/trunk/Makefile	2009-03-11 16:35:13 UTC (rev 3714)
+++ csw/mgar/pkg/pysqlite/trunk/Makefile	2009-03-11 17:38:37 UTC (rev 3715)
@@ -10,8 +10,12 @@
 MASTER_SITES = $(SF_MIRROR)/$(call TOLOWER,$(GARNAME))/
 WORKSRC = $(WORKDIR)/$(GARNAME)
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += CSWpysqlite.gspec
 
+PACKAGES = CSWpysqlite
+CATALOGNAME_CSWpysqlite = pysqlite
+SPKG_DESC_CSWpysqlite = SQLite 1.x support for Python
+REQUIRED_PKGS_CSWpysqlite = CSWpython CSWsqlite3
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=54058
 UPSTREAM_USE_SF = 1

Modified: csw/mgar/pkg/pysqlite/trunk/checksums
===================================================================
--- csw/mgar/pkg/pysqlite/trunk/checksums	2009-03-11 16:35:13 UTC (rev 3714)
+++ csw/mgar/pkg/pysqlite/trunk/checksums	2009-03-11 17:38:37 UTC (rev 3715)
@@ -1,2 +1 @@
 f5102a3cea8eab40dfd0512d44a9ef10  download/pysqlite-1.1.8a.tar.gz
-ab4ef10c0b2730e6b522f545b8a24b36  download/CSWpysqlite.gspec

Deleted: csw/mgar/pkg/pysqlite/trunk/files/CSWpysqlite.gspec
===================================================================
--- csw/mgar/pkg/pysqlite/trunk/files/CSWpysqlite.gspec	2009-03-11 16:35:13 UTC (rev 3714)
+++ csw/mgar/pkg/pysqlite/trunk/files/CSWpysqlite.gspec	2009-03-11 17:38:37 UTC (rev 3715)
@@ -1,4 +0,0 @@
-%var            bitname pysqlite
-%var            pkgname CSWpysqlite
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/LICENSE

Modified: csw/mgar/pkg/pysqlite2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pysqlite2/trunk/Makefile	2009-03-11 16:35:13 UTC (rev 3714)
+++ csw/mgar/pkg/pysqlite2/trunk/Makefile	2009-03-11 17:38:37 UTC (rev 3715)
@@ -12,7 +12,7 @@
 
 PACKAGES = CSWpysqlite2
 REQUIRED_PKGS_CSWpysqlite2 = CSWpython CSWsqlite3
-CATALOGNAME_CSWpysqlite2 = py_sqlite2
+CATALOGNAME_CSWpysqlite2 = pysqlite2
 SPKG_DESC_CSWpysqlite2 = SQLite3 support for Python
 
 # We define upstream file regex so we can be notifed of new upstream software release


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