- updating version # in prep for 3.5.2

2025-08-24 17:02:49 +02:00 · 2011-05-25 14:57:56 +00:00
parent 7387a469c4
commit 49f3518b03
7 changed files with 80 additions and 15 deletions
--- a/build-mg-win32.sh
+++ b/build-mg-win32.sh
@@ -22,3 +22,10 @@ echo 'Copying mingw dependencies if they are missing...'
 [[ -f "data/glest_game/libvorbisfile-3.dll" ]] && cp source/win32_deps/lib/libvorbisfile.dll data/glest_game/libvorbisfile-3.dll
 [[ -f "data/glest_game/libvorbis-0.dll" ]] && cp source/win32_deps/lib/libvorbis.dll data/glest_game/libvorbis-0.dll
 [[ -f "data/glest_game/libogg-0.dll" ]] && cp source/win32_deps/lib/libogg.dll data/glest_game/libogg-0.dll
+[[ -f "data/glest_game/OpenAL32.dll" ]] && cp source/win32_deps/lib/OpenAL32.dll data/glest_game/OpenAL32.dll
+[[ -f "data/glest_game/SDLmain.dll" ]] && cp source/win32_deps/lib/SDLmain.dll data/glest_game/SDLmain.dll
+[[ -f "data/glest_game/SDL.dll" ]] && cp source/win32_deps/lib/SDL.dll data/glest_game/SDL.dll
+[[ -f "data/glest_game/wxmsw28u_gcc_custom.dll" ]] && cp source/win32_deps/wxWidgets-2.8.10/lib/wxmsw28u_gcc_custom.dll data/glest_game/wxmsw28u_gcc_custom.dll
+[[ -f "data/glest_game/wxmsw28u_gl_gcc_custom.dll" ]] && cp source/win32_deps/wxWidgets-2.8.10/lib/wxmsw28u_gl_gcc_custom.dll data/glest_game/wxmsw28u_gl_gcc_custom.dll
+[[ -f "data/glest_game/zlib.dll" ]] && cp source/win32_deps/lib/zlib.dll data/glest_game/zlib.dll
+[[ -f "data/glest_game/mingwm10.dll" ]] && cp /usr/share/doc/mingw32-runtime/mingwm10.dll data/glest_game/mingwm10.dll
--- a/mk/linux/mg-version.sh
+++ b/mk/linux/mg-version.sh
@@ -1,7 +1,7 @@
 #!/bin/bash

-OLD_MG_VERSION=3.5.0
-MG_VERSION=3.5.1
+OLD_MG_VERSION=3.5.1
+MG_VERSION=3.5.2

 if [ "$1" = "--oldversion" ]; then
  echo "$OLD_MG_VERSION"
--- a/mk/linux/mojosetup/megaglest-installer/makedeps_folder.sh
+++ b/mk/linux/mojosetup/megaglest-installer/makedeps_folder.sh
@@ -22,7 +22,7 @@ sync_support_libs(){
 	local _cp="/bin/cp"
 	#local skip_deps="libm.so libpthread.so libstdc++.so libgcc_s.so libc.so libdl.so libX11.so libpulse libfusion libdirect libnvidia libXext librt libxcb libICE libSM libXtst libwrap libdbus libXau libXdmcp libnsl libFLAC libGL"
 	local skip_deps=""
-	local keep_deps="libcurl libgnu libicu liblua libxerces libjpeg libpng"
+	local keep_deps="libcurl libgnu libicu liblua libxerces libjpeg libpng libopenal libwx libgtk libgdk libvorbis libogg"
 	
 	local scan_via_skiplist=1 

--- a/mk/linux/mojosetup/megaglest-installer/scripts/config.lua
+++ b/mk/linux/mojosetup/megaglest-installer/scripts/config.lua
@@ -1,5 +1,5 @@
 local GAME_INSTALL_SIZE = 680000000;
-local GAME_VERSION = "3.5.1";
+local GAME_VERSION = "3.5.2";

 local _ = MojoSetup.translate

--- a/mk/windoze/Installer/MegaGlestInstaller.nsi
+++ b/mk/windoze/Installer/MegaGlestInstaller.nsi
@@ -3,8 +3,8 @@

 !define APNAME MegaGlest
 !define APNAME_OLD Mega-Glest
-!define APVER_OLD 3.5.0
-!define APVER 3.5.1
+!define APVER_OLD 3.5.1
+!define APVER 3.5.2

 Name "${APNAME} ${APVER}"
 SetCompressor /FINAL /SOLID lzma
--- a/mk/windoze/Installer/MegaGlestUpdater.nsi
+++ b/mk/windoze/Installer/MegaGlestUpdater.nsi
@@ -2,10 +2,10 @@
 ; General Attributes

 !define APNAME MegaGlest
-!define APVER 3.5.1
+!define APVER 3.5.2
 !define APNAME_OLD Mega-Glest
-!define APVER_OLD 3.5.0
-!define APVER_UPDATE 3.5.1
+!define APVER_OLD 3.5.1
+!define APVER_UPDATE 3.5.2

 Name "${APNAME} ${APVER_UPDATE}"
 SetCompressor /FINAL /SOLID lzma
@@ -21,16 +21,16 @@ BGGradient 0xDF9437 0xffffff

 ; Request application privileges for Windows Vista
 ;RequestExecutionLevel none
-RequestExecutionLevel admin
+RequestExecutionLevel none

 PageEx license
-       LicenseText "Megaglest License"
-       LicenseData "..\..\..\data\glest_game\docs\README.data-license.txt"
+       LicenseText "MegaGlest Game License"
+       LicenseData "..\..\..\docs\gnu_gpl_3.0.txt"
 PageExEnd

 PageEx license
-       LicenseText "Megaglest README"
-       LicenseData "..\..\..\docs\README.txt"
+       LicenseText "MegaGlest Data License"
+       LicenseData "..\..\..\data\glest_game\docs\cc-by-sa-3.0-unported.txt"
 PageExEnd

 ;--------------------------------
@@ -191,6 +191,19 @@ SectionEnd
 ; Optional section (can be disabled by the user)
 Section "Start Menu Shortcuts"

+  ; Remove shortcuts, if any
+  Delete "$SMPROGRAMS\${APNAME}\*.*"
+
+  CreateDirectory "$SMPROGRAMS\${APNAME}"
+  CreateShortCut "$SMPROGRAMS\${APNAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
+  CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME}.lnk" "$INSTDIR\megaglest.exe" "" "$INSTDIR\megaglest.exe" 0 "" "" "${APNAME}"
+
+;  CreateShortCut "$SMPROGRAMS\${APNAME} ${APVER}\${APNAME} Configurator.lnk" "$INSTDIR\glest_configurator.exe" "" "$INSTDIR\glest_configurator.exe" 0 "" "" "${APNAME} Config Editor"
+  CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME} Map Editor.lnk" "$INSTDIR\megaglest_editor.exe" "" "$INSTDIR\megaglest_editor.exe" 0 "" "" "${APNAME} MegaGlest Map Editor"
+  CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME} G3D Viewer.lnk" "$INSTDIR\megaglest_g3dviewer.exe" "" "$INSTDIR\megaglest_g3dviewer.exe" 0 "" "" "${APNAME} MegaGlest G3D Viewer"
+
+  CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME} User Data.lnk" "$APPDATA\megaglest" "" "" 0 "" "" "This folder contains downloaded data (such as mods) and your personal ${APNAME} configuration"
+
 SectionEnd

 ;--------------------------------
@@ -199,5 +212,50 @@ SectionEnd

 Section "Uninstall"

+  ; Remove registry keys
+  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APNAME}"
+  DeleteRegKey HKLM SOFTWARE\${APNAME}
+
+  ; Remove files and uninstaller
+  Delete "$INSTDIR\uninstall.exe"
+
+  Delete "$INSTDIR\megaglest.exe"
+  Delete "$INSTDIR\megaglest_editor.exe"
+  Delete "$INSTDIR\megaglest_configurator.exe"
+  Delete "$INSTDIR\megaglest_g3dviewer.exe"
+  Delete "$INSTDIR\configuration.xml"
+  Delete "$INSTDIR\megaglest.ico"
+  Delete "$INSTDIR\glest.ini"
+  Delete "$INSTDIR\glestkeys.ini"
+  Delete "$INSTDIR\servers.ini"
+  Delete "$INSTDIR\openal32.dll"
+  Delete "$INSTDIR\xerces-c_3_0.dll"
+  Delete "$INSTDIR\*.log"
+
+  Delete "$INSTDIR\data\*.*"
+  Delete "$INSTDIR\docs\*.*"
+  Delete "$INSTDIR\maps\*.*"
+  Delete "$INSTDIR\scenarios\*.*"
+  Delete "$INSTDIR\screens\*.*"
+  Delete "$INSTDIR\techs\*.*"
+  Delete "$INSTDIR\tilesets\*.*"
+  Delete "$INSTDIR\tutorials\*.*"
+
+  RMDir /r "$INSTDIR\data"
+  RMDir /r "$INSTDIR\docs"
+  RMDir /r "$INSTDIR\maps"
+  RMDir /r "$INSTDIR\scenarios"
+  RMDir /r "$INSTDIR\screens"
+  RMDir /r "$INSTDIR\techs"
+  RMDir /r "$INSTDIR\tilesets"
+  RMDir /r "$INSTDIR\tutorials"
+
+  ; Remove shortcuts, if any
+  Delete "$SMPROGRAMS\${APNAME}\*.*"
+
+  ; Remove directories used
+  RMDir "$SMPROGRAMS\${APNAME}"
+  RMDir /r "$INSTDIR"
+
 SectionEnd

--- a/source/glest_game/facilities/game_util.cpp
+++ b/source/glest_game/facilities/game_util.cpp
@@ -27,7 +27,7 @@ using namespace Shared::Platform;
 namespace Glest { namespace Game {

 const string mailString			= "contact@megaglest.org";
-const string glestVersionString 	= "v3.5.1";
+const string glestVersionString 	= "v3.5.2";
 #if defined(SVNVERSION)
 const string SVN_Rev 			= string("Rev: ") + string(SVNVERSION);
 #elif defined(SVNVERSIONHEADER)