misc/dist/windows: fix broken icon, other misc

fix, and shrink, the gopher icon, txt extensions
for license and readme files, minor format changes
in the wxs file

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/5683054

diff --git a/misc/dist/windows/LICENSE b/misc/dist/windows/LICENSE.rtf
similarity index 100%
rename from misc/dist/windows/LICENSE
rename to misc/dist/windows/LICENSE.rtf

diff --git a/misc/dist/windows/README b/misc/dist/windows/README.txt
similarity index 79%
rename from misc/dist/windows/README
rename to misc/dist/windows/README.txt
index a0b0a8a7c139ddfa1414d5e0cd6ed2e797ea2b4c..b2f00d427f5b788dab48f3da7620f9e9ab07d763 100644 (file)
--- a/misc/dist/windows/README
+++ b/misc/dist/windows/README.txt
@@ -11,19 +11,17 @@ Dependencies
 Packaging\r
 =========\r
 The dependencies must be callable from dist.bat, therefore,\r
-they'll need to be in/added to the system's search PATH.\r
+they'll need to be in/added to the system's search PATH. \r
 \r
 The packaging needs to be done from within a tracked Go folder. \r
 Packages are built by cloning the same version of the source tree\r
 that the Go tools were built from.\r
 \r
-To create an i386 distribution package on a 64 bit system, set\r
-GOARCH=386 prior to calling dist.bat.\r
-\r
 Run dist.bat from a command prompt or click on the batch file.\r
 \r
 TODO\r
-----\r
+----
+- Write a Go program for dist.bat functionality\r
 - Documentation server shortcut checkbox option\r
 \r
 Misc\r

diff --git a/misc/dist/windows/images/gopher.ico b/misc/dist/windows/images/gopher.ico
index 8421829d84bb1b08a82cb1f7cf0e400ed296cfac..39a6c47c4d3e488b929a3c106cc3798c85c969fa 100644 (file)
Binary files a/misc/dist/windows/images/gopher.ico and b/misc/dist/windows/images/gopher.ico differ

diff --git a/misc/dist/windows/installer.wxs b/misc/dist/windows/installer.wxs
index ee5d22c28548b5f70d9b08bc0fd2a7ac3b5897e3..faece29b022514fd29505783cadd06996d9d7486 100644 (file)
--- a/misc/dist/windows/installer.wxs
+++ b/misc/dist/windows/installer.wxs
@@ -36,11 +36,11 @@
     Languages="1033" />\r
     <!--    Platform="x86 or x64" -->\r
 \r
-    <Property Id="ARPCOMMENTS" Value="The Go programming language is a fast, statically typed, compiled language that feels like a dynamically typed, interpreted language." />\r
-    <Property Id="ARPCONTACT" Value="golang-nuts@googlegroups.com" />\r
-    <Property Id="ARPHELPLINK" Value="golang.org/doc/community.html" />\r
-    <Property Id="ARPREADME" Value="golang.org" />\r
-    <Property Id="ARPURLINFOABOUT" Value="golang.org" />\r
+<Property Id="ARPCOMMENTS" Value="The Go programming language is a fast, statically typed, compiled language that feels like a dynamically typed, interpreted language." />\r
+<Property Id="ARPCONTACT" Value="golang-nuts@googlegroups.com" />\r
+<Property Id="ARPHELPLINK" Value="golang.org/doc/community.html" />\r
+<Property Id="ARPREADME" Value="golang.org" />\r
+<Property Id="ARPURLINFOABOUT" Value="golang.org" />\r
 <Icon Id="gopher.ico" SourceFile="images\gopher.ico"/>\r
 <Property Id="ARPPRODUCTICON" Value="gopher.ico" />\r
 <Media Id='1' Cabinet="go.cab" EmbedCab="yes" CompressionLevel="high" />\r
@@ -114,10 +114,10 @@
         Key="Software\GoProgrammingLanguage"\r
         Action="create" >\r
             <RegistryValue\r
-        Name="installed"\r
-        Type="integer"\r
-        Value="1"\r
-        KeyPath="yes" />\r
+                Name="installed"\r
+                Type="integer"\r
+                Value="1"\r
+                KeyPath="yes" />\r
             <RegistryValue\r
                 Name="installLocation"\r
                 Type="string"\r
@@ -144,7 +144,6 @@
     Id="GoTools"\r
     Title="Go"\r
     Level="1">\r
-\r
       <ComponentRef Id="Component_GoEnvironment" />\r
       <ComponentGroupRef Id="AppFiles" />\r
       <ComponentRef Id="Component_GoShortCuts" />\r
@@ -156,7 +155,7 @@
 </InstallExecuteSequence>\r
 \r
 <!-- Include the user interface -->\r
-<WixVariable Id="WixUILicenseRtf" Value="LICENSE" />\r
+<WixVariable Id="WixUILicenseRtf" Value="LICENSE.rtf" />\r
 <WixVariable Id="WixUIBannerBmp" Value="images\Banner.jpg" />\r
 <WixVariable Id="WixUIDialogBmp" Value="images\Dialog.jpg" />\r
 <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />\r