Skip to content

Commit

Permalink
auto merge of #17135 : brson/rust/wininst, r=alexcrichton
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
bors committed Sep 10, 2014
2 parents 716db00 + 5206e79 commit 9f6d27c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion mk/dist.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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 $< $@
Expand Down
3 changes: 2 additions & 1 deletion src/etc/pkg/rust.iss
Original file line number Diff line number Diff line change
@@ -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]

Expand All @@ -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
Expand Down

0 comments on commit 9f6d27c

Please sign in to comment.