mk: Make windows installer work with -pre versions

diff --git a/Makefile.in b/Makefile.in
index 0404e2bdee6cf099ac887954c19ab70c3d23a945..dfeb735f5f1e6354ede1e634f1a8557cd4e79dee 100644 (file)
--- 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/src/etc/pkg/rust.iss b/src/etc/pkg/rust.iss
index 18f358a9893d32ab4746c5fa0d164b822cd3a83d..0375a041a39e97ab9a009b35fced5d015b0fd3e3 100644 (file)
--- 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