Skip to content

Commit 50d200d

Browse files
committed
Update Makefile to get CMSIS 5 version from git
Use commit date to always generate the same package using tar. Signed-off-by: Frederic.Pillon <[email protected]>
1 parent ebf2061 commit 50d200d

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

Diff for: Makefile

+6-4
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ cmsis: PACKAGE_FOLDER := CMSIS
5252
cmsis: clean print_info
5353
@echo ----------------------------------------------------------
5454
@echo "Packaging module."
55-
tar --exclude=./.gitattributes \
55+
@tar --exclude=./.gitattributes \
5656
--exclude=./.travis.yml \
5757
--exclude=CMSIS/index.html \
5858
--exclude=CMSIS/Documentation \
@@ -65,12 +65,14 @@ cmsis: clean print_info
6565
$(MAKE) PACKAGE_VERSION=$(PACKAGE_VERSION) --no-builtin-rules postpackaging -C .
6666
@echo ----------------------------------------------------------
6767

68-
cmsis5: PACKAGE_VERSION := 5.3.0
6968
cmsis5: PACKAGE_FOLDER := CMSIS_5
69+
cmsis5: PACKAGE_VERSION := $(shell git --git-dir=$(PACKAGE_FOLDER)/.git describe --tags)
70+
cmsis5: PACKAGE_DATE := $(firstword $(shell git --git-dir=$(PACKAGE_FOLDER)/.git log -1 --pretty=format:%ci))
7071
cmsis5: clean print_info
7172
@echo ----------------------------------------------------------
7273
@echo "Packaging module."
73-
tar --exclude=docs \
74+
@tar --mtime='$(PACKAGE_DATE)' \
75+
--exclude=docs \
7476
--exclude=CMSIS/CoreValidation \
7577
--exclude=CMSIS/Documentation \
7678
--exclude=CMSIS/DoxyGen \
@@ -113,5 +115,5 @@ postpackaging:
113115
@echo "PACKAGE_CHKSUM = $(PACKAGE_CHKSUM)"
114116
@echo "PACKAGE_SIZE = $(PACKAGE_SIZE)"
115117
@echo "PACKAGE_FILENAME = $(PACKAGE_FILENAME)"
116-
cat extras/package_index.json.template | sed s/%%VERSION%%/$(PACKAGE_VERSION)/ | sed s/%%FILENAME%%/$(PACKAGE_FILENAME)/ | sed s/%%CHECKSUM%%/$(PACKAGE_CHKSUM)/ | sed s/%%SIZE%%/$(PACKAGE_SIZE)/ > package_$(PACKAGE_NAME)_$(PACKAGE_VERSION)_index.json
118+
@cat extras/package_index.json.template | sed s/%%VERSION%%/$(PACKAGE_VERSION)/ | sed s/%%FILENAME%%/$(PACKAGE_FILENAME)/ | sed s/%%CHECKSUM%%/$(PACKAGE_CHKSUM)/ | sed s/%%SIZE%%/$(PACKAGE_SIZE)/ > package_$(PACKAGE_NAME)_$(PACKAGE_VERSION)_index.json
117119
@echo "package_$(PACKAGE_NAME)_$(PACKAGE_VERSION)_index.json created"

0 commit comments

Comments
 (0)