mk: Fix the naming of the windows installer harder

CFG_VERSION includes a bunch of VCS info in it that is not a valid
filename. CFG_RELEASE is just the version number.
This commit is contained in:
Brian Anderson 2014-01-07 16:51:37 -08:00
parent 1ea02170bd
commit 15cbcbcc03
2 changed files with 3 additions and 1 deletions

View File

@ -410,6 +410,7 @@ export CFG_SRC_DIR
export CFG_BUILD_DIR
export CFG_VERSION
export CFG_VERSION_WIN
export CFG_RELEASE
export CFG_BUILD
export CFG_LLVM_ROOT
export CFG_ENABLE_MINGW_CROSS

View File

@ -1,5 +1,6 @@
#define CFG_VERSION GetEnv("CFG_VERSION")
#define CFG_VERSION_WIN GetEnv("CFG_VERSION_WIN")
#define CFG_RELEASE GetEnv("CFG_RELEASE")
[Setup]
@ -19,7 +20,7 @@ DisableStartupPrompt=true
OutputDir=.\
SourceDir=.\
OutputBaseFilename=rust-{#CFG_VERSION}-install
OutputBaseFilename=rust-{#CFG_RELEASE}-install
DefaultDirName={pf32}\Rust
Compression=lzma2/ultra