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

[dmichelsen at users.sourceforge.net]

Revision: 6125
          http://gar.svn.sourceforge.net/gar/?rev=6125&view=rev
Author:   dmichelsen
Date:     2009-08-27 20:04:39 +0000 (Thu, 27 Aug 2009)

Log Message:
-----------
mGAR v2: Update CSWcswclassutils support in GAR to automatically rename config files so the default always ends up in .CSW

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

Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2009-08-27 16:37:21 UTC (rev 6124)
+++ csw/mgar/gar/v2/gar.mk	2009-08-27 20:04:39 UTC (rev 6125)
@@ -597,7 +597,7 @@
 # has not, so we use this one for appending.
 
 
-_PAX_ARGS = $(_INC_EXT_RULE) $(EXTRA_PAX_ARGS_$(MODULATION)) $(EXTRA_PAX_ARGS)
+_PAX_ARGS = $(_INC_EXT_RULE) $(_EXTRA_PAX_ARGS) $(EXTRA_PAX_ARGS_$(MODULATION)) $(EXTRA_PAX_ARGS)
 
 # The basic merge merges the compiles for all ISAs on the current architecture
 merge: checksum pre-merge $(addprefix merge-,$(MODULATIONS)) merge-license $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) post-merge

Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2009-08-27 16:37:21 UTC (rev 6124)
+++ csw/mgar/gar/v2/gar.pkg.mk	2009-08-27 20:04:39 UTC (rev 6125)
@@ -168,12 +168,15 @@
 # - set class for all config files
 ifneq ($(SAMPLECONF)$(PRESERVECONF)$(INITSMF)$(USERGROUP),)
 _CSWCLASS_FILTER = | perl -ane '\
-		$(foreach FILE,$(SAMPLECONF),$$F[1] = "cswsampleconf" if ( $$F[2] =~ m(^$(FILE)$$) );)\
-		$(foreach FILE,$(PRESERVECONF),$$F[1] = "cswpreserveconf" if( $$F[2] =~ m(^$(FILE)$$) );)\
+		$(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)$$) );)\
 		print join(" ", at F),"\n";'
 _EXTRA_GAR_PKGS += CSWcswclassutils
+# Make sure the configuration files always have a .CSW suffix and rename the
+# configuration files to this if necessary during merge.
+_EXTRA_PAX_ARGS += $(foreach FILE,$(SAMPLECONF:%.CSW=%) $(PRESERVECONF:%.CSW=%),-s ",^\.\($(FILE)\)$$,.\1.CSW,p")
 endif
 
 PKGGET_DESTDIR ?=


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