From df141e624da6d4c2976a4cecd9cb6779e23fedda Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Fri, 21 Mar 2014 10:48:13 -0700 Subject: [PATCH] mk: Reorder definitions in dist.mk Just to be more logical, put big headers between different installers --- mk/dist.mk | 129 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 77 insertions(+), 52 deletions(-) diff --git a/mk/dist.mk b/mk/dist.mk index 5f527a695f9..82502c5c795 100644 --- a/mk/dist.mk +++ b/mk/dist.mk @@ -48,31 +48,10 @@ UNROOTED_PKG_FILES := $(patsubst $(S)%,./%,$(PKG_FILES)) LICENSE.txt: $(S)COPYRIGHT $(S)LICENSE-APACHE $(S)LICENSE-MIT cat $^ > $@ -ifdef CFG_ISCC -%.iss: $(S)src/etc/pkg/%.iss - cp $< $@ - -%.ico: $(S)src/etc/pkg/%.ico - cp $< $@ - -$(PKG_EXE): rust.iss modpath.iss LICENSE.txt rust-logo.ico \ - $(PKG_FILES) $(CSREQ3_T_$(CFG_BUILD)_H_$(CFG_BUILD)) \ - dist-prepare-win - $(CFG_PYTHON) $(S)src/etc/copy-runtime-deps.py tmp/dist/win/bin - @$(call E, ISCC: $@) - $(Q)"$(CFG_ISCC)" $< -dist-prepare-win: PREPARE_HOST=$(CFG_BUILD) -dist-prepare-win: PREPARE_TARGETS=$(CFG_BUILD) -dist-prepare-win: PREPARE_DEST_DIR=tmp/dist/win -dist-prepare-win: PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD) -dist-prepare-win: PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD) -dist-prepare-win: PREPARE_LIB_CMD=$(DEFAULT_PREPARE_LIB_CMD) -dist-prepare-win: PREPARE_MAN_CMD=$(DEFAULT_PREPARE_MAN_CMD) -dist-prepare-win: PREPARE_CLEAN=true -dist-prepare-win: prepare-base - -endif +###################################################################### +# Source tarball +###################################################################### $(PKG_TAR): $(PKG_FILES) @$(call E, making dist dir) @@ -92,42 +71,42 @@ $(PKG_TAR): $(PKG_FILES) $(Q)tar -czf $(PKG_TAR) -C tmp/dist $(PKG_DIR) $(Q)rm -Rf tmp/dist/$(PKG_DIR) -.PHONY: dist distcheck -ifdef CFG_WINDOWSY_$(CFG_BUILD) - -dist: $(PKG_EXE) +###################################################################### +# Windows .exe installer +###################################################################### -distcheck: dist - @echo - @echo ----------------------------------------------- - @echo $(PKG_EXE) ready for distribution - @echo ----------------------------------------------- +ifdef CFG_ISCC +%.iss: $(S)src/etc/pkg/%.iss + cp $< $@ -else +%.ico: $(S)src/etc/pkg/%.ico + cp $< $@ -dist: $(PKG_TAR) +$(PKG_EXE): rust.iss modpath.iss LICENSE.txt rust-logo.ico \ + $(PKG_FILES) $(CSREQ3_T_$(CFG_BUILD)_H_$(CFG_BUILD)) \ + dist-prepare-win + $(CFG_PYTHON) $(S)src/etc/copy-runtime-deps.py tmp/dist/win/bin + @$(call E, ISCC: $@) + $(Q)"$(CFG_ISCC)" $< -distcheck: $(PKG_TAR) - $(Q)rm -Rf dist - $(Q)mkdir -p dist - @$(call E, unpacking $(PKG_TAR) in dist/$(PKG_DIR)) - $(Q)cd dist && tar -xzf ../$(PKG_TAR) - @$(call E, configuring in dist/$(PKG_DIR)-build) - $(Q)mkdir -p dist/$(PKG_DIR)-build - $(Q)cd dist/$(PKG_DIR)-build && ../$(PKG_DIR)/configure - @$(call E, making 'check' in dist/$(PKG_DIR)-build) - $(Q)+make -C dist/$(PKG_DIR)-build check - @$(call E, making 'clean' in dist/$(PKG_DIR)-build) - $(Q)+make -C dist/$(PKG_DIR)-build clean - $(Q)rm -Rf dist - @echo - @echo ----------------------------------------------- - @echo $(PKG_TAR) ready for distribution - @echo ----------------------------------------------- +dist-prepare-win: PREPARE_HOST=$(CFG_BUILD) +dist-prepare-win: PREPARE_TARGETS=$(CFG_BUILD) +dist-prepare-win: PREPARE_DEST_DIR=tmp/dist/win +dist-prepare-win: PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD) +dist-prepare-win: PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD) +dist-prepare-win: PREPARE_LIB_CMD=$(DEFAULT_PREPARE_LIB_CMD) +dist-prepare-win: PREPARE_MAN_CMD=$(DEFAULT_PREPARE_MAN_CMD) +dist-prepare-win: PREPARE_CLEAN=true +dist-prepare-win: prepare-base endif + +###################################################################### +# OS X .pkg installer +###################################################################### + ifeq ($(CFG_OSTYPE), apple-darwin) dist-prepare-osx: PREPARE_HOST=$(CFG_BUILD) @@ -155,6 +134,11 @@ distcheck-osx: $(PKG_OSX) endif + +###################################################################### +# Unix binary installer tarballs +###################################################################### + dist-install-dir: $(foreach host,$(CFG_HOST),dist-install-dir-$(host)) dist-tar-bins: $(foreach host,$(CFG_HOST),dist/$(PKG_DIR)-$(host).tar.gz) @@ -185,3 +169,44 @@ endef $(foreach host,$(CFG_HOST),\ $(eval $(call DEF_INSTALLER,$(host)))) + + +###################################################################### +# Primary targets (dist, distcheck) +###################################################################### + +ifdef CFG_WINDOWSY_$(CFG_BUILD) + +dist: $(PKG_EXE) + +distcheck: dist + @echo + @echo ----------------------------------------------- + @echo $(PKG_EXE) ready for distribution + @echo ----------------------------------------------- + +else + +dist: $(PKG_TAR) + +distcheck: $(PKG_TAR) + $(Q)rm -Rf dist + $(Q)mkdir -p dist + @$(call E, unpacking $(PKG_TAR) in dist/$(PKG_DIR)) + $(Q)cd dist && tar -xzf ../$(PKG_TAR) + @$(call E, configuring in dist/$(PKG_DIR)-build) + $(Q)mkdir -p dist/$(PKG_DIR)-build + $(Q)cd dist/$(PKG_DIR)-build && ../$(PKG_DIR)/configure + @$(call E, making 'check' in dist/$(PKG_DIR)-build) + $(Q)+make -C dist/$(PKG_DIR)-build check + @$(call E, making 'clean' in dist/$(PKG_DIR)-build) + $(Q)+make -C dist/$(PKG_DIR)-build clean + $(Q)rm -Rf dist + @echo + @echo ----------------------------------------------- + @echo $(PKG_TAR) ready for distribution + @echo ----------------------------------------------- + +endif + +.PHONY: dist distcheck -- GitLab