gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-06-09 10:24:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove any variables in the optional build variable list that are marked as mandatory by one or more included build system modules in the CORE build system module. Alter DOXYGEN build system module to by default override the Doxygen configuration file stylesheet and replace it with the LUFA Doxygen stylesheet.

Browse Source
This commit is contained in:
Dean Camera 2012-06-02 13:14:31 +00:00
parent 0b262c569f
commit ecdffe2e41
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
LUFA/Build/lufa.core.in
View File

@ -76,7 +76,7 @@ help: info
@echo " " @echo " "
@echo " Optional variables required by the selected build Modules: " @echo " Optional variables required by the selected build Modules: "
@echo " " @echo " "
@echo " [" $(sort $(LUFA_BUILD_OPTIONAL_VARS)) "]" @echo " [" $(filter-out $(LUFA_BUILD_MANDATORY_VARS), $(sort $(LUFA_BUILD_OPTIONAL_VARS))) "]"
@echo " " @echo " "
@echo "===================================================================" @echo "==================================================================="
@echo " The LUFA BuildSystem 2.0 - Powered By Unicorns (tm) " @echo " The LUFA BuildSystem 2.0 - Powered By Unicorns (tm) "
@ -92,4 +92,4 @@ list_mandatory:
@echo Mandatory Variables for Included Modules: $(sort $(LUFA_BUILD_MANDATORY_VARS)) @echo Mandatory Variables for Included Modules: $(sort $(LUFA_BUILD_MANDATORY_VARS))
list_optional: list_optional:
@echo Optional Variables for Included Modules: $(sort $(LUFA_BUILD_OPTIONAL_VARS)) @echo Optional Variables for Included Modules: $(filter-out $(LUFA_BUILD_MANDATORY_VARS), $(sort $(LUFA_BUILD_OPTIONAL_VARS)))

11
LUFA/Build/lufa.doxygen.in
View File

@ -8,7 +8,7 @@
LUFA_BUILD_MODULES += DOXYGEN LUFA_BUILD_MODULES += DOXYGEN
LUFA_BUILD_TARGETS += doxygen LUFA_BUILD_TARGETS += doxygen
LUFA_BUILD_MANDATORY_VARS += LUFA_BUILD_MANDATORY_VARS += LUFA_PATH
LUFA_BUILD_OPTIONAL_VARS += DOXYGEN_CONF DOXYGEN_FAIL_ON_WARNING DOXYGEN_OVERRIDE_PARAMS LUFA_BUILD_OPTIONAL_VARS += DOXYGEN_CONF DOXYGEN_FAIL_ON_WARNING DOXYGEN_OVERRIDE_PARAMS
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
@ -24,7 +24,7 @@ LUFA_BUILD_OPTIONAL_VARS += DOXYGEN_CONF DOXYGEN_FAIL_ON_WARNING DOXYGEN_OVERRI
# #
# MANDATORY PARAMETERS: # MANDATORY PARAMETERS:
# #
# (None) # LUFA_PATH - Path to the LUFA library core
# #
# OPTIONAL PARAMETERS: # OPTIONAL PARAMETERS:
# #
@ -35,16 +35,19 @@ LUFA_BUILD_OPTIONAL_VARS += DOXYGEN_CONF DOXYGEN_FAIL_ON_WARNING DOXYGEN_OVERRI
# configuration file # configuration file
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Sanity-check values of mandatory user-supplied variables
LUFA_PATH ?= $(error Makefile LUFA_PATH value not set.)
# Default values of optionally user-supplied variables # Default values of optionally user-supplied variables
DOXYGEN_CONF ?= Doxygen.conf DOXYGEN_CONF ?= Doxygen.conf
DOXYGEN_FAIL_ON_WARNING ?= Y DOXYGEN_FAIL_ON_WARNING ?= Y
DOXYGEN_OVERRIDE_PARAMS ?= QUIET=YES DOXYGEN_OVERRIDE_PARAMS ?= QUIET=YES HTML_STYLESHEET=$(patsubst %/,%,$(LUFA_PATH))/DoxygenPages/Style/Style.css
# Output Messages # Output Messages
MSG_DOXYGEN_CMD = ' [DOXYGEN] :' MSG_DOXYGEN_CMD = ' [DOXYGEN] :'
# Determine Doxygen invocation command # Determine Doxygen invocation command
BASE_DOXYGEN_CMD = ( cat Doxygen.conf ; $(DOXYGEN_OVERRIDE_PARAMS:%=echo "%") ) | doxygen - BASE_DOXYGEN_CMD = ( cat Doxygen.conf $(DOXYGEN_OVERRIDE_PARAMS:%=; echo "%") ) | doxygen -
ifeq ($(DOXYGEN_FAIL_ON_WARNING), Y) ifeq ($(DOXYGEN_FAIL_ON_WARNING), Y)
DOXYGEN_CMD = if ( $(BASE_DOXYGEN_CMD) 2>&1 | grep -v "warning: ignoring unsupported tag" ;); then exit 1; fi; DOXYGEN_CMD = if ( $(BASE_DOXYGEN_CMD) 2>&1 | grep -v "warning: ignoring unsupported tag" ;); then exit 1; fi;
else else