Update the Win32 installer to fit the new site design and to make Remix Pack 4 available. Juggle some file locations to make it easier to run the NSI script directly out of the win32_install directory.

The installer code is still kind of a mess, but this makes it more reliable than the old 0.7 installer from a user experience standpoint.

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

sc2/build/win32_install/packages.nsh

@@ -18,3 +18,6 @@
 !define PKG_REMIX3_FILE "uqm-remix-disc3.uqm"
 !define PKG_REMIX3_MD5SUM "5ccc6d4ac301ae98e172ac6835dcdead"
 !define PKG_REMIX3_SIZE 38989
+!define PKG_REMIX4_FILE "uqm-remix-disc4.uqm"
+!define PKG_REMIX4_MD5SUM "d3dc6036588662391a3820ca6b222dd6"
+!define PKG_REMIX4_SIZE 84517

sc2/build/win32_install/uqm-3do.cfg

@@ -0,0 +1,11 @@
+3domusic = BOOLEAN:true
+textmenu = BOOLEAN:false
+textgradients = BOOLEAN:false
+subtitles = BOOLEAN:false
+iconicscan = BOOLEAN:true
+3domovies = BOOLEAN:true
+speechvol = INT32:100
+pulseshield = BOOLEAN:true
+smoothmelee = BOOLEAN:true
+smoothscroll = BOOLEAN:true
+remixmusic = BOOLEAN:false

sc2/build/win32_install/uqm-installer.nsi

@@ -14,6 +14,10 @@ Var UQMUSERDATA
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"
 !define PRODUCT_STARTMENU_REGVAL "NSIS:StartMenuDir"
 
+; The INSTALLER_VERSION is a suffix to the version number for installer patches or to mark
+; alpha/beta/release candidate status. In normal releases it is the empty string.
+!define INSTALLER_VERSION "-1"
+
 ; UQM Package definitions
 !include "packages.nsh"
 
@@ -80,7 +84,7 @@ var ICONS_GROUP
 ; MUI end ------
 
 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile "uqm-${PRODUCT_VERSION}-installer.exe"
+OutFile "uqm-${PRODUCT_VERSION}${INSTALLER_VERSION}-installer.exe"
 InstallDir "$PROGRAMFILES\The Ur-Quan Masters\"
 InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
 ShowInstDetails show
@@ -125,114 +129,74 @@ FunctionEnd
 
 Function RandomServer
   Push $0
-  Push 27
+  Push 17
   Call Random
   Pop  $0
   IntCmp $0 0 0 +4 +4
-  StrCpy $0 "ovh"
-  Exch $0
-  Return
-  IntCmp $0 1 0 +4 +4
-  StrCpy $0 "mesh"
-  Exch $0
-  Return
-  IntCmp $0 2 0 +4 +4
   StrCpy $0 "aarnet"
   Exch $0
   Return
-  IntCmp $0 3 0 +4 +4
+  IntCmp $0 1 0 +4 +4
-  StrCpy $0 "switch"
+  StrCpy $0 "citylan"
   Exch $0
   Return
-  IntCmp $0 4 0 +4 +4
+  IntCmp $0 2 0 +4 +4
-  StrCpy $0 "superb-sea2"
-  Exch $0
-  Return
-  IntCmp $0 5 0 +4 +4
-  StrCpy $0 "jaist"
-  Exch $0
-  Return
-  IntCmp $0 6 0 +4 +4
-  StrCpy $0 "voxel"
-  Exch $0
-  Return
-  IntCmp $0 7 0 +4 +4
-  StrCpy $0 "heanet"
-  Exch $0
-  Return
-  IntCmp $0 8 0 +4 +4
-  StrCpy $0 "cdnetworks-us-1"
-  Exch $0
-  Return
-  IntCmp $0 9 0 +4 +4
-  StrCpy $0 "cdnetworks-us-2"
-  Exch $0
-  Return
-  IntCmp $0 10 0 +4 +4
-  StrCpy $0 "cdnetworks-kr-1"
-  Exch $0
-  Return
-  IntCmp $0 11 0 +4 +4
-  StrCpy $0 "surfnet"
-  Exch $0
-  Return
-  IntCmp $0 12 0 +4 +4
-  StrCpy $0 "cdnetworks-kr-2"
-  Exch $0
-  Return
-  IntCmp $0 13 0 +4 +4
-  StrCpy $0 "kent"
-  Exch $0
-  Return
-  IntCmp $0 14 0 +4 +4
-  StrCpy $0 "nchc"
-  Exch $0
-  Return
-  IntCmp $0 15 0 +4 +4
-  StrCpy $0 "dfn"
-  Exch $0
-  Return
-  IntCmp $0 16 0 +4 +4
   StrCpy $0 "freefr"
   Exch $0
   Return
-  IntCmp $0 17 0 +4 +4
+  IntCmp $0 3 0 +4 +4
   StrCpy $0 "garr"
   Exch $0
   Return
-  IntCmp $0 18 0 +4 +4
+  IntCmp $0 4 0 +4 +4
+  StrCpy $0 "heanet"
+  Exch $0
+  Return
+  IntCmp $0 5 0 +4 +4
+  StrCpy $0 "hivelocity"
+  Exch $0
+  Return
+  IntCmp $0 6 0 +4 +4
   StrCpy $0 "ignum"
   Exch $0
   Return
-  IntCmp $0 19 0 +4 +4
+  IntCmp $0 7 0 +4 +4
   StrCpy $0 "internode"
   Exch $0
   Return
-  IntCmp $0 20 0 +4 +4
+  IntCmp $0 8 0 +4 +4
   StrCpy $0 "iweb"
   Exch $0
   Return
-  IntCmp $0 21 0 +4 +4
+  IntCmp $0 9 0 +4 +4
+  StrCpy $0 "jaist"
+  Exch $0
+  Return
+  IntCmp $0 10 0 +4 +4
+  StrCpy $0 "nchc"
+  Exch $0
+  Return
+  IntCmp $0 11 0 +4 +4
   StrCpy $0 "netcologne"
   Exch $0
   Return
-  IntCmp $0 22 0 +4 +4
+  IntCmp $0 12 0 +4 +4
-  StrCpy $0 "leaseweb"
+  StrCpy $0 "switch"
   Exch $0
   Return
-  IntCmp $0 23 0 +4 +4
+  IntCmp $0 13 0 +4 +4
-  StrCpy $0 "ncu"
-  Exch $0
-  Return
-  IntCmp $0 24 0 +4 +4
   StrCpy $0 "tenet"
   Exch $0
   Return
-  IntCmp $0 25 0 +4 +4
+  IntCmp $0 14 0 +4 +4
-  StrCpy $0 "transact"
+  StrCpy $0 "ufpr"
   Exch $0
   Return
-  StrCpy $0 "citylan"
+  IntCmp $0 15 0 +4 +4
+  StrCpy $0 "voxel"
+  Exch $0
+  Return
+  StrCpy $0 "waix"
   Exch $0
 FunctionEnd
 
@@ -251,6 +215,7 @@ Function HandlePackage
   Exch $1 # File name
   Push $2
   Push $3
+  StrCpy $R9 0 # failure count
   # Check to make sure the file wasn't already installed
   IfFileExists "$0\$1" 0 NotThere
      md5dll::GetFileMD5 "$0\$1"
@@ -289,6 +254,12 @@ AttemptDownload:
   StrCmp $2 "success" DownloadSuccessful
   StrCmp $2 "cancel" DownloadCanceled
   StrCpy $2 "Could not install the package $1 due to the following error: $\"$2$\"."
+  # Only actually display the error every third try, unless it's a user cancellation. We can't
+  # really rely on SF.net to have everything at every mirror.
+  IntOp $R9 $R9 + 1
+  IntCmp $R9 3 0 AttemptDownload
+  # If we fell through, reset the count.
+  StrCpy $R9 0
   Goto CheckMandatory
 DownloadCanceled:
   StrCpy $2 "Download was canceled by user."
@@ -411,7 +382,7 @@ SectionGroup "!UQM" SECGRP01
     AddSize ${PKG_CONTENT_SIZE}
     StrCpy $MANDATORY 1
     StrCpy $MD5SUM "${PKG_CONTENT_MD5SUM}"
-    File "content\version"
+    File "..\..\content\version"
     StrCpy $DOWNLOADPATH "UQM/0.7/"
     Push "${PKG_CONTENT_FILE}"
     Push "$INSTDIR\content\packages"
@@ -504,20 +475,20 @@ SectionGroup "Modern Remixes" SECGRP03
     !insertmacro MUI_STARTMENU_WRITE_END
   SectionEnd
 
-#  Section "Pack 4" SEC08
+  Section "Pack 4" SEC08
-#    SectionIn 6
+    SectionIn 6
-#    AddSize ${PKG_REMIX4_SIZE}
+    AddSize ${PKG_REMIX4_SIZE}
-#    StrCpy $MANDATORY 0
+    StrCpy $MANDATORY 0
-#    StrCpy $MD5SUM "${PKG_REMIX4_MD5SUM}"
+    StrCpy $MD5SUM "${PKG_REMIX4_MD5SUM}"
-#    StrCpy $DOWNLOADPATH "UQM%20Remix%20Packs/UQM%20Remix%20Pack%204/"
+    StrCpy $DOWNLOADPATH "UQM%20Remix%20Packs/UQM%20Remix%20Pack%204/"
-#    Push "${PKG_REMIX4_FILE}"
+    Push "${PKG_REMIX4_FILE}"
-#    Push "$INSTDIR\content\addons"
+    Push "$INSTDIR\content\addons"
-#    Call HandlePackage
+    Call HandlePackage
-#    Call EnableRemixes
+    Call EnableRemixes
-#  ; Shortcuts
+  ; Shortcuts
-#    !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+    !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-#    !insertmacro MUI_STARTMENU_WRITE_END
+    !insertmacro MUI_STARTMENU_WRITE_END
-#  SectionEnd
+  SectionEnd
 SectionGroupEnd
 
 Section -ShortcutsAndIcons
@@ -588,7 +559,7 @@ SectionEnd
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC05} `Ur-Quan Masters Remix Pack 1 - 'Super Melee!'  Optional add-on music package.  If this package is selected and not present in the packages directory, the installer will attempt to download it.`
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC06} `Ur-Quan Masters Remix Pack 2 - 'Neutral Aliens - Don't Shoot!'  Optional add-on music package.  If this package is selected and not present in the packages directory, the installer will attempt to download it.`
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC07} `Ur-Quan Masters Remix Pack 3 - 'The Ur-Quan Hierarchy.'  Optional add-on music package.  If this package is selected and not present in the packages directory, the installer will attempt to download it.`
-#  !insertmacro MUI_DESCRIPTION_TEXT ${SEC08} `Ur-Quan Masters Remix Pack 4 - 'The New Alliance of Free Stars.'  Optional add-on music package.  If this package is selected and not present in the packages directory, the installer will attempt to download it.`
+  !insertmacro MUI_DESCRIPTION_TEXT ${SEC08} `Ur-Quan Masters Remix Pack 4 - 'The New Alliance of Free Stars.'  Optional add-on music package.  If this package is selected and not present in the packages directory, the installer will attempt to download it.`
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 

sc2/build/win32_install/uqm-pc.cfg

@@ -0,0 +1,11 @@
+3domusic = BOOLEAN:false
+textmenu = BOOLEAN:true
+textgradients = BOOLEAN:true
+subtitles = BOOLEAN:true
+iconicscan = BOOLEAN:false
+3domovies = BOOLEAN:false
+positionalsfx = BOOLEAN:false
+pulseshield = BOOLEAN:false
+smoothmelee = BOOLEAN:false
+smoothscroll = BOOLEAN:false
+remixmusic = BOOLEAN:false

sc2/doc/users/manual.txt

@@ -1,6 +1,6 @@
 THE UR-QUAN MASTERS v0.7 -- homepage: http://sc2.sf.net/
 
-Welcome to the sixth release of the Ur-Quan Masters port.  This
+Welcome to this beta release of the Ur-Quan Masters port.  This
 document will tell you everything you need to play, even if you've
 never played the original.
 
@@ -134,6 +134,15 @@ Set sound effects volume (0-100).
 Set speech volume (0-100). If set to 0, the game runs in 'no speech'
 mode and the oscilloscope reacts to the music.
 
+	-m 3do             (or --music 3do)
+
+Use the 3DO remixed soundtrack for songs that were in fact remixed.
+The default.
+
+	-m pc              (or --music pc)
+
+Use the .MOD based PC soundtrack everywhere.
+
 	-q                 (or --audioquality)
 
 Can be "high", "medium", or "low".  Specifies how nice the audio
@@ -782,7 +791,7 @@ inside the directory content/addons/<addon> will be included
 in the game. '--addon' may be specified more than once to enable multiple
 add-ons.
 
-Formerly standard packages, 3domusic and 3dovoice are now standard add-ons,
+Unlike previous releases, 3domusic and 3dovoice are now standard add-ons,
 and can be turned on and off from the in-game setup menu.
 The Precursors UQM Remix project is intended to be used as an add-on.
 If you install UQM 0.7 from the Windows installer, the remix packs