From 656db8319634035555ca388556876ecfc13ca1b5 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Fri, 3 Aug 2012 19:35:29 +0200 Subject: [PATCH] Added: #1440 Call the build plugin --HG-- branch : build_pipeline_v3 --- .../pipeline/plugin_nel/process_interface.cpp | 4 ++- .../service/module_pipeline_slave.cpp | 25 ++++++++++++++----- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/code/nel/tools/pipeline/plugin_nel/process_interface.cpp b/code/nel/tools/pipeline/plugin_nel/process_interface.cpp index f025b4ee2..e97b4ceec 100644 --- a/code/nel/tools/pipeline/plugin_nel/process_interface.cpp +++ b/code/nel/tools/pipeline/plugin_nel/process_interface.cpp @@ -31,7 +31,7 @@ // STL includes // NeL includes -// #include +#include // Project includes @@ -52,7 +52,9 @@ CProcessInterface::~CProcessInterface() void CProcessInterface::build() { + nldebug("Building process interface!"); + m_PipelineProcess->setExit(FINISH_ERROR, "Not yet implemented"); } } /* namespace PIPELINE */ diff --git a/code/nel/tools/pipeline/service/module_pipeline_slave.cpp b/code/nel/tools/pipeline/service/module_pipeline_slave.cpp index ddb44187b..141c86dd1 100644 --- a/code/nel/tools/pipeline/service/module_pipeline_slave.cpp +++ b/code/nel/tools/pipeline/service/module_pipeline_slave.cpp @@ -40,6 +40,7 @@ #include "module_pipeline_master_itf.h" #include "pipeline_service.h" #include "../plugin_library/process_info.h" +#include "../plugin_library/process_handler.h" #include "pipeline_workspace.h" #include "pipeline_process_impl.h" #include "database_status.h" @@ -516,12 +517,24 @@ public: CPluginBuildTask(CModulePipelineSlave *slave) : m_Slave(slave) { } virtual void run() { - // Figure out the build plugin - // ... - - // Build - // ... - // TODO ************/////////////////########################################################################### BUILD THING + // Call the build plugin + switch (m_Slave->m_ActiveProcess->m_ActivePlugin.HandlerType) + { + case PIPELINE::PLUGIN_REGISTERED_CLASS: + { + PIPELINE::IProcessHandler *processHandler = static_cast(NLMISC::CClassRegistry::create(m_Slave->m_ActiveProcess->m_ActivePlugin.Handler)); + processHandler->setPipelineProcess(m_Slave->m_ActiveProcess); + m_Slave->m_ActiveProcess->m_SubTaskResult = FINISH_NOT; + processHandler->build(); + } + break; + default: + nlwarning("Plugin type not implemented"); + break; + } + + // Write the results file + // ... ****************************** TODO // Done m_Slave->m_PluginBuildDone = true;