More cleanups of the installer. Adds openAL and symlinks for the .txt files

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

sc2/build/win32_install/build_archives.pl

@@ -6,15 +6,16 @@ $use_zip = 1;
 
 $make_archive = 1;
 
-$file = shift @ARGV;
+$contour_file = shift @ARGV;
 $tag = shift @ARGV;
 $do_full = shift @ARGV;
-if (! defined ($file) || scalar(@ARGV)) {
+if (! defined ($contour_file) || scalar(@ARGV)) {
   print STDERR "$0 contour_file [full]\n";
 #  print STDERR "  or\n";
 #  print STDERR "$0 cvs_log_file cvs_tag [full]\n";
   exit 1;
 }
+
 # fetch the version from uqmversion.h
 if (-f "../../src/uqmversion.h") {
   open (FH, "../../src/uqmversion.h") or die "couldn't read uqmversion.h\n";
@@ -74,7 +75,7 @@ if ($tag) {
   # log is made by doing:
   #   cd content
   #   cvs log -h > logfile
-  open FH, $file || die "Couldn't read cvs-log '$file'\n";
+  open FH, $contour_file || die "Couldn't read cvs-log '$contour_file'\n";
   print "Reading revisions from cvs-log file\n";
   while (<FH>) {
     chomp;
@@ -109,7 +110,7 @@ if ($tag) {
   chdir "../../content";
 } else {
   print "Reading revisions from local cvs repository\n";
-  open FH, $file || die "Couldn't read contour '$file'\n";
+  open FH, $contour_file || die "Couldn't read contour '$contour_file'\n";
   chdir "../../content";
   find (\&find_callback, ".");
   # use a contour file and the 'CVS' directories to determine the file list

sc2/build/win32_install/uqm.nsi

@@ -179,9 +179,9 @@ SectionIn 1 2 RO
   SetOutPath $INSTDIR
   ; Put file there
   File "..\..\uqm.exe"
-  File "..\..\WhatsNew"
+  File /oname=WhatsNew.txt "..\..\WhatsNew"
   File "..\..\doc\users\manual.txt"
-  File "..\..\COPYING"
+  File /oname=COPYING.txt "..\..\COPYING"
   ; Write the installation path into the registry
   WriteRegStr HKCU "Software\${MUI_PRODUCT}" "Install_Dir" "$INSTDIR"
   WriteRegStr HKLM "Software\${MUI_PRODUCT}" "Install_Dir" "$INSTDIR"
@@ -398,6 +398,19 @@ SectionIn 2
   File "..\..\ogg.dll"
 SectionEnd
 
+Section $(SecOpenALName) SecOpenAL
+!ifndef DEFAULT_UPGRADE
+SectionIn 1
+!else
+SectionIn 2
+!endif
+
+  ; Set output path to the installation directory.
+  SetOutPath $INSTDIR
+  ; Put file there
+  File "..\..\OpenAL32.dll"
+SectionEnd
+
 SubSectionEnd
 
 Section $(SecMoveSaveName) SecMoveSave
@@ -434,6 +447,9 @@ SectionIn 1 2
   CreateDirectory "$SMPROGRAMS\${MUI_PRODUCT}"
   CreateShortCut "$SMPROGRAMS\${MUI_PRODUCT}\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
   CreateShortCut "$SMPROGRAMS\${MUI_PRODUCT}\uqm.lnk" "$INSTDIR\uqm.exe" "" "$INSTDIR\uqm.exe" 0
+  CreateShortCut "$SMPROGRAMS\${MUI_PRODUCT}\manual.lnk" "$INSTDIR\manual.txt"
+  CreateShortCut "$SMPROGRAMS\${MUI_PRODUCT}\WhatsNew.lnk" "$INSTDIR\WhatsNew.txt"
+  CreateShortCut "$SMPROGRAMS\${MUI_PRODUCT}\COPYING.lnk" "$INSTDIR\COPYING.txt"
   
 SectionEnd
 
@@ -463,7 +479,7 @@ Function .onSelChange
   Push $0
     SectionGetFlags ${SecContent} $0
     IntOp $0 $0 & 1
-    IntCmp $0 0 sel_change_done
+    IntCmp $0 0 sel_change_voice
     SectionGetFlags ${SecUpgrade} $0
   !ifdef FULL_NEEDS_UPGRADE 
     IntOp $0 $0 | 1
@@ -471,6 +487,17 @@ Function .onSelChange
     IntOp $0 $0 & 0xFFFFFFFE
   !endif
     SectionSetFlags ${SecUpgrade} $0
+  sel_change_voice:
+    SectionGetFlags ${SecVoice} $0
+    IntOp $0 $0 & 1
+    IntCmp $0 0 sel_change_done
+    SectionGetFlags ${SecVUpgrade} $0
+  !ifdef FULL_NEEDS_UPGRADE 
+    IntOp $0 $0 | 1
+  !else
+    IntOp $0 $0 & 0xFFFFFFFE
+  !endif
+    SectionSetFlags ${SecVUpgrade} $0
   sel_change_done:
    Pop $0
 FunctionEnd
@@ -587,6 +614,7 @@ FunctionEnd
   !insertmacro MUI_DESCRIPTION_TEXT ${Sec3doMusic} $(Sec3doMusicDesc)
   !insertmacro MUI_DESCRIPTION_TEXT ${SecSupportDLL} $(SecSupportDLLDesc)
   !insertmacro MUI_DESCRIPTION_TEXT ${SecSDL} $(SecSDLDesc)
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecOpenAL} $(SecOpenALDesc)
   !insertmacro MUI_DESCRIPTION_TEXT ${SecVoiceDLL} $(SecVoiceDLLDesc)
   !insertmacro MUI_DESCRIPTION_TEXT ${SecMoveSave} $(SecMoveSaveDesc)
   !insertmacro MUI_DESCRIPTION_TEXT ${SecStartMenu} $(SecStartMenuDesc)
@@ -607,14 +635,15 @@ Section "Uninstall"
 
   ; remove files
   Delete "$INSTDIR\uqm.exe"
-  Delete "$INSTDIR\WhatsNew"
+  Delete "$INSTDIR\WhatsNew.txt"
   Delete "$INSTDIR\manual.txt"
-  Delete "$INSTDIR\COPYING"
+  Delete "$INSTDIR\COPYING.txt"
   Delete "$INSTDIR\SDL.dll"
   Delete "$INSTDIR\zlib.dll"
   Delete "$INSTDIR\libpng1.dll"
   Delete "$INSTDIR\jpeg.dll"
   Delete "$INSTDIR\SDL_image.dll"
+  Delete "$INSTDIR\OpenAL32.dll"
   Delete "$INSTDIR\vorbisfile.dll"
   Delete "$INSTDIR\vorbis.dll"
   Delete "$INSTDIR\ogg.dll"

sc2/build/win32_install/uqm_english.nsh

@@ -21,6 +21,7 @@ LangString SecUpgradeName ${LANG_ENGLISH} "Upgrade data files"
 LangString SecVUpgradeName ${LANG_ENGLISH} "Upgrade voice files"
 LangString SecSupportDLLName ${LANG_ENGLISH} "Graphics/Sound libs"
 LangString SecSDLName ${LANG_ENGLISH} "SDL"
+LangString SecOpenALName ${LANG_ENGLISH} "OpenAL"
 LangString SecVoiceDLLName ${LANG_ENGLISH} "Voice"
 LangString SecMoveSaveName ${LANG_ENGLISH} "Move Save Games"
 LangString SecStartMenuName ${LANG_ENGLISH} "Start Menu Shortcuts"
@@ -34,6 +35,7 @@ LangString SecVoiceDesc ${LANG_ENGLISH} "Download all voice files needed to play
 LangString Sec3doMusicDesc ${LANG_ENGLISH} "Download optional music from the 3do version."
 LangString SecSupportDLLDesc ${LANG_ENGLISH} "Install Support .dll files needed to play Ur-Quan Masters"
 LangString SecSDLDesc ${LANG_ENGLISH} "Install SDL and SDL_image libraries for graphics and sound support"
+LangString SecOpenALDesc ${LANG_ENGLISH} "Install OpenAL audio drivers"
 LangString SecVoiceDLLDesc ${LANG_ENGLISH} "Install OggVorbis libraries for playing voice"
 LangString SecMoveSaveDesc ${LANG_ENGLISH} "Move SavedGames from ${OLD_VERSION} location to new location"
 LangString SecStartMenuDesc ${LANG_ENGLISH} "Create shortcuts in the start menu"