Skip to content

Commit b91128f

Browse files
kgrytekgryte
committed
Consolidate exclude flags into a single env var
1 parent 1848986 commit b91128f

1 file changed

Lines changed: 19 additions & 49 deletions

File tree

‎tools/make/lib/ls/Makefile‎

Lines changed: 19 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -219,82 +219,52 @@ WAT_FILTER ?= .*/.*
219219
PACKAGES_FILTER ?= .*/.*
220220

221221

222-
# Benchmark exclude flags:
223-
FIND_BENCHMARKS_EXCLUDE_FLAGS ?= \
222+
# Common exclude flags:
223+
FIND_COMMON_EXCLUDE_FLAGS ?= \
224224
-not -path "$(ROOT_DIR)/.*" \
225225
-not -path "$(NODE_MODULES)/*" \
226226
-not -path "$(DOCS_DIR)/**/$(NODE_MODULES_FOLDER)/*" \
227-
-not -path "$(TOOLS_DIR)/*" \
228-
-not -path "$(TOOLS_PKGS_DIR)/*" \
229-
-not -path "$(DIST_DIR)/*" \
227+
-not -path "$(BUILD_DIR)/*" \
230228
-not -path "$(DEPS_DIR)/*" \
229+
-not -path "$(DIST_DIR)/*" \
231230
-not -path "$(REPORTS_DIR)/*" \
232-
-not -path "$(BUILD_DIR)/*" \
233231
-not -path "$(TMP_DIR)/*" \
234232
-not -path "$(ROOT_DIR)/**/$(BUILD_FOLDER)/*" \
235233
-not -path "$(ROOT_DIR)/**/$(TMP_FOLDER)/*"
236234

235+
# Benchmark exclude flags:
236+
FIND_BENCHMARKS_EXCLUDE_FLAGS ?= \
237+
$(FIND_COMMON_EXCLUDE_FLAGS) \
238+
-not -path "$(TOOLS_DIR)/*" \
239+
-not -path "$(TOOLS_PKGS_DIR)/*"
240+
237241
# Examples exclude flags:
238242
FIND_EXAMPLES_EXCLUDE_FLAGS ?= \
239-
-not -path "$(ROOT_DIR)/.*" \
240-
-not -path "$(NODE_MODULES)/*" \
241-
-not -path "$(DOCS_DIR)/**/$(NODE_MODULES_FOLDER)/*" \
243+
$(FIND_COMMON_EXCLUDE_FLAGS) \
242244
-not -path "$(TOOLS_DIR)/*" \
243245
-not -path "$(TOOLS_PKGS_DIR)/*" \
244-
-not -path "$(DIST_DIR)/*" \
245-
-not -path "$(DEPS_DIR)/*" \
246-
-not -path "$(REPORTS_DIR)/*" \
247-
-not -path "$(BUILD_DIR)/*" \
248-
-not -path "$(TMP_DIR)/*" \
249-
-not -path "$(ROOT_DIR)/**/$(BUILD_FOLDER)/*" \
250-
-not -path "$(ROOT_DIR)/**/$(TMP_FOLDER)/*" \
251-
-not -path "$(ROOT_DIR)/**/$(EXAMPLES_FOLDER)/fixtures/*"
246+
-not -path "$(ROOT_DIR)/**/$(EXAMPLES_FIXTURES_FOLDER)/*"
252247

253248
# Files exclude flags:
254-
FIND_FILES_EXCLUDE_FLAGS ?= \
255-
-not -path "$(ROOT_DIR)/.*" \
256-
-not -path "$(NODE_MODULES)/*" \
257-
-not -path "$(DOCS_DIR)/**/$(NODE_MODULES_FOLDER)/*" \
258-
-not -path "$(DIST_DIR)/*" \
259-
-not -path "$(DEPS_DIR)/*" \
260-
-not -path "$(REPORTS_DIR)/*" \
261-
-not -path "$(BUILD_DIR)/*" \
262-
-not -path "$(TMP_DIR)/*" \
263-
-not -path "$(ROOT_DIR)/**/$(BUILD_FOLDER)/*" \
264-
-not -path "$(ROOT_DIR)/**/$(TMP_FOLDER)/*"
249+
FIND_FILES_EXCLUDE_FLAGS ?= $(FIND_COMMON_EXCLUDE_FLAGS)
265250

266251
# Sources exclude flags:
267252
FIND_SOURCES_EXCLUDE_FLAGS ?= \
268-
-not -path "$(ROOT_DIR)/.*" \
269-
-not -path "$(NODE_MODULES)/*" \
270-
-not -path "$(DOCS_DIR)/**/$(NODE_MODULES_FOLDER)/*" \
253+
$(FIND_COMMON_EXCLUDE_FLAGS) \
271254
-not -path "$(TOOLS_DIR)/*" \
272255
-not -path "$(TOOLS_PKGS_DIR)/*" \
273-
-not -path "$(DIST_DIR)/*" \
274-
-not -path "$(DEPS_DIR)/*" \
275-
-not -path "$(REPORTS_DIR)/*" \
276-
-not -path "$(BUILD_DIR)/*" \
277-
-not -path "$(TMP_DIR)/*" \
278256
-not -path "$(ROOT_DIR)/**/$(EXAMPLES_FOLDER)/*" \
279257
-not -path "$(ROOT_DIR)/**/$(TESTS_FOLDER)/*" \
280258
-not -path "$(ROOT_DIR)/**/$(BENCHMARKS_FOLDER)/*" \
281-
-not -path "$(ROOT_DIR)/**/$(BUILD_FOLDER)/*" \
282-
-not -path "$(ROOT_DIR)/**/$(TMP_FOLDER)/*"
259+
-not -path "$(ROOT_DIR)/**/$(DOCUMENTATION_FOLDER)/*" \
260+
-not -path "$(ROOT_DIR)/**/$(CONFIG_FOLDER)/*" \
261+
-not -path "$(ROOT_DIR)/**/$(SCRIPTS_FOLDER)/*"
283262

284263
# Text fixtures exclude flags:
285264
FIND_TESTS_FIXTURES_EXCLUDE_FLAGS ?= \
286-
-not -path "$(ROOT_DIR)/.*" \
287-
-not -path "$(NODE_MODULES)/*" \
288-
-not -path "$(DOCS_DIR)/**/$(NODE_MODULES_FOLDER)/*" \
265+
$(FIND_COMMON_EXCLUDE_FLAGS) \
289266
-not -path "$(TOOLS_DIR)/*" \
290-
-not -path "$(TOOLS_PKGS_DIR)/*" \
291-
-not -path "$(DIST_DIR)/*" \
292-
-not -path "$(DEPS_DIR)/*" \
293-
-not -path "$(REPORTS_DIR)/*" \
294-
-not -path "$(BUILD_DIR)/*" \
295-
-not -path "$(TMP_DIR)/*" \
296-
-not -path "$(ROOT_DIR)/**/$(BUILD_FOLDER)/*" \
297-
-not -path "$(ROOT_DIR)/**/$(TMP_FOLDER)/*"
267+
-not -path "$(TOOLS_PKGS_DIR)/*"
298268

299269

300270
# DEPENDENCIES #

0 commit comments

Comments
 (0)