diff --git a/code/nel/tools/3d/CMakeLists.txt b/code/nel/tools/3d/CMakeLists.txt index 5947ed37e..7d22c39d6 100644 --- a/code/nel/tools/3d/CMakeLists.txt +++ b/code/nel/tools/3d/CMakeLists.txt @@ -7,6 +7,7 @@ IF(WITH_NEL_TOOLS) build_smallbank ig_lighter ig_elevation + lightmap_optimizer zone_dependencies zone_ig_lighter zone_lighter @@ -48,7 +49,7 @@ ENDIF(WIN32) IF(WITH_NEL_TOOLS) IF(WIN32) - ADD_SUBDIRECTORY(lightmap_optimizer) +# ADD_SUBDIRECTORY(lightmap_optimizer) IF(MFC_FOUND) ADD_SUBDIRECTORY(object_viewer_exe) ADD_SUBDIRECTORY(tile_edit) diff --git a/code/nel/tools/3d/lightmap_optimizer/main.cpp b/code/nel/tools/3d/lightmap_optimizer/main.cpp index ae8e4542a..3323cce40 100644 --- a/code/nel/tools/3d/lightmap_optimizer/main.cpp +++ b/code/nel/tools/3d/lightmap_optimizer/main.cpp @@ -32,7 +32,17 @@ #include "nel/3d/texture_file.h" #include "nel/3d/register_3d.h" -#include "windows.h" +#ifdef NL_OS_WINDOWS +# include +#else +# define strnicmp NLMISC::strnicmp +# include /* for directories functions */ +# include +# include +# include /* getcwd, chdir -- replacement for getCurDiretory & setCurDirectory on windows */ +#endif + + #include #include @@ -42,20 +52,20 @@ using namespace std; using namespace NL3D; -// --------------------------------------------------------------------------- -char sExeDir[MAX_PATH]; -void outString (const string &sText) +void outString (const string &sText) ; + +// --------------------------------------------------------------------------- +#ifdef NL_OS_WINDOWS // win32 code +void GetCWD (int length,char *dir) { - char sCurDir[MAX_PATH]; - GetCurrentDirectory (MAX_PATH, sCurDir); - SetCurrentDirectory (sExeDir); - NLMISC::createDebug (); - NLMISC::InfoLog->displayRaw(sText.c_str()); - SetCurrentDirectory (sCurDir); + GetCurrentDirectoryA (length, dir); } -// --------------------------------------------------------------------------- +bool ChDir(const char *path) +{ + return SetCurrentDirectoryA (path); +} void dir (const std::string &sFilter, std::vector &sAllFiles, bool bFullPath) { WIN32_FIND_DATA findData; @@ -63,7 +73,8 @@ void dir (const std::string &sFilter, std::vector &sAllFiles, bool char sCurDir[MAX_PATH]; sAllFiles.clear (); GetCurrentDirectory (MAX_PATH, sCurDir); - hFind = FindFirstFile (sFilter.c_str(), &findData); + std::string sFilterAsx = std::string("*") + sFilter; + hFind = FindFirstFile (sFilterAsx.c_str(), &findData); while (hFind != INVALID_HANDLE_VALUE) { DWORD res = GetFileAttributes(findData.cFileName); @@ -79,16 +90,69 @@ void dir (const std::string &sFilter, std::vector &sAllFiles, bool } FindClose (hFind); } +#else // posix version of the void dir(...) function. +void GetCWD (int length, char* directory) +{ + getcwd (directory,length); +} +bool ChDir(const char *path) +{ + return ( chdir (path) == 0 ? true : false ); +} +void dir (const string &sFilter, vector &sAllFiles, bool bFullPath) +{ + char sCurDir[MAX_PATH]; + DIR* dp = NULL; + struct dirent *dirp= NULL; + + GetCWD ( MAX_PATH,sCurDir ) ; + sAllFiles.clear (); + if ( (dp = opendir( sCurDir )) == NULL) + { + string sTmp = string("ERROR : Can't open the dir : \"")+string(sCurDir)+string("\"") ; + outString ( sTmp ) ; + return ; + } + + while ( (dirp = readdir(dp)) != NULL) + { + std:string sFileName = std::string(dirp->d_name) ; + if (sFileName.substr((sFileName.length()-sFilter.length()),sFilter.length()).find(sFilter)!= std::string::npos ) + { + if (bFullPath) + sAllFiles.push_back(string(sCurDir) + "/" + sFileName); + else + sAllFiles.push_back(sFileName); + } + + } + closedir(dp); +} +bool DeleteFile(const char* filename){ + if ( int res = unlink (filename) == -1 ) + return false; + return true; +} +#endif + + +// --------------------------------------------------------------------------- +char sExeDir[MAX_PATH]; + +void outString (const string &sText) +{ + char sCurDir[MAX_PATH]; + GetCWD (MAX_PATH, sCurDir); + ChDir (sExeDir); + NLMISC::createDebug (); + NLMISC::InfoLog->displayRaw(sText.c_str()); + ChDir (sCurDir); +} // --------------------------------------------------------------------------- bool fileExist (const std::string &sFileName) { - HANDLE hFile = CreateFile (sFileName.c_str(), GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (hFile == INVALID_HANDLE_VALUE) - return false; - CloseHandle (hFile); - return true; + return NLMISC::CFile::isExists(sFileName) ; } // ----------------------------------------------------------------------------------------------- @@ -332,25 +396,25 @@ int main(int nNbArg, char **ppArgs) char sSHPDir[MAX_PATH]; - GetCurrentDirectory (MAX_PATH, sExeDir); + GetCWD (MAX_PATH, sExeDir); // Get absolute directory for lightmaps - if (!SetCurrentDirectory(ppArgs[1])) + if (!ChDir(ppArgs[1])) { - outString (string("ERROR : directory ") + ppArgs[1] + " do not exists\n"); + outString (string("ERROR : directory ") + ppArgs[1] + " do not exists or access is denied\n"); return -1; } - GetCurrentDirectory (MAX_PATH, sLMPDir); - SetCurrentDirectory (sExeDir); + GetCWD (MAX_PATH, sLMPDir); + ChDir (sExeDir); // Get absolute directory for shapes - if (!SetCurrentDirectory(ppArgs[2])) + if (!ChDir(ppArgs[2])) { - outString (string("ERROR : directory ") + ppArgs[2] + " do not exists\n"); + outString (string("ERROR : directory ") + ppArgs[2] + " do not exists or access is denied\n"); return -1; } - GetCurrentDirectory (MAX_PATH, sSHPDir); - dir ("*.shape", AllShapeNames, false); + GetCWD (MAX_PATH, sSHPDir); + dir (".shape", AllShapeNames, false); registerSerial3d (); for (uint32 nShp = 0; nShp < AllShapeNames.size(); ++nShp) { @@ -374,13 +438,13 @@ int main(int nNbArg, char **ppArgs) if (nNbArg > 3 && ppArgs[3] && strlen(ppArgs[3]) > 0) { - SetCurrentDirectory (sExeDir); - if (!SetCurrentDirectory(ppArgs[3])) + ChDir (sExeDir); + if (!ChDir(ppArgs[3])) { outString (string("ERROR : directory ") + ppArgs[3] + " do not exists\n"); return -1; } - dir ("*.tag", tags, false); + dir (".tag", tags, false); for(uint k = 0; k < tags.size(); ++k) { std::string::size_type pos = tags[k].find('.'); @@ -426,7 +490,7 @@ int main(int nNbArg, char **ppArgs) // **** Parse all lightmaps, sorted by layer, and 8 or 16 bit mode - SetCurrentDirectory (sExeDir); + ChDir (sExeDir); for (uint32 lmc8bitMode = 0; lmc8bitMode < 2; ++lmc8bitMode) for (uint32 nNbLayer = 0; nNbLayer < 256; ++nNbLayer) { @@ -440,8 +504,8 @@ int main(int nNbArg, char **ppArgs) string sFilter; // **** Get All Lightmaps that have this number of layer, and this mode - sFilter = "*_" + NLMISC::toString(nNbLayer) + ".tga"; - SetCurrentDirectory (sLMPDir); + sFilter = "_" + NLMISC::toString(nNbLayer) + ".tga"; + ChDir (sLMPDir); dir (sFilter, AllLightmapNames, false); // filter by layer @@ -697,7 +761,7 @@ int main(int nNbArg, char **ppArgs) // Change shapes uvs related and names to the lightmap // --------------------------------------------------- - SetCurrentDirectory (sSHPDir); + ChDir (sSHPDir); for (k = 0; k < (sint32)AllShapes.size(); ++k) { @@ -891,7 +955,7 @@ int main(int nNbArg, char **ppArgs) } } - SetCurrentDirectory (sLMPDir); + ChDir (sLMPDir); // Get out of the j loop break; @@ -923,7 +987,7 @@ int main(int nNbArg, char **ppArgs) // **** Additionally, output or clear a "flag file" in a dir to info if a 8bit lihgtmap or not if (nNbArg >=5 && ppArgs[4] && strlen(ppArgs[4]) > 0) { - SetCurrentDirectory (sExeDir); + ChDir (sExeDir); // out a text file, with list of FILE *out= fopen(ppArgs[4], "wt"); diff --git a/code/nel/tools/build_gamedata/0_setup.py b/code/nel/tools/build_gamedata/0_setup.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/1_export.py b/code/nel/tools/build_gamedata/1_export.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/2_build.py b/code/nel/tools/build_gamedata/2_build.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/3_install.py b/code/nel/tools/build_gamedata/3_install.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/9_upload.py b/code/nel/tools/build_gamedata/9_upload.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/a1_worldedit_data.py b/code/nel/tools/build_gamedata/a1_worldedit_data.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/b1_client_dev.py b/code/nel/tools/build_gamedata/b1_client_dev.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/b2_shard_data.py b/code/nel/tools/build_gamedata/b2_shard_data.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/c1_shard_patch.py b/code/nel/tools/build_gamedata/c1_shard_patch.py old mode 100644 new mode 100755 index a67613f67..b67b053a8 --- a/code/nel/tools/build_gamedata/c1_shard_patch.py +++ b/code/nel/tools/build_gamedata/c1_shard_patch.py @@ -24,9 +24,13 @@ # along with this program. If not, see . # -import time, sys, os, shutil, subprocess, distutils.dir_util, tarfile +import time, sys, os, shutil, subprocess, distutils.dir_util, tarfile, argparse sys.path.append("configuration") +parser = argparse.ArgumentParser(description='Ryzom Core - Build Gamedata - Shard Patch') +parser.add_argument('--admininstall', '-ai', action='store_true') +args = parser.parse_args() + if os.path.isfile("log.log"): os.remove("log.log") log = open("log.log", "w") @@ -84,23 +88,24 @@ else: printLog(log, "SKIP " + adminInstallTgz) printLog(log, "") -printLog(log, ">>> Create new version <<<") -newVersion = 1 -vstr = str(newVersion).zfill(6) -vpath = PatchmanBridgeServerDirectory + "/" + vstr -while os.path.exists(vpath): - newVersion = newVersion + 1 +if not args.admininstall: + printLog(log, ">>> Create new version <<<") + newVersion = 1 vstr = str(newVersion).zfill(6) vpath = PatchmanBridgeServerDirectory + "/" + vstr -mkPath(log, vpath) -for dir in archiveDirectories: - mkPath(log, ShardInstallDirectory + "/" + dir) - tgzPath = vpath + "/" + dir + ".tgz" - printLog(log, "WRITE " + tgzPath) - tar = tarfile.open(tgzPath, "w:gz") - tar.add(ShardInstallDirectory + "/" + dir, arcname = dir) - tar.close() -printLog(log, "") + while os.path.exists(vpath): + newVersion = newVersion + 1 + vstr = str(newVersion).zfill(6) + vpath = PatchmanBridgeServerDirectory + "/" + vstr + mkPath(log, vpath) + for dir in archiveDirectories: + mkPath(log, ShardInstallDirectory + "/" + dir) + tgzPath = vpath + "/" + dir + ".tgz" + printLog(log, "WRITE " + tgzPath) + tar = tarfile.open(tgzPath, "w:gz") + tar.add(ShardInstallDirectory + "/" + dir, arcname = dir) + tar.close() + printLog(log, "") log.close() if os.path.isfile("c1_shard_patch.log"): diff --git a/code/nel/tools/build_gamedata/configuration/scripts.py b/code/nel/tools/build_gamedata/configuration/scripts.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/configuration/tools.py b/code/nel/tools/build_gamedata/configuration/tools.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/d1_client_patch.py b/code/nel/tools/build_gamedata/d1_client_patch.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/d2_client_install.py b/code/nel/tools/build_gamedata/d2_client_install.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/export_build_install.py b/code/nel/tools/build_gamedata/export_build_install.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/generators/ecosystem_project_template/directories.py b/code/nel/tools/build_gamedata/generators/ecosystem_project_template/directories.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/generators/ecosystem_project_template/process.py b/code/nel/tools/build_gamedata/generators/ecosystem_project_template/process.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/generators/generate_all.py b/code/nel/tools/build_gamedata/generators/generate_all.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/generators/generate_ecosystem_projects.py b/code/nel/tools/build_gamedata/generators/generate_ecosystem_projects.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/generators/generate_simple_max_exporters.py b/code/nel/tools/build_gamedata/generators/generate_simple_max_exporters.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/generators/generate_tagged_max_exporters.py b/code/nel/tools/build_gamedata/generators/generate_tagged_max_exporters.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/anim.ms b/code/nel/tools/build_gamedata/generators/max_exporter_scripts/anim.ms old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/anim.py b/code/nel/tools/build_gamedata/generators/max_exporter_scripts/anim.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/clod.ms b/code/nel/tools/build_gamedata/generators/max_exporter_scripts/clod.ms old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/clod.py b/code/nel/tools/build_gamedata/generators/max_exporter_scripts/clod.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/cmb.ms b/code/nel/tools/build_gamedata/generators/max_exporter_scripts/cmb.ms old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/cmb.py b/code/nel/tools/build_gamedata/generators/max_exporter_scripts/cmb.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/ig.ms b/code/nel/tools/build_gamedata/generators/max_exporter_scripts/ig.ms old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/pacs_prim.ms b/code/nel/tools/build_gamedata/generators/max_exporter_scripts/pacs_prim.ms old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/pacs_prim.py b/code/nel/tools/build_gamedata/generators/max_exporter_scripts/pacs_prim.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/shape.ms b/code/nel/tools/build_gamedata/generators/max_exporter_scripts/shape.ms old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/skel.ms b/code/nel/tools/build_gamedata/generators/max_exporter_scripts/skel.ms old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/skel.py b/code/nel/tools/build_gamedata/generators/max_exporter_scripts/skel.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/swt.ms b/code/nel/tools/build_gamedata/generators/max_exporter_scripts/swt.ms old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/swt.py b/code/nel/tools/build_gamedata/generators/max_exporter_scripts/swt.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/veget.ms b/code/nel/tools/build_gamedata/generators/max_exporter_scripts/veget.ms old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/veget.py b/code/nel/tools/build_gamedata/generators/max_exporter_scripts/veget.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/zone.ms b/code/nel/tools/build_gamedata/generators/max_exporter_scripts/zone.ms old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/generators/max_exporter_scripts/zone.py b/code/nel/tools/build_gamedata/generators/max_exporter_scripts/zone.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/generators/simple_max_exporter_template/0_setup.py b/code/nel/tools/build_gamedata/generators/simple_max_exporter_template/0_setup.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/generators/simple_max_exporter_template/1_export_footer.py b/code/nel/tools/build_gamedata/generators/simple_max_exporter_template/1_export_footer.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/generators/simple_max_exporter_template/1_export_header.py b/code/nel/tools/build_gamedata/generators/simple_max_exporter_template/1_export_header.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/generators/simple_max_exporter_template/2_build.py b/code/nel/tools/build_gamedata/generators/simple_max_exporter_template/2_build.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/generators/simple_max_exporter_template/3_install.py b/code/nel/tools/build_gamedata/generators/simple_max_exporter_template/3_install.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/generators/simple_max_exporter_template/export_footer.ms b/code/nel/tools/build_gamedata/generators/simple_max_exporter_template/export_footer.ms old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/generators/simple_max_exporter_template/export_header.ms b/code/nel/tools/build_gamedata/generators/simple_max_exporter_template/export_header.ms old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/generators/tagged_max_exporter_template/0_setup.py b/code/nel/tools/build_gamedata/generators/tagged_max_exporter_template/0_setup.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/generators/tagged_max_exporter_template/1_export_footer.py b/code/nel/tools/build_gamedata/generators/tagged_max_exporter_template/1_export_footer.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/generators/tagged_max_exporter_template/1_export_header.py b/code/nel/tools/build_gamedata/generators/tagged_max_exporter_template/1_export_header.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/generators/tagged_max_exporter_template/2_build.py b/code/nel/tools/build_gamedata/generators/tagged_max_exporter_template/2_build.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/generators/tagged_max_exporter_template/3_install.py b/code/nel/tools/build_gamedata/generators/tagged_max_exporter_template/3_install.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/generators/tagged_max_exporter_template/export_footer.ms b/code/nel/tools/build_gamedata/generators/tagged_max_exporter_template/export_footer.ms old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/generators/tagged_max_exporter_template/export_header.ms b/code/nel/tools/build_gamedata/generators/tagged_max_exporter_template/export_header.ms old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/0_setup.py b/code/nel/tools/build_gamedata/processes/0_setup.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/1_export.py b/code/nel/tools/build_gamedata/processes/1_export.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/2_build.py b/code/nel/tools/build_gamedata/processes/2_build.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/3_install.py b/code/nel/tools/build_gamedata/processes/3_install.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/_dummy/0_setup.py b/code/nel/tools/build_gamedata/processes/_dummy/0_setup.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/_dummy/1_export.py b/code/nel/tools/build_gamedata/processes/_dummy/1_export.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/_dummy/2_build.py b/code/nel/tools/build_gamedata/processes/_dummy/2_build.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/_dummy/3_install.py b/code/nel/tools/build_gamedata/processes/_dummy/3_install.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/ai_wmap/0_setup.py b/code/nel/tools/build_gamedata/processes/ai_wmap/0_setup.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/ai_wmap/1_export.py b/code/nel/tools/build_gamedata/processes/ai_wmap/1_export.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/ai_wmap/2_build.py b/code/nel/tools/build_gamedata/processes/ai_wmap/2_build.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/ai_wmap/3_install.py b/code/nel/tools/build_gamedata/processes/ai_wmap/3_install.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/anim/0_setup.py b/code/nel/tools/build_gamedata/processes/anim/0_setup.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/anim/1_export.py b/code/nel/tools/build_gamedata/processes/anim/1_export.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/anim/2_build.py b/code/nel/tools/build_gamedata/processes/anim/2_build.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/anim/3_install.py b/code/nel/tools/build_gamedata/processes/anim/3_install.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/anim/maxscript/anim_export.ms b/code/nel/tools/build_gamedata/processes/anim/maxscript/anim_export.ms old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/cegui/0_setup.py b/code/nel/tools/build_gamedata/processes/cegui/0_setup.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/cegui/1_export.py b/code/nel/tools/build_gamedata/processes/cegui/1_export.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/cegui/2_build.py b/code/nel/tools/build_gamedata/processes/cegui/2_build.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/cegui/3_install.py b/code/nel/tools/build_gamedata/processes/cegui/3_install.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/clodbank/0_setup.py b/code/nel/tools/build_gamedata/processes/clodbank/0_setup.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/clodbank/1_export.py b/code/nel/tools/build_gamedata/processes/clodbank/1_export.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/clodbank/2_build.py b/code/nel/tools/build_gamedata/processes/clodbank/2_build.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/clodbank/3_install.py b/code/nel/tools/build_gamedata/processes/clodbank/3_install.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/clodbank/maxscript/clod_export.ms b/code/nel/tools/build_gamedata/processes/clodbank/maxscript/clod_export.ms old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/copy/0_setup.py b/code/nel/tools/build_gamedata/processes/copy/0_setup.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/copy/1_export.py b/code/nel/tools/build_gamedata/processes/copy/1_export.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/copy/2_build.py b/code/nel/tools/build_gamedata/processes/copy/2_build.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/copy/3_install.py b/code/nel/tools/build_gamedata/processes/copy/3_install.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/displace/0_setup.py b/code/nel/tools/build_gamedata/processes/displace/0_setup.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/displace/1_export.py b/code/nel/tools/build_gamedata/processes/displace/1_export.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/displace/2_build.py b/code/nel/tools/build_gamedata/processes/displace/2_build.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/displace/3_install.py b/code/nel/tools/build_gamedata/processes/displace/3_install.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/farbank/0_setup.py b/code/nel/tools/build_gamedata/processes/farbank/0_setup.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/farbank/1_export.py b/code/nel/tools/build_gamedata/processes/farbank/1_export.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/farbank/2_build.py b/code/nel/tools/build_gamedata/processes/farbank/2_build.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/farbank/3_install.py b/code/nel/tools/build_gamedata/processes/farbank/3_install.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/font/0_setup.py b/code/nel/tools/build_gamedata/processes/font/0_setup.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/font/1_export.py b/code/nel/tools/build_gamedata/processes/font/1_export.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/font/2_build.py b/code/nel/tools/build_gamedata/processes/font/2_build.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/font/3_install.py b/code/nel/tools/build_gamedata/processes/font/3_install.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/ig/0_setup.py b/code/nel/tools/build_gamedata/processes/ig/0_setup.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/ig/1_export.py b/code/nel/tools/build_gamedata/processes/ig/1_export.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/ig/2_build.py b/code/nel/tools/build_gamedata/processes/ig/2_build.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/ig/3_install.py b/code/nel/tools/build_gamedata/processes/ig/3_install.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/ig/maxscript/ig_export.ms b/code/nel/tools/build_gamedata/processes/ig/maxscript/ig_export.ms old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/ig_light/0_setup.py b/code/nel/tools/build_gamedata/processes/ig_light/0_setup.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/ig_light/1_export.py b/code/nel/tools/build_gamedata/processes/ig_light/1_export.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/ig_light/2_build.py b/code/nel/tools/build_gamedata/processes/ig_light/2_build.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/ig_light/3_install.py b/code/nel/tools/build_gamedata/processes/ig_light/3_install.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/interface/0_setup.py b/code/nel/tools/build_gamedata/processes/interface/0_setup.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/interface/1_export.py b/code/nel/tools/build_gamedata/processes/interface/1_export.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/interface/2_build.py b/code/nel/tools/build_gamedata/processes/interface/2_build.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/interface/3_install.py b/code/nel/tools/build_gamedata/processes/interface/3_install.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/ligo/0_setup.py b/code/nel/tools/build_gamedata/processes/ligo/0_setup.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/ligo/1_export.py b/code/nel/tools/build_gamedata/processes/ligo/1_export.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/ligo/2_build.py b/code/nel/tools/build_gamedata/processes/ligo/2_build.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/ligo/3_install.py b/code/nel/tools/build_gamedata/processes/ligo/3_install.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/ligo/maxscript/nel_ligo_export.ms b/code/nel/tools/build_gamedata/processes/ligo/maxscript/nel_ligo_export.ms old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/map/0_setup.py b/code/nel/tools/build_gamedata/processes/map/0_setup.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/map/1_export.py b/code/nel/tools/build_gamedata/processes/map/1_export.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/map/2_build.py b/code/nel/tools/build_gamedata/processes/map/2_build.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/map/3_install.py b/code/nel/tools/build_gamedata/processes/map/3_install.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/pacs_prim/0_setup.py b/code/nel/tools/build_gamedata/processes/pacs_prim/0_setup.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/pacs_prim/1_export.py b/code/nel/tools/build_gamedata/processes/pacs_prim/1_export.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/pacs_prim/2_build.py b/code/nel/tools/build_gamedata/processes/pacs_prim/2_build.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/pacs_prim/3_install.py b/code/nel/tools/build_gamedata/processes/pacs_prim/3_install.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/pacs_prim/maxscript/pacs_prim_export.ms b/code/nel/tools/build_gamedata/processes/pacs_prim/maxscript/pacs_prim_export.ms old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/pacs_prim_list/0_setup.py b/code/nel/tools/build_gamedata/processes/pacs_prim_list/0_setup.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/pacs_prim_list/1_export.py b/code/nel/tools/build_gamedata/processes/pacs_prim_list/1_export.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/pacs_prim_list/2_build.py b/code/nel/tools/build_gamedata/processes/pacs_prim_list/2_build.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/pacs_prim_list/3_install.py b/code/nel/tools/build_gamedata/processes/pacs_prim_list/3_install.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/properties/0_setup.py b/code/nel/tools/build_gamedata/processes/properties/0_setup.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/properties/1_export.py b/code/nel/tools/build_gamedata/processes/properties/1_export.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/properties/2_build.py b/code/nel/tools/build_gamedata/processes/properties/2_build.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/properties/3_install.py b/code/nel/tools/build_gamedata/processes/properties/3_install.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/ps/0_setup.py b/code/nel/tools/build_gamedata/processes/ps/0_setup.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/ps/1_export.py b/code/nel/tools/build_gamedata/processes/ps/1_export.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/ps/2_build.py b/code/nel/tools/build_gamedata/processes/ps/2_build.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/ps/3_install.py b/code/nel/tools/build_gamedata/processes/ps/3_install.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/rbank/0_setup.py b/code/nel/tools/build_gamedata/processes/rbank/0_setup.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/rbank/1_export.py b/code/nel/tools/build_gamedata/processes/rbank/1_export.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/rbank/2_build.py b/code/nel/tools/build_gamedata/processes/rbank/2_build.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/rbank/3_install.py b/code/nel/tools/build_gamedata/processes/rbank/3_install.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/rbank/maxscript/cmb_export.ms b/code/nel/tools/build_gamedata/processes/rbank/maxscript/cmb_export.ms old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/shape/0_setup.py b/code/nel/tools/build_gamedata/processes/shape/0_setup.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/shape/1_export.py b/code/nel/tools/build_gamedata/processes/shape/1_export.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/shape/2_build.py b/code/nel/tools/build_gamedata/processes/shape/2_build.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/shape/3_install.py b/code/nel/tools/build_gamedata/processes/shape/3_install.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/shape/maxscript/shape_export.ms b/code/nel/tools/build_gamedata/processes/shape/maxscript/shape_export.ms old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/sheet_id/0_setup.py b/code/nel/tools/build_gamedata/processes/sheet_id/0_setup.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/sheet_id/1_export.py b/code/nel/tools/build_gamedata/processes/sheet_id/1_export.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/sheet_id/2_build.py b/code/nel/tools/build_gamedata/processes/sheet_id/2_build.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/sheet_id/3_install.py b/code/nel/tools/build_gamedata/processes/sheet_id/3_install.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/sheets/0_setup.py b/code/nel/tools/build_gamedata/processes/sheets/0_setup.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/sheets/1_export.py b/code/nel/tools/build_gamedata/processes/sheets/1_export.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/sheets/2_build.py b/code/nel/tools/build_gamedata/processes/sheets/2_build.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/sheets/3_install.py b/code/nel/tools/build_gamedata/processes/sheets/3_install.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/sheets_shard/0_setup.py b/code/nel/tools/build_gamedata/processes/sheets_shard/0_setup.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/sheets_shard/1_export.py b/code/nel/tools/build_gamedata/processes/sheets_shard/1_export.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/sheets_shard/2_build.py b/code/nel/tools/build_gamedata/processes/sheets_shard/2_build.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/sheets_shard/3_install.py b/code/nel/tools/build_gamedata/processes/sheets_shard/3_install.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/skel/0_setup.py b/code/nel/tools/build_gamedata/processes/skel/0_setup.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/skel/1_export.py b/code/nel/tools/build_gamedata/processes/skel/1_export.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/skel/2_build.py b/code/nel/tools/build_gamedata/processes/skel/2_build.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/skel/3_install.py b/code/nel/tools/build_gamedata/processes/skel/3_install.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/skel/maxscript/skel_export.ms b/code/nel/tools/build_gamedata/processes/skel/maxscript/skel_export.ms old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/smallbank/0_setup.py b/code/nel/tools/build_gamedata/processes/smallbank/0_setup.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/smallbank/1_export.py b/code/nel/tools/build_gamedata/processes/smallbank/1_export.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/smallbank/2_build.py b/code/nel/tools/build_gamedata/processes/smallbank/2_build.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/smallbank/3_install.py b/code/nel/tools/build_gamedata/processes/smallbank/3_install.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/sound/0_setup.py b/code/nel/tools/build_gamedata/processes/sound/0_setup.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/sound/1_export.py b/code/nel/tools/build_gamedata/processes/sound/1_export.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/sound/2_build.py b/code/nel/tools/build_gamedata/processes/sound/2_build.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/sound/3_install.py b/code/nel/tools/build_gamedata/processes/sound/3_install.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/swt/0_setup.py b/code/nel/tools/build_gamedata/processes/swt/0_setup.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/swt/1_export.py b/code/nel/tools/build_gamedata/processes/swt/1_export.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/swt/2_build.py b/code/nel/tools/build_gamedata/processes/swt/2_build.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/swt/3_install.py b/code/nel/tools/build_gamedata/processes/swt/3_install.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/swt/maxscript/swt_export.ms b/code/nel/tools/build_gamedata/processes/swt/maxscript/swt_export.ms old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/tiles/0_setup.py b/code/nel/tools/build_gamedata/processes/tiles/0_setup.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/tiles/1_export.py b/code/nel/tools/build_gamedata/processes/tiles/1_export.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/tiles/2_build.py b/code/nel/tools/build_gamedata/processes/tiles/2_build.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/tiles/3_install.py b/code/nel/tools/build_gamedata/processes/tiles/3_install.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/veget/0_setup.py b/code/nel/tools/build_gamedata/processes/veget/0_setup.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/veget/1_export.py b/code/nel/tools/build_gamedata/processes/veget/1_export.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/veget/2_build.py b/code/nel/tools/build_gamedata/processes/veget/2_build.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/veget/3_install.py b/code/nel/tools/build_gamedata/processes/veget/3_install.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/veget/maxscript/veget_export.ms b/code/nel/tools/build_gamedata/processes/veget/maxscript/veget_export.ms old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/vegetset/0_setup.py b/code/nel/tools/build_gamedata/processes/vegetset/0_setup.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/vegetset/1_export.py b/code/nel/tools/build_gamedata/processes/vegetset/1_export.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/vegetset/2_build.py b/code/nel/tools/build_gamedata/processes/vegetset/2_build.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/vegetset/3_install.py b/code/nel/tools/build_gamedata/processes/vegetset/3_install.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/zone/0_setup.py b/code/nel/tools/build_gamedata/processes/zone/0_setup.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/zone/1_export.py b/code/nel/tools/build_gamedata/processes/zone/1_export.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/zone/2_build.py b/code/nel/tools/build_gamedata/processes/zone/2_build.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/zone/3_install.py b/code/nel/tools/build_gamedata/processes/zone/3_install.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/zone/maxscript/zone_export.ms b/code/nel/tools/build_gamedata/processes/zone/maxscript/zone_export.ms old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/zone_light/0_setup.py b/code/nel/tools/build_gamedata/processes/zone_light/0_setup.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/zone_light/1_export.py b/code/nel/tools/build_gamedata/processes/zone_light/1_export.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/zone_light/2_build.py b/code/nel/tools/build_gamedata/processes/zone_light/2_build.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/processes/zone_light/3_install.py b/code/nel/tools/build_gamedata/processes/zone_light/3_install.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/translation/a1_make_phrase_diff.py b/code/nel/tools/build_gamedata/translation/a1_make_phrase_diff.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/translation/a2_merge_phrase_diff.py b/code/nel/tools/build_gamedata/translation/a2_merge_phrase_diff.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/translation/a3_make_clause_diff.py b/code/nel/tools/build_gamedata/translation/a3_make_clause_diff.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/translation/a4_merge_clause_diff.py b/code/nel/tools/build_gamedata/translation/a4_merge_clause_diff.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/translation/b1_make_words_diff.py b/code/nel/tools/build_gamedata/translation/b1_make_words_diff.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/translation/b2_merge_words_diff.py b/code/nel/tools/build_gamedata/translation/b2_merge_words_diff.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/translation/c1_make_string_diff.py b/code/nel/tools/build_gamedata/translation/c1_make_string_diff.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/translation/c2_merge_string_diff.py b/code/nel/tools/build_gamedata/translation/c2_merge_string_diff.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/translation/d1_make_botnames_diff.py b/code/nel/tools/build_gamedata/translation/d1_make_botnames_diff.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/translation/d2_merge_botnames_diff.py b/code/nel/tools/build_gamedata/translation/d2_merge_botnames_diff.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/translation/e1_clean_string_diff.py b/code/nel/tools/build_gamedata/translation/e1_clean_string_diff.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/translation/e2_clean_words_diff.py b/code/nel/tools/build_gamedata/translation/e2_clean_words_diff.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/translation/e3_clean_clause_diff.py b/code/nel/tools/build_gamedata/translation/e3_clean_clause_diff.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/translation/e4_clean_phrase_diff.py b/code/nel/tools/build_gamedata/translation/e4_clean_phrase_diff.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/translation/make_merge_all.py b/code/nel/tools/build_gamedata/translation/make_merge_all.py old mode 100644 new mode 100755 diff --git a/code/nel/tools/build_gamedata/translation/make_merge_wk.py b/code/nel/tools/build_gamedata/translation/make_merge_wk.py old mode 100644 new mode 100755 diff --git a/code/ryzom/client/src/init.cpp b/code/ryzom/client/src/init.cpp index d603be4a3..aa18cee6a 100644 --- a/code/ryzom/client/src/init.cpp +++ b/code/ryzom/client/src/init.cpp @@ -333,8 +333,8 @@ void ExitClientError (const char *format, ...) // Exit extern void quitCrashReport (); quitCrashReport (); - NLMISC::NL3D_BlockMemoryAssertOnPurge = false; // at this point some object may remain allocated - // so don't want to fire an assert here + NLMISC::NL3D_BlockMemoryAssertOnPurge = false; // at this point some object may remain allocated + // so don't want to fire an assert here exit (EXIT_FAILURE); } @@ -558,11 +558,11 @@ static std::string replaceApplicationDirToken(const std::string &dir) { #ifdef NL_OS_MAC - // if client_default.cfg is not in current directory, and it's not an absolute path, use application default directory - if (!CFile::isExists("client_default.cfg") && dir.size()>0 && dir[0]!='/') - { - return getAppBundlePath() + "/Contents/Resources/" + dir; - } + // if client_default.cfg is not in current directory, and it's not an absolute path, use application default directory + if (!CFile::isExists("client_default.cfg") && dir.size()>0 && dir[0]!='/') + { + return getAppBundlePath() + "/Contents/Resources/" + dir; + } #else static const std::string token = ""; std::string::size_type pos = dir.find(token); @@ -695,7 +695,7 @@ void addPreDataPaths(NLMISC::IProgressCallback &progress) { NLMISC::TTime initPaths = ryzomGetLocalTime (); H_AUTO(InitRZAddSearchPaths) - for (uint i = 0; i < ClientCfg.PreDataPath.size(); i++) + for (uint i = 0; i < ClientCfg.PreDataPath.size(); i++) { progress.progress ((float)i/(float)ClientCfg.PreDataPath.size()); progress.pushCropedValues ((float)i/(float)ClientCfg.PreDataPath.size(), (float)(i+1)/(float)ClientCfg.PreDataPath.size()); @@ -771,7 +771,7 @@ void prelogInit() NLMISC_REGISTER_CLASS(CNamedEntityPositionState); NLMISC_REGISTER_CLASS(CAnimalPositionState); - // _CrtSetDbgFlag( _CRTDBG_CHECK_CRT_DF ); + // _CrtSetDbgFlag( _CRTDBG_CHECK_CRT_DF ); // Init XML Lib allocator // Due to Bug #906, we disable the stl xml allocation @@ -924,9 +924,9 @@ void prelogInit() // For login phase, MUST be in windowed UDriver::CMode mode; - mode.Width = 1024; - mode.Height = 768; - mode.Windowed = true; + mode.Width = 1024; + mode.Height = 768; + mode.Windowed = true; // Disable Hardware Vertex Program. if(ClientCfg.DisableVtxProgram) @@ -944,7 +944,7 @@ void prelogInit() else Driver->setSwapVBLInterval(0); - if (StereoDisplay) // VR_CONFIG // VR_DRIVER + if (StereoDisplay) // VR_CONFIG // VR_DRIVER { // override mode TODO } @@ -1000,7 +1000,7 @@ void prelogInit() // check if an icon is present in registered paths if(CPath::exists("ryzom.png")) - filenames.push_back(CPath::lookup("ryzom.png")); + filenames.push_back(CPath::lookup("ryzom.png")); vector bitmaps; diff --git a/code/ryzom/client/src/interface_v3/sbrick_manager.cpp b/code/ryzom/client/src/interface_v3/sbrick_manager.cpp index a01e69f13..036a50052 100644 --- a/code/ryzom/client/src/interface_v3/sbrick_manager.cpp +++ b/code/ryzom/client/src/interface_v3/sbrick_manager.cpp @@ -50,55 +50,69 @@ CSBrickManager::CSBrickManager() : _NbFamily(0), _SabrinaCom(&_BrickContainer) // *************************************************************************** void CSBrickManager::init() { - // Read the Bricks from the SheetMngr. - const CSheetManager::TEntitySheetMap &sheetMap= SheetMngr.getSheets(); - for(CSheetManager::TEntitySheetMap::const_iterator it= sheetMap.begin(); it!=sheetMap.end(); it++) + const CSheetManager::TEntitySheetMap &sheetMap = SheetMngr.getSheets(); + _BrickVector.clear(); + _BrickVector.reserve(16 * 1024); + uint32 shtype = CSheetId::typeFromFileExtension("sbrick"); + for (CSheetManager::TEntitySheetMap::const_iterator it(sheetMap.begin()), end(sheetMap.end()); it != end; ++it) { // it's a brick? - CSBrickSheet *br= dynamic_cast(it->second.EntitySheet); - if(br) + CSBrickSheet *br = dynamic_cast(it->second.EntitySheet); // TODO: Avoid dynamic_cast, depend on getSheetType + if (br) { // ok, add it - _Bricks[it->first]= br; + uint32 shid = it->first.getShortId(); + nlassert(shtype == it->first.getSheetType()); + if (shid >= _BrickVector.size()) + _BrickVector.resize(shid + 1); + _BrickVector[shid] = br; } } // Process Bricks - if (_Bricks.empty()) return; - - map::iterator itb; + if (_BrickVector.empty()) return; - //build the vector of family bit fields, and the vector of existing bricks - for (itb = _Bricks.begin();itb != _Bricks.end();itb++) + // Build the vector of family bit fields, and the vector of existing bricks + for (std::vector::iterator itb(_BrickVector.begin()), endb(_BrickVector.end()); itb != endb; ++itb) { - //resize our vectors if necessary - if ( itb->second->BrickFamily >= (sint32)_NbFamily ) + CSBrickSheet *brickSheet = *itb; + if (!brickSheet) + continue; + + // Resize our vectors if necessary + if (brickSheet->BrickFamily >= (sint32)_NbFamily) { - _SheetsByFamilies.resize(itb->second->BrickFamily+1); - _FamiliesBits.resize(itb->second->BrickFamily+1, 0); - _NbBricksPerFamily.resize(itb->second->BrickFamily+1, 0); + _SheetsByFamilies.resize(brickSheet->BrickFamily + 1); + _FamiliesBits.resize(brickSheet->BrickFamily + 1, 0); + _NbBricksPerFamily.resize(brickSheet->BrickFamily + 1, 0); - _NbFamily = itb->second->BrickFamily+1; + _NbFamily = brickSheet->BrickFamily + 1; } } // Since _SheetsByFamilies is a vector of vector, avoid long reallocation by building it in 2 pass - for (itb = _Bricks.begin();itb != _Bricks.end();itb++) + sint32 shidc = -1; + for (std::vector::iterator itb(_BrickVector.begin()), endb(_BrickVector.end()); itb != endb; ++itb) { - //resize our vectors if necessary - //the index in familly must be decremented because the values start at 1 in the sheets - if (itb->second->IndexInFamily<1) + ++shidc; + CSBrickSheet *brickSheet = *itb; + if (!brickSheet) + continue; + + // Resize our vectors if necessary + // The index in familly must be decremented because the values start at 1 in the sheets + if (brickSheet->IndexInFamily < 1) { - nlwarning("CSBrickManager::CSBrickManager(): Reading file: %s: IndexInFamily==0 but should be >=1 - entry ignored",itb->first.toString().c_str()); + nlwarning("CSBrickManager::CSBrickManager(): Reading file: %s: IndexInFamily==0 but should be >=1 - entry ignored", brickSheet->Id.toString().c_str()); continue; } - if (_NbBricksPerFamily[itb->second->BrickFamily] < (uint)(itb->second->IndexInFamily) ) + if (_NbBricksPerFamily[brickSheet->BrickFamily] < (uint)(brickSheet->IndexInFamily)) { - _SheetsByFamilies[itb->second->BrickFamily].resize(itb->second->IndexInFamily); - _NbBricksPerFamily[itb->second->BrickFamily]=itb->second->IndexInFamily; + _SheetsByFamilies[brickSheet->BrickFamily].resize(brickSheet->IndexInFamily); + _NbBricksPerFamily[brickSheet->BrickFamily] = brickSheet->IndexInFamily; } - _SheetsByFamilies[itb->second->BrickFamily][itb->second->IndexInFamily-1] = itb->first; + _SheetsByFamilies[brickSheet->BrickFamily][brickSheet->IndexInFamily - 1] = brickSheet->Id; } // check brick content for client. @@ -192,20 +206,17 @@ void CSBrickManager::makeRoots() { _Roots.clear(); - map::iterator it = _Bricks.begin(); - - while (it != _Bricks.end()) + for (std::vector::size_type ib = 0; ib < _BrickVector.size(); ++ib) { - const CSheetId &rSheet = it->first; - const CSBrickSheet &rBR = *it->second; + const CSBrickSheet *brickSheet = _BrickVector[ib]; + if (!brickSheet) + continue; // List only the Roots - if ( !rBR.isRoot() ) - { it++; continue; } - - _Roots.push_back(rSheet); + if (!brickSheet->isRoot()) + continue; - it++; + _Roots.push_back(brickSheet->Id); } } @@ -223,22 +234,20 @@ const std::vector &CSBrickManager::getFamilyBricks(uint famil // *************************************************************************** void CSBrickManager::checkBricks() { - map::iterator it = _Bricks.begin(); - - while (it != _Bricks.end()) + for (std::vector::size_type ib = 0; ib < _BrickVector.size(); ++ib) { - CSBrickSheet &rBR = *it->second; + CSBrickSheet *brickSheet = _BrickVector[ib]; + if (!brickSheet) + continue; - if(rBR.ParameterFamilies.size()>CDBGroupBuildPhrase::MaxParam) + if (brickSheet->ParameterFamilies.size() > CDBGroupBuildPhrase::MaxParam) { nlwarning("The Sheet %s has too many parameters for Client Composition: %d/%d", - rBR.Id.toString().c_str(), rBR.ParameterFamilies.size(), CDBGroupBuildPhrase::MaxParam); + brickSheet->Id.toString().c_str(), brickSheet->ParameterFamilies.size(), CDBGroupBuildPhrase::MaxParam); // reset them... don't crahs client, but won't work. - rBR.ParameterFamilies.clear(); + brickSheet->ParameterFamilies.clear(); } - - it++; } } @@ -340,28 +349,27 @@ TOOL_TYPE::TCraftingToolType CSBrickManager::CBrickContainer::getFaberPlanToolTy // *************************************************************************** void CSBrickManager::makeVisualBrickForSkill() { - map::iterator it = _Bricks.begin(); - // clear - for(uint i=0;i::size_type ib = 0; ib < _BrickVector.size(); ++ib) { - const CSheetId &rSheet = it->first; - const CSBrickSheet &rBR = *it->second; + const CSBrickSheet *brickSheet = _BrickVector[ib]; + if (!brickSheet) + continue; // List only bricks with family == BIF - if ( rBR.BrickFamily == BRICK_FAMILIES::BIF ) + if (brickSheet->BrickFamily == BRICK_FAMILIES::BIF) { - if(rBR.getSkill()getSkill() < SKILLS::NUM_SKILLS) + { + _VisualBrickForSkill[brickSheet->getSkill()] = brickSheet->Id; + } } - - it++; } } @@ -378,43 +386,40 @@ CSheetId CSBrickManager::getVisualBrickForSkill(SKILLS::ESkills s) // *************************************************************************** void CSBrickManager::compileBrickProperties() { - map::iterator it = _Bricks.begin(); - // clear _BrickPropIdMap.clear(); uint NumIds= 0; // **** for all bricks, compile props - while (it != _Bricks.end()) + for (std::vector::size_type ib = 0; ib < _BrickVector.size(); ++ib) { -// const CSheetId &rSheet = it->first; - CSBrickSheet &rBR = *it->second; + CSBrickSheet *brickSheet = _BrickVector[ib]; + if (!brickSheet) + continue; // For all properties of this brick, compile - for(uint i=0;iProperties.size(); ++i) { - CSBrickSheet::CProperty &prop= rBR.Properties[i]; + CSBrickSheet::CProperty &prop = brickSheet->Properties[i]; string::size_type pos = prop.Text.find(':'); - if(pos!=string::npos) + if (pos != string::npos) { - string key= prop.Text.substr(0, pos); + string key = prop.Text.substr(0, pos); strlwr(key); - string value= prop.Text.substr(pos+1); + string value = prop.Text.substr(pos + 1); // get key id. - if(_BrickPropIdMap.find(key)==_BrickPropIdMap.end()) + if (_BrickPropIdMap.find(key) == _BrickPropIdMap.end()) { // Inc before to leave 0 as "undefined" - _BrickPropIdMap[key]= ++NumIds; + _BrickPropIdMap[key] = ++NumIds; } - prop.PropId= _BrickPropIdMap[key]; + prop.PropId = _BrickPropIdMap[key]; fromString(value, prop.Value); - pos= value.find(':'); - if(pos!=string::npos) - fromString(value.substr(pos+1), prop.Value2); + pos = value.find(':'); + if (pos != string::npos) + fromString(value.substr(pos + 1), prop.Value2); } } - - it++; } // Get usual PropIds @@ -428,19 +433,19 @@ void CSBrickManager::compileBrickProperties() // **** for all bricks, recompute localized text with formated version - it= _Bricks.begin(); ucstring textTemp; textTemp.reserve(1000); - while (it != _Bricks.end()) + for (std::vector::size_type ib = 0; ib < _BrickVector.size(); ++ib) { - const CSheetId &rSheet = it->first; - const CSBrickSheet &rBR = *it->second; + CSBrickSheet *brickSheet = _BrickVector[ib]; + if (!brickSheet) + continue; // Get the Brick texts ucstring texts[3]; - texts[0]= STRING_MANAGER::CStringManagerClient::getSBrickLocalizedName(rSheet); - texts[1]= STRING_MANAGER::CStringManagerClient::getSBrickLocalizedDescription(rSheet); - texts[2]= STRING_MANAGER::CStringManagerClient::getSBrickLocalizedCompositionDescription(rSheet); + texts[0]= STRING_MANAGER::CStringManagerClient::getSBrickLocalizedName(brickSheet->Id); + texts[1]= STRING_MANAGER::CStringManagerClient::getSBrickLocalizedDescription(brickSheet->Id); + texts[2]= STRING_MANAGER::CStringManagerClient::getSBrickLocalizedCompositionDescription(brickSheet->Id); // For alls texts, parse format for(uint i=0;i<3;i++) @@ -506,13 +511,13 @@ void CSBrickManager::compileBrickProperties() // if propid exist if(propId) { - for(uint p=0;pProperties.size();p++) { - const CSBrickSheet::CProperty &prop= rBR.Properties[p]; + const CSBrickSheet::CProperty &prop= brickSheet->Properties[p]; if(prop.PropId==propId) { if(paramId==0) - value= rBR.Properties[p].Value; + value= brickSheet->Properties[p].Value; else { // must parse the initial text/ skip the identifier @@ -562,9 +567,7 @@ void CSBrickManager::compileBrickProperties() } // reset - STRING_MANAGER::CStringManagerClient::replaceSBrickName(rSheet, texts[0], texts[1], texts[2]); - - it++; + STRING_MANAGER::CStringManagerClient::replaceSBrickName(brickSheet->Id, texts[0], texts[1], texts[2]); } } diff --git a/code/ryzom/client/src/interface_v3/sbrick_manager.h b/code/ryzom/client/src/interface_v3/sbrick_manager.h index fb54fc88a..d963309bf 100644 --- a/code/ryzom/client/src/interface_v3/sbrick_manager.h +++ b/code/ryzom/client/src/interface_v3/sbrick_manager.h @@ -65,11 +65,15 @@ public: */ CSBrickSheet *getBrick(const NLMISC::CSheetId &id) const { - std::map::const_iterator it = _Bricks.find(id); - if (it == _Bricks.end()) - return NULL; - return it->second; + uint32 shid = id.getShortId(); + CSBrickSheet *result = NULL; + if (shid < _BrickVector.size()) + result = _BrickVector[shid]; + //if (!result) + // nlwarning("Missing brick '%s'", id.toString().c_str()); + return result; } + /** * \return a sheet id of a brick */ @@ -142,27 +146,29 @@ protected: /// Constructor CSBrickManager(); - ///singleton's instance + /// Singleton's instance static CSBrickManager* _Instance; - //number of families + /// Number of families uint _NbFamily; - //number of bricks in each family + /// Number of bricks in each family std::vector _NbBricksPerFamily; - ///map linking a sheet id to a brick record. - std::map _Bricks; + /// Map linking a sheet id to a brick record. + // std::map _Bricks; + std::vector _BrickVector; - ///structure storing all bricks. each entry of the vector represent a family, described by a vector containing all the bricks - ///of the family - std::vector > _SheetsByFamilies; + /// Structure storing all bricks. each entry of the vector + /// represent a family, described by a vector containing all + /// the bricks of the family + std::vector > _SheetsByFamilies; - ///vector of bit fields describing the known bricks of each family - std::vector _FamiliesBits; + /// Vector of bit fields describing the known bricks of each family + std::vector _FamiliesBits; - /// list of roots only - std::vector _Roots; + /// List of roots only + std::vector _Roots; /// Mapper of SkillToBrick NLMISC::CSheetId _VisualBrickForSkill[SKILLS::NUM_SKILLS]; diff --git a/code/ryzom/client/src/interface_v3/sphrase_manager.cpp b/code/ryzom/client/src/interface_v3/sphrase_manager.cpp index 3d6155d23..7ef59dc1c 100644 --- a/code/ryzom/client/src/interface_v3/sphrase_manager.cpp +++ b/code/ryzom/client/src/interface_v3/sphrase_manager.cpp @@ -4504,17 +4504,19 @@ sint32 CSPhraseManager::getSheetFromPhrase(const CSPhraseCom &phrase) const uint32 CSPhraseManager::getTotalActionMalus(const CSPhraseCom &phrase) const { CInterfaceManager *pIM = CInterfaceManager::getInstance(); - CSBrickManager *pBM= CSBrickManager::getInstance(); - uint32 totalActionMalus= 0; + CSBrickManager *pBM = CSBrickManager::getInstance(); + uint32 totalActionMalus = 0; CCDBNodeLeaf *actMalus = _TotalMalusEquipLeaf ? &*_TotalMalusEquipLeaf : &*(_TotalMalusEquipLeaf = NLGUI::CDBManager::getInstance()->getDbProp("UI:VARIABLES:TOTAL_MALUS_EQUIP", false)); // root brick must not be Power or aura, because Action malus don't apply to them // (ie leave 0 ActionMalus for Aura or Powers if (!phrase.Bricks.empty()) { - CSBrickSheet *rootBrick= pBM->getBrick(phrase.Bricks[0]); - if(actMalus && !rootBrick->isSpecialPower()) - totalActionMalus= actMalus->getValue32(); + CSBrickSheet *rootBrick = pBM->getBrick(phrase.Bricks[0]); + if (!rootBrick) + nlerror("Invalid root sbrick in sphrase_com '%s'", phrase.Name.toUtf8().c_str()); + else if (actMalus && !rootBrick->isSpecialPower()) + totalActionMalus = actMalus->getValue32(); } return totalActionMalus; } diff --git a/code/ryzom/tools/leveldesign/georges_dll/stdafx.cpp b/code/ryzom/tools/leveldesign/georges_dll/stdafx.cpp index d4850a5aa..8178a3ed3 100644 --- a/code/ryzom/tools/leveldesign/georges_dll/stdafx.cpp +++ b/code/ryzom/tools/leveldesign/georges_dll/stdafx.cpp @@ -19,6 +19,3 @@ // stdafx.obj will contain the pre-compiled type information #include "stdafx.h" - - -void foo_std_afx_to_remove_warning() {}; diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/installer/libsetup.php b/code/ryzom/tools/server/ryzom_ams/www/html/installer/libsetup.php index e51dc1872..2901918e2 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/installer/libsetup.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/installer/libsetup.php @@ -56,6 +56,7 @@ if (!isset($_POST['function'])) { //require the pages that are being needed. require_once( '../config.default.php' ); + require_once( $AMS_LIB.'/libinclude.php' ); ini_set( "display_errors", true ); error_reporting( E_ALL );