diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-09-29 08:12:09 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-09-29 08:12:09 -0700 |
| commit | 01c25e6c7bb0b40eace6f05bbb9f9bb017a36b3a (patch) | |
| tree | 9c8506e8f49c2de01838edf42c135c3edd9cd725 | |
| parent | 6c23789ad1f62e39220e5e178928ecdad9db2a38 (diff) | |
| parent | b5c17b335237c89474315400163403bad9e4f3e9 (diff) | |
| download | rust-01c25e6c7bb0b40eace6f05bbb9f9bb017a36b3a.tar.gz rust-01c25e6c7bb0b40eace6f05bbb9f9bb017a36b3a.zip | |
rollup merge of #17542 : brson/devchannel
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | mk/main.mk | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/configure b/configure index a5699cc56c9..2391f222913 100755 --- a/configure +++ b/configure @@ -453,7 +453,7 @@ valopt datadir "${CFG_PREFIX}/share" "install data" valopt infodir "${CFG_PREFIX}/share/info" "install additional info" valopt mandir "${CFG_PREFIX}/share/man" "install man pages in PATH" -valopt release-channel "source" "the name of the release channel to build" +valopt release-channel "dev" "the name of the release channel to build" # On windows we just store the libraries in the bin directory because # there's no rpath. This is where the build system itself puts libraries; @@ -479,10 +479,10 @@ validate_opt # Validate the release channel case "$CFG_RELEASE_CHANNEL" in - (source | nightly | beta | stable) + (dev | nightly | beta | stable) ;; (*) - err "release channel must be 'source', 'nightly', 'beta' or 'stable'" + err "release channel must be 'dev', 'nightly', 'beta' or 'stable'" ;; esac diff --git a/mk/main.mk b/mk/main.mk index 6667a29d4f9..a4bac74aace 100644 --- a/mk/main.mk +++ b/mk/main.mk @@ -35,9 +35,9 @@ ifeq ($(CFG_RELEASE_CHANNEL),nightly) CFG_RELEASE=$(CFG_RELEASE_NUM)-nightly CFG_PACKAGE_VERS=nightly endif -ifeq ($(CFG_RELEASE_CHANNEL),source) -CFG_RELEASE=$(CFG_RELEASE_NUM)-pre -CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)-pre +ifeq ($(CFG_RELEASE_CHANNEL),dev) +CFG_RELEASE=$(CFG_RELEASE_NUM)-dev +CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)-dev endif # The name of the package to use for creating tarballs, installers etc. |