diff options
| -rwxr-xr-x | configure | 19 | ||||
| -rw-r--r-- | man/rustc.1 | 2 | ||||
| -rw-r--r-- | man/rustdoc.1 | 2 | ||||
| -rw-r--r-- | mk/main.mk | 32 | ||||
| -rw-r--r-- | src/etc/kate/rust.xml | 2 |
5 files changed, 43 insertions, 14 deletions
diff --git a/configure b/configure index 17534ee6c3d..9aa23e732ab 100755 --- a/configure +++ b/configure @@ -453,6 +453,8 @@ 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" + # 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; # --libdir is used to configure the installation directory. @@ -481,6 +483,23 @@ CFG_BUILD=`echo "${CFG_BUILD}" | sed 's/-pc-mingw32/-w64-mingw32/g'` CFG_HOST=`echo "${CFG_HOST}" | sed 's/-pc-mingw32/-w64-mingw32/g'` CFG_TARGET=`echo "${CFG_TARGET}" | sed 's/-pc-mingw32/-w64-mingw32/g'` +# Validate the release channel +case "$CFG_RELEASE_CHANNEL" in + (source | nightly | beta | stable) + ;; + (*) + err "release channel must be 'source', 'nightly', 'beta' or 'stable'" + ;; +esac + +# Continue supporting the old --enable-nightly flag to transition the bots +# XXX Remove me +if [ $CFG_ENABLE_NIGHTLY -eq 1 ] +then + CFG_RELEASE_CHANNEL=nightly + putvar CFG_RELEASE_CHANNEL +fi + step_msg "looking for build programs" probe_need CFG_PERL perl diff --git a/man/rustc.1 b/man/rustc.1 index 00d698e611e..6b7243541c4 100644 --- a/man/rustc.1 +++ b/man/rustc.1 @@ -1,4 +1,4 @@ -.TH RUSTC "1" "March 2014" "rustc 0.12.0-pre" "User Commands" +.TH RUSTC "1" "March 2014" "rustc 0.12.0" "User Commands" .SH NAME rustc \- The Rust compiler .SH SYNOPSIS diff --git a/man/rustdoc.1 b/man/rustdoc.1 index 12e776b9861..e675aca38aa 100644 --- a/man/rustdoc.1 +++ b/man/rustdoc.1 @@ -1,4 +1,4 @@ -.TH RUSTDOC "1" "March 2014" "rustdoc 0.12.0-pre" "User Commands" +.TH RUSTDOC "1" "March 2014" "rustdoc 0.12.0" "User Commands" .SH NAME rustdoc \- generate documentation from Rust source code .SH SYNOPSIS diff --git a/mk/main.mk b/mk/main.mk index 3d5d0b441f1..6667a29d4f9 100644 --- a/mk/main.mk +++ b/mk/main.mk @@ -14,22 +14,32 @@ # The version number CFG_RELEASE_NUM=0.12.0 -CFG_RELEASE_LABEL=-pre CFG_FILENAME_EXTRA=4e7c5e5c -ifndef CFG_ENABLE_NIGHTLY -# This is the normal version string -CFG_RELEASE=$(CFG_RELEASE_NUM)$(CFG_RELEASE_LABEL) -CFG_PACKAGE_VERS=$(CFG_RELEASE) -else -# Modify the version label for nightly builds -CFG_RELEASE=$(CFG_RELEASE_NUM)$(CFG_RELEASE_LABEL)-nightly -# When building nightly distributables just reuse the same "rust-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. +ifeq ($(CFG_RELEASE_CHANNEL),stable) +# This is the normal semver version string, e.g. "0.12.0", "0.12.0-nightly" +CFG_RELEASE=$(CFG_RELEASE_NUM) +# This is the string used in dist artifact file names, e.g. "0.12.0", "nightly" +CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM) +endif +ifeq ($(CFG_RELEASE_CHANNEL),beta) +CFG_RELEASE=$(CFG_RELEASE_NUM)-beta +# 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 +endif +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 +endif + # The name of the package to use for creating tarballs, installers etc. CFG_PACKAGE_NAME=rust-$(CFG_PACKAGE_VERS) diff --git a/src/etc/kate/rust.xml b/src/etc/kate/rust.xml index cf59f1454c1..2b80c0ff39f 100644 --- a/src/etc/kate/rust.xml +++ b/src/etc/kate/rust.xml @@ -7,7 +7,7 @@ <!ENTITY rustIdent "[a-zA-Z_][a-zA-Z_0-9]*"> <!ENTITY rustIntSuf "([iu](8|16|32|64)?)?"> ]> -<language name="Rust" version="0.12.0-pre" kateversion="2.4" section="Sources" extensions="*.rs" mimetype="text/x-rust" priority="15"> +<language name="Rust" version="0.12.0" kateversion="2.4" section="Sources" extensions="*.rs" mimetype="text/x-rust" priority="15"> <highlighting> <list name="fn"> <item> fn </item> |