Revision: 4084
http://gar.svn.sourceforge.net/gar/?rev=4084&view=rev
Author: dmichelsen
Date: 2009-03-30 19:21:37 +0000 (Mon, 30 Mar 2009)
Log Message:
-----------
mGAR v2: Allow modulation-specific patches with PATCHFILES_<modulation>
Modified Paths:
--------------
csw/mgar/gar/v2/gar.lib.mk
csw/mgar/gar/v2/gar.mk
Modified: csw/mgar/gar/v2/gar.lib.mk
===================================================================
--- csw/mgar/gar/v2/gar.lib.mk 2009-03-30 19:19:14 UTC (rev 4083)
+++ csw/mgar/gar/v2/gar.lib.mk 2009-03-30 19:21:37 UTC (rev 4084)
@@ -27,7 +27,7 @@
#################### FETCH RULES ####################
-URLS = $(call URLSTRIP,$(foreach SITE,$(FILE_SITES)
$(MASTER_SITES),$(addprefix $(SITE),$(DISTFILES))) $(foreach SITE,$(FILE_SITES)
$(PATCH_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(PATCHFILES))))
+URLS = $(call URLSTRIP,$(foreach SITE,$(FILE_SITES)
$(MASTER_SITES),$(addprefix $(SITE),$(DISTFILES))) $(foreach SITE,$(FILE_SITES)
$(PATCH_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(PATCHFILES) $(foreach
M,$(MODULATIONS),$(PATCHFILES_$M)))))
# if the caller has defined _postinstall, etc targets for a package, add
# these 'dynamic script' targets to our fetch list
Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk 2009-03-30 19:19:14 UTC (rev 4083)
+++ csw/mgar/gar/v2/gar.mk 2009-03-30 19:21:37 UTC (rev 4084)
@@ -44,7 +44,12 @@
DYNSCRIPTS = $(foreach PKG,$(SPKG_SPECS),$(foreach SCR,$(ADMSCRIPTS),$(if
$(value $(PKG)_$(SCR)), $(PKG).$(SCR))))
_NOCHECKSUM += $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R)))
-ALLFILES ?= $(DISTFILES) $(PATCHFILES) $(DYNSCRIPTS) $(foreach
R,$(GIT_REPOS),$(call GITPROJ,$(R)))
+# Allow overriding of only specific components of ALLFILES by clearing e. g.
'ALLFILES_DYNSCRIPTS = '
+ALLFILES_DISTFILES ?= $(DISTFILES)
+ALLFILES_PATCHFILES ?= $(PATCHFILES) $(foreach
M,$(MODULATIONS),$(PATCHFILES_$M))
+ALLFILES_DYNSCRIPTS ?= $(DYNSCRIPTS)
+ALLFILES_GIT_REPOS ?= $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R)))
+ALLFILES ?= $(ALLFILES_DISTFILES) $(ALLFILES_PATCHFILES)
$(ALLFILES_DYNSCRIPTS) $(ALLFILES_GIT_REPOS)
ifeq ($(MAKE_INSTALL_DIRS),1)
INSTALL_DIRS = $(addprefix $(DESTDIR),$(prefix) $(exec_prefix) $(bindir)
$(sbindir) $(libexecdir) $(datadir) $(sysconfdir) $(sharedstatedir)
$(localstatedir) $(libdir) $(infodir) $(lispdir) $(includedir) $(mandir)
$(foreach NUM,1 2 3 4 5 6 7 8, $(mandir)/man$(NUM)) $(sourcedir))
@@ -243,6 +248,7 @@
@$(foreach F,$(DISTFILES),echo " $F";)
@echo "Patch files: "
@$(foreach P,$(PATCHFILES),echo " $P";)
+ @$(foreach M,$(MODULATIONS),$(if $(PATCHFILES_$M),echo " Modulation $M
only: $(PATCHFILES_$M)";))
@echo "Dynamically generated scripts: "
@$(foreach D,$(DYNSCRIPTS),echo " $D";)
@echo "Git Repos tracked: "
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
[email protected]
https://lists.opencsw.org/mailman/listinfo/devel
