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

[dmichelsen at users.sourceforge.net]

Revision: 13301
          http://gar.svn.sourceforge.net/gar/?rev=13301&view=rev
Author:   dmichelsen
Date:     2011-02-14 16:55:23 +0000 (Mon, 14 Feb 2011)

Log Message:
-----------
mGAR v2: Automatically add README.CSW to the package docs if present

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	2011-02-14 09:33:17 UTC (rev 13300)
+++ csw/mgar/gar/v2/gar.mk	2011-02-14 16:55:23 UTC (rev 13301)
@@ -803,13 +803,17 @@
 
 
 # The basic merge merges the compiles for all ISAs on the current architecture
-merge: checksum pre-merge merge-do merge-license merge-classutils merge-checkpkgoverrides merge-alternatives $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) $(if $(AP2_MODS),post-merge-ap2mod) post-merge
-	@$(DONADA)
+merge: checksum pre-merge merge-do merge-license merge-classutils merge-checkpkgoverrides merge-alternatives $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) merge-README.CSW $(if $(AP2_MODS),post-merge-ap2mod) post-merge
+	banner merge
+	@$(MAKECOOKIE)
 
+.PHONY: merge-do
 merge-do: $(if $(PARALLELMODULATIONS),merge-parallel,merge-sequential)
 
+.PHONY: merge-sequential
 merge-sequential: $(addprefix merge-,$(MODULATIONS))
 
+.PHONY: merge-parallel
 merge-parallel: _PIDFILE=$(WORKROOTDIR)/build-global/multitail.pid
 merge-parallel: merge-watch
 	$(_DBG_MERGE)trap "kill -9 `cat $(_PIDFILE) $(foreach M,$(MODULATIONS),$(WORKROOTDIR)/build-$M/build.pid) 2>/dev/null`;stty sane" INT;\
@@ -824,6 +828,7 @@
 		exit "Return code: `cat $(WORKROOTDIR)/build-$M/build.ret`"; \
 	fi;)
 
+.PHONY: merge-watch
 merge-watch: _USEMULTITAIL=$(shell test -x $(MULTITAIL) && test -x $(TTY) && $(TTY) >/dev/null 2>&1; if [ $$? -eq 0 ]; then echo yes; fi)
 merge-watch: $(addprefix $(WORKROOTDIR)/build-,global $(MODULATIONS))
 	$(_DBG_MERGE)$(if $(_USEMULTITAIL),\
@@ -882,7 +887,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-checkpkgoverrides reset-merge-alternatives reset-merge-ap2mod reset-merge-src
+reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-classutils reset-merge-checkpkgoverrides reset-merge-alternatives reset-merge-README.CSW reset-merge-ap2mod reset-merge-src
 	@rm -f $(COOKIEDIR)/pre-merge $(foreach M,$(MODULATIONS),$(COOKIEDIR)/merge-$M) $(COOKIEDIR)/merge $(COOKIEDIR)/post-merge
 	@rm -rf $(PKGROOT)
 

Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2011-02-14 09:33:17 UTC (rev 13300)
+++ csw/mgar/gar/v2/gar.pkg.mk	2011-02-14 16:55:23 UTC (rev 13301)
@@ -651,6 +651,16 @@
 reset-merge-license:
 	@rm -f $(COOKIEDIR)/merge-license $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-license-$(SPEC))
 
+merge-README.CSW: $(WORKDIR)
+	$(_DBG)if test -f $(WORKDIR)/README.CSW; then \
+		$(foreach P,$(_PKG_SPECS),cp $(WORKDIR)/README.CSW $(PKGROOT)$(docdir)/$(call catalogname,$P)/README.CSW;) \
+	fi
+	@$(MAKECOOKIE)
+
+.PHONY: reset-merge-README.CSW
+reset-merge-README.CSW:
+	$(_DBG)rm -f $(COOKIEDIR)/merge-README.CSW $(foreach SPEC,$(_PKG_SPECS),$(PKGROOT)$(docdir)/$(call catalogname,$(SPEC))/README.CSW)
+
 merge-classutils: merge-migrateconf merge-usergroup merge-inetdconf merge-etcservices
 
 reset-merge-classutils: reset-merge-migrateconf reset-merge-usergroup reset-merge-inetdconf reset-merge-etcservices


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