Update file search to account for project tools directory

kgryte · kgryte · commit 2ef7965e23d3 · 2017-08-25T13:03:37.000-07:00
diff --git a/tools/make/lib/ls/benchmarks.mk b/tools/make/lib/ls/benchmarks.mk
@@ -21,6 +21,7 @@ FIND_BENCHMARKS_FLAGS ?= \
 	-not -path "$(ROOT_DIR)/.*" \
 	-not -path "$(NODE_MODULES)/*" \
 	-not -path "$(TOOLS_DIR)/*" \
+	-not -path "$(TOOLS_PKGS_DIR)/*" \
 	-not -path "$(BUILD_DIR)/*" \
 	-not -path "$(DEPS_DIR)/*" \
 	-not -path "$(REPORTS_DIR)/*"
diff --git a/tools/make/lib/ls/benchmarks_c.mk b/tools/make/lib/ls/benchmarks_c.mk
@@ -21,6 +21,7 @@ FIND_C_BENCHMARKS_FLAGS ?= \
 	-not -path "$(ROOT_DIR)/.*" \
 	-not -path "$(NODE_MODULES)/*" \
 	-not -path "$(TOOLS_DIR)/*" \
+	-not -path "$(TOOLS_PKGS_DIR)/*" \
 	-not -path "$(BUILD_DIR)/*" \
 	-not -path "$(DEPS_DIR)/*" \
 	-not -path "$(REPORTS_DIR)/*"
diff --git a/tools/make/lib/ls/benchmarks_cpp.mk b/tools/make/lib/ls/benchmarks_cpp.mk
@@ -21,6 +21,7 @@ FIND_CPP_BENCHMARKS_FLAGS ?= \
 	-not -path "$(ROOT_DIR)/.*" \
 	-not -path "$(NODE_MODULES)/*" \
 	-not -path "$(TOOLS_DIR)/*" \
+	-not -path "$(TOOLS_PKGS_DIR)/*" \
 	-not -path "$(BUILD_DIR)/*" \
 	-not -path "$(DEPS_DIR)/*" \
 	-not -path "$(REPORTS_DIR)/*"
diff --git a/tools/make/lib/ls/benchmarks_fortran.mk b/tools/make/lib/ls/benchmarks_fortran.mk
@@ -21,6 +21,7 @@ FIND_FORTRAN_BENCHMARKS_FLAGS ?= \
 	-not -path "$(ROOT_DIR)/.*" \
 	-not -path "$(NODE_MODULES)/*" \
 	-not -path "$(TOOLS_DIR)/*" \
+	-not -path "$(TOOLS_PKGS_DIR)/*" \
 	-not -path "$(BUILD_DIR)/*" \
 	-not -path "$(DEPS_DIR)/*" \
 	-not -path "$(REPORTS_DIR)/*"
diff --git a/tools/make/lib/ls/benchmarks_julia.mk b/tools/make/lib/ls/benchmarks_julia.mk
@@ -21,6 +21,7 @@ FIND_JULIA_BENCHMARKS_FLAGS ?= \
 	-not -path "$(ROOT_DIR)/.*" \
 	-not -path "$(NODE_MODULES)/*" \
 	-not -path "$(TOOLS_DIR)/*" \
+	-not -path "$(TOOLS_PKGS_DIR)/*" \
 	-not -path "$(BUILD_DIR)/*" \
 	-not -path "$(DEPS_DIR)/*" \
 	-not -path "$(REPORTS_DIR)/*"
diff --git a/tools/make/lib/ls/benchmarks_python.mk b/tools/make/lib/ls/benchmarks_python.mk
@@ -21,6 +21,7 @@ FIND_PYTHON_BENCHMARKS_FLAGS ?= \
 	-not -path "$(ROOT_DIR)/.*" \
 	-not -path "$(NODE_MODULES)/*" \
 	-not -path "$(TOOLS_DIR)/*" \
+	-not -path "$(TOOLS_PKGS_DIR)/*" \
 	-not -path "$(BUILD_DIR)/*" \
 	-not -path "$(DEPS_DIR)/*" \
 	-not -path "$(REPORTS_DIR)/*"
diff --git a/tools/make/lib/ls/benchmarks_r.mk b/tools/make/lib/ls/benchmarks_r.mk
@@ -21,6 +21,7 @@ FIND_R_BENCHMARKS_FLAGS ?= \
 	-not -path "$(ROOT_DIR)/.*" \
 	-not -path "$(NODE_MODULES)/*" \
 	-not -path "$(TOOLS_DIR)/*" \
+	-not -path "$(TOOLS_PKGS_DIR)/*" \
 	-not -path "$(BUILD_DIR)/*" \
 	-not -path "$(DEPS_DIR)/*" \
 	-not -path "$(REPORTS_DIR)/*"
diff --git a/tools/make/lib/ls/examples.mk b/tools/make/lib/ls/examples.mk
@@ -21,6 +21,7 @@ FIND_EXAMPLES_FLAGS ?= \
 	-not -path "$(ROOT_DIR)/.*" \
 	-not -path "$(NODE_MODULES)/*" \
 	-not -path "$(TOOLS_DIR)/*" \
+	-not -path "$(TOOLS_PKGS_DIR)/*" \
 	-not -path "$(BUILD_DIR)/*" \
 	-not -path "$(DEPS_DIR)/*" \
 	-not -path "$(REPORTS_DIR)/*" \
diff --git a/tools/make/lib/ls/examples_c.mk b/tools/make/lib/ls/examples_c.mk
@@ -21,6 +21,7 @@ FIND_C_EXAMPLES_FLAGS ?= \
 	-not -path "$(ROOT_DIR)/.*" \
 	-not -path "$(NODE_MODULES)/*" \
 	-not -path "$(TOOLS_DIR)/*" \
+	-not -path "$(TOOLS_PKGS_DIR)/*" \
 	-not -path "$(BUILD_DIR)/*" \
 	-not -path "$(DEPS_DIR)/*" \
 	-not -path "$(REPORTS_DIR)/*" \
diff --git a/tools/make/lib/ls/examples_cpp.mk b/tools/make/lib/ls/examples_cpp.mk
@@ -21,6 +21,7 @@ FIND_CPP_EXAMPLES_FLAGS ?= \
 	-not -path "$(ROOT_DIR)/.*" \
 	-not -path "$(NODE_MODULES)/*" \
 	-not -path "$(TOOLS_DIR)/*" \
+	-not -path "$(TOOLS_PKGS_DIR)/*" \
 	-not -path "$(BUILD_DIR)/*" \
 	-not -path "$(DEPS_DIR)/*" \
 	-not -path "$(REPORTS_DIR)/*" \
diff --git a/tools/make/lib/ls/examples_fortran.mk b/tools/make/lib/ls/examples_fortran.mk
@@ -21,6 +21,7 @@ FIND_FORTRAN_EXAMPLES_FLAGS ?= \
 	-not -path "$(ROOT_DIR)/.*" \
 	-not -path "$(NODE_MODULES)/*" \
 	-not -path "$(TOOLS_DIR)/*" \
+	-not -path "$(TOOLS_PKGS_DIR)/*" \
 	-not -path "$(BUILD_DIR)/*" \
 	-not -path "$(DEPS_DIR)/*" \
 	-not -path "$(REPORTS_DIR)/*" \
diff --git a/tools/make/lib/ls/examples_julia.mk b/tools/make/lib/ls/examples_julia.mk
@@ -21,6 +21,7 @@ FIND_JULIA_EXAMPLES_FLAGS ?= \
 	-not -path "$(ROOT_DIR)/.*" \
 	-not -path "$(NODE_MODULES)/*" \
 	-not -path "$(TOOLS_DIR)/*" \
+	-not -path "$(TOOLS_PKGS_DIR)/*" \
 	-not -path "$(BUILD_DIR)/*" \
 	-not -path "$(DEPS_DIR)/*" \
 	-not -path "$(REPORTS_DIR)/*" \
diff --git a/tools/make/lib/ls/examples_python.mk b/tools/make/lib/ls/examples_python.mk
@@ -21,6 +21,7 @@ FIND_PYTHON_EXAMPLES_FLAGS ?= \
 	-not -path "$(ROOT_DIR)/.*" \
 	-not -path "$(NODE_MODULES)/*" \
 	-not -path "$(TOOLS_DIR)/*" \
+	-not -path "$(TOOLS_PKGS_DIR)/*" \
 	-not -path "$(BUILD_DIR)/*" \
 	-not -path "$(DEPS_DIR)/*" \
 	-not -path "$(REPORTS_DIR)/*" \
diff --git a/tools/make/lib/ls/examples_r.mk b/tools/make/lib/ls/examples_r.mk
@@ -21,6 +21,7 @@ FIND_R_EXAMPLES_FLAGS ?= \
 	-not -path "$(ROOT_DIR)/.*" \
 	-not -path "$(NODE_MODULES)/*" \
 	-not -path "$(TOOLS_DIR)/*" \
+	-not -path "$(TOOLS_PKGS_DIR)/*" \
 	-not -path "$(BUILD_DIR)/*" \
 	-not -path "$(DEPS_DIR)/*" \
 	-not -path "$(REPORTS_DIR)/*" \
diff --git a/tools/make/lib/ls/sources.mk b/tools/make/lib/ls/sources.mk
@@ -20,6 +20,7 @@ FIND_SOURCES_FLAGS ?= \
 	-not -path "$(ROOT_DIR)/.*" \
 	-not -path "$(NODE_MODULES)/*" \
 	-not -path "$(TOOLS_DIR)/*" \
+	-not -path "$(TOOLS_PKGS_DIR)/*" \
 	-not -path "$(BUILD_DIR)/*" \
 	-not -path "$(DEPS_DIR)/*" \
 	-not -path "$(REPORTS_DIR)/*" \
diff --git a/tools/make/lib/ls/sources_c.mk b/tools/make/lib/ls/sources_c.mk
@@ -20,6 +20,7 @@ FIND_C_SOURCES_FLAGS ?= \
 	-not -path "$(ROOT_DIR)/.*" \
 	-not -path "$(NODE_MODULES)/*" \
 	-not -path "$(TOOLS_DIR)/*" \
+	-not -path "$(TOOLS_PKGS_DIR)/*" \
 	-not -path "$(BUILD_DIR)/*" \
 	-not -path "$(DEPS_DIR)/*" \
 	-not -path "$(REPORTS_DIR)/*" \
diff --git a/tools/make/lib/ls/sources_cpp.mk b/tools/make/lib/ls/sources_cpp.mk
@@ -20,6 +20,7 @@ FIND_CPP_SOURCES_FLAGS ?= \
 	-not -path "$(ROOT_DIR)/.*" \
 	-not -path "$(NODE_MODULES)/*" \
 	-not -path "$(TOOLS_DIR)/*" \
+	-not -path "$(TOOLS_PKGS_DIR)/*" \
 	-not -path "$(BUILD_DIR)/*" \
 	-not -path "$(DEPS_DIR)/*" \
 	-not -path "$(REPORTS_DIR)/*" \
diff --git a/tools/make/lib/ls/sources_fortran.mk b/tools/make/lib/ls/sources_fortran.mk
@@ -20,6 +20,7 @@ FIND_FORTRAN_SOURCES_FLAGS ?= \
 	-not -path "$(ROOT_DIR)/.*" \
 	-not -path "$(NODE_MODULES)/*" \
 	-not -path "$(TOOLS_DIR)/*" \
+	-not -path "$(TOOLS_PKGS_DIR)/*" \
 	-not -path "$(BUILD_DIR)/*" \
 	-not -path "$(DEPS_DIR)/*" \
 	-not -path "$(REPORTS_DIR)/*" \
diff --git a/tools/make/lib/ls/sources_julia.mk b/tools/make/lib/ls/sources_julia.mk
@@ -20,6 +20,7 @@ FIND_JULIA_SOURCES_FLAGS ?= \
 	-not -path "$(ROOT_DIR)/.*" \
 	-not -path "$(NODE_MODULES)/*" \
 	-not -path "$(TOOLS_DIR)/*" \
+	-not -path "$(TOOLS_PKGS_DIR)/*" \
 	-not -path "$(BUILD_DIR)/*" \
 	-not -path "$(DEPS_DIR)/*" \
 	-not -path "$(REPORTS_DIR)/*" \
diff --git a/tools/make/lib/ls/sources_python.mk b/tools/make/lib/ls/sources_python.mk
@@ -20,6 +20,7 @@ FIND_PYTHON_SOURCES_FLAGS ?= \
 	-not -path "$(ROOT_DIR)/.*" \
 	-not -path "$(NODE_MODULES)/*" \
 	-not -path "$(TOOLS_DIR)/*" \
+	-not -path "$(TOOLS_PKGS_DIR)/*" \
 	-not -path "$(BUILD_DIR)/*" \
 	-not -path "$(DEPS_DIR)/*" \
 	-not -path "$(REPORTS_DIR)/*" \
diff --git a/tools/make/lib/ls/sources_r.mk b/tools/make/lib/ls/sources_r.mk
@@ -20,6 +20,7 @@ FIND_R_SOURCES_FLAGS ?= \
 	-not -path "$(ROOT_DIR)/.*" \
 	-not -path "$(NODE_MODULES)/*" \
 	-not -path "$(TOOLS_DIR)/*" \
+	-not -path "$(TOOLS_PKGS_DIR)/*" \
 	-not -path "$(BUILD_DIR)/*" \
 	-not -path "$(DEPS_DIR)/*" \
 	-not -path "$(REPORTS_DIR)/*" \
diff --git a/tools/make/lib/ls/tests.mk b/tools/make/lib/ls/tests.mk
@@ -20,6 +20,7 @@ FIND_TESTS_FLAGS ?= \
 	-not -path "$(ROOT_DIR)/.*" \
 	-not -path "$(NODE_MODULES)/*" \
 	-not -path "$(TOOLS_DIR)/*" \
+	-not -path "$(TOOLS_PKGS_DIR)/*" \
 	-not -path "$(DEPS_DIR)/*" \
 	-not -path "$(BUILD_DIR)/*" \
 	-not -path "$(REPORTS_DIR)/*" \
diff --git a/tools/make/lib/ls/tests_directories.mk b/tools/make/lib/ls/tests_directories.mk
@@ -20,6 +20,7 @@ FIND_TESTS_DIRS_FLAGS ?= \
 	-not -path "$(ROOT_DIR)/.*" \
 	-not -path "$(NODE_MODULES)/*" \
 	-not -path "$(TOOLS_DIR)/*" \
+	-not -path "$(TOOLS_PKGS_DIR)/*" \
 	-not -path "$(BUILD_DIR)/*" \
 	-not -path "$(DEPS_DIR)/*" \
 	-not -path "$(REPORTS_DIR)/*" \
diff --git a/tools/make/lib/ls/tests_fixtures.mk b/tools/make/lib/ls/tests_fixtures.mk
@@ -21,6 +21,7 @@ FIND_TESTS_FIXTURES_FLAGS ?= \
 	-not -path "$(ROOT_DIR)/.*" \
 	-not -path "$(NODE_MODULES)/*" \
 	-not -path "$(TOOLS_DIR)/*" \
+	-not -path "$(TOOLS_PKGS_DIR)/*" \
 	-not -path "$(BUILD_DIR)/*" \
 	-not -path "$(DEPS_DIR)/*" \
 	-not -path "$(REPORTS_DIR)/*" \
diff --git a/tools/make/lib/ls/tests_fixtures_c.mk b/tools/make/lib/ls/tests_fixtures_c.mk
@@ -21,6 +21,7 @@ FIND_C_TESTS_FIXTURES_FLAGS ?= \
 	-not -path "$(ROOT_DIR)/.*" \
 	-not -path "$(NODE_MODULES)/*" \
 	-not -path "$(TOOLS_DIR)/*" \
+	-not -path "$(TOOLS_PKGS_DIR)/*" \
 	-not -path "$(BUILD_DIR)/*" \
 	-not -path "$(DEPS_DIR)/*" \
 	-not -path "$(REPORTS_DIR)/*" \
diff --git a/tools/make/lib/ls/tests_fixtures_cpp.mk b/tools/make/lib/ls/tests_fixtures_cpp.mk
@@ -21,6 +21,7 @@ FIND_CPP_TESTS_FIXTURES_FLAGS ?= \
 	-not -path "$(ROOT_DIR)/.*" \
 	-not -path "$(NODE_MODULES)/*" \
 	-not -path "$(TOOLS_DIR)/*" \
+	-not -path "$(TOOLS_PKGS_DIR)/*" \
 	-not -path "$(BUILD_DIR)/*" \
 	-not -path "$(DEPS_DIR)/*" \
 	-not -path "$(REPORTS_DIR)/*" \
diff --git a/tools/make/lib/ls/tests_fixtures_fortran.mk b/tools/make/lib/ls/tests_fixtures_fortran.mk
@@ -21,6 +21,7 @@ FIND_FORTRAN_TESTS_FIXTURES_FLAGS ?= \
 	-not -path "$(ROOT_DIR)/.*" \
 	-not -path "$(NODE_MODULES)/*" \
 	-not -path "$(TOOLS_DIR)/*" \
+	-not -path "$(TOOLS_PKGS_DIR)/*" \
 	-not -path "$(BUILD_DIR)/*" \
 	-not -path "$(DEPS_DIR)/*" \
 	-not -path "$(REPORTS_DIR)/*" \
diff --git a/tools/make/lib/ls/tests_fixtures_julia.mk b/tools/make/lib/ls/tests_fixtures_julia.mk
@@ -21,6 +21,7 @@ FIND_JULIA_TESTS_FIXTURES_FLAGS ?= \
 	-not -path "$(ROOT_DIR)/.*" \
 	-not -path "$(NODE_MODULES)/*" \
 	-not -path "$(TOOLS_DIR)/*" \
+	-not -path "$(TOOLS_PKGS_DIR)/*" \
 	-not -path "$(BUILD_DIR)/*" \
 	-not -path "$(DEPS_DIR)/*" \
 	-not -path "$(REPORTS_DIR)/*" \
diff --git a/tools/make/lib/ls/tests_fixtures_python.mk b/tools/make/lib/ls/tests_fixtures_python.mk
@@ -21,6 +21,7 @@ FIND_PYTHON_TESTS_FIXTURES_FLAGS ?= \
 	-not -path "$(ROOT_DIR)/.*" \
 	-not -path "$(NODE_MODULES)/*" \
 	-not -path "$(TOOLS_DIR)/*" \
+	-not -path "$(TOOLS_PKGS_DIR)/*" \
 	-not -path "$(BUILD_DIR)/*" \
 	-not -path "$(DEPS_DIR)/*" \
 	-not -path "$(REPORTS_DIR)/*" \
diff --git a/tools/make/lib/ls/tests_fixtures_r.mk b/tools/make/lib/ls/tests_fixtures_r.mk
@@ -21,6 +21,7 @@ FIND_R_TESTS_FIXTURES_FLAGS ?= \
 	-not -path "$(ROOT_DIR)/.*" \
 	-not -path "$(NODE_MODULES)/*" \
 	-not -path "$(TOOLS_DIR)/*" \
+	-not -path "$(TOOLS_PKGS_DIR)/*" \
 	-not -path "$(BUILD_DIR)/*" \
 	-not -path "$(DEPS_DIR)/*" \
 	-not -path "$(REPORTS_DIR)/*" \
diff --git a/tools/make/lib/ls/tools_tests.mk b/tools/make/lib/ls/tools_tests.mk
@@ -25,7 +25,7 @@ ifneq ($(OS), Darwin)
 endif
 
 # Define a command to list test files:
-FIND_TOOLS_TESTS_CMD ?= find $(find_kernel_prefix) $(TOOLS_DIR) $(FIND_TOOLS_TESTS_FLAGS)
+FIND_TOOLS_TESTS_CMD ?= find $(find_kernel_prefix) $(TOOLS_DIR) $(TOOLS_PKGS_DIR) $(FIND_TOOLS_TESTS_FLAGS)
 
 # Define the list of test files:
 TOOLS_TESTS ?= $(shell $(FIND_TOOLS_TESTS_CMD))
@@ -38,6 +38,6 @@ TOOLS_TESTS ?= $(shell $(FIND_TOOLS_TESTS_CMD))
 # This target prints a newline-delimited list of test files.
 
 list-tools-tests:
-	$(QUIET) find $(find_kernel_prefix) $(TOOLS_DIR) $(FIND_TOOLS_TESTS_FLAGS) $(find_print_tools_tests_list)
+	$(QUIET) find $(find_kernel_prefix) $(TOOLS_DIR) $(TOOLS_PKGS_DIR) $(FIND_TOOLS_TESTS_FLAGS) $(find_print_tools_tests_list)
 
 .PHONY: list-tools-tests
