From 7eacbe67060c2166a4e2476800a87bbf55d20421 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Sat, 3 Mar 2012 10:21:09 +0100 Subject: [PATCH] Added: CMake projects for pipeline --HG-- branch : build_pipeline_v3 --- code/CMakeModules/nel.cmake | 1 + code/nel/tools/3d/build_interface/CMakeLists.txt | 2 ++ code/nel/tools/CMakeLists.txt | 4 ++++ code/nel/tools/pipeline/CMakeLists.txt | 4 ++++ .../tools/pipeline/plugin_library/CMakeLists.txt | 13 +++++++++++++ .../pipeline_interface.cpp | 0 .../pipeline_interface.h | 0 .../process_plugin.cpp | 0 .../process_plugin.h | 0 .../tool_logger.cpp | 0 .../tool_logger.h | 2 +- code/nel/tools/pipeline/plugin_max/CMakeLists.txt | 13 +++++++++++++ .../pipeline_plugin_max.cpp | 2 +- .../pipeline_plugin_max.h | 0 .../process_max_shape.cpp | 2 +- .../process_max_shape.h | 2 +- code/nel/tools/pipeline/service/CMakeLists.txt | 13 +++++++++++++ .../{pipeline_service => service}/callback.cpp | 0 .../{pipeline_service => service}/callback.h | 0 .../database_status.cpp | 0 .../{pipeline_service => service}/database_status.h | 0 .../pipeline_interface_impl.cpp | 0 .../pipeline_interface_impl.h | 2 +- .../pipeline_service.cpp | 0 .../pipeline_service.h | 5 ++++- .../pipeline_workspace.cpp | 0 .../pipeline_workspace.h | 0 27 files changed, 59 insertions(+), 6 deletions(-) create mode 100644 code/nel/tools/pipeline/CMakeLists.txt create mode 100644 code/nel/tools/pipeline/plugin_library/CMakeLists.txt rename code/nel/tools/pipeline/{pipeline_library => plugin_library}/pipeline_interface.cpp (100%) rename code/nel/tools/pipeline/{pipeline_library => plugin_library}/pipeline_interface.h (100%) rename code/nel/tools/pipeline/{pipeline_library => plugin_library}/process_plugin.cpp (100%) rename code/nel/tools/pipeline/{pipeline_library => plugin_library}/process_plugin.h (100%) rename code/nel/tools/pipeline/{pipeline_library => plugin_library}/tool_logger.cpp (100%) rename code/nel/tools/pipeline/{pipeline_library => plugin_library}/tool_logger.h (95%) create mode 100644 code/nel/tools/pipeline/plugin_max/CMakeLists.txt rename code/nel/tools/pipeline/{pipeline_plugin_max => plugin_max}/pipeline_plugin_max.cpp (93%) rename code/nel/tools/pipeline/{pipeline_plugin_max => plugin_max}/pipeline_plugin_max.h (100%) rename code/nel/tools/pipeline/{pipeline_plugin_max => plugin_max}/process_max_shape.cpp (93%) rename code/nel/tools/pipeline/{pipeline_plugin_max => plugin_max}/process_max_shape.h (93%) create mode 100644 code/nel/tools/pipeline/service/CMakeLists.txt rename code/nel/tools/pipeline/{pipeline_service => service}/callback.cpp (100%) rename code/nel/tools/pipeline/{pipeline_service => service}/callback.h (100%) rename code/nel/tools/pipeline/{pipeline_service => service}/database_status.cpp (100%) rename code/nel/tools/pipeline/{pipeline_service => service}/database_status.h (100%) rename code/nel/tools/pipeline/{pipeline_service => service}/pipeline_interface_impl.cpp (100%) rename code/nel/tools/pipeline/{pipeline_service => service}/pipeline_interface_impl.h (94%) rename code/nel/tools/pipeline/{pipeline_service => service}/pipeline_service.cpp (100%) rename code/nel/tools/pipeline/{pipeline_service => service}/pipeline_service.h (95%) rename code/nel/tools/pipeline/{pipeline_service => service}/pipeline_workspace.cpp (100%) rename code/nel/tools/pipeline/{pipeline_service => service}/pipeline_workspace.h (100%) diff --git a/code/CMakeModules/nel.cmake b/code/CMakeModules/nel.cmake index 7dd43e8b4..a360f19ae 100644 --- a/code/CMakeModules/nel.cmake +++ b/code/CMakeModules/nel.cmake @@ -248,6 +248,7 @@ MACRO(NL_SETUP_NEL_DEFAULT_OPTIONS) OPTION(WITH_NEL_MAXPLUGIN "Build NeL 3dsMax Plugin" OFF) OPTION(WITH_NEL_SAMPLES "Build NeL Samples" ON ) OPTION(WITH_NEL_TESTS "Build NeL Unit Tests" ON ) + OPTION(WITH_NEL_PIPELINE "Build NeL Pipeline" ON ) ENDMACRO(NL_SETUP_NEL_DEFAULT_OPTIONS) MACRO(NL_SETUP_NELNS_DEFAULT_OPTIONS) diff --git a/code/nel/tools/3d/build_interface/CMakeLists.txt b/code/nel/tools/3d/build_interface/CMakeLists.txt index 2b4d51550..9ed5345c6 100644 --- a/code/nel/tools/3d/build_interface/CMakeLists.txt +++ b/code/nel/tools/3d/build_interface/CMakeLists.txt @@ -1,5 +1,7 @@ FILE(GLOB SRC *.cpp *.h) +SOURCE_GROUP("" FILES ${SRC}) + ADD_EXECUTABLE(build_interface ${SRC}) TARGET_LINK_LIBRARIES(build_interface nelmisc) diff --git a/code/nel/tools/CMakeLists.txt b/code/nel/tools/CMakeLists.txt index 9aa869d60..0ca844daa 100644 --- a/code/nel/tools/CMakeLists.txt +++ b/code/nel/tools/CMakeLists.txt @@ -25,4 +25,8 @@ IF(WITH_NEL_TESTS) ADD_SUBDIRECTORY(nel_unit_test) ENDIF(WITH_NEL_TESTS) +IF(WITH_NEL_PIPELINE) + ADD_SUBDIRECTORY(pipeline) +ENDIF(WITH_NEL_PIPELINE) + #build_gamedata diff --git a/code/nel/tools/pipeline/CMakeLists.txt b/code/nel/tools/pipeline/CMakeLists.txt new file mode 100644 index 000000000..7ab8b206e --- /dev/null +++ b/code/nel/tools/pipeline/CMakeLists.txt @@ -0,0 +1,4 @@ +SUBDIRS( + plugin_library + plugin_max + service) diff --git a/code/nel/tools/pipeline/plugin_library/CMakeLists.txt b/code/nel/tools/pipeline/plugin_library/CMakeLists.txt new file mode 100644 index 000000000..6ff16f270 --- /dev/null +++ b/code/nel/tools/pipeline/plugin_library/CMakeLists.txt @@ -0,0 +1,13 @@ +FILE(GLOB SRC *.cpp *.h) + +SOURCE_GROUP("" FILES ${SRC}) + +ADD_LIBRARY(pipeline_plugin_library STATIC ${SRC}) + +TARGET_LINK_LIBRARIES(pipeline_plugin_library nelmisc) + +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) diff --git a/code/nel/tools/pipeline/pipeline_library/pipeline_interface.cpp b/code/nel/tools/pipeline/plugin_library/pipeline_interface.cpp similarity index 100% rename from code/nel/tools/pipeline/pipeline_library/pipeline_interface.cpp rename to code/nel/tools/pipeline/plugin_library/pipeline_interface.cpp diff --git a/code/nel/tools/pipeline/pipeline_library/pipeline_interface.h b/code/nel/tools/pipeline/plugin_library/pipeline_interface.h similarity index 100% rename from code/nel/tools/pipeline/pipeline_library/pipeline_interface.h rename to code/nel/tools/pipeline/plugin_library/pipeline_interface.h diff --git a/code/nel/tools/pipeline/pipeline_library/process_plugin.cpp b/code/nel/tools/pipeline/plugin_library/process_plugin.cpp similarity index 100% rename from code/nel/tools/pipeline/pipeline_library/process_plugin.cpp rename to code/nel/tools/pipeline/plugin_library/process_plugin.cpp diff --git a/code/nel/tools/pipeline/pipeline_library/process_plugin.h b/code/nel/tools/pipeline/plugin_library/process_plugin.h similarity index 100% rename from code/nel/tools/pipeline/pipeline_library/process_plugin.h rename to code/nel/tools/pipeline/plugin_library/process_plugin.h diff --git a/code/nel/tools/pipeline/pipeline_library/tool_logger.cpp b/code/nel/tools/pipeline/plugin_library/tool_logger.cpp similarity index 100% rename from code/nel/tools/pipeline/pipeline_library/tool_logger.cpp rename to code/nel/tools/pipeline/plugin_library/tool_logger.cpp diff --git a/code/nel/tools/pipeline/pipeline_library/tool_logger.h b/code/nel/tools/pipeline/plugin_library/tool_logger.h similarity index 95% rename from code/nel/tools/pipeline/pipeline_library/tool_logger.h rename to code/nel/tools/pipeline/plugin_library/tool_logger.h index 5886130da..287d4b196 100644 --- a/code/nel/tools/pipeline/pipeline_library/tool_logger.h +++ b/code/nel/tools/pipeline/plugin_library/tool_logger.h @@ -34,7 +34,7 @@ #include // NeL includes -#include +#include #include // Project includes diff --git a/code/nel/tools/pipeline/plugin_max/CMakeLists.txt b/code/nel/tools/pipeline/plugin_max/CMakeLists.txt new file mode 100644 index 000000000..c5d44521c --- /dev/null +++ b/code/nel/tools/pipeline/plugin_max/CMakeLists.txt @@ -0,0 +1,13 @@ +FILE(GLOB SRC *.cpp *.h) + +SOURCE_GROUP("" FILES ${SRC}) + +ADD_LIBRARY(pipeline_plugin_max MODULE ${SRC}) + +TARGET_LINK_LIBRARIES(pipeline_plugin_max pipeline_plugin_library nelmisc) + +NL_DEFAULT_PROPS(pipeline_plugin_max "Pipeline Plugin Max") +NL_ADD_LIB_SUFFIX(pipeline_plugin_max) +NL_ADD_RUNTIME_FLAGS(pipeline_plugin_max) + +INSTALL(TARGETS pipeline_plugin_max LIBRARY DESTINATION lib ARCHIVE DESTINATION lib RUNTIME DESTINATION bin COMPONENT pipeline) diff --git a/code/nel/tools/pipeline/pipeline_plugin_max/pipeline_plugin_max.cpp b/code/nel/tools/pipeline/plugin_max/pipeline_plugin_max.cpp similarity index 93% rename from code/nel/tools/pipeline/pipeline_plugin_max/pipeline_plugin_max.cpp rename to code/nel/tools/pipeline/plugin_max/pipeline_plugin_max.cpp index 0e1922c87..7b20a795a 100644 --- a/code/nel/tools/pipeline/pipeline_plugin_max/pipeline_plugin_max.cpp +++ b/code/nel/tools/pipeline/plugin_max/pipeline_plugin_max.cpp @@ -35,7 +35,7 @@ #include "nel/misc/debug.h" // Project includes -#include "../pipeline_library/pipeline_interface.h" +#include "../plugin_library/pipeline_interface.h" #include "process_max_shape.h" using namespace std; diff --git a/code/nel/tools/pipeline/pipeline_plugin_max/pipeline_plugin_max.h b/code/nel/tools/pipeline/plugin_max/pipeline_plugin_max.h similarity index 100% rename from code/nel/tools/pipeline/pipeline_plugin_max/pipeline_plugin_max.h rename to code/nel/tools/pipeline/plugin_max/pipeline_plugin_max.h diff --git a/code/nel/tools/pipeline/pipeline_plugin_max/process_max_shape.cpp b/code/nel/tools/pipeline/plugin_max/process_max_shape.cpp similarity index 93% rename from code/nel/tools/pipeline/pipeline_plugin_max/process_max_shape.cpp rename to code/nel/tools/pipeline/plugin_max/process_max_shape.cpp index 6e5ab3ef8..943a2199c 100644 --- a/code/nel/tools/pipeline/pipeline_plugin_max/process_max_shape.cpp +++ b/code/nel/tools/pipeline/plugin_max/process_max_shape.cpp @@ -36,7 +36,7 @@ #include // Project includes -#include "../pipeline_library/pipeline_interface.h" +#include "../plugin_library/pipeline_interface.h" using namespace std; // using namespace NLMISC; diff --git a/code/nel/tools/pipeline/pipeline_plugin_max/process_max_shape.h b/code/nel/tools/pipeline/plugin_max/process_max_shape.h similarity index 93% rename from code/nel/tools/pipeline/pipeline_plugin_max/process_max_shape.h rename to code/nel/tools/pipeline/plugin_max/process_max_shape.h index 62388b050..418070c0c 100644 --- a/code/nel/tools/pipeline/pipeline_plugin_max/process_max_shape.h +++ b/code/nel/tools/pipeline/plugin_max/process_max_shape.h @@ -34,7 +34,7 @@ // NeL includes // Project includes -#include "../pipeline_library/process_plugin.h" +#include "../plugin_library/process_plugin.h" namespace PIPELINE { diff --git a/code/nel/tools/pipeline/service/CMakeLists.txt b/code/nel/tools/pipeline/service/CMakeLists.txt new file mode 100644 index 000000000..7c33b708e --- /dev/null +++ b/code/nel/tools/pipeline/service/CMakeLists.txt @@ -0,0 +1,13 @@ +FILE(GLOB SRC *.cpp *.h) + +SOURCE_GROUP("" FILES ${SRC}) + +ADD_EXECUTABLE(pipeline_service WIN32 ${SRC}) + +INCLUDE_DIRECTORIES(${BOOST_ROOT}) +TARGET_LINK_LIBRARIES(pipeline_service pipeline_plugin_library nelmisc nelnet nelgeorges) + +NL_DEFAULT_PROPS(pipeline_service "Pipeline Service") +NL_ADD_RUNTIME_FLAGS(pipeline_service) + +INSTALL(TARGETS pipeline_service RUNTIME DESTINATION bin COMPONENT pipeline) diff --git a/code/nel/tools/pipeline/pipeline_service/callback.cpp b/code/nel/tools/pipeline/service/callback.cpp similarity index 100% rename from code/nel/tools/pipeline/pipeline_service/callback.cpp rename to code/nel/tools/pipeline/service/callback.cpp diff --git a/code/nel/tools/pipeline/pipeline_service/callback.h b/code/nel/tools/pipeline/service/callback.h similarity index 100% rename from code/nel/tools/pipeline/pipeline_service/callback.h rename to code/nel/tools/pipeline/service/callback.h diff --git a/code/nel/tools/pipeline/pipeline_service/database_status.cpp b/code/nel/tools/pipeline/service/database_status.cpp similarity index 100% rename from code/nel/tools/pipeline/pipeline_service/database_status.cpp rename to code/nel/tools/pipeline/service/database_status.cpp diff --git a/code/nel/tools/pipeline/pipeline_service/database_status.h b/code/nel/tools/pipeline/service/database_status.h similarity index 100% rename from code/nel/tools/pipeline/pipeline_service/database_status.h rename to code/nel/tools/pipeline/service/database_status.h diff --git a/code/nel/tools/pipeline/pipeline_service/pipeline_interface_impl.cpp b/code/nel/tools/pipeline/service/pipeline_interface_impl.cpp similarity index 100% rename from code/nel/tools/pipeline/pipeline_service/pipeline_interface_impl.cpp rename to code/nel/tools/pipeline/service/pipeline_interface_impl.cpp diff --git a/code/nel/tools/pipeline/pipeline_service/pipeline_interface_impl.h b/code/nel/tools/pipeline/service/pipeline_interface_impl.h similarity index 94% rename from code/nel/tools/pipeline/pipeline_service/pipeline_interface_impl.h rename to code/nel/tools/pipeline/service/pipeline_interface_impl.h index 080c5c31b..83f5976b6 100644 --- a/code/nel/tools/pipeline/pipeline_service/pipeline_interface_impl.h +++ b/code/nel/tools/pipeline/service/pipeline_interface_impl.h @@ -36,7 +36,7 @@ // NeL includes // Project includes -#include "../pipeline_library/pipeline_interface.h" +#include "../plugin_library/pipeline_interface.h" namespace PIPELINE { diff --git a/code/nel/tools/pipeline/pipeline_service/pipeline_service.cpp b/code/nel/tools/pipeline/service/pipeline_service.cpp similarity index 100% rename from code/nel/tools/pipeline/pipeline_service/pipeline_service.cpp rename to code/nel/tools/pipeline/service/pipeline_service.cpp diff --git a/code/nel/tools/pipeline/pipeline_service/pipeline_service.h b/code/nel/tools/pipeline/service/pipeline_service.h similarity index 95% rename from code/nel/tools/pipeline/pipeline_service/pipeline_service.h rename to code/nel/tools/pipeline/service/pipeline_service.h index 20b336dad..85dadc5f8 100644 --- a/code/nel/tools/pipeline/pipeline_service/pipeline_service.h +++ b/code/nel/tools/pipeline/service/pipeline_service.h @@ -41,7 +41,7 @@ namespace NLMISC { } namespace PIPELINE { - +/* #if defined(PIPELINE_MASTER) # if defined(PIPELINE_SLAVE) # error Cannot define both PIPELINE_MASTER and PIPELINE_SLAVE at the same time. @@ -50,6 +50,9 @@ namespace PIPELINE { #else # error Must define either PIPELINE_MASTER or PIPELINE_SLAVE. Create 2 projects that output pipeline_service_master and pipeline_service_slave executables. #endif +*/ + +#define PIPELINE_MASTER extern std::string g_DatabaseDirectory; extern std::string g_PipelineDirectory; diff --git a/code/nel/tools/pipeline/pipeline_service/pipeline_workspace.cpp b/code/nel/tools/pipeline/service/pipeline_workspace.cpp similarity index 100% rename from code/nel/tools/pipeline/pipeline_service/pipeline_workspace.cpp rename to code/nel/tools/pipeline/service/pipeline_workspace.cpp diff --git a/code/nel/tools/pipeline/pipeline_service/pipeline_workspace.h b/code/nel/tools/pipeline/service/pipeline_workspace.h similarity index 100% rename from code/nel/tools/pipeline/pipeline_service/pipeline_workspace.h rename to code/nel/tools/pipeline/service/pipeline_workspace.h