Merge: From default to build_pipeline_v3.

--HG--
branch : build_pipeline_v3

code/CMakeLists.txt

@@ -257,7 +257,7 @@ IF(WIN32)
   IF(WITH_TOOLS)
     SET(CMAKE_INSTALL_MFC_LIBRARIES TRUE)
   ENDIF(WITH_TOOLS)
-  INCLUDE(InstallRequiredSystemLibraries)
+  #INCLUDE(InstallRequiredSystemLibraries)
 ENDIF(WIN32)
 
 INCLUDE(CPack)

code/ryzom/server/src/general_utilities_service/rfr_ryzom_file_retriever.cpp

@@ -472,7 +472,9 @@ bool CRyzomFileRetrieverImplementation::downloadBackupFiles(const CSString& shar
 			continue;
 
 		// generate a local filename for the downloaded file
-		CSString localFileName= NLMISC::CPath::standardizePath(localDirectory)+(fileName+"_"+fdc[i].FileName.replace("/","_")).replace(".","_");
+		CSString localFileName= NLMISC::CPath::standardizePath(localDirectory)+(fileName+"_"+fdc[i].FileName);
+		localFileName = localFileName.replace("/","_");
+		localFileName = localFileName.replace(".","_");
 		nlinfo("Requesting file download: REMOTE:%s => LOCAL:%s",fdc[i].FileName.c_str(),localFileName.c_str());
 
 		// put in a request for the file to be retrieved

code/ryzom/server/src/patchman_service/pam_patchman_admin_module.cpp

@@ -134,7 +134,8 @@ bool CPatchmanAdminModule::initModule(const TParsedCommandLine &initInfo)
 	CDeploymentConfigurationSynchroniser::init(this);
 
 	// now that the base classes have been initialised, we can cumulate the module manifests
-	_Manifest= (CFileReceiver::getModuleManifest()+_Manifest).strip();
+	_Manifest= (CFileReceiver::getModuleManifest()+_Manifest);
+	_Manifest = _Manifest.strip();
 
 	// we're all done so let the world know
 	registerProgress(string("PAM Initialised: ")+logMsg+" "+_Manifest);

code/ryzom/server/src/patchman_service/spa_server_patch_applier.cpp

@@ -385,7 +385,8 @@ bool CServerPatchApplier::initModule(const TParsedCommandLine &initInfo)
 	CDeploymentConfigurationSynchroniser::init(this);
 
 	// now that the base classes have been initialised, we can cumulate the module manifests
-	_Manifest= (CFileReceiver::getModuleManifest()+_Manifest).strip();
+	_Manifest= (CFileReceiver::getModuleManifest()+_Manifest);
+	_Manifest = _Manifest.strip();
 
 	// we're all done so let the world know
 	registerProgress(string("SPA Initialised: ")+logMsg+" "+_Manifest);

code/ryzom/server/src/patchman_service/spb_server_patch_bridge.cpp

@@ -136,7 +136,8 @@ bool CServerPatchBridge::initModule(const TParsedCommandLine &initInfo)
 	CFileReceiver::init(this,"*/*");
 
 	// now  that the base classes have been initialised, we can cumulate the module manifests
-	_Manifest= (CFileRepository::buildModuleManifest()+" "+CFileReceiver::getModuleManifest()+" "+_Manifest).strip();
+	_Manifest= (CFileRepository::buildModuleManifest()+" "+CFileReceiver::getModuleManifest()+" "+_Manifest);
+	_Manifest = _Manifest.strip();
 
 	// scan our local file cache to buildup our starting file base
 	setStateVariable("State","Scanning");

code/ryzom/server/src/patchman_service/spt_server_patch_terminal.cpp

@@ -81,7 +81,9 @@ static void addSPTMessage(const CSString& moduleName, const CSString& msgText)
 	nldebug("SPTMSG_VERBOSE %d: %s: %s",count,moduleName.c_str(),msgText.c_str());
 
 	// look for a slot to stick the message in
-	CSString cleanModuleName= (moduleName.splitTo(':')+'/'+moduleName.splitFrom(':').splitFrom(':')).strip();
+	CSString cleanModuleName= (moduleName.splitTo(':')+'/'+moduleName.splitFrom(':').splitFrom(':'));
+	cleanModuleName = cleanModuleName.strip();
+
 	uint32 oldest=0;
 	uint32 oldestTime=~0u;
 	for (uint32 i=0;i<sizeof(SPTMessage)/sizeof(SPTMessage[0]) && i<NumSPTWatches.get();++i)