diff options
| author | bors <bors@rust-lang.org> | 2013-06-28 14:14:03 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-06-28 14:14:03 -0700 |
| commit | 5d2e565bb1f4566bdaab053876bacad72c57f582 (patch) | |
| tree | ef1072732e9a4154ce1b3f682ff65c28e2de058f | |
| parent | f44b951a1ea40b61508b2d0abb3f239797f885c5 (diff) | |
| parent | 6511fe45e2df0328a5267dae9b1dda160edd1861 (diff) | |
| download | rust-5d2e565bb1f4566bdaab053876bacad72c57f582.tar.gz rust-5d2e565bb1f4566bdaab053876bacad72c57f582.zip | |
auto merge of #7437 : brson/rust/winver, r=brson
r? @graydon (or anybody)
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | mk/dist.mk | 2 | ||||
| -rw-r--r-- | mk/tools.mk | 3 | ||||
| -rw-r--r-- | src/etc/pkg/rust.iss | 3 |
4 files changed, 9 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 0404e2bdee6..dfeb735f5f1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -141,6 +141,9 @@ endif CFG_GIT_DIR := $(CFG_SRC_DIR).git CFG_RELEASE = 0.7-pre CFG_VERSION = $(CFG_RELEASE) +# windows exe's need numeric versions - don't use anything but +# numbers and dots here +CFG_VERSION_WIN = 0.7 ifneq ($(wildcard $(CFG_GIT)),) ifneq ($(wildcard $(CFG_GIT_DIR)),) @@ -311,6 +314,7 @@ $(foreach host,$(CFG_HOST_TRIPLES), \ export CFG_SRC_DIR export CFG_BUILD_DIR export CFG_VERSION +export CFG_VERSION_WIN export CFG_BUILD_TRIPLE export CFG_LLVM_ROOT export CFG_ENABLE_MINGW_CROSS diff --git a/mk/dist.mk b/mk/dist.mk index 912b692a247..cb5b3607fca 100644 --- a/mk/dist.mk +++ b/mk/dist.mk @@ -57,7 +57,7 @@ LICENSE.txt: $(S)COPYRIGHT $(S)LICENSE-APACHE $(S)LICENSE-MIT cp $< $@ $(PKG_EXE): rust.iss modpath.iss LICENSE.txt rust-logo.ico \ - $(PKG_FILES) all rustc-stage3 + $(PKG_FILES) $(CSREQ3_T_$(CFG_BUILD_TRIPLE)_H_$(CFG_BUILD_TRIPLE)) @$(call E, ISCC: $@) $(Q)"$(CFG_ISCC)" $< endif diff --git a/mk/tools.mk b/mk/tools.mk index 7b50441b3c7..0a901358ac1 100644 --- a/mk/tools.mk +++ b/mk/tools.mk @@ -191,7 +191,8 @@ $(foreach host,$(CFG_HOST_TRIPLES), \ $(foreach target,$(CFG_TARGET_TRIPLES), \ $(eval $(call TOOLS_STAGE_N_TARGET,0,1,$(host),$(target))) \ $(eval $(call TOOLS_STAGE_N_TARGET,1,2,$(host),$(target))) \ - $(eval $(call TOOLS_STAGE_N_TARGET,2,3,$(host),$(target))))) + $(eval $(call TOOLS_STAGE_N_TARGET,2,3,$(host),$(target))) \ + $(eval $(call TOOLS_STAGE_N_TARGET,3,bogus,$(host),$(target))))) $(foreach host,$(CFG_HOST_TRIPLES), \ $(eval $(call TOOLS_STAGE_N_HOST,0,1,$(host),$(host))) \ diff --git a/src/etc/pkg/rust.iss b/src/etc/pkg/rust.iss index 18f358a9893..0375a041a39 100644 --- a/src/etc/pkg/rust.iss +++ b/src/etc/pkg/rust.iss @@ -1,4 +1,5 @@ #define CFG_VERSION GetEnv("CFG_VERSION") +#define CFG_VERSION_WIN GetEnv("CFG_VERSION_WIN") [Setup] @@ -8,7 +9,7 @@ AppVersion={#CFG_VERSION} AppCopyright=Copyright (C) 2006-2013 Mozilla Foundation, MIT license AppPublisher=Mozilla Foundation AppPublisherURL=http://www.rust-lang.org -VersionInfoVersion={#CFG_VERSION} +VersionInfoVersion={#CFG_VERSION_WIN} LicenseFile=LICENSE.txt DisableWelcomePage=true |