Skip to content

Commit 2bc0464

Browse files
fpistmfpistm
committed
[Makefile] Cosmetic update
Signed-off-by: Frederic.Pillon <[email protected]>
1 parent 3effaa7 commit 2bc0464

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

‎STM32/src/Makefile

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,18 @@ core: PACKAGE_VERSION := $(shell git --git-dir=$(PACKAGE_FOLDER)/.git describe -
3838
core: PACKAGE_DATE := $(firstword $(shell git --git-dir=$(PACKAGE_FOLDER)/.git log -1 --pretty=format:%ci))
3939
core: clean print_info
4040
@echo ----------------------------------------------------------
41-
@echo "Packaging core."
42-
git --git-dir=$(PACKAGE_FOLDER)/.git show HEAD --pretty=short --no-patch > $(PACKAGE_FOLDER)/package_version.txt
43-
sed -i 's/{runtime.hardware.path}\/tools/{runtime.tools.STM32Tools.path}\/tools/g' $(PACKAGE_FOLDER)/platform.txt
44-
tar --mtime='$(PACKAGE_DATE)' \
41+
@echo "Packaging $@..."
42+
@git --git-dir=$(PACKAGE_FOLDER)/.git show HEAD --pretty=short --no-patch > $(PACKAGE_FOLDER)/package_version.txt
43+
@sed -i 's/{runtime.hardware.path}\/tools/{runtime.tools.STM32Tools.path}\/tools/g' $(PACKAGE_FOLDER)/platform.txt
44+
@tar --mtime='$(PACKAGE_DATE)' \
4545
--exclude=.git \
4646
--exclude=.gitattributes \
4747
--exclude=.github \
4848
--exclude=.gitignore \
4949
--transform "s|$(PACKAGE_FOLDER)|$(PACKAGE_NAME)|" \
5050
-cjf "$(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.bz2" "$(PACKAGE_FOLDER)"
51-
rm -f $(PACKAGE_FOLDER)/package_version.txt
52-
git --git-dir=$(PACKAGE_FOLDER)/.git checkout .
51+
@-$(RM) $(PACKAGE_FOLDER)/package_version.txt
52+
@git --git-dir=$(PACKAGE_FOLDER)/.git checkout .
5353
$(MAKE) PACKAGE_NAME=$(PACKAGE_NAME) PACKAGE_VERSION=$(PACKAGE_VERSION) PACKAGE_FOLDER="$(PACKAGE_FOLDER)" --no-builtin-rules postpackaging_core -C .
5454
@echo ----------------------------------------------------------
5555

@@ -59,9 +59,9 @@ tools: PACKAGE_VERSION := $(shell git --git-dir=$(PACKAGE_FOLDER)/.git describe
5959
tools: PACKAGE_DATE := $(firstword $(shell git --git-dir=$(PACKAGE_FOLDER)/.git log -1 --pretty=format:%ci))
6060
tools: clean print_info
6161
@echo ----------------------------------------------------------
62-
@echo "Packaging tools."
63-
git --git-dir=$(PACKAGE_FOLDER)/.git show HEAD --pretty=short --no-patch > $(PACKAGE_FOLDER)/package_version.txt
64-
tar --mtime='$(PACKAGE_DATE)' \
62+
@echo "Packaging $@..."
63+
@git --git-dir=$(PACKAGE_FOLDER)/.git show HEAD --pretty=short --no-patch > $(PACKAGE_FOLDER)/package_version.txt
64+
@tar --mtime='$(PACKAGE_DATE)' \
6565
--exclude=.git \
6666
--exclude=.gitattributes \
6767
--exclude=.github \
@@ -71,7 +71,7 @@ tools: clean print_info
7171
--exclude=macosx \
7272
--transform "s|$(PACKAGE_FOLDER)|$(PACKAGE_NAME)/tools|" \
7373
-cjf "$(PACKAGE_NAME)-$(PACKAGE_VERSION)-windows.tar.bz2" "$(PACKAGE_FOLDER)"
74-
tar --mtime='$(PACKAGE_DATE)' \
74+
@tar --mtime='$(PACKAGE_DATE)' \
7575
--exclude=.git \
7676
--exclude=.gitattributes \
7777
--exclude=.github \
@@ -80,7 +80,7 @@ tools: clean print_info
8080
--exclude=win \
8181
--transform "s|$(PACKAGE_FOLDER)|$(PACKAGE_NAME)/tools|" \
8282
-cjf "$(PACKAGE_NAME)-$(PACKAGE_VERSION)-linux.tar.bz2" "$(PACKAGE_FOLDER)"
83-
tar --mtime='$(PACKAGE_DATE)' \
83+
@tar --mtime='$(PACKAGE_DATE)' \
8484
--exclude=.git \
8585
--exclude=.gitattributes \
8686
--exclude=.github \
@@ -90,7 +90,7 @@ tools: clean print_info
9090
--exclude=win \
9191
--transform "s|$(PACKAGE_FOLDER)|$(PACKAGE_NAME)/tools|" \
9292
-cjf "$(PACKAGE_NAME)-$(PACKAGE_VERSION)-mac.tar.bz2" "$(PACKAGE_FOLDER)"
93-
rm -f $(PACKAGE_FOLDER)/package_version.txt
93+
@-$(RM) $(PACKAGE_FOLDER)/package_version.txt
9494
$(MAKE) PACKAGE_NAME=$(PACKAGE_NAME) PACKAGE_VERSION=$(PACKAGE_VERSION) --no-builtin-rules postpackaging_tools -C .
9595
@echo ----------------------------------------------------------
9696

@@ -115,7 +115,7 @@ postpackaging_core:
115115
@echo "PACKAGE_CHKSUM = $(PACKAGE_CHKSUM)"
116116
@echo "PACKAGE_SIZE = $(PACKAGE_SIZE)"
117117
@echo "PACKAGE_FILENAME = $(PACKAGE_FILENAME)"
118-
BOARDS_LIST=`grep -E ".+\.menu\.pnum\.[^\.]+=" $(PACKAGE_FOLDER)/boards.txt | cut -d'=' -f2 | awk '{print " {\"name\": \""$$0"\"},"}'`; \
118+
@BOARDS_LIST=`grep -E ".+\.menu\.pnum\.[^\.]+=" $(PACKAGE_FOLDER)/boards.txt | cut -d'=' -f2 | awk '{print " {\"name\": \""$$0"\"},"}'`; \
119119
BOARDS_LIST=$${BOARDS_LIST::-1}; \
120120
cat templates/package_core_index.json | sed s/%%VERSION%%/$(PACKAGE_VERSION)/ | sed s/%%FILENAME%%/$(PACKAGE_FILENAME)/ | sed s/%%CHECKSUM%%/$(PACKAGE_CHKSUM)/ | sed s/%%SIZE%%/$(PACKAGE_SIZE)/ | sed -e "s/%%BOARDSLIST%%/$${BOARDS_LIST//$$'\n'/\\n}/" > package_$(PACKAGE_NAME)_$(PACKAGE_VERSION)_index.json
121121
@echo "package_$(PACKAGE_NAME)_$(PACKAGE_VERSION)_index.json created"
@@ -130,5 +130,5 @@ postpackaging_tools:
130130
@echo "PACKAGE_MAC_FILENAME = $(PACKAGE_MAC_FILENAME)"
131131
@echo "PACKAGE_MAC_SIZE = $(PACKAGE_MAC_SIZE)"
132132
@echo "PACKAGE_MAC_CHKSUM = $(PACKAGE_MAC_CHKSUM)"
133-
cat templates/package_tools_index.json | sed s/%%PACKAGENAME%%/$(PACKAGE_NAME)/ | sed s/%%VERSION%%/$(PACKAGE_VERSION)/ | sed s/%%FILENAMEWIN%%/$(PACKAGE_WIN_FILENAME)/ | sed s/%%CHECKSUMWIN%%/$(PACKAGE_WIN_CHKSUM)/ | sed s/%%SIZEWIN%%/$(PACKAGE_WIN_SIZE)/ | sed s/%%FILENAMEMAC%%/$(PACKAGE_MAC_FILENAME)/ | sed s/%%CHECKSUMMAC%%/$(PACKAGE_MAC_CHKSUM)/ | sed s/%%SIZEMAC%%/$(PACKAGE_MAC_SIZE)/ | sed s/%%FILENAMELINUX%%/$(PACKAGE_LINUX_FILENAME)/ | sed s/%%CHECKSUMLINUX%%/$(PACKAGE_LINUX_CHKSUM)/ | sed s/%%SIZELINUX%%/$(PACKAGE_LINUX_SIZE)/ > package_$(PACKAGE_NAME)_$(PACKAGE_VERSION)_index.json
133+
@cat templates/package_tools_index.json | sed s/%%PACKAGENAME%%/$(PACKAGE_NAME)/ | sed s/%%VERSION%%/$(PACKAGE_VERSION)/ | sed s/%%FILENAMEWIN%%/$(PACKAGE_WIN_FILENAME)/ | sed s/%%CHECKSUMWIN%%/$(PACKAGE_WIN_CHKSUM)/ | sed s/%%SIZEWIN%%/$(PACKAGE_WIN_SIZE)/ | sed s/%%FILENAMEMAC%%/$(PACKAGE_MAC_FILENAME)/ | sed s/%%CHECKSUMMAC%%/$(PACKAGE_MAC_CHKSUM)/ | sed s/%%SIZEMAC%%/$(PACKAGE_MAC_SIZE)/ | sed s/%%FILENAMELINUX%%/$(PACKAGE_LINUX_FILENAME)/ | sed s/%%CHECKSUMLINUX%%/$(PACKAGE_LINUX_CHKSUM)/ | sed s/%%SIZELINUX%%/$(PACKAGE_LINUX_SIZE)/ > package_$(PACKAGE_NAME)_$(PACKAGE_VERSION)_index.json
134134
@echo "package_$(PACKAGE_NAME)_$(PACKAGE_VERSION)_index.json created"

0 commit comments

Comments
 (0)