Commit 38da344d authored by Sebastian Eichelbaum's avatar Sebastian Eichelbaum
Browse files

[MERGE] - merged in current state of OW 1.2.5 release branch

parents a26401c6 84c8dc21
......@@ -58,33 +58,34 @@ void WModuleFactory::load()
WLogger::getLogger()->addLogMessage( "Loading Modules", "ModuleFactory", LL_INFO );
// operation must be exclusive
PrototypeSharedContainerType::WriteTicket m_prototypeAccess = m_prototypes.getWriteTicket();
PrototypeSharedContainerType::WriteTicket l = m_prototypes.getWriteTicket();
// Load the dynamic modules here:
m_moduleLoader.load( m_prototypeAccess );
// unlock as read lock is sufficient for the further steps
m_prototypeAccess.reset();
// for this a read lock is sufficient, gets unlocked if it looses scope
PrototypeSharedContainerType::ReadTicket l = m_prototypes.getReadTicket();
m_moduleLoader.load( l );
// initialize every module in the set
std::set< std::string > names; // helper to find duplicates
for( PrototypeContainerConstIteratorType listIter = l->get().begin(); listIter != l->get().end();
++listIter )
PrototypeContainerIteratorType listIter = l->get().begin();
while( listIter != l->get().end() )
{
WLogger::getLogger()->addLogMessage( "Initializing module prototype: \"" + ( *listIter )->getName() + "\"", "ModuleFactory", LL_DEBUG );
// that should not happen. Names should not occur multiple times since they are unique
if( names.count( ( *listIter )->getName() ) )
{
throw WPrototypeNotUnique( std::string( "Module \"" + ( *listIter )->getName()
+ "\" is not unique. Modules have to have a unique name." ) );
WLogger::getLogger()->addLogMessage( std::string( "Module \"" + ( *listIter )->getName() +
"\" is not unique. Modules have to have a unique name. Ignoring this module." ),
"ModuleFactory", LL_ERROR );
// we remove the module from the prototype list
l->get().erase( listIter++ );
continue;
}
else
{
names.insert( ( *listIter )->getName() );
initializeModule( ( *listIter ) );
++listIter;
}
names.insert( ( *listIter )->getName() );
initializeModule( ( *listIter ) );
}
}
......
......@@ -182,7 +182,7 @@ Builder_DEB()
BUILDER_DEB_UPSTREAM_SRC_TAR=$BUILDER_DEB_UPSTREAM_SRC_BASENAME.orig.tar.gz
# create some place to work in
CreateWorkingDir "deb" "$BUILDER_DEB_UPSTREAM_SRC_DIR" "src/modules/data/ext/nifti src/modules/data/ext/biosig"
CreateWorkingDir "deb" "$BUILDER_DEB_UPSTREAM_SRC_DIR" "src/modules/data/ext/nifti src/modules/data/ext/biosig resources/core/share/openwalnut/fonts"
if [ $? -ne 0 ]; then
echo " * Failed to create working diretory."
exit 1
......
version=3
http://static.openwalnut.org/download/releases.html OpenWalnut_(.+).tar.gz
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment