Added: #1440 Configuration for compiling and running pipeline service on Linux.

--HG--
branch : build_pipeline_v3

code/nel/src/misc/tool_logger.cpp

@@ -26,7 +26,7 @@
  */
 
 #include <nel/misc/types_nl.h>
-#include "tool_logger.h"
+#include "nel/misc/tool_logger.h"
 
 // STL includes
 

code/nel/tools/3d/build_interface/main.cpp

@@ -26,7 +26,7 @@
 #include <vector>
 #include <string>
 
-#include "../../pipeline/pipeline_library/tool_logger.h"
+#include "nel/misc/tool_logger.h"
 
 // ---------------------------------------------------------------------------
 

code/nel/tools/pipeline/plugin_library/CMakeLists.txt

@@ -2,12 +2,14 @@ FILE(GLOB SRC *.cpp *.h)
 
 SOURCE_GROUP("" FILES ${SRC})
 
-ADD_LIBRARY(pipeline_plugin_library STATIC ${SRC})
+NL_TARGET_LIB(pipeline_plugin_library ${SRC})
 
 TARGET_LINK_LIBRARIES(pipeline_plugin_library nelmisc)
-
+SET_TARGET_PROPERTIES(pipeline_plugin_library PROPERTIES LINK_INTERFACE_LIBRARIES "")
 NL_DEFAULT_PROPS(pipeline_plugin_library "Pipeline Plugin Library")
 NL_ADD_LIB_SUFFIX(pipeline_plugin_library)
 NL_ADD_RUNTIME_FLAGS(pipeline_plugin_library)
 
-INSTALL(TARGETS pipeline_plugin_library RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)
+IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
+  INSTALL(TARGETS pipeline_plugin_library LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)
+ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)

code/nel/tools/pipeline/plugin_library/pipeline_process.cpp

@@ -29,6 +29,7 @@
 #include "pipeline_process.h"
 
 // STL includes
+#include <vector>
 
 // NeL includes
 #include <nel/misc/app_context.h>

code/nel/tools/pipeline/plugin_library/pipeline_process.h

@@ -30,6 +30,8 @@
 #include <nel/misc/types_nl.h>
 
 // STL includes
+#include <vector>
+#include <string>
 
 // NeL includes
 

code/nel/tools/pipeline/plugin_max/pipeline_plugin_max.cpp

@@ -59,12 +59,14 @@ class CPipelinePluginMaxNelLibrary : public NLMISC::INelLibrary
 };
 NLMISC_DECL_PURE_LIB(CPipelinePluginMaxNelLibrary)
 
+#ifdef NL_OS_WINDOWS
 HINSTANCE CPipelinePluginMaxDllHandle = NULL;
 BOOL WINAPI DllMain(HANDLE hModule, DWORD /* ul_reason_for_call */, LPVOID /* lpReserved */)
 {
 	CPipelinePluginMaxDllHandle = (HINSTANCE)hModule;
 	return TRUE;
 }
+#endif
 
 // ******************************************************************
 /*

code/nel/tools/pipeline/plugin_nel/pipeline_plugin_nel.cpp

@@ -61,12 +61,14 @@ class CPipelinePluginNeLNelLibrary : public NLMISC::INelLibrary
 };
 NLMISC_DECL_PURE_LIB(CPipelinePluginNeLNelLibrary)
 
+#ifdef NL_OS_WINDOWS
 HINSTANCE CPipelinePluginNeLDllHandle = NULL;
 BOOL WINAPI DllMain(HANDLE hModule, DWORD /* ul_reason_for_call */, LPVOID /* lpReserved */)
 {
 	CPipelinePluginNeLDllHandle = (HINSTANCE)hModule;
 	return TRUE;
 }
+#endif
 
 // ******************************************************************
 

code/nel/tools/pipeline/service/CMakeLists.txt

@@ -2,10 +2,16 @@ FILE(GLOB SRC *.cpp *.h)
 
 SOURCE_GROUP("" FILES ${SRC})
 
+FIND_PACKAGE(Boost COMPONENTS thread REQUIRED)
 ADD_EXECUTABLE(pipeline_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${BOOST_ROOT})
+IF(UNIX)
-TARGET_LINK_LIBRARIES(pipeline_service pipeline_plugin_library nelmisc nelnet nelgeorges)
+  INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR})
+  TARGET_LINK_LIBRARIES(pipeline_service pipeline_plugin_library nelmisc nelnet nelgeorges ${Boost_LIBRARIES})
+ELSE(UNIX)
+  INCLUDE_DIRECTORIES(${BOOST_ROOT})
+  TARGET_LINK_LIBRARIES(pipeline_service pipeline_plugin_library nelmisc nelnet nelgeorges)
+ENDIF(UNIX)
 
 NL_DEFAULT_PROPS(pipeline_service "Pipeline Service")
 NL_ADD_RUNTIME_FLAGS(pipeline_service)

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

@@ -31,6 +31,7 @@
 
 // STL includes
 #include <boost/thread/mutex.hpp>
+#include <vector>
 
 // NeL includes
 

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

@@ -153,7 +153,7 @@ std::string getStatusFilePath(const std::string &path)
 
 } /* anonymous namespace */
 
-void CFileError::serial(NLMISC::IStream &stream)
+void CFileError::serial(NLMISC::IStream &stream) throw (NLMISC::EStream)
 {
 	uint version = stream.serialVersion(1);
 	stream.serial(Project);
@@ -161,7 +161,7 @@ void CFileError::serial(NLMISC::IStream &stream)
 	stream.serial(Message);
 }
 
-void CFileStatus::serial(NLMISC::IStream &stream)
+void CFileStatus::serial(NLMISC::IStream &stream) throw (NLMISC::EStream)
 {
 	uint version = stream.serialVersion(2);
 	stream.serial(FirstSeen);

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

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

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

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

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

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

code/nel/tools/pipeline/service/example_cfg/master/pipeline_service.cfg

@@ -1,4 +0,0 @@
-
-#include "../pipeline_service_default.cfg"
-#include "../user/pipeline_service_user.cfg"
-#include "../pipeline_service_master.cfg"

code/nel/tools/pipeline/service/example_cfg/master_gtk/pipeline_service.cfg

@@ -0,0 +1,9 @@
+
+#include "../pipeline_service_linux.cfg"
+#include "../pipeline_service_default.cfg"
+#include "../pipeline_service_common.cfg"
+#include "../user/pipeline_service_user.cfg"
+#include "../user/pipeline_service_user_linux.cfg"
+#include "../pipeline_service_master.cfg"
+WindowStyle = "GTK";
+

code/nel/tools/pipeline/service/example_cfg/master_linux/pipeline_service.cfg

@@ -0,0 +1,9 @@
+
+#include "../pipeline_service_linux.cfg"
+#include "../pipeline_service_default.cfg"
+#include "../pipeline_service_common.cfg"
+#include "../user/pipeline_service_user.cfg"
+#include "../user/pipeline_service_user_linux.cfg"
+#include "../pipeline_service_master.cfg"
+WindowStyle = "NONE";
+

code/nel/tools/pipeline/service/example_cfg/master_win/pipeline_service.cfg

@@ -0,0 +1,9 @@
+
+#include "../pipeline_service_win.cfg"
+#include "../pipeline_service_default.cfg"
+#include "../pipeline_service_common.cfg"
+#include "../user/pipeline_service_user.cfg"
+#include "../user/pipeline_service_user_win.cfg"
+#include "../pipeline_service_master.cfg"
+WindowStyle = "WIN";
+

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

@@ -0,0 +1,13 @@
+
+DontUseNS = 1;
+NSHost = "localhost";
+
+DisplayedVariables = 
+{ 
+	"Status|pipelineServiceState", "FileQueue|asyncFileQueueCount", 
+	"", "InfoFlags|infoFlags", 
+	"", "@Reload Sheets|reloadSheets", "@Busy Test|busyTestState" , "@Plug Slave|slave.plug gw", "@Unplug Slave|slave.unplug gw", 
+};
+
+DontUseAES = 1;
+

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

@@ -1,10 +1,10 @@
 
 // Intermediate working directory used by the pipeline.
-WorkspaceDirectory = "W:/workspace";
+WorkspaceDirectory = SharedWork + "/workspace";
 
 // Workspace location
-WorkspaceDfnDirectory = "L:/leveldesign/dfn";
+WorkspaceDfnDirectory = SharedLeveldesign + "/leveldesign/DFN";
-WorkspaceSheetDirectory = "L:/leveldesign/pipeline";
+WorkspaceSheetDirectory = SharedLeveldesign + "/leveldesign/pipeline";
 WorkspaceSheet = "ryzom_core.pipeline_workspace";
 
 // Lists all directories that can be accessed by the pipeline processes
@@ -29,13 +29,13 @@ GeorgesDirectories =
 	"LeveldesignGameElementDirectory", 
 };
 
-DatabaseDirectory = "W:/database";
+DatabaseDirectory = SharedWork + "/database";
-LeveldesignDfnDirectory = "L:/leveldesign/dfn";
+LeveldesignDfnDirectory = SharedLeveldesign + "/leveldesign/DFN";
-LeveldesignWorldDirectory = "L:/leveldesign/World";
+LeveldesignWorldDirectory = SharedLeveldesign + "/leveldesign/World";
-LeveldesignEcosystemsDirectory = "L:/leveldesign/Ecosystems";
+LeveldesignEcosystemsDirectory = SharedLeveldesign + "/leveldesign/Ecosystems";
-LeveldesignGameElemDirectory = "L:/leveldesign/Game_elem";
+LeveldesignGameElemDirectory = SharedLeveldesign + "/leveldesign/Game_elem";
-LeveldesignGameElementDirectory = "L:/leveldesign/game_element";
+LeveldesignGameElementDirectory = SharedLeveldesign + "/leveldesign/game_element";
-PrimitivesDirectory = "L:/primitives";
+PrimitivesDirectory = SharedLeveldesign + "/primitives";
 
 // ToolDirectories = { "R:/build/dev/bin/Release", "D:/libraries/external/bin" };
 // ToolSuffix = ".exe";
@@ -48,20 +48,8 @@ PrimitivesDirectory = "L:/primitives";
 MasterAddress = "192.168.150.1";
 MasterPort = 50123;
 
-UsedPlugins = { "pipeline_plugin_max", "pipeline_plugin_nel" };
+UsedPlugins += { "pipeline_plugin_nel" };
 
 // MaxPath = "C:/Program Files (x86)/Autodesk/3ds Max 2010";
 // MaxExecutable = "3dsmax.exe";
 
-DontUseNS = 1;
-NSHost = "localhost";
-
-WindowStyle = "WIN";
-DisplayedVariables = 
-{ 
-	"Status|pipelineServiceState", "FileQueue|asyncFileQueueCount", 
-	"", "InfoFlags|infoFlags", 
-	"", "@Reload Sheets|reloadSheets", "@Busy Test|busyTestState" , "@Plug Slave|slave.plug gw", "@Unplug Slave|slave.unplug gw", 
-};
-
-DontUseAES = 1;

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

@@ -0,0 +1,6 @@
+
+SharedWork = "/srv/work"; // W: on Win
+SharedLeveldesign = "/srv/leveldesign"; // L: on Win
+
+UsedPlugins = { };
+

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

@@ -0,0 +1,6 @@
+
+SharedWork = "W:";
+SharedLeveldesign = "L:";
+
+UsedPlugins = { "pipeline_plugin_max" };
+

code/nel/tools/pipeline/service/example_cfg/slave/pipeline_service.cfg

@@ -1,4 +0,0 @@
-
-#include "../pipeline_service_default.cfg"
-#include "../user/pipeline_service_user.cfg"
-#include "../pipeline_service_slave.cfg"

code/nel/tools/pipeline/service/example_cfg/slave_linux/pipeline_service.cfg

@@ -0,0 +1,9 @@
+
+#include "../pipeline_service_linux.cfg"
+#include "../pipeline_service_default.cfg"
+#include "../pipeline_service_common.cfg"
+#include "../user/pipeline_service_user.cfg"
+#include "../user/pipeline_service_user_linux.cfg"
+#include "../pipeline_service_slave.cfg"
+WindowStyle = "NONE";
+

code/nel/tools/pipeline/service/example_cfg/slave_win/pipeline_service.cfg

@@ -0,0 +1,9 @@
+
+#include "../pipeline_service_win.cfg"
+#include "../pipeline_service_default.cfg"
+#include "../pipeline_service_common.cfg"
+#include "../user/pipeline_service_user.cfg"
+#include "../user/pipeline_service_user_win.cfg"
+#include "../pipeline_service_slave.cfg"
+WindowStyle = "WIN";
+

code/nel/tools/pipeline/service/example_cfg/user/pipeline_service_user.cfg

@@ -1,2 +1,3 @@
 
-RootConfigFilename = "../pipeline_service_default.cfg";
+// Place your custom shared override configuration values here
+

code/nel/tools/pipeline/service/example_cfg/user/pipeline_service_user_linux.cfg

@@ -0,0 +1,3 @@
+
+// Place your custom shared override configuration values here
+

code/nel/tools/pipeline/service/example_cfg/user/pipeline_service_user_win.cfg

@@ -0,0 +1,3 @@
+
+// Place your custom shared override configuration values here
+