From b16111f8a99690f5dc392af3f8e6eff37ef63c0f Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Wed, 31 Dec 2014 20:57:48 -0800 Subject: [PATCH 1/2] mk: The doc directory is no longer included in the main package --- mk/dist.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/dist.mk b/mk/dist.mk index a8b331c6cc2..e1b6b017d1c 100644 --- a/mk/dist.mk +++ b/mk/dist.mk @@ -212,7 +212,7 @@ distcheck-osx: dist-osx # Unix binary installer tarballs ###################################################################### -NON_INSTALLED_PREFIXES=COPYRIGHT,LICENSE-APACHE,LICENSE-MIT,README.md,doc +NON_INSTALLED_PREFIXES=COPYRIGHT,LICENSE-APACHE,LICENSE-MIT,README.md define DEF_INSTALLER From d53914961c2cd29e2b70954b9b915a2d3c231eac Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Wed, 31 Dec 2014 21:01:02 -0800 Subject: [PATCH 2/2] mk: Put the version number somewhere discoverable in the installer The binaries for some release channels to not contain the version number, which makes it hard for scripts to determine the version number. --- mk/dist.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mk/dist.mk b/mk/dist.mk index e1b6b017d1c..6986746a117 100644 --- a/mk/dist.mk +++ b/mk/dist.mk @@ -212,7 +212,7 @@ distcheck-osx: dist-osx # Unix binary installer tarballs ###################################################################### -NON_INSTALLED_PREFIXES=COPYRIGHT,LICENSE-APACHE,LICENSE-MIT,README.md +NON_INSTALLED_PREFIXES=COPYRIGHT,LICENSE-APACHE,LICENSE-MIT,README.md,version define DEF_INSTALLER @@ -236,6 +236,8 @@ dist-install-dir-$(1): prepare-base-dir-$(1) docs compiler-docs $$(Q)$$(PREPARE_MAN_CMD) $$(S)LICENSE-APACHE $$(PREPARE_DEST_DIR)/share/doc/rust $$(Q)$$(PREPARE_MAN_CMD) $$(S)LICENSE-MIT $$(PREPARE_DEST_DIR)/share/doc/rust $$(Q)$$(PREPARE_MAN_CMD) $$(S)README.md $$(PREPARE_DEST_DIR)/share/doc/rust +# This tiny morsel of metadata is used by rust-packaging + $$(Q)echo "$(CFG_VERSION)" > $$(PREPARE_DEST_DIR)/version dist/$$(PKG_NAME)-$(1).tar.gz: dist-install-dir-$(1) @$(call E, build: $$@)