shimun/solo
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

version string

Browse Source
This commit is contained in:
Conor Patrick 2019-11-20 11:41:21 -05:00
parent de55e521cc
commit 670a4e5d62
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
targets/stm32l432/build/common.mk
View File

@ -1,3 +1,5 @@
include ../../fido2/version.mk
CC=$(PREFIX)arm-none-eabi-gcc CC=$(PREFIX)arm-none-eabi-gcc
CP=$(PREFIX)arm-none-eabi-objcopy CP=$(PREFIX)arm-none-eabi-objcopy
SZ=$(PREFIX)arm-none-eabi-size SZ=$(PREFIX)arm-none-eabi-size
@ -14,20 +16,20 @@ USB_LIB := lib/usbd/usbd_cdc.c lib/usbd/usbd_cdc_if.c lib/usbd/usbd_composite.c
lib/usbd/usbd_ctlreq.c lib/usbd/usbd_desc.c lib/usbd/usbd_hid.c \ lib/usbd/usbd_ctlreq.c lib/usbd/usbd_desc.c lib/usbd/usbd_hid.c \
lib/usbd/usbd_ccid.c lib/usbd/usbd_ccid.c
VERSION_FULL?=$(shell git describe) VERSION_FULL?=$(SOLO_VERSION_FULL)
VERSION:=$(shell python -c 'print("$(VERSION_FULL)".split("-")[0])') VERSION:=$(SOLO_VERSION)
VERSION_MAJ:=$(shell python -c 'print("$(VERSION)".split(".")[0])') VERSION_MAJ:=$(SOLO_VERSION_MAJ)
VERSION_MIN:=$(shell python -c 'print("$(VERSION)".split(".")[1])') VERSION_MIN:=$(SOLO_VERSION_MIN)
VERSION_PAT:=$(shell python -c 'print("$(VERSION)".split(".")[2])') VERSION_PAT:=$(SOLO_VERSION_PAT)
VERSION_FLAGS= -DSOLO_VERSION_MAJ=$(VERSION_MAJ) -DSOLO_VERSION_MIN=$(VERSION_MIN) \ VERSION_FLAGS= -DSOLO_VERSION_MAJ=$(VERSION_MAJ) -DSOLO_VERSION_MIN=$(VERSION_MIN) \
-DSOLO_VERSION_PATCH=$(VERSION_PAT) -DSOLO_VERSION=\"$(VERSION_FULL)\" -DSOLO_VERSION_PATCH=$(VERSION_PAT) -DSOLO_VERSION=\"$(VERSION_FULL)\"
_all: _all:
echo $(VERSION_FULL) echo $(SOLO_VERSION_FULL)
echo $(VERSION_MAJ) echo $(SOLO_VERSION_MAJ)
echo $(VERSION_MIN) echo $(SOLO_VERSION_MIN)
echo $(VERSION_PAT) echo $(SOLO_VERSION_PAT)
%.o: %.s %.o: %.s
$(AS) -o $@ $^ $(AS) -o $@ $^