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

[dmichelsen at users.sourceforge.net]

Revision: 17888
          http://gar.svn.sourceforge.net/gar/?rev=17888&view=rev
Author:   dmichelsen
Date:     2012-04-27 08:58:11 +0000 (Fri, 27 Apr 2012)
Log Message:
-----------
Deprecate admfiles, allow expansion of obsoleted package contents

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

Modified: csw/mgar/gar/v2/gar.lib.mk
===================================================================
--- csw/mgar/gar/v2/gar.lib.mk	2012-04-26 15:56:38 UTC (rev 17887)
+++ csw/mgar/gar/v2/gar.lib.mk	2012-04-27 08:58:11 UTC (rev 17888)
@@ -48,8 +48,10 @@
 # 1) we have to strip the colon from the URLs
 # 2) the download is very costly with bigger Makefiles as they will be
 #    re-evaluated for every URL (nested gmake invocation, room for improvement)
+$(DOWNLOADDIR)/%: _FLIST=$(filter %/$*,$(URLS))
 $(DOWNLOADDIR)/%:  
-	@if test -f $(COOKIEDIR)/checksum-$*; then : ; else \
+	$(if $(_FLIST),,$(error INTERNAL ERROR: The file $* is requested but not in the list of generated URLs))
+	if test -f $(COOKIEDIR)/checksum-$*; then : ; else \
 		echo " ==> Grabbing $@"; \
 		( for i in $(filter %/$*,$(URLS)); do  \
 			echo " 	==> Trying $$i"; \

Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2012-04-26 15:56:38 UTC (rev 17887)
+++ csw/mgar/gar/v2/gar.pkg.mk	2012-04-27 08:58:11 UTC (rev 17888)
@@ -74,8 +74,8 @@
 # the string is cut (no longer on word boundaries).
 SPKG_DESC_$(1) ?= $(shell echo Transitional package. Content moved to $(foreach P,$(OBSOLETING_PKGS),$(if $(filter $(1),$(OBSOLETED_BY_$P)),$P)) | perl -npe 's/(.{100}).+/substr($$1,0,96) . " ..."/e')
 RUNTIME_DEP_PKGS_$(1) = $(foreach P,$(OBSOLETING_PKGS),$(if $(filter $(1),$(OBSOLETED_BY_$P)),$P))
-PKGFILES_$(1) = NOFILES
-ARCHALL_$(1) = 1
+PKGFILES_$(1) ?= NOFILES
+ARCHALL_$(1) ?= 1
 # For legacy packages we know that the dependency is correct because we deliberately set it
 # A legacy dependency from another package may not have been released
 # The catalog name may not match for legacy packages
@@ -318,7 +318,10 @@
 # Canned command for generating admin file names
 # Usage: $(call admfiles,SUNWpackage,depend copyright)
 # pkg.gspec is added by default.
-admfiles = $(1).gspec $(foreach PKG,$(1),$(foreach ADM,$(2),$(PKG).$(ADM)))
+#admfiles = $(1).gspec $(foreach PKG,$(1),$(foreach ADM,$(2),$(PKG).$(ADM)))
+# The problem is that with the new ruleset the expansion of admfiles is too late leading to
+# files not be in the list of generated download URLs, deprecate use
+admfiles = $(error The use of admfiles is deprecated. Please use a manual list of files)
 
 # Standard sets of admin files for use with admfiles
 ADMSTANDARD = prototype depend

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