From 56c26ab663e77a128788375b0c039b203c0a5337 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Mon, 29 Dec 2014 20:16:39 -0800 Subject: mk: Allow an optional number to come after the beta version label --- mk/main.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mk/main.mk b/mk/main.mk index 4aed1cea9ca..37efe5e12f8 100644 --- a/mk/main.mk +++ b/mk/main.mk @@ -15,6 +15,9 @@ # The version number CFG_RELEASE_NUM=0.13.0 +# An optional number to put after the label, e.g. '2' -> '-beta2' +CFG_BETA_CYCLE=1 + CFG_FILENAME_EXTRA=4e7c5e5c ifeq ($(CFG_RELEASE_CHANNEL),stable) @@ -24,7 +27,7 @@ CFG_RELEASE=$(CFG_RELEASE_NUM) CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM) endif ifeq ($(CFG_RELEASE_CHANNEL),beta) -CFG_RELEASE=$(CFG_RELEASE_NUM)-beta +CFG_RELEASE=$(CFG_RELEASE_NUM)-beta$(CFG_BETA_CYCLE) # When building beta/nightly distributables just reuse the same "beta" # name so when we upload we'll always override the previous # nighly. This doesn't actually impact the version reported by rustc - -- cgit 1.4.1-3-g733a5 From f253002e345a200c19772b16ba5b559435ef5139 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Mon, 29 Dec 2014 20:19:02 -0800 Subject: mk: The beta channel temporarily produced alpha versions --- mk/main.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mk/main.mk b/mk/main.mk index 37efe5e12f8..e55b7e9ab8c 100644 --- a/mk/main.mk +++ b/mk/main.mk @@ -27,12 +27,13 @@ CFG_RELEASE=$(CFG_RELEASE_NUM) CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM) endif ifeq ($(CFG_RELEASE_CHANNEL),beta) -CFG_RELEASE=$(CFG_RELEASE_NUM)-beta$(CFG_BETA_CYCLE) +# The beta channel is temporarily called 'alpha' +CFG_RELEASE=$(CFG_RELEASE_NUM)-alpha$(CFG_BETA_CYCLE) # When building beta/nightly distributables just reuse the same "beta" # name so when we upload we'll always override the previous # nighly. This doesn't actually impact the version reported by rustc - # it's just for file naming. -CFG_PACKAGE_VERS=beta +CFG_PACKAGE_VERS=alpha endif ifeq ($(CFG_RELEASE_CHANNEL),nightly) CFG_RELEASE=$(CFG_RELEASE_NUM)-nightly -- cgit 1.4.1-3-g733a5 From 20fcece88bfdca78695b2d5b454d2cf1570625b6 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Tue, 30 Dec 2014 10:18:54 -0800 Subject: mk: The alpha will not have a cycle number --- mk/main.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/main.mk b/mk/main.mk index e55b7e9ab8c..5cae54430d7 100644 --- a/mk/main.mk +++ b/mk/main.mk @@ -16,7 +16,7 @@ CFG_RELEASE_NUM=0.13.0 # An optional number to put after the label, e.g. '2' -> '-beta2' -CFG_BETA_CYCLE=1 +CFG_BETA_CYCLE= CFG_FILENAME_EXTRA=4e7c5e5c -- cgit 1.4.1-3-g733a5