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

[dmichelsen at users.sourceforge.net]

Revision: 6856
          http://gar.svn.sourceforge.net/gar/?rev=6856&view=rev
Author:   dmichelsen
Date:     2009-10-13 16:23:26 +0000 (Tue, 13 Oct 2009)

Log Message:
-----------
mGAR v2: Copy stuff from DISTFILES to global WORKDIR without unpacking

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-10-13 16:01:56 UTC (rev 6855)
+++ csw/mgar/gar/v2/gar.lib.mk	2009-10-13 16:23:26 UTC (rev 6856)
@@ -393,6 +393,9 @@
 extract-archive-%.git: git-extract-%.git
 	@$(MAKECOOKIE)
 
+extract-copy-%: cp-extract-%
+	@$(MAKECOOKIE)
+
 # anything we don't know about, we just assume is already
 # uncompressed and unarchived in plain format
 extract-archive-%: cp-extract-%

Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2009-10-13 16:01:56 UTC (rev 6855)
+++ csw/mgar/gar/v2/gar.mk	2009-10-13 16:23:26 UTC (rev 6856)
@@ -329,8 +329,9 @@
 garchive: checksum $(GARCHIVE_TARGETS) ;
 
 # extract		- Unpacks $(DISTFILES) into $(EXTRACTDIR) (patches are "zcatted" into the patch program)
-EXTRACT_TARGETS-global ?= $(foreach SPEC,$(SPKG_SPECS),$(filter $(SPEC).%,$(DISTFILES) $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R)))))
-EXTRACT_TARGETS = $(addprefix extract-archive-,$(filter-out $(NOEXTRACT),$(if $(EXTRACT_TARGETS-$(MODULATION)),$(EXTRACT_TARGETS-$(MODULATION)),$(DISTFILES) $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R))))))
+EXTRACT_TARGETS-global ?= $(addprefix extract-copy-,$(filter-out $(NOEXTRACT),$(DISTFILES) $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R)))))
+EXTRACT_TARGETS-default = $(addprefix extract-archive-,$(filter-out $(NOEXTRACT),$(DISTFILES) $(DYNSCRIPTS) $(foreach R,$(GIT_REPOS),$(call GITPROJ,$(R)))))
+EXTRACT_TARGETS = $(or $(EXTRACT_TARGETS-$(MODULATION)),$(EXTRACT_TARGETS-default))
 
 # We call an additional extract-modulated without resetting any variables so
 # a complete unpacked set goes to the global dir for packaging (like gspec)


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