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

--HG--
branch : build_pipeline_v3
hg/feature/build_pipeline_v3
kaetemi 13 years ago
parent 70c7dd27cd
commit b159cd2502

@ -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/

@ -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/

@ -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/

@ -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!!!

@ -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
{

@ -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)
{
std::string pluginName = usedPlugins.asString(i);
if (pluginName.size() > 0)
{
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 delete library;
else
{
nlwarning("Failed to load plugin '%s'", pluginName.c_str());
delete library;
}
}
}
s_InfoFlags->removeFlag("PLUGIN");
s_InfoFlags->removeFlag("INIT");
}

Loading…
Cancel
Save