From 49abad7028ba24af8d006a8f2bac3fa94ae33449 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 10 Sep 2016 19:38:27 +0200 Subject: [PATCH 1/3] Fixed: Bug where exedll.bnp wasn't downloaded --HG-- branch : develop --- code/ryzom/client/src/login_patch.cpp | 105 +++++++++++++------------- 1 file changed, 54 insertions(+), 51 deletions(-) diff --git a/code/ryzom/client/src/login_patch.cpp b/code/ryzom/client/src/login_patch.cpp index f7ce24f45..34669e43f 100644 --- a/code/ryzom/client/src/login_patch.cpp +++ b/code/ryzom/client/src/login_patch.cpp @@ -73,9 +73,6 @@ // -static std::vector ForceMainlandPatchCategories; -static std::vector ForceRemovePatchCategories; - using namespace std; using namespace NLMISC; @@ -157,36 +154,6 @@ CPatchManager::CPatchManager() : State("t_state"), DataScanState("t_data_scan_st _AsyncDownloader = NULL; _StateListener = NULL; _StartRyzomAtEnd = true; - - // only download binaries for current platform - ForceRemovePatchCategories.clear(); - ForceRemovePatchCategories.push_back("main_exedll"); -#if defined(NL_OS_WIN64) - ForceRemovePatchCategories.push_back("main_exedll_win32"); - ForceRemovePatchCategories.push_back("main_exedll_linux32"); - ForceRemovePatchCategories.push_back("main_exedll_linux64"); - ForceRemovePatchCategories.push_back("main_exedll_osx"); -#elif defined(NL_OS_WIN32) - ForceRemovePatchCategories.push_back("main_exedll_win64"); - ForceRemovePatchCategories.push_back("main_exedll_linux32"); - ForceRemovePatchCategories.push_back("main_exedll_linux64"); - ForceRemovePatchCategories.push_back("main_exedll_osx"); -#elif defined(NL_OS_MAC) - ForceRemovePatchCategories.push_back("main_exedll_win32"); - ForceRemovePatchCategories.push_back("main_exedll_win64"); - ForceRemovePatchCategories.push_back("main_exedll_linux32"); - ForceRemovePatchCategories.push_back("main_exedll_linux64"); -#elif defined(NL_OS_UNIX) && defined(_LP64) - ForceRemovePatchCategories.push_back("main_exedll_win32"); - ForceRemovePatchCategories.push_back("main_exedll_win64"); - ForceRemovePatchCategories.push_back("main_exedll_linux32"); - ForceRemovePatchCategories.push_back("main_exedll_osx"); -#else - ForceRemovePatchCategories.push_back("main_exedll_win32"); - ForceRemovePatchCategories.push_back("main_exedll_win64"); - ForceRemovePatchCategories.push_back("main_exedll_linux64"); - ForceRemovePatchCategories.push_back("main_exedll_osx"); -#endif } // **************************************************************************** @@ -1249,35 +1216,71 @@ void CPatchManager::readDescFile(sint32 nVersion) } } - // tmp for debug : flag some categories as 'Mainland' + // patch category for current platform + std::string platformPatchCategory; + +#if defined(NL_OS_WIN64) + platformPatchCategory = "main_exedll_win64"; +#elif defined(NL_OS_WIN32) + platformPatchCategory = "main_exedll_win32"; +#elif defined(NL_OS_MAC) + platformPatchCategory = "main_exedll_osx"; +#elif defined(NL_OS_UNIX) && defined(_LP64) + platformPatchCategory = "main_exedll_linux64"; +#else + platformPatchCategory = "main_exedll_linux32"; +#endif + + // check if we are using main_exedll or specific main_exedll_* for platform + bool foundPlatformPatchCategory = false; + for (cat = 0; cat < DescFile.getCategories().categoryCount(); ++cat) { - if (std::find(ForceMainlandPatchCategories.begin(), ForceMainlandPatchCategories.end(), - DescFile.getCategories().getCategory(cat).getName()) != ForceMainlandPatchCategories.end()) + CBNPCategory &category = const_cast(DescFile.getCategories().getCategory(cat)); + + if (category.getName() == platformPatchCategory) { - const_cast(DescFile.getCategories().getCategory(cat)).setOptional(true); + foundPlatformPatchCategory = true; + break; } } - CBNPFileSet &bnpFS = const_cast(DescFile.getFiles()); - - for(cat = 0; cat < DescFile.getCategories().categoryCount();) + if (foundPlatformPatchCategory) { - const CBNPCategory &bnpCat = DescFile.getCategories().getCategory(cat); + std::vector forceRemovePatchCategories; - if (std::find(ForceRemovePatchCategories.begin(), ForceRemovePatchCategories.end(), - bnpCat.getName()) != ForceRemovePatchCategories.end()) + // only download binaries for current platform + forceRemovePatchCategories.push_back("main_exedll"); + forceRemovePatchCategories.push_back("main_exedll_win32"); + forceRemovePatchCategories.push_back("main_exedll_win64"); + forceRemovePatchCategories.push_back("main_exedll_linux32"); + forceRemovePatchCategories.push_back("main_exedll_linux64"); + forceRemovePatchCategories.push_back("main_exedll_osx"); + + // remove current platform category from remove list + forceRemovePatchCategories.erase(std::remove(forceRemovePatchCategories.begin(), + forceRemovePatchCategories.end(), platformPatchCategory), forceRemovePatchCategories.end()); + + CBNPFileSet &bnpFS = const_cast(DescFile.getFiles()); + + for (cat = 0; cat < DescFile.getCategories().categoryCount();) { - for(uint file = 0; file < bnpCat.fileCount(); ++file) + const CBNPCategory &bnpCat = DescFile.getCategories().getCategory(cat); + + if (std::find(forceRemovePatchCategories.begin(), forceRemovePatchCategories.end(), + bnpCat.getName()) != forceRemovePatchCategories.end()) { - std::string fileName = bnpCat.getFile(file); - bnpFS.removeFile(fileName); + for (uint file = 0; file < bnpCat.fileCount(); ++file) + { + std::string fileName = bnpCat.getFile(file); + bnpFS.removeFile(fileName); + } + const_cast(DescFile.getCategories()).deleteCategory(cat); + } + else + { + ++cat; } - const_cast(DescFile.getCategories()).deleteCategory(cat); - } - else - { - ++cat; } } } From fc202e40343f6a139d6f214137300e2a55a5737a Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 10 Sep 2016 19:38:40 +0200 Subject: [PATCH 2/3] Changed: Minor change --HG-- branch : develop --- code/ryzom/client/src/stdpch.h | 1 - 1 file changed, 1 deletion(-) diff --git a/code/ryzom/client/src/stdpch.h b/code/ryzom/client/src/stdpch.h index e54865c18..c017c584b 100644 --- a/code/ryzom/client/src/stdpch.h +++ b/code/ryzom/client/src/stdpch.h @@ -29,7 +29,6 @@ #include #include #include -//#include #include #include #include From dca429c0b550cac82630e197882671ee237764f3 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 10 Sep 2016 19:39:36 +0200 Subject: [PATCH 3/3] Fixed: Don't put downloaded files in quarantine under OS X --HG-- branch : develop --- code/ryzom/client/macosx/Info.plist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/ryzom/client/macosx/Info.plist b/code/ryzom/client/macosx/Info.plist index 9bb1fdbe0..0d86dbb1b 100644 --- a/code/ryzom/client/macosx/Info.plist +++ b/code/ryzom/client/macosx/Info.plist @@ -43,7 +43,7 @@ LSApplicationCategoryType public.app-category.role-playing-games LSFileQuarantineEnabled - + LSMinimumSystemVersion ${CMAKE_OSX_DEPLOYMENT_TARGET} LSRequiresCarbon