Merge pull request #4386 from YosysHQ/micko/check_abc

Modify abc directory content check
This commit is contained in:
Miodrag Milanović 2024-05-09 09:44:23 +02:00 committed by GitHub
commit bdce7fac66
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 14 deletions

View File

@ -790,6 +790,9 @@ check-git-abc:
elif git -C "$(YOSYS_SRC)" submodule status abc 2>/dev/null | grep -q '^ '; then \ elif git -C "$(YOSYS_SRC)" submodule status abc 2>/dev/null | grep -q '^ '; then \
echo "'abc' is a git submodule. Continuing."; \ echo "'abc' is a git submodule. Continuing."; \
exit 0; \ exit 0; \
elif [ -f "$(YOSYS_SRC)/abc/.gitcommit" ] && ! grep -q '\$$Format:%h\$$' "$(YOSYS_SRC)/abc/.gitcommit"; then \
echo "'abc' comes from a tarball. Continuing."; \
exit 0; \
elif [ -f "$(YOSYS_SRC)/abc/.gitcommit" ] && grep -q '\$$Format:%h\$$' "$(YOSYS_SRC)/abc/.gitcommit"; then \ elif [ -f "$(YOSYS_SRC)/abc/.gitcommit" ] && grep -q '\$$Format:%h\$$' "$(YOSYS_SRC)/abc/.gitcommit"; then \
echo "Error: 'abc' is not configured as a git submodule."; \ echo "Error: 'abc' is not configured as a git submodule."; \
echo "To resolve this:"; \ echo "To resolve this:"; \
@ -799,8 +802,8 @@ check-git-abc:
echo "4. Reapply your changes: Move your saved changes back to the 'abc' directory, if necessary."; \ echo "4. Reapply your changes: Move your saved changes back to the 'abc' directory, if necessary."; \
exit 1; \ exit 1; \
else \ else \
echo "'abc' comes from a tarball. Continuing."; \ echo "Initialize the submodule: Run 'git submodule update --init' to set up 'abc' as a submodule."; \
exit 0; \ exit 1; \
fi fi
ABC_SOURCES := $(wildcard $(YOSYS_SRC)/abc/*) ABC_SOURCES := $(wildcard $(YOSYS_SRC)/abc/*)