Changeset 5666 for code/branches/libraries/src

Timestamp:

Aug 21, 2009, 2:17:09 PM (15 years ago)

Author:

landauf

Message:

renamed plugins as modules

Location:

code/branches/libraries/src

Files:

• SpecialConfig.h.in (modified) (3 diffs)
• core/Core.cc (modified) (9 diffs)
• core/DynLib.cc (modified) (2 diffs)
• orxonox/gamestates/CMakeLists.txt (modified) (1 diff)
• orxonox/objects/quest/CMakeLists.txt (modified) (1 diff)
• orxonox/overlays/CMakeLists.txt (modified) (1 diff)

code/branches/libraries/src/SpecialConfig.h.in

@@ -74 +74 @@
     // INSTALLATION PATHS
     const char ORXONOX_RUNTIME_INSTALL_PATH[] = "@ORXONOX_RUNTIME_INSTALL_PATH@";
-    const char ORXONOX_PLUGIN_INSTALL_PATH[]  = "@ORXONOX_PLUGIN_INSTALL_PATH@";
+    const char ORXONOX_MODULE_INSTALL_PATH[]  = "@ORXONOX_MODULE_INSTALL_PATH@";
     const char ORXONOX_MEDIA_INSTALL_PATH[]   = "@ORXONOX_MEDIA_INSTALL_PATH@";
     /* Config and Log path might be relative because they could be user and therefore runtime dependent */
@@ -83 +83 @@
     const char ORXONOX_MEDIA_DEV_PATH[]       = "@CMAKE_MEDIA_OUTPUT_DIRECTORY@";
 #ifdef CMAKE_CONFIGURATION_TYPES
-    const char ORXONOX_PLUGIN_DEV_PATH[]      = "@CMAKE_PLUGIN_OUTPUT_DIRECTORY@/" BOOST_PP_STRINGIZE(CMAKE_BUILD_TYPE);
+    const char ORXONOX_MODULE_DEV_PATH[]      = "@CMAKE_MODULE_OUTPUT_DIRECTORY@/" BOOST_PP_STRINGIZE(CMAKE_BUILD_TYPE);
     const char ORXONOX_CONFIG_DEV_PATH[]      = "@CMAKE_CONFIG_OUTPUT_DIRECTORY@/" BOOST_PP_STRINGIZE(CMAKE_BUILD_TYPE);
     const char ORXONOX_LOG_DEV_PATH[]         = "@CMAKE_LOG_OUTPUT_DIRECTORY@/"    BOOST_PP_STRINGIZE(CMAKE_BUILD_TYPE);
 #else
-    const char ORXONOX_PLUGIN_DEV_PATH[]      = "@CMAKE_PLUGIN_OUTPUT_DIRECTORY@";
+    const char ORXONOX_MODULE_DEV_PATH[]      = "@CMAKE_MODULE_OUTPUT_DIRECTORY@";
     const char ORXONOX_CONFIG_DEV_PATH[]      = "@CMAKE_CONFIG_OUTPUT_DIRECTORY@";
     const char ORXONOX_LOG_DEV_PATH[]         = "@CMAKE_LOG_OUTPUT_DIRECTORY@";
@@ -94 +94 @@
     const char ORXONOX_DEP_LIB_PATH[]         = "@DEP_LIBRARY_DIR@";
 #endif
+
+    // Module extension
+    const char ORXONOX_MODULE_EXTENSION[]     = "@ORXONOX_MODULE_EXTENSION@";
 
     // OGRE PLUGINS

code/branches/libraries/src/core/Core.cc

@@ -250 +250 @@
         boost::filesystem::path rootPath_;
         boost::filesystem::path executablePath_;        //!< Path to the executable
-        boost::filesystem::path pluginPath_;            //!< Path to the plugins
+        boost::filesystem::path modulePath_;            //!< Path to the modules
         boost::filesystem::path mediaPath_;             //!< Path to the media file folder
         boost::filesystem::path configPath_;            //!< Path to the config file folder
@@ -272 +272 @@
         this->dynLibManager_.reset(new DynLibManager());
 
-        // Load plugins
+        // Load modules
         try
         {
             // We search for helper files with the following extension
-            std::string pluginextension = ".plugin";
-            size_t pluginextensionlength = pluginextension.size();
+            std::string moduleextension = ORXONOX_MODULE_EXTENSION;
+            size_t moduleextensionlength = moduleextension.size();
 
             // Search in the directory of our executable
-            boost::filesystem::path searchpath = this->configuration_->pluginPath_;
-
-            // Add that path to the PATH variable in case a plugin depends on another one
+            boost::filesystem::path searchpath = this->configuration_->modulePath_;
+
+            // Add that path to the PATH variable in case a module depends on another one
             std::string pathVariable = getenv("PATH");
-            putenv(const_cast<char*>(("PATH=" + pathVariable + ";" + configuration_->pluginPath_.string()).c_str()));
+            putenv(const_cast<char*>(("PATH=" + pathVariable + ";" + configuration_->modulePath_.string()).c_str()));
 
             boost::filesystem::directory_iterator file(searchpath);
@@ -295 +295 @@
 
                 // Check if the file ends with the exension in question
-                if (filename.size() > pluginextensionlength)
+                if (filename.size() > moduleextensionlength)
                 {
-                    if (filename.substr(filename.size() - pluginextensionlength) == pluginextension)
+                    if (filename.substr(filename.size() - moduleextensionlength) == moduleextension)
                     {
                         // We've found a helper file - now load the library with the same name
-                        std::string library = filename.substr(0, filename.size() - pluginextensionlength);
+                        std::string library = filename.substr(0, filename.size() - moduleextensionlength);
                         boost::filesystem::path librarypath = searchpath / library;
 
@@ -309 +309 @@
                         catch (const std::exception& e)
                         {
-                            COUT(1) << "Couldn't load plugin \"" << librarypath.string() << "\": " << e.what() << std::endl;
+                            COUT(1) << "Couldn't load module \"" << librarypath.string() << "\": " << e.what() << std::endl;
                         }
                         catch (...)
                         {
-                            COUT(1) << "Couldn't load plugin \"" << librarypath.string() << "\"" << std::endl;
+                            COUT(1) << "Couldn't load module \"" << librarypath.string() << "\"" << std::endl;
                         }
                     }
@@ -323 +323 @@
         catch (const std::exception& e)
         {
-            COUT(1) << "An error occurred while loading plugins: " << e.what() << std::endl;
+            COUT(1) << "An error occurred while loading modules: " << e.what() << std::endl;
         }
         catch (...)
         {
-            COUT(1) << "An error occurred while loading plugins." << std::endl;
-        }
-
-        // Parse command line arguments AFTER the plugins have been loaded (static code!)
+            COUT(1) << "An error occurred while loading modules." << std::endl;
+        }
+
+        // Parse command line arguments AFTER the modules have been loaded (static code!)
         CommandLine::parseCommandLine(cmdLine);
 
@@ -574 +574 @@
     /**
     @brief
-        Retrievs the executable path and sets all hard coded fixed path (currently only plugin path)
+        Retrievs the executable path and sets all hard coded fixed path (currently only the module path)
         Also checks for "orxonox_dev_build.keep_me" in the executable diretory.
         If found it means that this is not an installed run, hence we
@@ -631 +631 @@
 
         /////////////////////
-        // SET PLUGIN PATH //
+        // SET MODULE PATH //
         /////////////////////
 
@@ -638 +638 @@
             COUT(1) << "Running from the build tree." << std::endl;
             Core::bDevRun_ = true;
-            configuration_->pluginPath_ = ORXONOX_PLUGIN_DEV_PATH;
+            configuration_->modulePath_ = ORXONOX_MODULE_DEV_PATH;
         }
         else
@@ -654 +654 @@
                 ThrowException(General, "Could not derive a root directory. Might the binary installation directory contain '..' when taken relative to the installation prefix path?");
 
-            // Plugin path is fixed as well
-            configuration_->pluginPath_ = configuration_->rootPath_ / ORXONOX_PLUGIN_INSTALL_PATH;
+            // Module path is fixed as well
+            configuration_->modulePath_ = configuration_->rootPath_ / ORXONOX_MODULE_INSTALL_PATH;
 
 #else
 
             // There is no root path, so don't set it at all
-            // Plugin path is fixed as well
-            configuration_->pluginPath_ = ORXONOX_PLUGIN_INSTALL_PATH;
+            // Module path is fixed as well
+            configuration_->modulePath_ = ORXONOX_MODULE_INSTALL_PATH;
 
 #endif

code/branches/libraries/src/core/DynLib.cc

@@ -64 +64 @@
     {
         // Log library load
-        COUT(2) << "Loading plugin " << mName << std::endl;
+        COUT(2) << "Loading module " << mName << std::endl;
 
                 std::string name = mName;
@@ -86 +86 @@
     {
         // Log library unload
-        COUT(4) << "Unloading plugin " << mName << std::endl;
+        COUT(4) << "Unloading module " << mName << std::endl;
 
         if( DYNLIB_UNLOAD( m_hInst ) )

code/branches/libraries/src/orxonox/gamestates/CMakeLists.txt

@@ -12 +12 @@
 
 ORXONOX_ADD_LIBRARY(gamestates
-  PLUGIN
+  MODULE
   DEFINE_SYMBOL
     "GAMESTATES_SHARED_BUILD"

code/branches/libraries/src/orxonox/objects/quest/CMakeLists.txt

@@ -21 +21 @@
 ADD_SUBDIRECTORY(notifications)
 
-# add the parent directory for tolua (TODO: remove this if the quest plugin is moved somewhere else)
+# add the parent directory for tolua (TODO: remove this if the quest module is moved somewhere else)
 INCLUDE_DIRECTORIES(..)
 
 ORXONOX_ADD_LIBRARY(quest
-  PLUGIN
+  MODULE
   TOLUA_FILES
     QuestDescription.h

code/branches/libraries/src/orxonox/overlays/CMakeLists.txt

@@ -15 +15 @@
 
 ORXONOX_ADD_LIBRARY(overlays
-  PLUGIN
+  MODULE
   FIND_HEADER_FILES
   DEFINE_SYMBOL