Remove ONESHELL stuff

This commit is contained in:
Justin Traglia 2024-09-20 10:08:18 -05:00
parent e0651d34b0
commit eff5e8f697
No known key found for this signature in database
GPG Key ID: F099C9CD25DF82A1
1 changed files with 9 additions and 14 deletions

View File

@ -28,6 +28,12 @@ FORK_CHOICE_DIR = ./fork_choice
# To check generator matching: # To check generator matching:
#$(info $$GENERATOR_TARGETS is [${GENERATOR_TARGETS}]) #$(info $$GENERATOR_TARGETS is [${GENERATOR_TARGETS}])
MARKDOWN_FILES = $(wildcard $(SPEC_DIR)/*/*.md) \
$(wildcard $(SPEC_DIR)/*/*/*.md) \
$(wildcard $(SPEC_DIR)/_features/*/*.md) \
$(wildcard $(SPEC_DIR)/_features/*/*/*.md) \
$(wildcard $(SSZ_DIR)/*.md)
ALL_EXECUTABLE_SPEC_NAMES = phase0 altair bellatrix capella deneb electra whisk eip6800 eip7732 ALL_EXECUTABLE_SPEC_NAMES = phase0 altair bellatrix capella deneb electra whisk eip6800 eip7732
# The parameters for commands. Use `foreach` to avoid listing specs again. # The parameters for commands. Use `foreach` to avoid listing specs again.
COVERAGE_SCOPE := $(foreach S,$(ALL_EXECUTABLE_SPEC_NAMES), --cov=eth2spec.$S.$(TEST_PRESET_TYPE)) COVERAGE_SCOPE := $(foreach S,$(ALL_EXECUTABLE_SPEC_NAMES), --cov=eth2spec.$S.$(TEST_PRESET_TYPE))
@ -135,26 +141,15 @@ endif
open_cov: open_cov:
((open "$(COV_INDEX_FILE)" || xdg-open "$(COV_INDEX_FILE)") &> /dev/null) & ((open "$(COV_INDEX_FILE)" || xdg-open "$(COV_INDEX_FILE)") &> /dev/null) &
# When using .ONESHELL, bail on errors.
.SHELLFLAGS = -e
# This contains all markdown files that should have table of contents.
MARKDOWN_FILES = $(wildcard $(SPEC_DIR)/*/*.md) \
$(wildcard $(SPEC_DIR)/*/*/*.md) \
$(wildcard $(SPEC_DIR)/_features/*/*.md) \
$(wildcard $(SPEC_DIR)/_features/*/*/*.md) \
$(wildcard $(SSZ_DIR)/*.md)
# Check all files and error if any ToC were modified. # Check all files and error if any ToC were modified.
check_toc: $(MARKDOWN_FILES:=.toc) check_toc: $(MARKDOWN_FILES:=.toc)
@[ "$$(find . -name '*.md.tmp' -print -quit)" ] && exit 1 || exit 0 @[ "$$(find . -name '*.md.tmp' -print -quit)" ] && exit 1 || exit 0
# Generate ToC sections & save copy of original if modified. # Generate ToC sections & save copy of original if modified.
.ONESHELL:
%.toc: %.toc:
@cp $* $*.tmp @cp $* $*.tmp; \
@doctoc $* > /dev/null doctoc $* > /dev/null; \
@if diff -q $* $*.tmp > /dev/null; then \ if diff -q $* $*.tmp > /dev/null; then \
echo "Good $*"; \ echo "Good $*"; \
rm $*.tmp; \ rm $*.tmp; \
else \ else \