Skip to content

Commit 006dc7a

Browse files
committed
Change tools packaging
remove useless tools/ directory. Aligned with core 2.0.0 release. Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent 14903de commit 006dc7a

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

STM32/src/Makefile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ core: clean print_info
4444
@echo ----------------------------------------------------------
4545
@echo "Packaging $@..."
4646
@git --git-dir=$(PACKAGE_FOLDER)/.git show HEAD --pretty=short --no-patch > $(PACKAGE_FOLDER)/package_version.txt
47-
@sed -i 's/{runtime.hardware.path}\/tools/{runtime.tools.STM32Tools.path}\/tools/g' $(PACKAGE_FOLDER)/platform.txt
4847
@tar --mtime='$(PACKAGE_DATE)' \
4948
--exclude=.git \
5049
--exclude=.gitattributes \
@@ -73,7 +72,7 @@ tools: clean print_info
7372
--exclude=linux \
7473
--exclude=linux64 \
7574
--exclude=macosx \
76-
--transform "s|$(PACKAGE_FOLDER)|$(PACKAGE_NAME)/tools|" \
75+
--transform "s|$(PACKAGE_FOLDER)|$(PACKAGE_NAME)|" \
7776
-cjf "$(PACKAGE_NAME)-$(PACKAGE_VERSION)-windows.tar.bz2" "$(PACKAGE_FOLDER)"
7877
@tar --mtime='$(PACKAGE_DATE)' \
7978
--exclude=.git \
@@ -82,7 +81,7 @@ tools: clean print_info
8281
--exclude=.gitignore \
8382
--exclude=macosx \
8483
--exclude=win \
85-
--transform "s|$(PACKAGE_FOLDER)|$(PACKAGE_NAME)/tools|" \
84+
--transform "s|$(PACKAGE_FOLDER)|$(PACKAGE_NAME)|" \
8685
-cjf "$(PACKAGE_NAME)-$(PACKAGE_VERSION)-linux.tar.bz2" "$(PACKAGE_FOLDER)"
8786
@tar --mtime='$(PACKAGE_DATE)' \
8887
--exclude=.git \
@@ -92,7 +91,7 @@ tools: clean print_info
9291
--exclude=linux \
9392
--exclude=linux64 \
9493
--exclude=win \
95-
--transform "s|$(PACKAGE_FOLDER)|$(PACKAGE_NAME)/tools|" \
94+
--transform "s|$(PACKAGE_FOLDER)|$(PACKAGE_NAME)|" \
9695
-cjf "$(PACKAGE_NAME)-$(PACKAGE_VERSION)-mac.tar.bz2" "$(PACKAGE_FOLDER)"
9796
@-$(RM) $(PACKAGE_FOLDER)/package_version.txt
9897
$(MAKE) PACKAGE_NAME=$(PACKAGE_NAME) PACKAGE_VERSION=$(PACKAGE_VERSION) --no-builtin-rules postpackaging_tools -C .

0 commit comments

Comments
 (0)