24836578 finding lintable manifests takes too long
authorJohn Beck <John.Beck@Oracle.COM>
Wed, 05 Apr 2017 09:01:59 -0700
changeset 7836 2d73177c07ee
parent 7835 20c33a4fd225
child 7837 e695e26f0bb2
24836578 finding lintable manifests takes too long
components/Makefile
--- a/components/Makefile	Tue Apr 04 13:32:28 2017 -0700
+++ b/components/Makefile	Wed Apr 05 09:01:59 2017 -0700
@@ -116,8 +116,7 @@
 
 clobber:	$(COMPONENT_DIRS.nosetup) clean
 	@cd ../tools ; echo "clobbering tools..." ; $(GMAKE) clobber
-	$(RM) -r $(WS_REPO) $(WS_HOME) $(WS_LOGS) $(WS_LINT_CACHE) \
-	    $(shell find . -name 'manifest-*.published')
+	$(RM) -r $(WS_REPO) $(WS_HOME) $(WS_LOGS) $(WS_LINT_CACHE)
 
 setup:	$(WS_MACH) $(WS_LOGS) $(WS_HOME) $(WS_REPO) tools $(WS_LINT_CACHE)
 
@@ -172,14 +171,15 @@
 	done
 
 # Use PKGLINT below instead of PKGLINTVAR because we know we always want the
-# real one for this set of rules.
+# real one for this set of rules.  We use $(wildcard ...) because not all
+# component directories get published (evaluation builds complicate things).
 pkglint:
 	@echo 'pkglinting all package manifests...'
 	@$(ENV) PYTHONPATH=$(WS_TOOLS)/python \
 			SOLARIS_VERSION=$(SOLARIS_VERSION) \
 			$(PKGLINT) \
 			-c $(WS_LINT_CACHE) -f $(WS_TOOLS)/pkglintrc \
-			$(shell find . -name 'manifest-*.published')
+			$(wildcard $(COMPONENT_DIRS:%=%/build/manifest-*.published))
 
 publish:
 	$(PKGREPO) refresh -s $(PKG_REPO)