bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rollup merge of #20584: brson/versioning

Browse source 
Also, change the version number to 1.0.0.
This commit is contained in:
Alex Crichton 2015-01-05 18:42:08 -08:00
commit f3ad232022
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
mk/main.mk
View file

@ -13,7 +13,7 @@
###################################################################### ######################################################################
# The version number # The version number
CFG_RELEASE_NUM=0.13.0 CFG_RELEASE_NUM=1.0.0
# An optional number to put after the label, e.g. '2' -> '-beta2' # An optional number to put after the label, e.g. '2' -> '-beta2'
CFG_BETA_CYCLE= CFG_BETA_CYCLE=
@ -29,14 +29,14 @@ endif
ifeq ($(CFG_RELEASE_CHANNEL),beta) ifeq ($(CFG_RELEASE_CHANNEL),beta)
# The beta channel is temporarily called 'alpha' # The beta channel is temporarily called 'alpha'
CFG_RELEASE=$(CFG_RELEASE_NUM)-alpha$(CFG_BETA_CYCLE) CFG_RELEASE=$(CFG_RELEASE_NUM)-alpha$(CFG_BETA_CYCLE)
# When building beta/nightly distributables just reuse the same "beta" CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)-alpha$(CFG_BETA_CYCLE)
# 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=alpha
endif endif
ifeq ($(CFG_RELEASE_CHANNEL),nightly) ifeq ($(CFG_RELEASE_CHANNEL),nightly)
CFG_RELEASE=$(CFG_RELEASE_NUM)-nightly CFG_RELEASE=$(CFG_RELEASE_NUM)-nightly
# When building nightly distributables just reuse the same "nightly" 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=nightly CFG_PACKAGE_VERS=nightly
endif endif
ifeq ($(CFG_RELEASE_CHANNEL),dev) ifeq ($(CFG_RELEASE_CHANNEL),dev)