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

[dmichelsen at users.sourceforge.net]

Revision: 8458
          http://gar.svn.sourceforge.net/gar/?rev=8458&view=rev
Author:   dmichelsen
Date:     2010-02-10 13:36:12 +0000 (Wed, 10 Feb 2010)

Log Message:
-----------
mGAR v2: Add checkpkg overrides

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	2010-02-10 13:22:17 UTC (rev 8457)
+++ csw/mgar/gar/v2/gar.mk	2010-02-10 13:36:12 UTC (rev 8458)
@@ -712,7 +712,7 @@
 
 
 # The basic merge merges the compiles for all ISAs on the current architecture
-merge: checksum pre-merge merge-do merge-license merge-classutils $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) post-merge
+merge: checksum pre-merge merge-do merge-license merge-classutils merge-checkpkgoverrides $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) post-merge
 	@$(DONADA)
 
 merge-do: $(if $(PARALLELMODULATIONS),merge-parallel,merge-sequential)
@@ -788,7 +788,7 @@
 .PHONY: remerge reset-merge reset-merge-modulated
 remerge: reset-merge merge
 
-reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-classutils reset-merge-src
+reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-classutils reset-merge-checkpkgoverrides reset-merge-src
 	@rm -f $(COOKIEDIR)/pre-merge $(foreach M,$(MODULATIONS),$(COOKIEDIR)/merge-$M) $(COOKIEDIR)/merge $(COOKIEDIR)/post-merge
 	@rm -rf $(PKGROOT)
 	@$(DONADA)

Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2010-02-10 13:22:17 UTC (rev 8457)
+++ csw/mgar/gar/v2/gar.pkg.mk	2010-02-10 13:36:12 UTC (rev 8458)
@@ -657,6 +657,19 @@
 reset-merge-etcservices:
 	@rm -f $(COOKIEDIR)/merge-etcservices $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-etcservices-$(SPEC))
 
+merge-checkpkgoverrides-%:
+	@echo "[ Generating checkpkg override for package $* ]"
+	$(_DBG)ginstall -d $(PKGROOT)/opt/csw/share/checkpkg/overrides
+	$(_DBG)$(foreach O,$(or $(CHECKPKG_OVERRIDES_$*),$(CHECKPKG_OVERRIDES)),echo "$O" | \
+		perl -F'\|' -ane 'unshift @F,"$*" if(@F<2); print "$$F[0]: $$F[1]";print " $$F[2]" if( $$F[2] );' \
+		> $(PKGROOT)/opt/csw/share/checkpkg/overrides/$(call catalogname,$*))
+	@$(MAKECOOKIE)
+
+merge-checkpkgoverrides: $(foreach S,$(SPKG_SPECS),$(if $(or $(CHECKPKG_OVERRIDES_$S),$(CHECKPKG_OVERRIDES)),merge-checkpkgoverrides-$S))
+
+reset-merge-checkpkgoverrides:
+	@rm -f $(COOKIEDIR)/merge-checkpkgoverrides $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-checkpkgoverrides-$(SPEC))
+
 merge-src: _SRCDIR=$(PKGROOT)$(sourcedir)/$(call catalogname,$(SRCPACKAGE_BASE))
 merge-src: fetch
 	$(_DBG)mkdir -p $(_SRCDIR)/files


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