diff options
| author | Brian Anderson <banderson@mozilla.com> | 2014-01-07 16:51:37 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2014-01-07 17:01:07 -0800 |
| commit | 15cbcbcc0374e6f39ee8d1a8325f25b69950b7c2 (patch) | |
| tree | fb3c8e01b70925a9d3e2f5b7a96242d4853f2a2c | |
| parent | 1ea02170bddf9b9a684a1e22d5c5d9ff5af8bc71 (diff) | |
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.
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | src/etc/pkg/rust.iss | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 5e2059242e2..c2a562967d6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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 diff --git a/src/etc/pkg/rust.iss b/src/etc/pkg/rust.iss index 0375a041a39..1c46055fff7 100644 --- a/src/etc/pkg/rust.iss +++ b/src/etc/pkg/rust.iss @@ -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 |