mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-02-26 15:54:15 +01:00
OP-1694 make package rule non-nested: tidy dist
This commit is contained in:
parent
07cad1db27
commit
b85952be6b
17
Makefile
17
Makefile
@ -150,6 +150,9 @@ $(BUILD_DIR):
|
|||||||
$(PACKAGE_DIR):
|
$(PACKAGE_DIR):
|
||||||
$(MKDIR) -p $@
|
$(MKDIR) -p $@
|
||||||
|
|
||||||
|
$(DIST_DIR):
|
||||||
|
$(MKDIR) -p $@
|
||||||
|
|
||||||
##############################
|
##############################
|
||||||
#
|
#
|
||||||
# UAVObjects
|
# UAVObjects
|
||||||
@ -876,21 +879,23 @@ build-info:
|
|||||||
#
|
#
|
||||||
##############################
|
##############################
|
||||||
|
|
||||||
|
DIST_VER_INFO := $(DIST_DIR)/version-info.json
|
||||||
|
|
||||||
|
.PHONY: $(DIST_VER_INFO) # Because to many deps to list
|
||||||
|
$(DIST_VER_INFO): $(DIST_DIR)
|
||||||
|
$(V1) $(VERSION_INFO) --jsonpath="$(DIST_DIR)"
|
||||||
|
|
||||||
.PHONY: dist
|
.PHONY: dist
|
||||||
dist:
|
dist: $(DIST_DIR) $(DIST_VER_INFO)
|
||||||
@$(ECHO) " SOURCE FOR DISTRIBUTION $(call toprel, $(DIST_DIR))"
|
@$(ECHO) " SOURCE FOR DISTRIBUTION $(call toprel, $(DIST_DIR))"
|
||||||
$(V1) $(MKDIR) -p "$(DIST_DIR)"
|
|
||||||
$(V1) $(VERSION_INFO) \
|
|
||||||
--jsonpath="$(DIST_DIR)"
|
|
||||||
$(eval DIST_NAME := $(call toprel, "$(DIST_DIR)/OpenPilot-$(shell git describe).tar"))
|
$(eval DIST_NAME := $(call toprel, "$(DIST_DIR)/OpenPilot-$(shell git describe).tar"))
|
||||||
$(V1) git archive --prefix="OpenPilot/" -o "$(DIST_NAME)" HEAD
|
$(V1) git archive --prefix="OpenPilot/" -o "$(DIST_NAME)" HEAD
|
||||||
$(V1) tar --append --file="$(DIST_NAME)" \
|
$(V1) tar --append --file="$(DIST_NAME)" \
|
||||||
--transform='s,.*version-info.json,OpenPilot/version-info.json,' \
|
--transform='s,.*version-info.json,OpenPilot/version-info.json,' \
|
||||||
$(call toprel, "$(DIST_DIR)/version-info.json")
|
$(call toprel, "$(DIST_VER_INFO)")
|
||||||
$(V1) gzip -f "$(DIST_NAME)"
|
$(V1) gzip -f "$(DIST_NAME)"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
##############################
|
##############################
|
||||||
#
|
#
|
||||||
# Install OpenPilot
|
# Install OpenPilot
|
||||||
|
Loading…
x
Reference in New Issue
Block a user