From 380de3bdc5853556d3cc663a6ca92fdccc3dec23 Mon Sep 17 00:00:00 2001
From: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
Date: Tue, 5 Apr 2011 20:53:24 +0200
Subject: Make the set of included DLLs in the Windows installer explicit

This is to make sure the right DLLs are shipped, not too many and not
too few.

Reviewed-by: Yohann Ferreira
---
 packaging/windows/setup.nsi | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'packaging')

diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi
index 221b60d6..caa0442a 100644
--- a/packaging/windows/setup.nsi
+++ b/packaging/windows/setup.nsi
@@ -198,7 +198,22 @@ Section "Core files (required)" SecCore
   SetOutPath "$INSTDIR"
 
   File "${EXEDIR}\mana.exe"
-  File "${DLLDIR}\*.dll"
+  File "${DLLDIR}\guichan.dll"
+  File "${DLLDIR}\guichan_sdl.dll"
+  File "${DLLDIR}\libcurl-4.dll"
+  File "${DLLDIR}\libiconv2.dll"
+  File "${DLLDIR}\libiconv-2.dll"
+  File "${DLLDIR}\libintl3.dll"
+  File "${DLLDIR}\libpng12-0.dll"
+  File "${DLLDIR}\libxml2-2.dll"
+  File "${DLLDIR}\physfs.dll"
+  File "${DLLDIR}\SDL.dll"
+  File "${DLLDIR}\SDL_gfx.dll"
+  File "${DLLDIR}\SDL_image.dll"
+  File "${DLLDIR}\SDL_mixer.dll"
+  File "${DLLDIR}\SDL_net.dll"
+  File "${DLLDIR}\SDL_ttf.dll"
+  File "${DLLDIR}\zlib1.dll"
   File "${SRCDIR}\AUTHORS"
   File "${SRCDIR}\COPYING"
   File "${SRCDIR}\NEWS"
-- 
cgit v1.2.3-60-g2f50


From 2078854480ccd0216f730c0eb9d9b5acabf1fc24 Mon Sep 17 00:00:00 2001
From: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
Date: Tue, 5 Apr 2011 20:59:28 +0200
Subject: Request admin permissions in Windows installer

Not always necessary, for example when installing in a user directory,
but not asking for admin rights does more harm than good (your average
Joe will just be complaining that the installer isn't working).

Reviewed-by: Yohann Ferreira
---
 packaging/windows/setup.nsi | 1 +
 1 file changed, 1 insertion(+)

(limited to 'packaging')

diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi
index caa0442a..390bfb56 100644
--- a/packaging/windows/setup.nsi
+++ b/packaging/windows/setup.nsi
@@ -170,6 +170,7 @@ InstallDir "$PROGRAMFILES\Mana"
 InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
 ShowInstDetails show
 ShowUnInstDetails show
+RequestExecutionLevel admin
 
 Function .onInit
   !insertmacro MUI_LANGDLL_DISPLAY
-- 
cgit v1.2.3-60-g2f50


From 6555221077d9805913dde0c41b51d2063ff1db50 Mon Sep 17 00:00:00 2001
From: Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>
Date: Wed, 6 Apr 2011 14:42:38 +0200
Subject: Removed unsufficiently translated po files from build and release.

I also removed the fact to tell the number of language provided
as it's useless and harder to maintain.
---
 packaging/windows/setup.nsi |  2 +-
 po/LINGUAS                  | 58 ++++++++++++++++++++++-----------------------
 2 files changed, 30 insertions(+), 30 deletions(-)

(limited to 'packaging')

diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi
index 390bfb56..8bb30260 100644
--- a/packaging/windows/setup.nsi
+++ b/packaging/windows/setup.nsi
@@ -262,7 +262,7 @@ SectionEnd
   !insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "The core program files."
   !insertmacro MUI_DESCRIPTION_TEXT ${SecMusic} "Background music. (If selected the music will be downloaded from the internet.)"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecPortable} "Portable client. (If selected client will work as portable client.)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecTrans} "Translations for the user interface into 23 different languages. Uncheck this component to leave it in English."
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecTrans} "Translations for the user interface. Uncheck this component to leave it in English."
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 
diff --git a/po/LINGUAS b/po/LINGUAS
index 7900f760..c8a0ef78 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,38 +1,38 @@
 # Set of available languages.
-#ar # Disabled because of current client limitations (shaping, RTL)
-#bg # Not enough translations
-#ca # Not enough translations
-#cs # Not enough translations
-da
+#ar    # Disabled because of current client limitations (shaping, RTL)
+#bg    # Not enough translations
+#ca    # Not enough translations
+#cs    # Not enough translations
+#da    # not enough translations
 de
-en_GB
-#eo # Not enough translations
+#en_GB # Not enough translations
+#eo    # Not enough translations
 es
-#et # Not enough translations
-#fa # Disabled because of current client limitations (shaping, RTL)
-#fi # Not enough translations
+#et    # Not enough translations
+#fa    # Disabled because of current client limitations (shaping, RTL)
+#fi    # Not enough translations
 fr
-#he # Disabled because of current client limitations (RTL)
-hr
-hu
-#id # Not enough translations
-it
-#ja # Disabled because of current client limitations (font fallbacking)
-#ka # Not enough translations
-#nb # Not enough translations
-#nds # Not enough translations
-nl
-pl
-pt
+#he    # Disabled because of current client limitations (RTL)
+#hr    # Not enough translations
+#hu    # Not enough translations
+#id    # Not enough translations
+#it    # Not enough translations
+#ja    # Disabled because of current client limitations (font fallbacking)
+#ka    # Not enough translations
+#nb    # Not enough translations
+#nds   # Not enough translations
+#nl    # Not enough translations
+#pl    # Not enough translations
+#pt    # Not enough translations
 pt_BR
 ru
-#sk # Not enough translations
-#sq # Not enough translations
-sv
-#te # Disabled because of current client limitations (font fallbacking)
-#th # Disabled because of current client limitations (font fallbacking)
-#tr # Not enough translations
-#uk # Not enough translations
+#sk    # Not enough translations
+#sq    # Not enough translations
+#sv    # Not enough translations
+#te    # Disabled because of current client limitations (font fallbacking)
+#th    # Disabled because of current client limitations (font fallbacking)
+#tr    # Not enough translations
+#uk    # Not enough translations
 #zh_CN # Disabled because of current client limitations (font fallbacking)
 #zh_HK # Disabled because of current client limitations (font fallbacking)
 #zh_TW # Disabled because of current client limitations (font fallbacking)
-- 
cgit v1.2.3-60-g2f50


From b6f3db30c595d8e89572c78eb82b9823b8491c54 Mon Sep 17 00:00:00 2001
From: Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>
Date: Wed, 6 Apr 2011 18:50:14 +0200
Subject: Removed the music download section.

It doesn't make sense on the generic client.
---
 packaging/windows/setup.nsi | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'packaging')

diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi
index 8bb30260..7d04b66c 100644
--- a/packaging/windows/setup.nsi
+++ b/packaging/windows/setup.nsi
@@ -237,16 +237,6 @@ Section "Core files (required)" SecCore
   File "${SRCDIR}\docs\FAQ.txt"
 SectionEnd
 
-Section /o "Music" SecMusic
-  AddSize 17602
-  CreateDirectory "$INSTDIR\data\music"
-  SetOutPath "$INSTDIR\data\music"
-  NSISdl::download "http://downloads.sourceforge.net/themanaworld/tmwmusic-0.2.tar.gz" "$TEMP\tmwmusic-0.2.tar.gz"
-  ;Requires an additional plugin from http://nsis.sourceforge.net/UnTGZ_plug-in  Place untgz.dll in your nsis/plugin dir
-  untgz::extract -j -d "$INSTDIR\data\music" "$TEMP\tmwmusic-0.2.tar.gz"
-  Delete "$TEMP\tmwmusic-0.2.tar.gz"
-SectionEnd
-
 Section /o "Portable" SecPortable
   SetOutPath "$INSTDIR"
   File "portable.xml"
@@ -260,7 +250,6 @@ SectionEnd
 ;Package descriptions
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
   !insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "The core program files."
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecMusic} "Background music. (If selected the music will be downloaded from the internet.)"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecPortable} "Portable client. (If selected client will work as portable client.)"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecTrans} "Translations for the user interface. Uncheck this component to leave it in English."
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
-- 
cgit v1.2.3-60-g2f50


From e0f4556aba825d63410669ec3a41fbcadd6e86f7 Mon Sep 17 00:00:00 2001
From: Stefan Dombrowski <stefan@uni-bonn.de>
Date: Wed, 13 Apr 2011 11:24:13 +0200
Subject: Portable install saves logs and configs in a folder called settings

---
 packaging/windows/portable.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packaging')

diff --git a/packaging/windows/portable.xml b/packaging/windows/portable.xml
index 0059d109..165b8283 100644
--- a/packaging/windows/portable.xml
+++ b/packaging/windows/portable.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <configuration>
- <option name="dataDir" value="logs"/>
- <option name="configDir" value="configs"/>
+ <option name="dataDir" value="settings"/>
+ <option name="configDir" value="settings"/>
  <option name="screenshotDir" value="screenshots"/>
 </configuration>
-- 
cgit v1.2.3-60-g2f50


From 0b1c6eb3c4941dc2d47ad3207bab4509ae1014cc Mon Sep 17 00:00:00 2001
From: Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>
Date: Sat, 30 Apr 2011 12:35:22 +0200
Subject: Applied the product short name handling for mana.

Already done and reviewed on the tmw branding repo.
---
 packaging/windows/setup.nsi | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'packaging')

diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi
index 7d04b66c..698df4ef 100644
--- a/packaging/windows/setup.nsi
+++ b/packaging/windows/setup.nsi
@@ -3,8 +3,8 @@
 ; like the old install script.
 ;
 ; DLLDIR - directory containing required dlls
-; EXEDIR - directory containing mana.exe
-; EXESUFFIX - offset to SRCDIR pointing to a directory containing mana.exe
+; EXEDIR - directory containing ${PRODUCT_NAME_SHORT}.exe
+; EXESUFFIX - offset to SRCDIR pointing to a directory containing ${PRODUCT_NAME_SHORT}.exe
 ; PRODUCT_VERSION - software version
 ; UPX - upx binary name
 ;
@@ -37,17 +37,19 @@ SetCompressor /SOLID lzma
   !define DLLDIR ${SRCDIR}/dll
 !endif
 
-;--- (and without !defines ) ---
-!System "${UPX} --best --crp-ms=999999 --compress-icons=0 --nrv2d ${EXEDIR}\mana.exe"
-
 ; HM NIS Edit helper defines
 !define PRODUCT_NAME "Mana"
+!define PRODUCT_NAME_SHORT "mana"
+
+;--- (and without !defines ) ---
+!System "${UPX} --best --crp-ms=999999 --compress-icons=0 --nrv2d ${EXEDIR}\${PRODUCT_NAME_SHORT}.exe"
+
 !ifndef PRODUCT_VERSION
-  !define PRODUCT_VERSION "0.0.29.1"
+  !define PRODUCT_VERSION "0.5-git"
 !endif
 !define PRODUCT_PUBLISHER "Mana Development Team"
 !define PRODUCT_WEB_SITE "http://manasource.org"
-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\mana.exe"
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME_SHORT}.exe"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"
 
@@ -93,7 +95,7 @@ SetCompressor /SOLID lzma
 
 Function RunMana
 SetOutPath $INSTDIR
-Exec "$INSTDIR\mana.exe"
+Exec "$INSTDIR\${PRODUCT_NAME_SHORT}.exe"
 FunctionEnd
 
 Function changeFinishImage
@@ -165,7 +167,7 @@ ReserveFile "setup_finish.bmp"
 ; MUI end ------
 
 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile "mana-${PRODUCT_VERSION}-win32.exe"
+OutFile "${PRODUCT_NAME_SHORT}-${PRODUCT_VERSION}-win32.exe"
 InstallDir "$PROGRAMFILES\Mana"
 InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
 ShowInstDetails show
@@ -183,8 +185,8 @@ Section "Core files (required)" SecCore
   SetOutPath "$INSTDIR"
   SetOverwrite ifnewer
   CreateDirectory "$SMPROGRAMS\Mana"
-  CreateShortCut "$SMPROGRAMS\Mana\Mana.lnk" "$INSTDIR\mana.exe"
-  CreateShortCut "$DESKTOP\Mana.lnk" "$INSTDIR\mana.exe"
+  CreateShortCut "$SMPROGRAMS\Mana\Mana.lnk" "$INSTDIR\${PRODUCT_NAME_SHORT}.exe"
+  CreateShortCut "$DESKTOP\Mana.lnk" "$INSTDIR\${PRODUCT_NAME_SHORT}.exe"
   CreateDirectory "$INSTDIR\data"
   CreateDirectory "$INSTDIR\data\fonts"
   CreateDirectory "$INSTDIR\data\graphics"
@@ -198,7 +200,7 @@ Section "Core files (required)" SecCore
   SetOverwrite ifnewer
   SetOutPath "$INSTDIR"
 
-  File "${EXEDIR}\mana.exe"
+  File "${EXEDIR}\${PRODUCT_NAME_SHORT}.exe"
   File "${DLLDIR}\guichan.dll"
   File "${DLLDIR}\guichan_sdl.dll"
   File "${DLLDIR}\libcurl-4.dll"
@@ -266,10 +268,10 @@ SectionEnd
 
 Section -Post
   WriteUninstaller "$INSTDIR\uninst.exe"
-  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\mana.exe"
+  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\${PRODUCT_NAME_SHORT}.exe"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\mana.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\${PRODUCT_NAME_SHORT}.exe"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
-- 
cgit v1.2.3-60-g2f50