auto merge of #17135 : brson/rust/wininst, r=alexcrichton

This builds on #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.
rust-lang · Sep 10, 2014 · 9f6d27c · 9f6d27c
2 parents 716db00 + 5206e79
commit 9f6d27c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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