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

[skayser at users.sourceforge.net]

Revision: 6138
          http://gar.svn.sourceforge.net/gar/?rev=6138&view=rev
Author:   skayser
Date:     2009-08-29 15:09:08 +0000 (Sat, 29 Aug 2009)

Log Message:
-----------
gar/v2: PYCOMPILE, move exlusion logic from python/category.mk to gar.mk

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

Modified: csw/mgar/gar/v2/categories/python/category.mk
===================================================================
--- csw/mgar/gar/v2/categories/python/category.mk	2009-08-29 09:50:32 UTC (rev 6137)
+++ csw/mgar/gar/v2/categories/python/category.mk	2009-08-29 15:09:08 UTC (rev 6138)
@@ -1,13 +1,14 @@
 # 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
+# Exclude egg-info files (only needed for easy_install)
 _MERGE_EXCLUDE_CATEGORY += .*\.egg-info.*
 
+# Activate cswpycompile support to exclude .pyc and .pyo files from 
+# the package and compile them on installation. File exclusion is 
+# handled by gar.mk and cswclassutils integration by gar.pkg.mk
+PYCOMPILE = 1
+
 # Haven't seen a python module with a configure phase so far
 CONFIGURE_SCRIPTS ?=
 

Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2009-08-29 09:50:32 UTC (rev 6137)
+++ csw/mgar/gar/v2/gar.mk	2009-08-29 15:09:08 UTC (rev 6138)
@@ -561,7 +561,8 @@
 
 # Support for cswpycompile, skip pre-compiled python files (.pyc, .pyo)
 # during the merge phase.
-MERGE_EXCLUDE_PYCOMPILE ?= $(addsuffix c,$(PYCOMPILE)) $(addsuffix o,$(PYCOMPILE))
+_PYCOMPILE_FILES = /opt/csw/lib/python/site-packages/.*\.py
+MERGE_EXCLUDE_PYCOMPILE ?= $(if $(PYCOMPILE), $(addsuffix c,$(_PYCOMPILE_FILES)) $(addsuffix o,$(_PYCOMPILE_FILES)))
 
 MERGE_EXCLUDE_INFODIR ?= $(sharedstatedir)/info/dir
 MERGE_EXCLUDE_LIBTOOL ?= $(libdir)/.*\.la

Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2009-08-29 09:50:32 UTC (rev 6137)
+++ csw/mgar/gar/v2/gar.pkg.mk	2009-08-29 15:09:08 UTC (rev 6138)
@@ -173,7 +173,7 @@
 		$(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)$$) );)\
+		$(if $(PYCOMPILE),$(foreach FILE,$(_PYCOMPILE_FILES),$$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.