From f154da9e12608589e8d5f0508f908a0c3e88a1bb Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Thu, 15 Jan 2015 11:54:00 -0700
Subject: Imported Upstream version 1.4

---
 misc/makerelease/windows/installer.wxs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'misc/makerelease/windows')

diff --git a/misc/makerelease/windows/installer.wxs b/misc/makerelease/windows/installer.wxs
index b170b98dc..01178e265 100644
--- a/misc/makerelease/windows/installer.wxs
+++ b/misc/makerelease/windows/installer.wxs
@@ -18,13 +18,12 @@
 
 <Product
     Id="FF5B30B2-08C2-11E1-85A2-6ACA4824019B"
-    Name="Go Programming Language $(var.Arch) $(var.Version)"
+    Name="Go Programming Language $(var.Arch) $(var.GoVersion)"
     Language="1033"
     Codepage="1252"
-    Version="0.0.0.0"
+    Version="$(var.WixGoVersion)"
     Manufacturer="http://golang.org"
     UpgradeCode="$(var.UpgradeCode)" >
-    <!-- Version="$(var.Version)" TODO: Version requires X.X.X.X format -->
 
 <Package
     Id='*' 
@@ -40,9 +39,9 @@
 
 <Property Id="ARPCOMMENTS" Value="The Go programming language is a fast, statically typed, compiled language that feels like a dynamically typed, interpreted language." />
 <Property Id="ARPCONTACT" Value="golang-nuts@googlegroups.com" />
-<Property Id="ARPHELPLINK" Value="golang.org/doc/community.html" />
-<Property Id="ARPREADME" Value="golang.org" />
-<Property Id="ARPURLINFOABOUT" Value="golang.org" />
+<Property Id="ARPHELPLINK" Value="https://golang.org/help/" />
+<Property Id="ARPREADME" Value="https://golang.org" />
+<Property Id="ARPURLINFOABOUT" Value="https://golang.org" />
 <Property Id="LicenseAccepted">1</Property>
 <Icon Id="gopher.ico" SourceFile="images\gopher.ico"/>
 <Property Id="ARPPRODUCTICON" Value="gopher.ico" />
-- 
cgit v1.2.3