From 6d08939f11b6495c4fca504f5809c499938eb42f Mon Sep 17 00:00:00 2001
From: Buginator <buginator@gna.org>
Date: Mon, 1 Jun 2009 05:06:47 +0000
Subject: [PATCH] Update NSIS again, and add the wz2100header.bmp that NSIS
 uses.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7625 4a71c877-e1ca-e34f-864e-861f7616d084
---
 icons/wz2100header.bmp   | Bin 0 -> 25820 bytes
 pkg/nsis/warzone2100.nsi | 114 ++++++++++++++++++++++++++-------------
 2 files changed, 76 insertions(+), 38 deletions(-)
 create mode 100644 icons/wz2100header.bmp

diff --git a/icons/wz2100header.bmp b/icons/wz2100header.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..5b9a883209573bec8e205ff9c9d296d749296a15
GIT binary patch
literal 25820
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

literal 0
HcmV?d00001

diff --git a/pkg/nsis/warzone2100.nsi b/pkg/nsis/warzone2100.nsi
index d15d06f5a..4e61bd116 100644
--- a/pkg/nsis/warzone2100.nsi
+++ b/pkg/nsis/warzone2100.nsi
@@ -28,6 +28,8 @@
 
 ;--------------------------------
 ;General
+   CRCCheck on   ;make sure this isn't corrupted
+   SetCompressor /SOLID  lzma
 
   ;Name and file
   Name "${PACKAGE_NAME}"
@@ -61,6 +63,10 @@ VIAddVersionKey "ProductVersion"	"${PACKAGE_VERSION}"
 ;--------------------------------
 ;Interface Settings
 
+  !define MUI_HEADERIMAGE
+  !define MUI_HEADERIMAGE_BITMAP "${TOP_SRCDIR}\icons\wz2100header.bmp"
+  !define MUI_HEADERIMAGE_RIGHT
+
   !define MUI_ICON "${TOP_SRCDIR}\icons\warzone2100.ico"
   !define MUI_UNICON "${TOP_SRCDIR}\icons\warzone2100.uninstall.ico"
 
@@ -124,8 +130,11 @@ VIAddVersionKey "ProductVersion"	"${PACKAGE_VERSION}"
 
   !insertmacro MUI_RESERVEFILE_LANGDLL
 
-
-
+;-------------------------------
+; for the message box
+LangString DIALOG_MSG ${LANG_ENGLISH} "Do you want to play the game in Chinese?$\r$\n$\r$\n$\r$\nImportant: This requires a different font, which may cause Warzone 2100 to take a long time to start on Windows Vista and later." 
+LangString DIALOG_MSG ${LANG_GERMAN} "Möchten Sie das Spiel auf Chinesisch spielen?$\r$\n$\r$\n$\r$\nWichtig: Dies benötigt eine andere Schriftart, was dazu führen könnte, dass Warzone 2100 unter Windows Vista und später sehr viel Zeit zum Starten benötigt."
+LangString DIALOG_MSG ${LANG_DUTCH}  "Do you want to play the game in Chinese?$\r$\n$\r$\n$\r$\nImportant: This requires a different font, which may cause Warzone 2100 to take a long time to start on Windows Vista and later." 
 ;--------------------------------
 ;Installer Sections
 
@@ -176,8 +185,13 @@ Section $(TEXT_SecBase) SecBase
   File "/oname=readme.screen.css" "${TOP_SRCDIR}\doc\styles\readme.screen.css"
 
   SetOutPath "$INSTDIR\fonts"
-
-  File "${EXTDIR}\etc\fonts\fonts.conf"
+  MessageBox MB_YESNO|MB_ICONQUESTION|MB_DEFBUTTON2 $(DIALOG_MSG) IDYES WINDOWSFONT_ENABLED IDNO WINDOWSFONT_DISABLED
+WINDOWSFONT_ENABLED:
+  File "/oname=fonts.conf" "${EXTDIR}\etc\fonts\fonts.conf.wd_enable" 
+  goto FONT_DONE
+WINDOWSFONT_DISABLED:
+  File "/oname=fonts.conf" "${EXTDIR}\etc\fonts\fonts.conf.wd_disable"
+FONT_DONE:
   File "${EXTDIR}\etc\fonts\DejaVuSans.ttf"
   File "${EXTDIR}\etc\fonts\DejaVuSans-Bold.ttf"
 
@@ -199,7 +213,7 @@ Section $(TEXT_SecBase) SecBase
   WriteUninstaller "$INSTDIR\uninstall.exe"
 
   !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-
+    SetOutPath "$INSTDIR"	
     ;Create shortcuts
     CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
     CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\uninstall.exe"
@@ -207,6 +221,8 @@ Section $(TEXT_SecBase) SecBase
 
   !insertmacro MUI_STARTMENU_WRITE_END
 
+  SetOutPath "$INSTDIR"	
+  CreateShortCut "$DESKTOP\${PACKAGE_NAME}.lnk" "$INSTDIR\${PACKAGE}.exe"
 SectionEnd
 
 
@@ -233,25 +249,27 @@ Section $(TEXT_SecAivolutionMod) SecAivolutionMod
   SetOutPath "$INSTDIR"
 
   !insertmacro MUI_STARTMENU_WRITE_BEGIN "Application"
-    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\${PACKAGE_NAME} - Aivolution.lnk" "$INSTDIR\${PACKAGE}.exe" "--mod aivolution.wz"
+    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\${PACKAGE_NAME} - Aivolution.lnk" "$INSTDIR\${PACKAGE}.exe" "--mod_mp aivolution.wz"
   !insertmacro MUI_STARTMENU_WRITE_END
 
 SectionEnd
 
-Section $(TEXT_SecMusicMod) SecMusicMod
-
-  SetOutPath "$INSTDIR\mods\global\autoload"
-
-  IfFileExists "music_1.0.wz" +6
-    NSISdl::download "http://download.gna.org/warzone/releases/mods/community-music_1.0.AUTHORS"          "music_1.0.AUTHORS.txt"
-    NSISdl::download "http://download.gna.org/warzone/releases/mods/community-music_1.0.wz"               "music_1.0.wz"
-    Pop $R0 ; Get the return value
-    StrCmp $R0 "success" +2
-      MessageBox MB_OK|MB_ICONSTOP "Download of Music mod failed: $R0"
-
-  SetOutPath "$INSTDIR"
-
-SectionEnd
+; This is disabled for now
+;
+;Section $(TEXT_SecMusicMod) SecMusicMod
+;
+;  SetOutPath "$INSTDIR\mods\music"
+;
+;  IfFileExists "music_1.0.wz" +6
+;    NSISdl::download "http://download.gna.org/warzone/releases/mods/community-music_1.1.AUTHORS"          "music_1.1.AUTHORS.txt"
+;    NSISdl::download "http://download.gna.org/warzone/releases/mods/community-music_1.1.wz"               "music_1.1.wz"
+;    Pop $R0 ; Get the return value
+;    StrCmp $R0 "success" +2
+;      MessageBox MB_OK|MB_ICONSTOP "Download of Music mod failed: $R0"
+;
+;  SetOutPath "$INSTDIR"
+;
+;SectionEnd
 
 Section $(TEXT_SecNTWMod) SecNTWMod
 
@@ -272,7 +290,7 @@ SectionGroupEnd
 Section $(TEXT_SecFMVs) SecFMVs
 
   IfFileExists "sequences.wz" +5
-    NSISdl::download "http://download.gna.org/warzone/videos/sequences.wz"               "sequences.wz"
+    NSISdl::download "http://download.gna.org/warzone/videos/sequences-2.2.wz"               "sequences.wz"
     Pop $R0 ; Get the return value
     StrCmp $R0 "success" +2
       MessageBox MB_OK|MB_ICONSTOP "Download of videos failed: $R0"
@@ -338,6 +356,12 @@ Section $(TEXT_SecNLS) SecNLS
   SetOutPath "$INSTDIR\locale\ru\LC_MESSAGES"
   File "/oname=${PACKAGE}.mo" "${TOP_BUILDDIR}\po\ru.gmo"
 
+  SetOutPath "$INSTDIR\locale\sl\LC_MESSAGES"
+  File "/oname=${PACKAGE}.mo" "${TOP_BUILDDIR}\po\sl.gmo"
+
+  SetOutPath "$INSTDIR\locale\zh_TW\LC_MESSAGES"
+  File "/oname=${PACKAGE}.mo" "${TOP_BUILDDIR}\po\zh_TW.gmo"
+
   SetOutPath "$INSTDIR\locale\zh_CN\LC_MESSAGES"
   File "/oname=${PACKAGE}.mo" "${TOP_BUILDDIR}\po\zh_CN.gmo"
 
@@ -355,7 +379,7 @@ Function .onInit
 FunctionEnd
 
 Function LaunchLink
-  ExecShell "" "$SMPROGRAMS\$STARTMENU_FOLDER\${PACKAGE_NAME}.lnk"
+  Exec '$INSTDIR\${PACKAGE}.exe'
 FunctionEnd
 
 ;--------------------------------
@@ -374,8 +398,8 @@ FunctionEnd
   LangString TEXT_SecAivolutionMod ${LANG_ENGLISH} "Aivolution"
   LangString DESC_SecAivolutionMod ${LANG_ENGLISH} "Improved artificial intelligence that learns."
 
-  LangString TEXT_SecMusicMod ${LANG_ENGLISH} "Music"
-  LangString DESC_SecMusicMod ${LANG_ENGLISH} "Download and install music."
+;  LangString TEXT_SecMusicMod ${LANG_ENGLISH} "Music"
+;  LangString DESC_SecMusicMod ${LANG_ENGLISH} "Download and install music."
 
   LangString TEXT_SecFMVs ${LANG_ENGLISH} "Videos"
   LangString DESC_SecFMVs ${LANG_ENGLISH} "Download and install videos (in-game cutscenes)."
@@ -400,8 +424,8 @@ FunctionEnd
   LangString TEXT_SecAivolutionMod ${LANG_DUTCH} "Aivolution"
   LangString DESC_SecAivolutionMod ${LANG_DUTCH} "Verbeterde kunstmatige intelligentie die leert."
 
-  LangString TEXT_SecMusicMod ${LANG_DUTCH} "Muziek"
-  LangString DESC_SecMusicMod ${LANG_DUTCH} "Muziek downloaden en installeren."
+;  LangString TEXT_SecMusicMod ${LANG_DUTCH} "Muziek"
+;  LangString DESC_SecMusicMod ${LANG_DUTCH} "Muziek downloaden en installeren."
 
   LangString TEXT_SecFMVs ${LANG_DUTCH} "FMV"
   LangString DESC_SecFMVs ${LANG_DUTCH} "FMV downloaden en installeren."
@@ -426,8 +450,8 @@ FunctionEnd
   LangString TEXT_SecAivolutionMod ${LANG_GERMAN} "Aivolution"
   LangString DESC_SecAivolutionMod ${LANG_GERMAN} "Verbesserte künstliche Intelligenz, die dazulernt."
 
-  LangString TEXT_SecMusicMod ${LANG_GERMAN} "Musik"
-  LangString DESC_SecMusicMod ${LANG_GERMAN} "Musik herunterladen und installieren."
+;  LangString TEXT_SecMusicMod ${LANG_GERMAN} "Musik"
+;  LangString DESC_SecMusicMod ${LANG_GERMAN} "Musik herunterladen und installieren."
 
   LangString TEXT_SecFMVs ${LANG_GERMAN} "FMV"
   LangString DESC_SecFMVs ${LANG_GERMAN} "FMV herunterladen und installieren."
@@ -458,7 +482,7 @@ FunctionEnd
 
     !insertmacro MUI_DESCRIPTION_TEXT ${SecMods} $(DESC_SecMods)
     !insertmacro MUI_DESCRIPTION_TEXT ${SecAivolutionMod} $(DESC_SecAivolutionMod)
-    !insertmacro MUI_DESCRIPTION_TEXT ${SecMusicMod} $(DESC_SecMusicMod)
+;    !insertmacro MUI_DESCRIPTION_TEXT ${SecMusicMod} $(DESC_SecMusicMod)
     !insertmacro MUI_DESCRIPTION_TEXT ${SecFMVs} $(DESC_SecFMVs)
     !insertmacro MUI_DESCRIPTION_TEXT ${SecNTWMod} $(DESC_SecNTWMod)
 
@@ -516,9 +540,6 @@ Section "Uninstall"
   Delete "$INSTDIR\fonts\DejaVuSans-Bold.ttf"
   RMDir "$INSTDIR\fonts"
 
-  Delete "$INSTDIR\mods\global\autoload\music_1.0.AUTHORS.txt"
-  Delete "$INSTDIR\mods\global\autoload\music_1.0.wz"
-  RMDir "$INSTDIR\mods\global\autoload"
 
   Delete "$INSTDIR\mods\music\music_1.0.AUTHORS.txt"
   Delete "$INSTDIR\mods\music\music_1.0.wz"
@@ -612,6 +633,14 @@ Section "Uninstall"
   RMDir "$INSTDIR\locale\ru\LC_MESSAGES"
   RMDir "$INSTDIR\locale\ru"
 
+  Delete "$INSTDIR\locale\sl\LC_MESSAGES\${PACKAGE}.mo"
+  RMDir "$INSTDIR\locale\sl\LC_MESSAGES"
+  RMDir "$INSTDIR\locale\sl"
+
+  Delete "$INSTDIR\locale\zh_TW\LC_MESSAGES\${PACKAGE}.mo"
+  RMDir "$INSTDIR\locale\zh_TW\LC_MESSAGES"
+  RMDir "$INSTDIR\locale\zh_TW"
+
   Delete "$INSTDIR\locale\zh_CN\LC_MESSAGES\${PACKAGE}.mo"
   RMDir "$INSTDIR\locale\zh_CN\LC_MESSAGES"
   RMDir "$INSTDIR\locale\zh_CN"
@@ -619,14 +648,22 @@ Section "Uninstall"
   RMDir "$INSTDIR\locale"
   RMDir "$INSTDIR"
 
-  Delete "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk"
-  Delete "$SMPROGRAMS\$STARTMENU_FOLDER\${PACKAGE_NAME}.lnk"
-  Delete "$SMPROGRAMS\$STARTMENU_FOLDER\${PACKAGE_NAME} - Aivolution.lnk"
-  Delete "$SMPROGRAMS\$STARTMENU_FOLDER\${PACKAGE_NAME} - NTW.lnk"
-  RMDir "$SMPROGRAMS\$STARTMENU_FOLDER"
+; remove the desktop shortcut icon
+
+  Delete "$DESKTOP\${PACKAGE_NAME}.lnk"
+
+; and now, lets really remove the startmenu entries...
+
+  !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
+
+  Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
+  Delete "$SMPROGRAMS\$MUI_TEMP\${PACKAGE_NAME}.lnk"
+  Delete "$SMPROGRAMS\$MUI_TEMP\${PACKAGE_NAME} - Aivolution.lnk"
+  Delete "$SMPROGRAMS\$MUI_TEMP\${PACKAGE_NAME} - NTW.lnk"
+;  RMDir "$SMPROGRAMS\$STARTMENU_FOLDER"
 
   ;Delete empty start menu parent diretories
-  !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
+;  !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
   StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
 
   startMenuDeleteLoop:
@@ -656,3 +693,4 @@ Function un.onInit
   !insertmacro MUI_UNGETLANGUAGE
 
 FunctionEnd
+