aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-10 09:19:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source
This commit is contained in:
kervala 2015-12-13 20:32:17 +01:00
parent 172e8ef65c
commit 22c9abadc7
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/ryzom/server/src/pd_support_service/stat_globals.cpp
View file

@ -61,19 +61,19 @@ namespace STAT_GLOBALS
NLMISC::CSString getInputFilePath(const NLMISC::CSString& path) NLMISC::CSString getInputFilePath(const NLMISC::CSString& path)
{ {
NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(InputFileDirectory.get()); NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(InputFileDirectory.get());
return (path.left((uint)pathRoot.size())==pathRoot)? path: pathRoot+path; return path.left((uint)pathRoot.size()) == pathRoot ? path:pathRoot+path;
} }
NLMISC::CSString getScriptFilePath(const NLMISC::CSString& path) NLMISC::CSString getScriptFilePath(const NLMISC::CSString& path)
{ {
NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(ScriptDirectory.get()); NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(ScriptDirectory.get());
return (path.left((uint)pathRoot.size())==pathRoot)? path: pathRoot+path; return path.left((uint)pathRoot.size()) == pathRoot ? path:pathRoot+path;
} }
NLMISC::CSString getOutputFilePath(const NLMISC::CSString& path) NLMISC::CSString getOutputFilePath(const NLMISC::CSString& path)
{ {
NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(OutputDirectory.get()); NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(OutputDirectory.get());
return (path.left((uint)pathRoot.size())==pathRoot)? path: pathRoot+path; return path.left((uint)pathRoot.size()) == pathRoot ? path:pathRoot+path;
} }

4
code/ryzom/tools/patch_gen/patch_gen_common.cpp
View file

@ -86,7 +86,7 @@ void GenerateLZMA(const std::string sourceFile, const std::string &outputFile)
_spawnlp(_P_WAIT, "lzma.exe","lzma.exe", "e", sourceFile.c_str(), outputFile.c_str(), NULL); _spawnlp(_P_WAIT, "lzma.exe","lzma.exe", "e", sourceFile.c_str(), outputFile.c_str(), NULL);
#else // NL_OS_WINDOWS #else // NL_OS_WINDOWS
// new lzma only supports one file name on command line, so make a copy // new lzma only supports one file name on command line, so make a copy
CFile::copyFile(sourceFile, outputFile); CFile::copyFile(outputFile, sourceFile);
// new lzma syntax, -z = compress, -9 = best compression // new lzma syntax, -z = compress, -9 = best compression
std::string cmd = NLMISC::toString("lzma -z -9 %s", outputFile.c_str()); std::string cmd = NLMISC::toString("lzma -z -9 %s", outputFile.c_str());
@ -102,7 +102,7 @@ void GenerateLZMA(const std::string sourceFile, const std::string &outputFile)
else else
{ {
// lzma always append a .lzma extension, so rename compressed file to wanted one // lzma always append a .lzma extension, so rename compressed file to wanted one
CFile::moveFile(outputFile + ".lzma", outputFile); CFile::moveFile(outputFile, outputFile + ".lzma");
} }
#endif // NL_OS_WINDOWS #endif // NL_OS_WINDOWS
} }