From abde821537223ea850e7150ba591b37ee5f93d06 Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 21 Sep 2016 17:27:29 +0200 Subject: [PATCH 1/2] Added: upgd_nl.bat for Windows --HG-- branch : develop --- code/ryzom/client/windows/upgd_nl.bat | 34 +++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 code/ryzom/client/windows/upgd_nl.bat diff --git a/code/ryzom/client/windows/upgd_nl.bat b/code/ryzom/client/windows/upgd_nl.bat new file mode 100644 index 000000000..d5a0c97c2 --- /dev/null +++ b/code/ryzom/client/windows/upgd_nl.bat @@ -0,0 +1,34 @@ +@echo off + +if "x%ROOTPATH%x" == "xx" ( + echo upgd_nl.bat can only be launched from updt_nl.bat + goto end +) + +rem We used this hack because to client 2.1 to 3.0 patch, +rem MSVC10 DLLs are using the same name and are deleted during patch +if exist %ROOTPATH%\msvcp100_win32.dll ( + if exist %ROOTPATH%\msvcp100.dll del %ROOTPATH%\msvcp100.dll + copy %ROOTPATH%\msvcp100_win32.dll %ROOTPATH%\msvcp100.dll +) + +if exist %ROOTPATH%\msvcr100_win32.dll ( + if exist %ROOTPATH%\msvcr100.dll del %ROOTPATH%\msvcr100.dll + copy %ROOTPATH%\msvcr100_win32.dll %ROOTPATH%\msvcr100.dll +) + +if exist %ROOTPATH%\msvcp100_win64.dll ( + if exist %ROOTPATH%\msvcp100.dll del %ROOTPATH%\msvcp100.dll + copy %ROOTPATH%\msvcp100_win64.dll %ROOTPATH%\msvcp100.dll +) + +if exist %ROOTPATH%\msvcr100_win64.dll ( + if exist %ROOTPATH%\msvcr100.dll del %ROOTPATH%\msvcr100.dll + copy %ROOTPATH%\msvcr100_win64.dll %ROOTPATH%\msvcr100.dll +) + +if exist %ROOTPATH%\..\ryzom_installer_qt_r.exe ( + copy %ROOTPATH%\ryzom_installer_qt_r.exe %ROOTPATH%\.. +) + +:end From cb92380966fb8f28e966268129b8119ae5cbf37b Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 21 Sep 2016 17:34:13 +0200 Subject: [PATCH 2/2] Changed: Install Upgrade scripts --HG-- branch : develop --- code/ryzom/client/CMakeLists.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/code/ryzom/client/CMakeLists.txt b/code/ryzom/client/CMakeLists.txt index 919f9fe22..16a1b5544 100644 --- a/code/ryzom/client/CMakeLists.txt +++ b/code/ryzom/client/CMakeLists.txt @@ -10,4 +10,13 @@ IF(WITH_RYZOM_CLIENT) ENDIF() INSTALL(FILES client_default.cfg DESTINATION ${RYZOM_ETC_PREFIX}) + + IF(WITH_RYZOM_PATCH) + IF(APPLE) + INSTALL(FILES macosx/upgd_nl.sh DESTINATION ${RYZOM_GAMES_PREFIX}) + ELSEIF(WIN32) + INSTALL(FILES windows/upgd_nl.bat DESTINATION ${RYZOM_GAMES_PREFIX}) + ELSE() + INSTALL(FILES unix/upgd_nl.sh DESTINATION ${RYZOM_GAMES_PREFIX}) + ENDIF() ENDIF()