luke
/
prjxray
mirror of https://github.com/openXC7/prjxray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change xxxdb to db-xxx. 

Makes it work better with tab completion, type db-<tab>
Groups the db related commands together.

Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
This commit is contained in:
Tim 'mithro' Ansell 2019-03-22 15:15:12 -07:00
parent 31a4c7ce01
commit 76b5c1c9ca
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/kokoro/db-full.sh vendored
View File

@ -77,7 +77,7 @@ echo "----------------------------------------"
# Check the database # Check the database
#make checkdb-${XRAY_SETTINGS} || true #make checkdb-${XRAY_SETTINGS} || true
# Format the database # Format the database
make formatdb-${XRAY_SETTINGS} make db-format-${XRAY_SETTINGS}
# Output if the database has differences # Output if the database has differences
echo echo
@ -139,7 +139,7 @@ echo "----------------------------------------"
echo "----------------------------------------" echo "----------------------------------------"
# Check the database and fail if it is broken. # Check the database and fail if it is broken.
make checkdb-${XRAY_SETTINGS} make db-check-${XRAY_SETTINGS}
# If we get here, then all the fuzzers completed fine. Hence we are # If we get here, then all the fuzzers completed fine. Hence we are
# going to assume we don't want to keep all the build / logs / etc (as # going to assume we don't want to keep all the build / logs / etc (as

20
Makefile
View File

@ -79,36 +79,36 @@ define database
# $(1) - Database name # $(1) - Database name
checkdb-$(1): db-check-$(1):
@echo @echo
@echo "Checking $(1) database" @echo "Checking $(1) database"
@echo "============================" @echo "============================"
@$(IN_ENV) python3 utils/checkdb.py --db-root database/$(1) @$(IN_ENV) python3 utils/db-check.py --db-root database/$(1)
formatdb-$(1): db-format-$(1):
@echo @echo
@echo "Formatting $(1) database" @echo "Formatting $(1) database"
@echo "============================" @echo "============================"
@$(IN_ENV) cd database/$(1); python3 ../../utils/sort_db.py @$(IN_ENV) cd database/$(1); python3 ../../utils/sort_db.py
@if [ -e database/Info.md ]; then $(IN_ENV) ./utils/info_md.py --keep; fi @if [ -e database/Info.md ]; then $(IN_ENV) ./utils/info_md.py --keep; fi
.PHONY: checkdb-$(1) formatdb-$(1) .PHONY: db-check-$(1) db-format-$(1)
.NOTPARALLEL: checkdb-$(1) formatdb-$(1) .NOTPARALLEL: db-check-$(1) db-format-$(1)
checkdb: checkdb-$(1) db-check: db-check-$(1)
formatdb: formatdb-$(1) db-format: db-format-$(1)
endef endef
$(foreach DB,$(DATABASES),$(eval $(call database,$(DB)))) $(foreach DB,$(DATABASES),$(eval $(call database,$(DB))))
checkdb: db-check:
@true @true
formatdb: db-format:
@true @true
.PHONY: checkdb formatdb .PHONY: db-check db-format
clean: clean:
$(MAKE) -C database clean $(MAKE) -C database clean