X-Git-Url: http://rtime.felk.cvut.cz/gitweb/omk.git/blobdiff_plain/8a38ab00c99a9111769295204f420b46917d1067..c58097452ae99625405af4a4636e10e6e003530b:/snippets/sysless diff --git a/snippets/sysless b/snippets/sysless index ed55141..1b02ea8 100644 --- a/snippets/sysless +++ b/snippets/sysless @@ -2,6 +2,7 @@ # # # bin_PROGRAMS .. list of the require binary programs +# test_PROGRAMS .. list of the test programs # include_HEADERS .. list of the user-space public header files # lib_LIBRARIES .. list of the user-space libraries # lib_LDSCRIPTS .. list of LD scripts that should be copied to the lib direcotry @@ -20,6 +21,30 @@ # specified, then the value of DEFAULT_LD_SCRIPT_VARIANT from config.target is used. # PREFIX_DIR .. Prefix to directories in _compiled and _build. Used in config.omk. +BUILD_DIR_NAME = _build$(addprefix /,$(PREFIX_DIR)) +COMPILED_DIR_NAME = _compiled$(addprefix /,$(PREFIX_DIR)) + +LOCAL_BUILD_DIR=$(MAKERULES_DIR)/$(BUILD_DIR_NAME)/$(RELATIVE_DIR) +#$(warning LOCAL_BUILD_DIR = $(LOCAL_BUILD_DIR)) + +#===================================================================== +# Common utility rules + +link_VARIANTS ?= $(DEFAULT_LD_SCRIPT_VARIANT) + + +#===================================================================== +# Include correct rules for just running pass + +USER_COMPILED_DIR_NAME=$(MAKERULES_DIR)/$(COMPILED_DIR_NAME) + +USER_INCLUDE_DIR = $(USER_COMPILED_DIR_NAME)/include +USER_LIB_DIR = $(USER_COMPILED_DIR_NAME)/lib +USER_UTILS_DIR = $(USER_COMPILED_DIR_NAME)/bin-utils +USER_TESTS_DIR = $(USER_COMPILED_DIR_NAME)/bin-tests +USER_BIN_DIR = $(USER_COMPILED_DIR_NAME)/bin +USER_OBJS_DIR = $(LOCAL_BUILD_DIR) + .PHONY: check-dir # Some support to serialize some targets for parallel make @@ -29,6 +54,7 @@ library-pass: include-pass binary-pass utils-pass: library-pass override OMK_SERIALIZE_INCLUDED = y +MAKEOVERRIDES := $(filter-out OMK_SERIALIZE_INCLUDED=n,$(MAKEOVERRIDES)) endif # ------------------------------------- @@ -65,8 +91,10 @@ GEN_HEADERS+=$(cmetric_include_HEADERS:%=$(USER_INCLUDE_DIR)/%) # Generate rules for compilation of programs and libraries ifneq ($(link_VARIANTS),) $(foreach prog,$(bin_PROGRAMS),$(foreach link,$(link_VARIANTS),$(eval $(call PROGRAM_template,$(prog),$(USER_BIN_DIR),$(link))))) +$(foreach prog,$(test_PROGRAMS),$(foreach link,$(link_VARIANTS),$(eval $(call PROGRAM_template,$(prog),$(USER_TESTS_DIR),$(link))))) else $(foreach prog,$(bin_PROGRAMS),$(eval $(call PROGRAM_template,$(prog),$(USER_BIN_DIR)))) +$(foreach prog,$(test_PROGRAMS),$(eval $(call PROGRAM_template,$(prog),$(USER_TESTS_DIR)))) endif $(foreach lib,$(lib_LIBRARIES),$(eval $(call LIBRARY_template,$(lib)))) @@ -110,11 +138,11 @@ library-pass-local: $(addprefix $(USER_INCLUDE_DIR)/,$(cmetric_include_HEADERS)) $(addprefix $(LIB_DIR)/,$(lib_OBJS)) ifneq ($(link_VARIANTS),) -binary-pass-local: $(foreach link,$(link_VARIANTS),$(bin_PROGRAMS:%=$(USER_BIN_DIR)/%-$(link)) \ - $(foreach of,$(OUTPUT_FORMATS),$(bin_PROGRAMS:%=$(USER_BIN_DIR)/%-$(link).$(of)))) +binary-pass-local: $(foreach link,$(link_VARIANTS),$(bin_PROGRAMS:%=$(USER_BIN_DIR)/%-$(link)) $(test_PROGRAMS:%=$(USER_TESTS_DIR)/%-$(link)) \ + $(foreach of,$(OUTPUT_FORMATS),$(bin_PROGRAMS:%=$(USER_BIN_DIR)/%-$(link).$(of)) $(test_PROGRAMS:%=$(USER_TESTS_DIR)/%-$(link).$(of)))) else -binary-pass-local: $(bin_PROGRAMS:%=$(USER_BIN_DIR)/%) \ - $(foreach of,$(OUTPUT_FORMATS),$(bin_PROGRAMS:%=$(USER_BIN_DIR)/%.$(of))) +binary-pass-local: $(bin_PROGRAMS:%=$(USER_BIN_DIR)/%) $(test_PROGRAMS:%=$(USER_TESTS_DIR)/%) \ + $(foreach of,$(OUTPUT_FORMATS),$(bin_PROGRAMS:%=$(USER_BIN_DIR)/%.$(of)) $(test_PROGRAMS:%=$(USER_TESTS_DIR)/%.$(of))) endif endif # TARGET_RULE_TEMPLATES @@ -158,6 +186,12 @@ utils-pass-local: $(utils_PROGRAMS:%=$(USER_UTILS_DIR)/%) endif # HOST_RULE_TEMPLATES +# Checks for OMK tester +ifdef OMK_TESTSROOT +default-config-pass-check include-pass-check: +library-pass-check binary-pass-check: + @[ -x "$(shell which $(CC))" ] || $(call canttest,Cannot find compiler: $(CC)) +endif #===================================================================== # Automatic loading of compiled program by issuing "make load" @@ -173,7 +207,7 @@ define LOAD_PROGRAM_template .PHONY: load-$(1)$(3:%=-%) load-$(1)$(3:%=-%): $(2)/$(1)$(3:%=-%)$(LOAD_EXTENSION) @$(QUIET_CMD_ECHO) " LOAD $$<" - @if [ -z "$$(LOAD_CMD$(3:%=-%))" ]; then echo "No command for loading applications to '$(3)' is specified."; exit 1; fi + @if [ -z '$$(LOAD_CMD$(3:%=-%))' ]; then echo "No command for loading applications to '$(3)' is specified."; exit 1; fi $(Q) $$(LOAD_CMD$(3:%=-%)) $$< endef @@ -182,7 +216,7 @@ endef define LOAD_RUN_VARIANT_template .PHONY: load-$(1) run-$(1) -load-$(1): load-$(firstword $(bin_PROGRAMS))-$(1) +load-$(1): load-$(firstword $(bin_PROGRAMS) $(test_PROGRAMS))-$(1) run-$(1): @$(QUIET_CMD_ECHO) " RUN $(1)" @@ -192,10 +226,11 @@ run-$(1): endef $(foreach link,$(link_VARIANTS),$(foreach prog,$(bin_PROGRAMS),$(eval $(call LOAD_PROGRAM_template,$(prog),$(USER_BIN_DIR),$(link))))) +$(foreach link,$(link_VARIANTS),$(foreach prog,$(test_PROGRAMS),$(eval $(call LOAD_PROGRAM_template,$(prog),$(USER_TESTS_DIR),$(link))))) $(foreach link,$(link_VARIANTS),$(eval $(call LOAD_RUN_VARIANT_template,$(link)))) .PHONY: load run -load: $(addprefix load-,$(firstword $(bin_PROGRAMS))-$(firstword $(link_VARIANTS))) +load: $(addprefix load-,$(firstword $(bin_PROGRAMS) $(test_PROGRAMS))-$(firstword $(link_VARIANTS))) run: run-$(firstword $(link_VARIANTS)) @@ -203,23 +238,23 @@ run: run-$(firstword $(link_VARIANTS)) #===================================================================== # Generate pass rules from generic templates -OTHER_PASSES = dep clean install $(eval $(call omk_pass_template, include-pass, $(LOCAL_BUILD_DIR),,$(include_HEADERS)$(nobase_include_HEADERS)$(renamed_include_HEADERS)$(lib_LDSCRIPTS)$(config_include_HEADERS)$(LOCAL_CONFIG_H))) $(eval $(call omk_pass_template, library-pass, $(LOCAL_BUILD_DIR),TARGET_RULE_TEMPLATES=y,$(lib_LIBRARIES)$(shared_LIBRARIES)$(lib_obj_SOURCES))) -$(eval $(call omk_pass_template, binary-pass, $(LOCAL_BUILD_DIR),TARGET_RULE_TEMPLATES=y,$(bin_PROGRAMS))) +$(eval $(call omk_pass_template, binary-pass, $(LOCAL_BUILD_DIR),TARGET_RULE_TEMPLATES=y,$(bin_PROGRAMS) $(test_PROGRAMS))) $(eval $(call omk_pass_template, utils-pass, $(LOCAL_BUILD_DIR),HOST_RULE_TEMPLATES=y,$(utils_PROGRAMS))) - - -$(eval $(call omk_pass_template,$(OTHER_PASSES),$(LOCAL_BUILD_DIR),,always)) +$(eval $(call omk_pass_template, dep, $(LOCAL_BUILD_DIR),,always)) +$(eval $(call omk_pass_template, clean, $(LOCAL_BUILD_DIR),,always)) +$(eval $(call omk_pass_template, install,$(LOCAL_BUILD_DIR),,always)) dep-local: install-local: +$(eval $(call include-pass-template,$(USER_INCLUDE_DIR),include)) + include-pass-local: - $(call include-pass-template,$(USER_INCLUDE_DIR),include) @$(foreach f, $(lib_LDSCRIPTS), cmp --quiet $(SOURCES_DIR)/$(f) $(USER_LIB_DIR)/$(notdir $(f)) \ || $(call cp_cmd,$(SOURCES_DIR)/$(f),$(USER_LIB_DIR)/$(notdir $(f))) || exit 1 ; ) @@ -236,7 +271,9 @@ check-dir: @$(call mkdir_def,$(USER_LIB_DIR)) @$(call mkdir_def,$(USER_BIN_DIR)) @$(call mkdir_def,$(USER_UTILS_DIR)) + @$(call mkdir_def,$(USER_TESTS_DIR)) +include-pass-submakes: extra-rules-subdirs # Which passes to pass default: include-pass library-pass binary-pass utils-pass