Implements subprojects and updates projects for this (#459)
* non-working commit * working * subprojects implemented for planck * pass a subproject variable through to c * consolidates clueboard revisions * thanks for letting me know about conflicts.. * turn off audio for yang's * corrects starting paths for subprojects * messing around with travis * semicolon * travis script * travis script * script for travis * correct directory (probably), amend files to commit * remove origin before adding * git pull, correct syntax * git checkout * git pull origin branch * where are we? * where are we? * merging * force things to happen * adds commit message, adds add * rebase, no commit message * rebase branch * idk! * try just pull * fetch - merge * specify repo branch * checkout * goddammit * merge? idk * pls * after all * don't split up keyboards * syntax * adds quick for all-keyboards * trying out new script * script update * lowercase * all keyboards * stop replacing compiled.hex automatically * adds if statement * skip automated build branches * forces push to automated build branch * throw an add in there * upstream? * adds AUTOGEN * ignore all .hex files again * testing out new repo * global ident * generate script, keyboard_keymap.hex * skip generation for now, print pandoc info, submodule update * try trusty * and sudo * try generate * updates subprojects to keyboards * no idea * updates to keyboards * cleans up clueboard stuff * setup to use local readme * updates cluepad, planck experimental * remove extra led.c [ci skip] * disable power up for now * config files updates * makefile updates * .h file updates, config tuning * disable audio for yang
This commit is contained in:
parent
755b17f8fc
commit
215c2119af
44 changed files with 480 additions and 475 deletions
|
@ -51,6 +51,13 @@ ifeq ($(COLOR),true)
|
|||
BOLD=\033[1m
|
||||
endif
|
||||
|
||||
ifdef quick
|
||||
QUICK = $(quick)
|
||||
endif
|
||||
|
||||
QUICK ?= false
|
||||
AUTOGEN ?= false
|
||||
|
||||
ifneq ($(shell awk --version 2>/dev/null),)
|
||||
AWK=awk
|
||||
else
|
||||
|
@ -524,7 +531,12 @@ extcoff: $(BUILD_DIR)/$(TARGET).elf
|
|||
@$(SILENT) || printf "$(MSG_FLASH) $@" | $(AWK_CMD)
|
||||
$(eval CMD=$(OBJCOPY) -O $(FORMAT) -R .eeprom -R .fuse -R .lock -R .signature $< $@)
|
||||
@$(BUILD_CMD)
|
||||
@$(COPY) $@ $(TARGET).hex
|
||||
@if $(AUTOGEN); then \
|
||||
$(SILENT) || printf "Copying $(TARGET).hex to keymaps/$(KEYMAP)/$(KEYBOARD)_$(KEYMAP).hex\n"; \
|
||||
$(COPY) $@ $(KEYMAP_PATH)/$(KEYBOARD)_$(KEYMAP).hex; \
|
||||
else \
|
||||
$(COPY) $@ $(TARGET).hex; \
|
||||
fi
|
||||
|
||||
%.eep: %.elf
|
||||
@$(SILENT) || printf "$(MSG_EEPROM) $@" | $(AWK_CMD)
|
||||
|
@ -570,7 +582,7 @@ $(OBJDIR)/%.o : %.c
|
|||
$(OBJDIR)/%.o : %.cpp
|
||||
@mkdir -p $(@D)
|
||||
@$(SILENT) || printf "$(MSG_COMPILING_CPP) $<" | $(AWK_CMD)
|
||||
$(CC) -c $(ALL_CPPFLAGS) $< -o $@
|
||||
$(eval CMD=$(CC) -c $(ALL_CPPFLAGS) $< -o $@)
|
||||
@$(BUILD_CMD)
|
||||
|
||||
# Compile: create assembler files from C source files.
|
||||
|
@ -600,9 +612,11 @@ $(OBJDIR)/%.o : %.S
|
|||
clean: begin clean_list end
|
||||
|
||||
clean_list :
|
||||
$(REMOVE) -r $(TOP_DIR)/$(BUILD_DIR)
|
||||
$(REMOVE) -r $(KEYBOARD_PATH)/$(BUILD_DIR)
|
||||
$(REMOVE) -r $(KEYMAP_PATH)/$(BUILD_DIR)
|
||||
@$(REMOVE) -r $(BUILD_DIR)
|
||||
@$(REMOVE) -r $(TOP_DIR)/$(BUILD_DIR)
|
||||
@$(REMOVE) -r $(KEYBOARD_PATH)/$(BUILD_DIR)
|
||||
@if $$SUBPROJECT; then $(REMOVE) -r $(SUBPROJECT_PATH)/$(BUILD_DIR); fi
|
||||
@$(REMOVE) -r $(KEYMAP_PATH)/$(BUILD_DIR)
|
||||
|
||||
show_path:
|
||||
@echo VPATH=$(VPATH)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue