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

[skayser at users.sourceforge.net]

Revision: 14157
          http://gar.svn.sourceforge.net/gar/?rev=14157&view=rev
Author:   skayser
Date:     2011-04-13 10:25:48 +0000 (Wed, 13 Apr 2011)

Log Message:
-----------
.buildsys/v2: add changelog.CSW handling similar to README.CSW, also adjust _DBG -> _DBG_MERGE for merge related targets

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-04-13 10:21:56 UTC (rev 14156)
+++ csw/mgar/gar/v2/gar.mk	2011-04-13 10:25:48 UTC (rev 14157)
@@ -806,7 +806,7 @@
 
 
 # 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) merge-README.CSW merge-obsolete $(if $(AP2_MODS),post-merge-ap2mod) post-merge
+merge: checksum pre-merge merge-do merge-license merge-classutils merge-checkpkgoverrides merge-alternatives $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) merge-distfile-README.CSW merge-distfile-changelog.CSW merge-obsolete $(if $(AP2_MODS),post-merge-ap2mod) post-merge
 	banner merge
 	@$(MAKECOOKIE)
 
@@ -890,7 +890,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-README.CSW reset-merge-obsolete 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-distfile-README.CSW reset-merge-distfile-changelog.CSW reset-merge-obsolete 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-04-13 10:21:56 UTC (rev 14156)
+++ csw/mgar/gar/v2/gar.pkg.mk	2011-04-13 10:25:48 UTC (rev 14157)
@@ -705,19 +705,19 @@
 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 \
+merge-distfile-%: $(DOWNLOADDIR)
+	$(_DBG_MERGE)if test -f $(DOWNLOADDIR)/$*; then \
 		$(foreach P,$(_PKG_SPECS),mkdir -p $(PKGROOT)$(docdir)/$(call catalogname,$P);) \
-		$(foreach P,$(_PKG_SPECS),cp $(WORKDIR)/README.CSW $(PKGROOT)$(docdir)/$(call catalogname,$P)/README.CSW;) \
+		$(foreach P,$(_PKG_SPECS),cp $(DOWNLOADDIR)/$* $(PKGROOT)$(docdir)/$(call catalogname,$P)/$*;) \
 	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)
+.PHONY: reset-merge-distfile-%
+reset-merge-distfile-%:
+	$(_DBG_MERGE)rm -f $(COOKIEDIR)/merge-distfile-$* $(foreach SPEC,$(_PKG_SPECS),$(PKGROOT)$(docdir)/$(call catalogname,$(SPEC))/$*)
 
 merge-obsolete: $(WORKDIR_GLOBAL)
-	$(_DBG)$(foreach P,$(OBSOLETED_PKGS),$(foreach Q,$(OBSOLETING_PKGS),$(if $(filter $P,$(OBSOLETED_BY_$Q)), \
+	$(_DBG_MERGE)$(foreach P,$(OBSOLETED_PKGS),$(foreach Q,$(OBSOLETING_PKGS),$(if $(filter $P,$(OBSOLETED_BY_$Q)), \
 		($(if $(SPKG_DESC_$Q), \
 			echo "$Q $(call catalogname,$Q) - $(SPKG_DESC_$Q)";, \
 			echo "$(shell (/usr/bin/pkginfo $Q || echo "$Q - ") | $(GAWK) '{ $$1 = "P"; print }')"; \


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