From d7cfd8b91db127459d61aa8b8d091cb08e732208 Mon Sep 17 00:00:00 2001 From: kkitayam <45088311+kkitayam@users.noreply.github.com> Date: Thu, 14 Jan 2021 01:19:43 +0900 Subject: [PATCH] replaced variable name to CMDEXE from UNAME. removed the rule that .d files are converted to .P files. --- examples/make.mk | 2 +- examples/rules.mk | 13 ++----------- hw/bsp/adafruit_clue/board.mk | 2 +- hw/bsp/arduino_nano33_ble/board.mk | 2 +- hw/bsp/circuitplayground_bluefruit/board.mk | 2 +- hw/bsp/feather_nrf52840_express/board.mk | 2 +- hw/bsp/feather_nrf52840_sense/board.mk | 2 +- hw/bsp/itsybitsy_nrf52840/board.mk | 2 +- hw/bsp/nrf52840_mdk_dongle/board.mk | 2 +- hw/bsp/pca10056/board.mk | 2 +- hw/bsp/pca10059/board.mk | 2 +- hw/bsp/pca10100/board.mk | 2 +- hw/bsp/raytac_mdbt50q_rx/board.mk | 2 +- tools/top.mk | 8 ++++---- 14 files changed, 18 insertions(+), 27 deletions(-) diff --git a/examples/make.mk b/examples/make.mk index ee4ed640..992a4e60 100644 --- a/examples/make.mk +++ b/examples/make.mk @@ -34,7 +34,7 @@ CXX = $(CROSS_COMPILE)g++ OBJCOPY = $(CROSS_COMPILE)objcopy SIZE = $(CROSS_COMPILE)size MKDIR = mkdir -ifeq ($(UNAME),Windows) +ifeq ($(CMDEXE),1) CP = copy RM = del else diff --git a/examples/rules.mk b/examples/rules.mk index a445f033..2274d1cd 100644 --- a/examples/rules.mk +++ b/examples/rules.mk @@ -81,7 +81,7 @@ uf2: $(BUILD)/$(BOARD)-firmware.uf2 OBJ_DIRS = $(sort $(dir $(OBJ))) $(OBJ): | $(OBJ_DIRS) $(OBJ_DIRS): -ifeq ($(UNAME),Windows) +ifeq ($(CMDEXE),1) @$(MKDIR) $(subst /,\,$@) else @$(MKDIR) -p $@ @@ -111,15 +111,6 @@ vpath %.c . $(TOP) $(BUILD)/obj/%.o: %.c @echo CC $(notdir $@) @$(CC) $(CFLAGS) -c -MD -o $@ $< -ifneq ($(UNAME),Windows) - @# The following fixes the dependency file. - @# See http://make.paulandlesley.org/autodep.html for details. - @# Regex adjusted from the above to play better with Windows paths, etc. - @$(CP) $(@:.o=.d) $(@:.o=.P); \ - $(SED) -e 's/#.*//' -e 's/^.*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $(@:.o=.d) >> $(@:.o=.P); \ - $(RM) $(@:.o=.d) -endif # ASM sources lower case .s vpath %.s . $(TOP) @@ -140,7 +131,7 @@ size: $(BUILD)/$(BOARD)-firmware.elf .PHONY: clean clean: -ifeq ($(UNAME),Windows) +ifeq ($(CMDEXE),1) rd /S /Q $(subst /,\,$(BUILD)) else $(RM) -rf $(BUILD) diff --git a/hw/bsp/adafruit_clue/board.mk b/hw/bsp/adafruit_clue/board.mk index ef6e093f..3db045ac 100644 --- a/hw/bsp/adafruit_clue/board.mk +++ b/hw/bsp/adafruit_clue/board.mk @@ -14,7 +14,7 @@ CFLAGS += -Wno-error=undef -Wno-error=unused-parameter -Wno-error=cast-align # due to tusb_hal_nrf_power_event GCCVERSION = $(firstword $(subst ., ,$(shell arm-none-eabi-gcc -dumpversion))) -ifeq ($(UNAME),Windows) +ifeq ($(CMDEXE),1) ifeq ($(shell if $(GCCVERSION) geq 8 echo 1), 1) CFLAGS += -Wno-error=cast-function-type endif diff --git a/hw/bsp/arduino_nano33_ble/board.mk b/hw/bsp/arduino_nano33_ble/board.mk index 63d1550d..1ee8867e 100644 --- a/hw/bsp/arduino_nano33_ble/board.mk +++ b/hw/bsp/arduino_nano33_ble/board.mk @@ -14,7 +14,7 @@ CFLAGS += -Wno-error=undef -Wno-error=unused-parameter -Wno-error=cast-align # due to tusb_hal_nrf_power_event GCCVERSION = $(firstword $(subst ., ,$(shell arm-none-eabi-gcc -dumpversion))) -ifeq ($(UNAME),Windows) +ifeq ($(CMDEXE),1) ifeq ($(shell if $(GCCVERSION) geq 8 echo 1), 1) CFLAGS += -Wno-error=cast-function-type endif diff --git a/hw/bsp/circuitplayground_bluefruit/board.mk b/hw/bsp/circuitplayground_bluefruit/board.mk index ef6e093f..3db045ac 100644 --- a/hw/bsp/circuitplayground_bluefruit/board.mk +++ b/hw/bsp/circuitplayground_bluefruit/board.mk @@ -14,7 +14,7 @@ CFLAGS += -Wno-error=undef -Wno-error=unused-parameter -Wno-error=cast-align # due to tusb_hal_nrf_power_event GCCVERSION = $(firstword $(subst ., ,$(shell arm-none-eabi-gcc -dumpversion))) -ifeq ($(UNAME),Windows) +ifeq ($(CMDEXE),1) ifeq ($(shell if $(GCCVERSION) geq 8 echo 1), 1) CFLAGS += -Wno-error=cast-function-type endif diff --git a/hw/bsp/feather_nrf52840_express/board.mk b/hw/bsp/feather_nrf52840_express/board.mk index 2feb070a..059e55df 100644 --- a/hw/bsp/feather_nrf52840_express/board.mk +++ b/hw/bsp/feather_nrf52840_express/board.mk @@ -14,7 +14,7 @@ CFLAGS += -Wno-error=undef -Wno-error=unused-parameter -Wno-error=cast-align # due to tusb_hal_nrf_power_event GCCVERSION = $(firstword $(subst ., ,$(shell arm-none-eabi-gcc -dumpversion))) -ifeq ($(UNAME),Windows) +ifeq ($(CMDEXE),1) ifeq ($(shell if $(GCCVERSION) geq 8 echo 1), 1) CFLAGS += -Wno-error=cast-function-type endif diff --git a/hw/bsp/feather_nrf52840_sense/board.mk b/hw/bsp/feather_nrf52840_sense/board.mk index ef6e093f..3db045ac 100644 --- a/hw/bsp/feather_nrf52840_sense/board.mk +++ b/hw/bsp/feather_nrf52840_sense/board.mk @@ -14,7 +14,7 @@ CFLAGS += -Wno-error=undef -Wno-error=unused-parameter -Wno-error=cast-align # due to tusb_hal_nrf_power_event GCCVERSION = $(firstword $(subst ., ,$(shell arm-none-eabi-gcc -dumpversion))) -ifeq ($(UNAME),Windows) +ifeq ($(CMDEXE),1) ifeq ($(shell if $(GCCVERSION) geq 8 echo 1), 1) CFLAGS += -Wno-error=cast-function-type endif diff --git a/hw/bsp/itsybitsy_nrf52840/board.mk b/hw/bsp/itsybitsy_nrf52840/board.mk index 2feb070a..059e55df 100644 --- a/hw/bsp/itsybitsy_nrf52840/board.mk +++ b/hw/bsp/itsybitsy_nrf52840/board.mk @@ -14,7 +14,7 @@ CFLAGS += -Wno-error=undef -Wno-error=unused-parameter -Wno-error=cast-align # due to tusb_hal_nrf_power_event GCCVERSION = $(firstword $(subst ., ,$(shell arm-none-eabi-gcc -dumpversion))) -ifeq ($(UNAME),Windows) +ifeq ($(CMDEXE),1) ifeq ($(shell if $(GCCVERSION) geq 8 echo 1), 1) CFLAGS += -Wno-error=cast-function-type endif diff --git a/hw/bsp/nrf52840_mdk_dongle/board.mk b/hw/bsp/nrf52840_mdk_dongle/board.mk index baa4cc22..3c44e402 100644 --- a/hw/bsp/nrf52840_mdk_dongle/board.mk +++ b/hw/bsp/nrf52840_mdk_dongle/board.mk @@ -13,7 +13,7 @@ CFLAGS += -Wno-error=undef -Wno-error=unused-parameter -Wno-error=cast-align # due to tusb_hal_nrf_power_event GCCVERSION = $(firstword $(subst ., ,$(shell arm-none-eabi-gcc -dumpversion))) -ifeq ($(UNAME),Windows) +ifeq ($(CMDEXE),1) ifeq ($(shell if $(GCCVERSION) geq 8 echo 1), 1) CFLAGS += -Wno-error=cast-function-type endif diff --git a/hw/bsp/pca10056/board.mk b/hw/bsp/pca10056/board.mk index 3ea85983..b8691525 100644 --- a/hw/bsp/pca10056/board.mk +++ b/hw/bsp/pca10056/board.mk @@ -14,7 +14,7 @@ CFLAGS += -Wno-error=undef -Wno-error=unused-parameter -Wno-error=cast-align # due to tusb_hal_nrf_power_event GCCVERSION = $(firstword $(subst ., ,$(shell arm-none-eabi-gcc -dumpversion))) -ifeq ($(UNAME),Windows) +ifeq ($(CMDEXE),1) ifeq ($(shell if $(GCCVERSION) geq 8 echo 1), 1) CFLAGS += -Wno-error=cast-function-type endif diff --git a/hw/bsp/pca10059/board.mk b/hw/bsp/pca10059/board.mk index e9bc890c..178f0947 100644 --- a/hw/bsp/pca10059/board.mk +++ b/hw/bsp/pca10059/board.mk @@ -14,7 +14,7 @@ CFLAGS += -Wno-error=undef -Wno-error=unused-parameter -Wno-error=cast-align # due to tusb_hal_nrf_power_event GCCVERSION = $(firstword $(subst ., ,$(shell arm-none-eabi-gcc -dumpversion))) -ifeq ($(UNAME),Windows) +ifeq ($(CMDEXE),1) ifeq ($(shell if $(GCCVERSION) geq 8 echo 1), 1) CFLAGS += -Wno-error=cast-function-type endif diff --git a/hw/bsp/pca10100/board.mk b/hw/bsp/pca10100/board.mk index 0b4d42f2..8ada94ba 100644 --- a/hw/bsp/pca10100/board.mk +++ b/hw/bsp/pca10100/board.mk @@ -14,7 +14,7 @@ CFLAGS += -Wno-error=undef -Wno-error=unused-parameter -Wno-error=cast-align # due to tusb_hal_nrf_power_event GCCVERSION = $(firstword $(subst ., ,$(shell arm-none-eabi-gcc -dumpversion))) -ifeq ($(UNAME),Windows) +ifeq ($(CMDEXE),1) ifeq ($(shell if $(GCCVERSION) geq 8 echo 1), 1) CFLAGS += -Wno-error=cast-function-type endif diff --git a/hw/bsp/raytac_mdbt50q_rx/board.mk b/hw/bsp/raytac_mdbt50q_rx/board.mk index 6ff079dd..2c29acfa 100644 --- a/hw/bsp/raytac_mdbt50q_rx/board.mk +++ b/hw/bsp/raytac_mdbt50q_rx/board.mk @@ -13,7 +13,7 @@ CFLAGS += -Wno-error=undef -Wno-error=unused-parameter -Wno-error=cast-align # due to tusb_hal_nrf_power_event GCCVERSION = $(firstword $(subst ., ,$(shell arm-none-eabi-gcc -dumpversion))) -ifeq ($(UNAME),Windows) +ifeq ($(CMDEXE),1) ifeq ($(shell if $(GCCVERSION) geq 8 echo 1), 1) CFLAGS += -Wno-error=cast-function-type endif diff --git a/tools/top.mk b/tools/top.mk index d276f581..84523a55 100644 --- a/tools/top.mk +++ b/tools/top.mk @@ -2,10 +2,10 @@ ifneq ($(lastword a b),b) $(error This Makefile require make 3.81 or newer) endif -# Detect windows or not +# Detect whether shell style is windows or not # https://stackoverflow.com/questions/714100/os-detecting-makefile/52062069#52062069 ifeq '$(findstring ;,$(PATH))' ';' -UNAME := Windows +CMDEXE := 1 endif # Set TOP to be the path to get from the current directory (where make was @@ -15,14 +15,14 @@ endif THIS_MAKEFILE := $(lastword $(MAKEFILE_LIST)) TOP := $(patsubst %/tools/top.mk,%,$(THIS_MAKEFILE)) -ifeq ($(UNAME),Windows) +ifeq ($(CMDEXE),1) TOP := $(subst \,/,$(shell for %%i in ( $(TOP) ) do echo %%~fi)) else TOP := $(shell realpath $(TOP)) endif #$(info Top directory is $(TOP)) -ifeq ($(UNAME),Windows) +ifeq ($(CMDEXE),1) CURRENT_PATH := $(subst $(TOP)/,,$(subst \,/,$(shell echo %CD%))) else CURRENT_PATH := $(shell realpath --relative-to=$(TOP) `pwd`)