Skip to content

Commit 17445bb

Browse files
silverwindsapk
andauthored
remove release-dirs make target (#10350)
- only `mkdir`the dist dirs when they are absent - add the dist dirs as prereqs so targets like `make release-sources` can run standalone Co-authored-by: Antoine GIRARD <[email protected]>
1 parent dc822d5 commit 17445bb

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

Makefile

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
DIST := dist
2+
DIST_DIRS := $(DIST)/binaries $(DIST)/release
23
IMPORT := code.gitea.io/gitea
34
export GO111MODULE=off
45

@@ -446,14 +447,13 @@ $(EXECUTABLE): $(GO_SOURCES) $(TAGS_PREREQ)
446447
GO111MODULE=on $(GO) build -mod=vendor $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@
447448

448449
.PHONY: release
449-
release: generate release-dirs release-windows release-linux release-darwin release-copy release-compress release-sources release-check
450+
release: generate release-windows release-linux release-darwin release-copy release-compress release-sources release-check
450451

451-
.PHONY: release-dirs
452-
release-dirs:
453-
mkdir -p $(DIST)/binaries $(DIST)/release
452+
$(DIST_DIRS):
453+
mkdir -p $(DIST_DIRS)
454454

455455
.PHONY: release-windows
456-
release-windows:
456+
release-windows: | $(DIST_DIRS)
457457
@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
458458
$(GO) get -u src.techknowlogick.com/xgo; \
459459
fi
@@ -463,7 +463,7 @@ ifeq ($(CI),drone)
463463
endif
464464

465465
.PHONY: release-linux
466-
release-linux:
466+
release-linux: | $(DIST_DIRS)
467467
@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
468468
$(GO) get -u src.techknowlogick.com/xgo; \
469469
fi
@@ -473,7 +473,7 @@ ifeq ($(CI),drone)
473473
endif
474474

475475
.PHONY: release-darwin
476-
release-darwin:
476+
release-darwin: | $(DIST_DIRS)
477477
@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
478478
$(GO) get -u src.techknowlogick.com/xgo; \
479479
fi
@@ -483,22 +483,22 @@ ifeq ($(CI),drone)
483483
endif
484484

485485
.PHONY: release-copy
486-
release-copy:
486+
release-copy: | $(DIST_DIRS)
487487
cd $(DIST); for file in `find /build -type f -name "*"`; do cp $${file} ./release/; done;
488488

489489
.PHONY: release-check
490-
release-check:
490+
release-check: | $(DIST_DIRS)
491491
cd $(DIST)/release/; for file in `find . -type f -name "*"`; do echo "checksumming $${file}" && $(SHASUM) `echo $${file} | sed 's/^..//'` > $${file}.sha256; done;
492492

493493
.PHONY: release-compress
494-
release-compress:
494+
release-compress: | $(DIST_DIRS)
495495
@hash gxz > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
496496
$(GO) get -u github.com/ulikunitz/xz/cmd/gxz; \
497497
fi
498498
cd $(DIST)/release/; for file in `find . -type f -name "*"`; do echo "compressing $${file}" && gxz -k -9 $${file}; done;
499499

500500
.PHONY: release-sources
501-
release-sources:
501+
release-sources: | $(DIST_DIRS)
502502
tar cvzf $(DIST)/release/gitea-src-$(VERSION).tar.gz --exclude $(DIST) --exclude .git --exclude $(MAKE_EVIDENCE_DIR) .
503503

504504
node_modules: package-lock.json

0 commit comments

Comments
 (0)