From e09a91418d5bbc710540c64f45107ea99237e494 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 4 Jan 2018 17:01:59 +0000 Subject: [PATCH] projects-dir.mk: Add support for exclude-.txt Signed-off-by: Jan Lindemann --- make/projects-dir.mk | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/make/projects-dir.mk b/make/projects-dir.mk index 06657b6d..0905b984 100644 --- a/make/projects-dir.mk +++ b/make/projects-dir.mk @@ -41,10 +41,16 @@ EXCLUDE_FROM_BUILD += \ jux3 \ emscren-v8 -EXCLUDES_FILE ?= exclude.txt +# ------------ external programs I -ifneq ($(wildcard $(EXCLUDES_FILE)),) - EXCLUDE_FROM_BUILD += $(shell cat $(EXCLUDES_FILE)) +MOD_SCRIPT_DIR = ./jw-build/scripts +GET_OS_SH = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/get-os.sh /opt/jw-build/bin/get-os.sh) get-os-sh-not-found) + +EXCLUDES_FILE ?= exclude.txt +EXCLUDES_FILES = exclude-$(shell $(GET_OS_SH) name).txt exclude-$(shell $(GET_OS_SH)).txt $(EXCLUDES_FILE) + +ifneq ($(wildcard $(EXCLUDES_FILES)),) + EXCLUDE_FROM_BUILD += $(shell sed 's/\#.*//g' $(wildcard $(EXCLUDES_FILES))) endif BUILD_PROJECTS = $(filter-out $(EXCLUDE_FROM_BUILD),$(PROJECTS)) @@ -81,9 +87,8 @@ ifneq ($(EXCLUDE_FROM_BUILD),) BUILD_PY_EXTRA_ARGS += --exclude "$(EXCLUDE_FROM_BUILD)" endif -# ------------ external programs +# ------------ external programs II -MOD_SCRIPT_DIR = ./jw-build/scripts PGIT = CLONE_PROJECTS="$(PROJECTS)" /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/pgit.sh /opt/jw-build/bin/pgit.sh) pgit.sh-not-found) BUILD_PY = python2 $(MOD_SCRIPT_DIR)/build.py -b $(shell pwd) $(BUILD_PY_EXTRA_ARGS) PROJECTS_PY = python2 $(MOD_SCRIPT_DIR)/projects.py --prefix $(shell pwd) $(PROJECTS_PY_EXTRA_ARGS) @@ -93,7 +98,6 @@ PKG_MANAGER_SH ?= /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/pkg-m CREATE_PROJECT_SH ?= /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/jw-build-create-project.sh /opt/jw-build/bin/jw-build-create-project.sh) jw-build-create-project-not-found) LIST_VCS_FILES = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/list-cvs-files.sh /opt/jw-build/bin/list-cvs-files.sh) list-cvs-files-not-found) JANWARE_PKG = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/jannet /opt/jw-build/bin/jannet) jannet-not-found) -GET_OS_SH = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/get-os.sh /opt/jw-build/bin/get-os.sh) get-os-sh-not-found) BROWSER ?= firefox GIT_SRV_ADMIN_SH = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@git.jannet.de /opt/jw-build/bin/git-srv-admin.sh CVS_ADMIN_SH = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@git.jannet.de /opt/jw-build/bin/cvs-admin.sh @@ -129,6 +133,9 @@ echo-prereq-release: echo-os: @$(GET_OS_SH) +echo-excludes: + @echo $(EXCLUDE_FROM_BUILD) + pkg-manager-refresh: $(PKG_MANAGER_SH) refresh -y