[csw-devel] SF.net SVN: gar:[6133] csw/mgar/gar/v2

[skayser at users.sourceforge.net]

Revision: 6133
          http://gar.svn.sourceforge.net/gar/?rev=6133&view=rev
Author:   skayser
Date:     2009-08-28 21:42:21 +0000 (Fri, 28 Aug 2009)

Log Message:
-----------
gar/v2: merged python category enhancements from v2-skayser

Modified Paths:
--------------
    csw/mgar/gar/v2/gar.mk
    csw/mgar/gar/v2/gar.pkg.mk

Added Paths:
-----------
    csw/mgar/gar/v2/categories/python/
    csw/mgar/gar/v2/categories/python/category.mk

Removed Paths:
-------------
    csw/mgar/gar/v2/categories/python/category.mk

Property Changed:
----------------
    csw/mgar/gar/v2/


Property changes on: csw/mgar/gar/v2
___________________________________________________________________
Added: svn:mergeinfo
   + /csw/mgar/gar/v2-skayser:6087-6132

Deleted: csw/mgar/gar/v2/categories/python/category.mk
===================================================================
--- csw/mgar/gar/v2-skayser/categories/python/category.mk	2009-08-28 21:15:14 UTC (rev 6132)
+++ csw/mgar/gar/v2/categories/python/category.mk	2009-08-28 21:42:21 UTC (rev 6133)
@@ -1,20 +0,0 @@
-# Add a dependency to CSWpython
-_EXTRA_GAR_PKGS += CSWpython
-
-# We just set PYCOMPILE, gar.mk then excludes the corresponding .py{c,o} 
-# files. Only thing we explicitly exclude here are the egg-info files. 
-# gar.pkg.mk handles the usual cswclassutils stuff. 
-
-PYCOMPILE = /opt/csw/lib/python/site-packages/.*\.py
-_MERGE_EXCLUDE_CATEGORY += .*\.egg-info.*
-
-# Haven't seen a python module with a configure phase so far
-CONFIGURE_SCRIPTS ?=
-
-# gar.lib.mk contains implicit targets for setup.py
-BUILD_SCRIPTS ?= $(WORKSRC)/setup.py
-INSTALL_SCRIPTS ?= $(WORKSRC)/setup.py
-INSTALL_ARGS ?= --root=$(DESTDIR) --prefix=$(prefix)
-TEST_SCRIPTS ?= $(WORKSRC)/setup.py
-
-include gar/gar.mk

Copied: csw/mgar/gar/v2/categories/python/category.mk (from rev 6132, csw/mgar/gar/v2-skayser/categories/python/category.mk)
===================================================================
--- csw/mgar/gar/v2/categories/python/category.mk	                        (rev 0)
+++ csw/mgar/gar/v2/categories/python/category.mk	2009-08-28 21:42:21 UTC (rev 6133)
@@ -0,0 +1,20 @@
+# Add a dependency to CSWpython
+_EXTRA_GAR_PKGS += CSWpython
+
+# We just set PYCOMPILE, gar.mk then excludes the corresponding .py{c,o} 
+# files. Only thing we explicitly exclude here are the egg-info files. 
+# gar.pkg.mk handles the usual cswclassutils stuff. 
+
+PYCOMPILE = /opt/csw/lib/python/site-packages/.*\.py
+_MERGE_EXCLUDE_CATEGORY += .*\.egg-info.*
+
+# Haven't seen a python module with a configure phase so far
+CONFIGURE_SCRIPTS ?=
+
+# gar.lib.mk contains implicit targets for setup.py
+BUILD_SCRIPTS ?= $(WORKSRC)/setup.py
+INSTALL_SCRIPTS ?= $(WORKSRC)/setup.py
+INSTALL_ARGS ?= --root=$(DESTDIR) --prefix=$(prefix)
+TEST_SCRIPTS ?= $(WORKSRC)/setup.py
+
+include gar/gar.mk

Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2009-08-28 21:15:14 UTC (rev 6132)
+++ csw/mgar/gar/v2/gar.mk	2009-08-28 21:42:21 UTC (rev 6133)
@@ -559,11 +559,15 @@
 # This can be defined in category.mk
 MERGE_EXCLUDE_CATEGORY ?= $(_MERGE_EXCLUDE_CATEGORY)
 
+# Support for cswpycompile, skip pre-compiled python files (.pyc, .pyo)
+# during the merge phase.
+MERGE_EXCLUDE_PYCOMPILE ?= $(addsuffix c,$(PYCOMPILE)) $(addsuffix o,$(PYCOMPILE))
+
 MERGE_EXCLUDE_INFODIR ?= $(sharedstatedir)/info/dir
 MERGE_EXCLUDE_LIBTOOL ?= $(libdir)/.*\.la
 MERGE_EXCLUDE_BACKUPFILES ?= .*\~
 MERGE_EXCLUDE_STATICLIBS ?= $(libdir)/.*\.a
-MERGE_EXCLUDE_DEFAULT ?= $(MERGE_EXCLUDE_CATEGORY) $(MERGE_EXCLUDE_INFODIR) $(MERGE_EXCLUDE_LIBTOOL) $(MERGE_EXCLUDE_BACKUPFILES) $(MERGE_EXCLUDE_STATICLIBS)
+MERGE_EXCLUDE_DEFAULT ?= $(MERGE_EXCLUDE_CATEGORY) $(MERGE_EXCLUDE_INFODIR) $(MERGE_EXCLUDE_LIBTOOL) $(MERGE_EXCLUDE_BACKUPFILES) $(MERGE_EXCLUDE_STATICLIBS) $(MERGE_EXCLUDE_PYCOMPILE)
 
 # Exclude these files
 ifeq ($(origin MERGE_EXCLUDE_FILES_$(MODULATION)), undefined)

Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2009-08-28 21:15:14 UTC (rev 6132)
+++ csw/mgar/gar/v2/gar.pkg.mk	2009-08-28 21:42:21 UTC (rev 6133)
@@ -165,13 +165,15 @@
 SPKG_CLASSES := $(SPKG_CLASSES) $(if $(PRESERVECONF),$(if $(filter cswpreserveconf,$(SPKG_CLASSES)),,cswpreserveconf))
 SPKG_CLASSES := $(SPKG_CLASSES) $(if $(INITSMF),$(if $(filter cswinitsmf,$(SPKG_CLASSES)),,cswinitsmf))
 SPKG_CLASSES := $(SPKG_CLASSES) $(if $(USERGROUP),$(if $(filter cswusergroup,$(SPKG_CLASSES)),,cswusergroup))
+SPKG_CLASSES := $(SPKG_CLASSES) $(if $(PYCOMPILE),$(if $(filter cswpycompile,$(SPKG_CLASSES)),,cswpycompile))
 # - set class for all config files
-ifneq ($(SAMPLECONF)$(PRESERVECONF)$(INITSMF)$(USERGROUP),)
+ifneq ($(SAMPLECONF)$(PRESERVECONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),)
 _CSWCLASS_FILTER = | perl -ane '\
 		$(foreach FILE,$(SAMPLECONF:%.CSW=%),$$F[1] = "cswsampleconf" if ( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\
 		$(foreach FILE,$(PRESERVECONF:%.CSW=%),$$F[1] = "cswpreserveconf" if( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\
 		$(foreach FILE,$(INITSMF),$$F[1] = "cswinitsmf" if( $$F[2] =~ m(^$(FILE)$$) );)\
 		$(foreach FILE,$(USERGROUP),$$F[1] = "cswusergroup" if( $$F[2] =~ m(^$(FILE)$$) );)\
+		$(foreach FILE,$(PYCOMPILE),$$F[1] = "cswpycompile" if( $$F[2] =~ m(^$(FILE)$$) );)\
 		print join(" ", at F),"\n";'
 _EXTRA_GAR_PKGS += CSWcswclassutils
 # Make sure the configuration files always have a .CSW suffix and rename the


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