Changed: #1440 Correct encoding for generated itf. Change pipeline config for Linux

--HG--
branch : build_pipeline_v3

code/nel/tools/pipeline/service/example_cfg/gtk_run_master.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
 
-cd /home/nevrax/build/devl/bin
-./pipeline_service -C/home/nevrax/code/nel/tools/pipeline/service/example_cfg/master_gtk/
+cd /home/kaetemi/core/pipeline_v3/build/devl/bin
+./pipeline_service -C/home/kaetemi/core/pipeline_v3/code/nel/tools/pipeline/service/example_cfg/master_gtk/
 

code/nel/tools/pipeline/service/example_cfg/linux_run_master.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
 
-cd /home/nevrax/build/devl/bin
-./pipeline_service -C/home/nevrax/code/nel/tools/pipeline/service/example_cfg/master_linux/
+cd /home/kaetemi/core/pipeline_v3/build/devl/bin
+./pipeline_service -C/home/kaetemi/core/pipeline_v3/code/nel/tools/pipeline/service/example_cfg/master_linux/
 

code/nel/tools/pipeline/service/example_cfg/linux_run_slave.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
 
-cd /home/nevrax/build/devl/bin
-./pipeline_service -C/home/nevrax/code/nel/tools/pipeline/service/example_cfg/master_slave/
+cd /home/kaetemi/core/pipeline_v3/build/devl/bin
+./pipeline_service -C/home/kaetemi/core/pipeline_v3/code/nel/tools/pipeline/service/example_cfg/master_slave/
 

code/nel/tools/pipeline/service/example_cfg/pipeline_service_linux.cfg

@@ -2,5 +2,5 @@
 SharedWork = "/srv/work"; // W: on Win
 SharedLeveldesign = "/srv/leveldesign"; // L: on Win
 
-UsedPlugins = { };
+UsedPlugins = { "" }; // CConfigFile BUG: Need dummy value to += afterwards!!!
 

code/nel/tools/pipeline/service/metadata_storage.h

@@ -32,6 +32,7 @@
 // STL includes
 
 // NeL includes
+#include <vector>
 
 // Project includes
 #include "workspace_storage.h"
@@ -106,6 +107,7 @@ public:
 #define PIPELINE_DATABASE_RESULT_SUFFIX ".result"
 struct CProjectResult
 {
+public:
 	std::vector<std::string> FilePaths;
 	struct CFileResult
 	{

code/nel/tools/pipeline/service/module_pipeline_master.cpp

@@ -120,7 +120,7 @@ protected:
 	bool m_AbortRequested;
 
 	NLMISC::CTaskManager *m_TaskManager; // Manages tasks requested by a slave.
-	NLMISC::CSynchronized<std::list<IRunnable *>> m_WaitingCallbacks;
+	NLMISC::CSynchronized<std::list<IRunnable *> > m_WaitingCallbacks;
 
 	// A runnable that's executed at next update state used as a callback.
 	// Override runnable as normal as the callback function.
@@ -129,7 +129,7 @@ protected:
 	public:
 		CDelayedCallback(CModulePipelineMaster *master) : Master(master)
 		{
-			NLMISC::CSynchronized<std::list<IRunnable *>>::CAccessor waitingCallbacks(&Master->m_WaitingCallbacks);
+			NLMISC::CSynchronized<std::list<IRunnable *> >::CAccessor waitingCallbacks(&Master->m_WaitingCallbacks);
 			waitingCallbacks.value().push_back(this);
 		}
 		inline CCallback<void> getCallback() { return CCallback<void>(this, &CDelayedCallback::callback); }
@@ -142,7 +142,7 @@ protected:
 				Master->addUpdateTask(this);
 			}
 			{
-				NLMISC::CSynchronized<std::list<IRunnable *>>::CAccessor waitingCallbacks(&Master->m_WaitingCallbacks);
+				NLMISC::CSynchronized<std::list<IRunnable *> >::CAccessor waitingCallbacks(&Master->m_WaitingCallbacks);
 				waitingCallbacks.value().remove(this);
 			}
 		}
@@ -150,7 +150,7 @@ protected:
 
 	// Runnable tasks that are ran on the next update cycle.
 	// The IRunnable instance is deleted by the update cycle.
-	NLMISC::CSynchronized<std::deque<IRunnable *>> m_UpdateTasks;
+	NLMISC::CSynchronized<std::deque<IRunnable *> > m_UpdateTasks;
 
 	// build command
 	bool m_BypassErrors;
@@ -181,7 +181,7 @@ public:
 		for (; ; )
 		{
 			{
-				NLMISC::CSynchronized<std::list<IRunnable *>>::CAccessor waitingCallbacks(&m_WaitingCallbacks);
+				NLMISC::CSynchronized<std::list<IRunnable *> >::CAccessor waitingCallbacks(&m_WaitingCallbacks);
 				if (waitingCallbacks.value().size() == 0)
 					break;
 			}
@@ -310,7 +310,7 @@ public:
 	// The IRunnable will be deleted
 	void addUpdateTask(IRunnable *runnable)
 	{
-		NLMISC::CSynchronized<std::deque<IRunnable *>>::CAccessor updateTasks(&m_UpdateTasks);
+		NLMISC::CSynchronized<std::deque<IRunnable *> >::CAccessor updateTasks(&m_UpdateTasks);
 		updateTasks.value().push_back(runnable);
 	}
 
@@ -322,7 +322,7 @@ public:
 	{
 		IRunnable *currentRunnable;
 		{
-			NLMISC::CSynchronized<std::deque<IRunnable *>>::CAccessor updateTasks(&m_UpdateTasks);
+			NLMISC::CSynchronized<std::deque<IRunnable *> >::CAccessor updateTasks(&m_UpdateTasks);
 			if (updateTasks.value().size() == 0)
 				return;
 			currentRunnable = updateTasks.value().front();
@@ -331,7 +331,7 @@ public:
 		{
 			currentRunnable->run();
 			{
-				NLMISC::CSynchronized<std::deque<IRunnable *>>::CAccessor updateTasks(&m_UpdateTasks);
+				NLMISC::CSynchronized<std::deque<IRunnable *> >::CAccessor updateTasks(&m_UpdateTasks);
 				updateTasks.value().pop_front();
 				if (updateTasks.value().size() == 0)
 					break;

code/nel/tools/pipeline/service/pipeline_service.cpp

@@ -578,17 +578,28 @@ public:
 		s_PipelineProcessImpl = new CPipelineProcessImpl(NULL); // Create a singleton impl for global usage without running project for test purposes.
 
 		// Load libraries
+		s_InfoFlags->addFlag("PLUGIN");
 		const CConfigFile::CVar &usedPlugins = ConfigFile.getVar("UsedPlugins");
 		s_LoadedLibraries.reserve(usedPlugins.size());
 		for (uint i = 0; i < usedPlugins.size(); ++i)
 		{
-			CLibrary *library = new CLibrary();
-			if (library->loadLibrary(usedPlugins.asString(i), true, true, true))
+			std::string pluginName = usedPlugins.asString(i);
+			if (pluginName.size() > 0)
 			{
-				s_LoadedLibraries.push_back(library);
+				CLibrary *library = new CLibrary();
+				if (library->loadLibrary(usedPlugins.asString(i), true, true, true))
+				{
+					nlinfo("Loaded plugin '%s'", pluginName.c_str());
+					s_LoadedLibraries.push_back(library);
+				}
+				else
+				{
+					nlwarning("Failed to load plugin '%s'", pluginName.c_str());
+					delete library;
+				}
 			}
-			else delete library;
 		}
+		s_InfoFlags->removeFlag("PLUGIN");
 
 		s_InfoFlags->removeFlag("INIT");
 	}