Minor changes to installer and installer directions

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@661 8092fc87-c524-0410-9efc-e669fe64eaf9

sc2/build/win32_install/README

@@ -16,11 +16,6 @@ resource hacker: http://www.users.on.net/johnson/resourcehacker/
 
 1) Compile uqm.exe
 
-This doesn't seem to work.  If someone can figure outhow to add an icon,
-please update these directions
-#2) Use resource hacker or some other program to  attach the uqm icon:
-#    reshacker -modify uqm.exe,uqm.exe,build\\win32_install\\uqm.ico,icongroup,100,0
-
 2) If you have upx, run it  on uqm.exe as follows:
     upx --best --crp-ms=100000 uqm.exe
 
@@ -62,9 +57,11 @@ please update these directions
        OLD_VERSION: The earliest version that can be upgraded from
        MIRROR_LOCATION: Where the mirror file lives (probbaly ok as is)
        NO_MIRROR_LOCATION: Where to get non-mirrored files from
-       FULL_NEEDS_UPGRADE: If you built the 'content' archive, set  to '0'
-                           otherwise set to '1' (i.e. official builds should
-                           have this set  to '0' dev builds set to '1')
+       FULL_NEEDS_UPGRADE: This parameter is set if a 'full' build requires
+                           both the 'content' archive pak along with the
+                           'upgrade' archive pak.  In general, only official
+                           builds wil have this set to '0'  all other builds
+                           ahould leave it at '1'
        CONTENT_USE_MIRROR: Whether to use the mirror for the 'content' archive
        CONTENT_PACKAGE_FILE: the name of the 'content' file (from step 4)
        CONTENT_TYPE_ZIP/CONTENT_TYPE_TGZ: set the correct define

sc2/build/win32_install/uqm.nsi

@@ -1,7 +1,8 @@
-!define MUI_PRODUCT "Ur-Quan Masters" ;Define your own software name here
+!define MUI_PRODUCT "The Ur-Quan Masters" ;Define your own software name here
 !define MUI_VERSION "0.13" ;Define your own software version here
 !define OLD_VERSION "0.1" ; The earliest version that we can upgrade from
 
+!define DEFAULT_UPGRADE 1 ;  Define if the default install should be 'upgrade'
 !define MIRROR_LOCATION "http://sc2.sourceforge.net/install_files/mirrors.txt"
 !define NO_MIRROR_LOCATION "http://sc2.sourceforge.net/install_files/"
 
@@ -95,8 +96,14 @@
 ;--------------------------------
 ;Installer Sections
 
-InstType $(InstTypeFullName)
-InstType $(InstTypeUpgradeName)
+
+!ifndef DEFAULT_UPGRADE
+  InstType $(InstTypeFullName)
+  InstType $(InstTypeUpgradeName)
+!else
+  InstType $(InstTypeUpgradeName)
+  InstType $(InstTypeFullName)
+!endif
 
 Section !$(SecUQMName) SecUQM
 SectionIn 1 2 RO
@@ -129,7 +136,11 @@ SectionIn 1 2 RO
 SectionEnd
 
 Section $(SecContentName) SecContent
+!ifndef DEFAULT_UPGRADE
 SectionIn 1
+!else
+SectionIn 2
+!endif
 
   AddSize ${CONTENT_SIZE}
 
@@ -168,7 +179,11 @@ Section $(SecUpgradeName) SecUpgrade
   !ifdef FULL_NEEDS_UPGRADE 
     SectionIn 1 2
   !else
-    SectionIn 2
+    !ifndef DEFAULT_UPGRADE
+      SectionIn 2
+    !else
+      SectionIn 1
+    !endif
   !endif
 
   AddSize ${UPGRADE_SIZE}
@@ -208,7 +223,11 @@ SectionEnd
 SubSection $(SecSupportDLLName) SecSupportDLL
 
 Section $(SecSDLName) SecSDL
+!ifndef DEFAULT_UPGRADE
 SectionIn 1
+!else
+SectionIn 2
+!endif
 
   ; Set output path to the installation directory.
   SetOutPath $INSTDIR
@@ -221,7 +240,11 @@ SectionIn 1
 SectionEnd
 
 Section $(SecVoiceName) SecVoice
+!ifndef DEFAULT_UPGRADE
 SectionIn 1
+!else
+SectionIn 2
+!endif
 
   ; Set output path to the installation directory.
   SetOutPath $INSTDIR