common Makefile.common,1.70,1.71

[Mike Bonnet (mikeb)]

Author: mikeb

Update of /cvs/pkgs/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16112

Modified Files:
	Makefile.common 
Log Message:
allow build groups to be explicitly defined in chain-build


Index: Makefile.common
===================================================================
RCS file: /cvs/pkgs/common/Makefile.common,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- Makefile.common	6 Jul 2007 16:56:11 -0000	1.70
+++ Makefile.common	6 Jul 2007 18:22:44 -0000	1.71
@@ -426,7 +426,10 @@
                         echo "$(NAME) must not appear in CHAIN" ; \
                         exit 1 ; \
                 fi ; \
-                if [ -n "$$urls" ]; then \
+                if [ "$$component" = ":" ]; then \
+                        urls="$$urls :" ; \
+                        continue ; \
+                elif [ -n "$$urls" -a -z "$(findstring :,$(CHAIN))" ]; then \
                         urls="$$urls :" ; \
                 fi ; \
                 rm -rf .tmp-$$$$ ; \
@@ -437,7 +440,10 @@
                 popd > /dev/null ; \
                 rm -rf .tmp-$$$$ ; \
         done ; \
-        urls="$$urls : `make -s cvsurl`" ; \
+        if [ -z "$(findstring :,$(CHAIN))" ]; then \
+                urls="$$urls :" ; \
+        fi ; \
+        urls="$$urls `make -s cvsurl`" ; \
         $(BUILD_CLIENT) chain-build $(BUILD_FLAGS) $(TARGET) $$urls
 
 # "make new | less" to see what has changed since the last tag was assigned
@@ -519,6 +525,11 @@
 	@echo "	chain-build		Build current package in order with other packages"
 	@echo "		example:  make chain-build CHAIN='libwidget libgizmo'"
 	@echo "		The current package is added to the end of the CHAIN list."
+	@echo "		Colons (:) can be used in the CHAIN parameter to define dependency groups."
+	@echo "		Packages in a single group will be built in parallel, and all packages"
+	@echo "		  in a group must build successfully and populate the repository before"
+	@echo "		  the next group will begin building."
+	@echo "		If no groups are defined, packages will be built sequentially."
 	@echo "	mockbuild		Local test build using mock"
 	@echo "	verrel			Echo \"$(NAME)-$(VERSION)-$(RELEASE)\""
 	@echo "	new			Diff against last tag"