[csw-devel] SF.net SVN: gar:[7123] csw/mgar/gar/v2/gar.pkg.mk

[dmichelsen at users.sourceforge.net]

Revision: 7123
          http://gar.svn.sourceforge.net/gar/?rev=7123&view=rev
Author:   dmichelsen
Date:     2009-11-05 14:59:22 +0000 (Thu, 05 Nov 2009)

Log Message:
-----------
mGAR v2: Check all packages at the same time

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

Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2009-11-05 14:18:29 UTC (rev 7122)
+++ csw/mgar/gar/v2/gar.pkg.mk	2009-11-05 14:59:22 UTC (rev 7123)
@@ -579,12 +579,6 @@
 # package - Use the mkpackage utility to create Solaris packages
 #
 
-ifneq ($(ENABLE_CHECK),0)
-PACKAGE_TARGETS = $(foreach SPEC,$(_PKG_SPECS), package-$(SPEC) pkgcheck-$(SPEC))
-else
-PACKAGE_TARGETS = $(foreach SPEC,$(_PKG_SPECS), package-$(SPEC))
-endif
-
 SPKG_DESTDIRS = $(SPKG_SPOOLDIR) $(SPKG_EXPORT)
 
 $(SPKG_DESTDIRS):
@@ -610,7 +604,8 @@
 # We depend on extract as the additional package files (like .gspec) must be
 # unpacked to global/ for packaging. E. g. 'merge' depends only on the specific
 # modulations and does not fill global/.
-_package: validateplatform extract-global merge $(SPKG_DESTDIRS) pre-package $(PACKAGE_TARGETS) post-package
+_package: validateplatform extract-global merge $(SPKG_DESTDIRS) pre-package $(PACKAGE_TARGETS) post-package $(if $(filter-out 0,$(ENABLE_CHECK)),pkgcheck)
+	@$(MAKECOOKIE)
 
 package: _package
 	@echo
@@ -642,13 +637,10 @@
 
 # pkgcheck - check if the package is compliant
 #
-pkgcheck: $(addprefix pkgcheck-,$(_PKG_SPECS))
-	@$(DONADA)
+pkgcheck: $(foreach SPEC,$(_PKG_SPECS),package-$(SPEC))
+	$(_DBG)( LC_ALL=C $(GARBIN)/checkpkg $(foreach SPEC,$(_PKG_SPECS),$(SPKG_EXPORT)/`$(call _PKG_ENV,$(SPEC)) mkpackage -qs $(WORKDIR)/$(SPEC).gspec -D pkgfile`.gz ) || exit 2;)
+	@$(MAKECOOKIE)
 
-pkgcheck-%:
-	@echo " ==> Checking compliance: $*"
-	@( LC_ALL=C $(GARBIN)/checkpkg $(SPKG_EXPORT)/`$(call _PKG_ENV,$1) mkpackage -qs $(WORKDIR)/$*.gspec -D pkgfile`.gz ) || exit 2
-
 pkgcheck-p:
 	@$(foreach COOKIEFILE,$(PKGCHECK_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;)
 


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