[csw-devel] SF.net SVN: gar:[11723] csw/mgar/gar/v2-noexternals/gar.mk

bdwalton at users.sourceforge.net bdwalton at users.sourceforge.net
Fri Nov 26 02:20:44 CET 2010


Revision: 11723
          http://gar.svn.sourceforge.net/gar/?rev=11723&view=rev
Author:   bdwalton
Date:     2010-11-26 01:20:44 +0000 (Fri, 26 Nov 2010)

Log Message:
-----------
gar/v2: add NOGITPATCH toggle to disable the git makepatch stuff

Modified Paths:
--------------
    csw/mgar/gar/v2-noexternals/gar.mk

Modified: csw/mgar/gar/v2-noexternals/gar.mk
===================================================================
--- csw/mgar/gar/v2-noexternals/gar.mk	2010-11-25 21:01:46 UTC (rev 11722)
+++ csw/mgar/gar/v2-noexternals/gar.mk	2010-11-26 01:20:44 UTC (rev 11723)
@@ -396,7 +396,7 @@
 
 # We call an additional extract-modulated without resetting any variables so
 # a complete unpacked set goes to the global dir for packaging (like gspec)
-extract: checksum $(COOKIEDIR) pre-extract pre-extract-git-check extract-modulated $(addprefix extract-,$(MODULATIONS)) post-extract
+extract: checksum $(COOKIEDIR) pre-extract $(if $(NOGITPATCH),,pre-extract-git-check) extract-modulated $(addprefix extract-,$(MODULATIONS)) post-extract
 	@$(DONADA)
 
 extract-global: $(if $(filter global,$(MODULATION)),extract-modulated)
@@ -407,7 +407,7 @@
 		$(addprefix dep-$(GARDIR)/,$(EXTRACTDEPS)) \
 		announce-modulation \
 		pre-extract-modulated pre-extract-$(MODULATION) $(EXTRACT_TARGETS) post-extract-$(MODULATION) post-extract-modulated \
-		$(if $(filter global,$(MODULATION)),,post-extract-gitsnap) \
+		$(if $(filter global,$(MODULATION)),,$(if $(NOGITPATCH),,post-extract-gitsnap)) \
 		$(foreach FILE,$(EXPANDVARS),expandvars-$(FILE))
 	@$(DONADA)
 
@@ -468,7 +468,7 @@
 patch: pre-patch $(addprefix patch-,$(MODULATIONS)) post-patch
 	@$(DONADA)
 
-patch-modulated: extract-modulated $(WORKSRC) pre-patch-modulated pre-patch-$(MODULATION) $(PATCH_TARGETS) $(if $(filter global,$(MODULATION)),,post-patch-gitsnap) post-patch-$(MODULATION) post-patch-modulated
+patch-modulated: extract-modulated $(WORKSRC) pre-patch-modulated pre-patch-$(MODULATION) $(PATCH_TARGETS) $(if $(filter global,$(MODULATION)),,$(if $(NOGITPATCH),,post-patch-gitsnap)) post-patch-$(MODULATION) post-patch-modulated
 	@$(DONADA)
 
 # returns true if patch has completed successfully, false
@@ -485,9 +485,13 @@
 	  fi )
 	@$(MAKECOOKIE)
 
-makepatch: $(addprefix patch-,$(MODULATIONS)) $(addprefix makepatch-,$(MODULATIONS))
+makepatch: $(if $(NOGITPATCH),makepatch-nogit,$(addprefix patch-,$(MODULATIONS)) $(addprefix makepatch-,$(MODULATIONS)))
 	@$(DONADA)
 
+makepatch-nogit:
+	@echo You set NOGITPATCH in your build recipe.  I can't create a patch.
+	@$(DONADA)
+
 # Allow generation of patches from modified work source.
 makepatch-modulated: $(FILEDIR)
 	@( if [ -d "$(WORKSRC)/.git" ]; then \


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


More information about the devel mailing list