diff options
| author | bors <bors@rust-lang.org> | 2014-09-10 19:25:36 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-09-10 19:25:36 +0000 |
| commit | 9f6d27c39f48895577eff1b9b42ab0e1d8e2a4a8 (patch) | |
| tree | 4430400ef664f4f25b6b6575510104ed308b98ea | |
| parent | 716db009b4b55cf3d8c1441cd1cf6ac90280714a (diff) | |
| parent | 5206e79b926250c4547d83449cebbdeade586cd2 (diff) | |
| download | rust-9f6d27c39f48895577eff1b9b42ab0e1d8e2a4a8.tar.gz rust-9f6d27c39f48895577eff1b9b42ab0e1d8e2a4a8.zip | |
auto merge of #17135 : brson/rust/wininst, r=alexcrichton
This builds on https://github.com/rust-lang/rust/pull/17109, putting the target triple into the installer name so that we can have both 32-bit and 64-bit. The resulting installers will be called `rust-0.12.0-pre-x86_64-w64-mingw32.exe`, etc.
| -rw-r--r-- | mk/dist.mk | 2 | ||||
| -rw-r--r-- | src/etc/pkg/rust.iss | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mk/dist.mk b/mk/dist.mk index a203dd8b639..4d86af37171 100644 --- a/mk/dist.mk +++ b/mk/dist.mk @@ -112,7 +112,7 @@ distcheck-tar-src: dist-tar-src ifdef CFG_ISCC -PKG_EXE = dist/$(PKG_NAME)-install.exe +PKG_EXE = dist/$(PKG_NAME)-$(CFG_BUILD).exe %.iss: $(S)src/etc/pkg/%.iss cp $< $@ diff --git a/src/etc/pkg/rust.iss b/src/etc/pkg/rust.iss index 053fe34952c..08c28c4399b 100644 --- a/src/etc/pkg/rust.iss +++ b/src/etc/pkg/rust.iss @@ -1,6 +1,7 @@ #define CFG_VERSION_WIN GetEnv("CFG_VERSION_WIN") #define CFG_RELEASE GetEnv("CFG_RELEASE") #define CFG_PACKAGE_NAME GetEnv("CFG_PACKAGE_NAME") +#define CFG_BUILD GetEnv("CFG_BUILD") [Setup] @@ -20,7 +21,7 @@ DisableStartupPrompt=true OutputDir=.\dist\ SourceDir=.\ -OutputBaseFilename={#CFG_PACKAGE_NAME}-install +OutputBaseFilename={#CFG_PACKAGE_NAME}-{#CFG_BUILD} DefaultDirName={pf32}\Rust Compression=lzma2/ultra |