kingkevin
/
passkey_fw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use make abspath intead of shell realpath

This commit is contained in:
hathach 2023-03-03 15:55:34 +07:00
parent e92583ffd7
commit 9a8a9359e4
No known key found for this signature in database
GPG Key ID: F5D50C6D51D17CBA
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/build_win_mac.yml vendored
View File

@ -27,6 +27,7 @@ jobs:
# ---------------------------------------
build-arm:
strategy:
fail-fast: false
matrix:
os: [windows-latest, macos-latest]
runs-on: ${{ matrix.os }}

11
tools/top.mk
View File

@ -26,20 +26,21 @@ THIS_MAKEFILE := $(lastword $(MAKEFILE_LIST))
# strip off /tools/top.mk to get for example ../../..
TOP := $(patsubst %/tools/top.mk,%,$(THIS_MAKEFILE))
#$(info top.mk: Initial TOP=$(TOP))
$(info top.mk: Initial TOP=$(TOP))
# Set TOP to an absolute path, for example /tinyUSB (from ../../..)
ifeq ($(CMDEXE),1)
TOP := $(subst \,/,$(shell for %%i in ( $(TOP) ) do echo %%~fi))
else
TOP := $(shell realpath $(TOP))
TOP := $(abspath $(TOP))
endif
#$(info top.mk: Top directory is $(TOP))
$(info top.mk: Top directory is $(TOP))
# Set CURRENT_PATH to the relative path from TOP to the current directory, ie examples/device/cdc_msc_freertos
ifeq ($(CMDEXE),1)
CURRENT_PATH := $(subst $(TOP)/,,$(subst \,/,$(shell echo %CD%)))
else
CURRENT_PATH := $(shell realpath --relative-to=$(TOP) `pwd`)
CURRENT_PATH = $(subst $(TOP)/,,$(abspath .))
endif
#$(info top.mk: Path from top is $(CURRENT_PATH))
$(info top.mk: CURRENT_PATH = $(CURRENT_PATH))