janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

make: Clean-indented makefiles

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-03-17 16:24:26 +00:00
commit 68f25261ba
6 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/defs-dev.mk
View file

@ -282,7 +282,7 @@ LOG_THREAD_NAMES ?= true
COMPILE_DEBUG_CODE ?= true COMPILE_DEBUG_CODE ?= true
#COMPILE_DEBUG_LOG ?= true #COMPILE_DEBUG_LOG ?= true
USE_COMPILER_DEBUG_OPTS ?= true USE_COMPILER_DEBUG_OPTS ?= true
#USE_COMPILER_OPTIMIZATION_OPTS?= true #USE_COMPILER_OPTIMIZATION_OPTS ?= true
USE_DISABLE_COMPILER_OPTIMISATION_OPTS ?= true USE_DISABLE_COMPILER_OPTIMISATION_OPTS ?= true
ifeq ($(TARGET),mingw) ifeq ($(TARGET),mingw)
USE_STACK_PROTECTOR ?= false USE_STACK_PROTECTOR ?= false

2
make/defs-dist.mk
View file

@ -282,7 +282,7 @@ LOG_THREAD_NAMES ?= true
#COMPILE_DEBUG_CODE ?= true #COMPILE_DEBUG_CODE ?= true
#COMPILE_DEBUG_LOG ?= true #COMPILE_DEBUG_LOG ?= true
USE_COMPILER_DEBUG_OPTS ?= true USE_COMPILER_DEBUG_OPTS ?= true
USE_COMPILER_OPTIMIZATION_OPTS?= true USE_COMPILER_OPTIMIZATION_OPTS ?= true
USE_DISABLE_COMPILER_OPTIMISATION_OPTS ?= false USE_DISABLE_COMPILER_OPTIMISATION_OPTS ?= false
USE_STACK_PROTECTOR ?= true USE_STACK_PROTECTOR ?= true
#USE_STACK_CHECKER ?= true #USE_STACK_CHECKER ?= true

4
make/mcu-defs.mk
View file

@ -12,11 +12,11 @@ ifneq ($(MAKECMDGOALS),clean)
ifeq ($(MCU_BOARD_MODEL),) ifeq ($(MCU_BOARD_MODEL),)
$(error MCU_BOARD_MODEL not specified) $(error MCU_BOARD_MODEL not specified)
endif endif
ifeq ($(MCU_FLASH_OFFSET),) ifeq ($(MCU_FLASH_OFFSET),)
$(error MCU_FLASH_OFFSET not specified) $(error MCU_FLASH_OFFSET not specified)
endif endif
ifeq ($(MCU_FLASH_SIZE),) ifeq ($(MCU_FLASH_SIZE),)
$(error MCU_FLASH_SIZE not specified) $(error MCU_FLASH_SIZE not specified)
endif endif

4
make/projects-dir.mk
View file

@ -84,7 +84,7 @@ endif
export GIT_SSH := $(CVS_RSH) export GIT_SSH := $(CVS_RSH)
ifeq ($(filter pkg-%,$(MAKECMDGOALS)),) ifeq ($(filter pkg-%,$(MAKECMDGOALS)),)
export JW_BUILD_SSH_EXTRA_OPTS+= -o StrictHostKeyChecking=no -o ControlMaster=auto -o ControlPath=/tmp/%r@jw-build:%h:%p -o ControlPersist=3m -l $(JANWARE_USER) export JW_BUILD_SSH_EXTRA_OPTS += -o StrictHostKeyChecking=no -o ControlMaster=auto -o ControlPath=/tmp/%r@jw-build:%h:%p -o ControlPersist=3m -l $(JANWARE_USER)
endif endif
ifneq ($(CLONE_FROM_USER),) ifneq ($(CLONE_FROM_USER),)
@ -94,7 +94,7 @@ else
endif endif
ifneq ($(EXCLUDE_FROM_BUILD),) ifneq ($(EXCLUDE_FROM_BUILD),)
PROJECTS_PY_EXTRA_BUILD_OPTS+= --exclude "$(EXCLUDE_FROM_BUILD)" PROJECTS_PY_EXTRA_BUILD_OPTS += --exclude "$(EXCLUDE_FROM_BUILD)"
endif endif
# ------------ external programs II # ------------ external programs II

2
make/rpmdist.mk
View file

@ -25,7 +25,7 @@ RELEASES_FILE = $(TOPDIR)/RELEASES$(FLAVOUR_SUFFIX)
RELEASES ?= $(shell $(PKG_SH_EXE) version \ RELEASES ?= $(shell $(PKG_SH_EXE) version \
-p $(OS_NAME_VERSION)/$(RPM_ARCH) $(RELEASES_FILE) read | $(SED) 's/-dev//') -p $(OS_NAME_VERSION)/$(RPM_ARCH) $(RELEASES_FILE) read | $(SED) 's/-dev//')
RPMBUILD ?= pkgbuild RPMBUILD ?= pkgbuild
CHECK_CVS_SYNC_BEFORE_RPM_RELEASE?= true CHECK_CVS_SYNC_BEFORE_RPM_RELEASE ?= true
HASH = $(shell $(cvs_files) -z | \ HASH = $(shell $(cvs_files) -z | \
grep -vz "CHANGES\|VERSION\|HASH\|MD5SUMS\|RELEASES" | \ grep -vz "CHANGES\|VERSION\|HASH\|MD5SUMS\|RELEASES" | \
xargs -0 md5sum | md5sum | $(SED) 's/ .*//') xargs -0 md5sum | md5sum | $(SED) 's/ .*//')

32
make/targets-tools.mk
View file

@ -4,7 +4,7 @@
# $Id$ # $Id$
ifndef TARGETS_TOOLS_MK_INCLUDED ifndef TARGETS_TOOLS_MK_INCLUDED
TARGETS_TOOLS_MK_INCLUDED = true TARGETS_TOOLS_MK_INCLUDED = true
include $(MODDIR)/make/rules.mk include $(MODDIR)/make/rules.mk
@ -52,34 +52,34 @@ clean.link:
rmdir -p $(dir $(HDRDIR_SCOPE_SUFFIX)) 2>/dev/null || : ;\ rmdir -p $(dir $(HDRDIR_SCOPE_SUFFIX)) 2>/dev/null || : ;\
fi fi
CLANG_TIDY_H_C_CPP := $(shell $(ECHO) $(LOCAL_H) | xargs -r $(GREP) -l 'extern *"C"') CLANG_TIDY_H_C_CPP := $(shell $(ECHO) $(LOCAL_H) | xargs -r $(GREP) -l 'extern *"C"')
CLANG_TIDY_H_C := $(wildcard [a-z]*.h) CLANG_TIDY_H_C := $(wildcard [a-z]*.h)
CLANG_TIDY_H_CPP := $(wildcard [A-Z]*.h) CLANG_TIDY_H_CPP := $(wildcard [A-Z]*.h)
#CLANG_TIDY_H_CPP := $(filter-out $(CLANG_TIDY_H_C),$(LOCAL_H)) #CLANG_TIDY_H_CPP := $(filter-out $(CLANG_TIDY_H_C),$(LOCAL_H))
# false positives on assert(), see https://reviews.llvm.org/D31130 # false positives on assert(), see https://reviews.llvm.org/D31130
CLANG_TIDY_EXTRA_ARGS += -cppcoreguidelines-pro-bounds-array-to-pointer-decay CLANG_TIDY_EXTRA_ARGS += -cppcoreguidelines-pro-bounds-array-to-pointer-decay
# keep va_args # keep va_args
CLANG_TIDY_EXTRA_ARGS += -cppcoreguidelines-pro-type-vararg CLANG_TIDY_EXTRA_ARGS += -cppcoreguidelines-pro-type-vararg
# keep pointer arithmetic # keep pointer arithmetic
CLANG_TIDY_EXTRA_ARGS += -cppcoreguidelines-pro-bounds-pointer-arithmetic CLANG_TIDY_EXTRA_ARGS += -cppcoreguidelines-pro-bounds-pointer-arithmetic
# don't have GSL (for now) # don't have GSL (for now)
CLANG_TIDY_EXTRA_ARGS += -cppcoreguidelines-pro-bounds-constant-array-index CLANG_TIDY_EXTRA_ARGS += -cppcoreguidelines-pro-bounds-constant-array-index
CLANG_TIDY_FILTER = $(SED) 's%\[\([a-z-]\+\)\]$$%[https://clang.llvm.org/extra/clang-tidy/checks/\1.html]%' CLANG_TIDY_FILTER = $(SED) 's%\[\([a-z-]\+\)\]$$%[https://clang.llvm.org/extra/clang-tidy/checks/\1.html]%'
comma := , comma := ,
empty := empty :=
space := $(empty) $(empty) space := $(empty) $(empty)
CLANG_TIDY_CHECKS ?= -$(subst $(space),,*,clang-analyzer-*,-clang-analyzer-cplusplus*,modernize-*,portability-*,cppcoreguidelines-*$(addprefix $(comma),$(CLANG_TIDY_EXTRA_ARGS))) CLANG_TIDY_CHECKS ?= -$(subst $(space),,*,clang-analyzer-*,-clang-analyzer-cplusplus*,modernize-*,portability-*,cppcoreguidelines-*$(addprefix $(comma),$(CLANG_TIDY_EXTRA_ARGS)))
CLANG_TIDY ?= clang-tidy -checks=$(CLANG_TIDY_CHECKS) CLANG_TIDY ?= clang-tidy -checks=$(CLANG_TIDY_CHECKS)
clean: clang-tidy-clean clean: clang-tidy-clean
clang-tidy-clean: clang-tidy-clean:
rm -f clang-tidy-cache*.tmp rm -f clang-tidy-cache*.tmp
CLANG_TIDY_CACHE_CPP = clang-tidy-cache-cpp.tmp CLANG_TIDY_CACHE_CPP = clang-tidy-cache-cpp.tmp
$(CLANG_TIDY_CACHE_CPP): $(LOCAL_CPP) $(CLANG_TIDY_CACHE_CPP): $(LOCAL_CPP)
$(CLANG_TIDY) $(LOCAL_CPP) -- $(INCLUDE) -x c++ | $(CLANG_TIDY_FILTER) | tee $@ $(CLANG_TIDY) $(LOCAL_CPP) -- $(INCLUDE) -x c++ | $(CLANG_TIDY_FILTER) | tee $@