Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Clone chibios and ugfx if it's not already checked out. (#1651)

Browse source 
* Clone chibios and ugfx if it's not already checked out.

* update the submodule out of date message
This commit is contained in:
skullydazed 2017-09-06 15:21:31 -07:00 committed by GitHub
parent 4580d3a730
commit 2b3803eb5e
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Makefile
View file

@ -514,6 +514,9 @@ $(SUBPROJECTS): %: %-allkm
cmp $(ROOT_DIR)/Makefile $(ROOT_DIR)/Makefile >/dev/null 2>&1; if [ $$? -gt 0 ]; then printf "$(MSG_NO_CMP)"; exit 1; fi;
# Check if the submodules are dirty, and display a warning if they are
ifndef SKIP_GIT
if [ ! -e lib/chibios ]; then git submodule sync lib/chibios && git submodule update --init lib/chibios; fi
if [ ! -e lib/chibios-contrib ]; then git submodule sync lib/chibios-contrib && git submodule update --init lib/chibios-contrib; fi
if [ ! -e lib/ugfx ]; then git submodule sync lib/ugfx && git submodule update --init lib/ugfx; fi
git submodule status --recursive 2>/dev/null | \
while IFS= read -r x; do \
case "$$x" in \
@ -551,6 +554,10 @@ test: test-all
.PHONY: test-clean
test-clean: test-all-clean
lib/%:
git submodule sync $?
git submodule update --init $?
git-submodule:
git submodule sync --recursive
git submodule update --init --recursive

3
message.mk
View file

@ -56,8 +56,7 @@ MSG_CLEANING = Cleaning project:
MSG_CREATING_LIBRARY = Creating library:
MSG_SUBMODULE_DIRTY = $(WARN_COLOR)WARNING:$(NO_COLOR)\n \
Some git sub-modules are out of date or modified, please consider runnning:$(BOLD)\n\
git submodule sync --recursive\n\
git submodule update --init --recursive$(NO_COLOR)\n\n\
make git-submodule\n\
You can ignore this warning if you are not compiling any ChibiOS keyboards,\n\
or if you have modified the ChibiOS libraries yourself. \n\n
MSG_NO_CMP = $(ERROR_COLOR)Error:$(NO_COLOR)$(BOLD) cmp command not found, please install diffutils\n$(NO_COLOR)