Changeset 2702 for code/branches/buildsystem3/src/orxonox

Timestamp:

Feb 27, 2009, 2:13:29 PM (15 years ago)

Author:

rgrieder

Message:

Completed work on installation:

• The CMake switch INSTALL_COPYABLE tells whether you will be able to move the installed directory or not. If TRUE then all folders, including log and config directory, will be put into the CMAKE_INSTALL_PREFIX. Furthermore, relative paths are used, which get resolved at run time.
• If INSTALL_COPYABLE is set to FALSE, the standard operating system directories will be used. That also means on Windows files get written to the Application Data/.orxonox folder instead of Program Files/Orxonox
• Default configuration is INSTALL_COPYABLE=TRUE for Windows and FALSE for Unix

• Split OrxonoxConfig.h.in in two to avoid complete recompiles when changing only a path or INSTALL_COPYABLE
• Added a global constant character: CP_SLASH which stands for cross platform slash, meaning '/' on Unix and '
  ' on Windows
• Core class now has methods getFooPath(), getFooPathString() and getFooPathPOSIXString() where Foo can be Media, Log or Config
• getFooPathPOSIXString() will always return a directory formatted with slashes, even on Windows
• getFooPath() returns a reference to the boost::filesystem::path
• boost/filesystem.hpp does not get included to Core.h because it has a very large rat tail
• The platform specific directory stuff gets done in Core::postMainInitialisation()
• Adjusted all classes using the media path

Location:

code/branches/buildsystem3/src/orxonox

Files:

• Main.cc (modified) (1 diff)
• gamestates/GSGraphics.cc (modified) (5 diffs)
• gamestates/GSLevel.cc (modified) (1 diff)
• gamestates/GSRoot.cc (modified) (1 diff)
• gui/GUIManager.cc (modified) (2 diffs)
• objects/Level.cc (modified) (2 diffs)

code/branches/buildsystem3/src/orxonox/Main.cc

@@ -92 +92 @@
     using namespace orxonox;
 
-    // First, determine whether we have an installed or a binary dir run
-    // The latter occurs when simply running from the build directory
-    Core::checkDevBuild();
-
-    // Make sure the directories we write in exist or else make them
-    Core::createDirectories();
+    Core::postMainInitialisation();
 
     // create a signal handler (only active for linux)
     SignalHandler signalHandler;
-    signalHandler.doCatch(argv[0], Core::getLogPath() + "orxonox_crash.log");
+    signalHandler.doCatch(argv[0], Core::getLogPathString() + "orxonox_crash.log");
 
     // Parse command line arguments

code/branches/buildsystem3/src/orxonox/gamestates/GSGraphics.cc

@@ -45 +45 @@
 #include <OgreWindowEventUtilities.h>
 
+#include "SpecialConfig.h"
 #include "util/Debug.h"
 #include "util/Exception.h"
@@ -135 +136 @@
         // load debug overlay
         COUT(3) << "Loading Debug Overlay..." << std::endl;
-        this->debugOverlay_ = new XMLFile(Core::getMediaPath() + "overlay/debug.oxo");
+        this->debugOverlay_ = new XMLFile((Core::getMediaPath() / "overlay" / "debug.oxo").file_string());
         Loader::open(debugOverlay_);
 
@@ -293 +294 @@
         }
 
-        boost::filesystem::path ogreConfigFilepath(Core::getConfigPath());
-        ogreConfigFilepath /= this->ogreConfigFile_;
-        boost::filesystem::path ogreLogFilepath(Core::getLogPath());
-        ogreLogFilepath /= this->ogreLogFile_;
+        boost::filesystem::path ogreConfigFilepath(Core::getConfigPath() / this->ogreConfigFile_);
+        boost::filesystem::path ogreLogFilepath(Core::getLogPath() / this->ogreLogFile_);
 
         // create a new logManager
@@ -357 +356 @@
         try
         {
-            cf.load(Core::getMediaPath() + resourceFile_);
+            cf.load((Core::getMediaPath() / resourceFile_).file_string());
         }
         catch (...)
@@ -383 +382 @@
 
                     Ogre::ResourceGroupManager::getSingleton().addResourceLocation(
-                        std::string(Core::getMediaPath() + archName), typeName, secName);
+                        (Core::getMediaPath() / archName).directory_string(), typeName, secName);
                 }
             }

code/branches/buildsystem3/src/orxonox/gamestates/GSLevel.cc

@@ -202 +202 @@
         std::string levelName;
         CommandLine::getValue("level", &levelName);
-        startFile_ = new XMLFile(Core::getMediaPath() + std::string("levels/") + levelName);
+        startFile_ = new XMLFile(Core::getMediaPathString() + "levels" + CP_SLASH + levelName);
         Loader::open(startFile_);
     }

code/branches/buildsystem3/src/orxonox/gamestates/GSRoot.cc

@@ -111 +111 @@
 
         // initialise TCL
-        this->tclBind_ = new TclBind(Core::getMediaPath());
+        this->tclBind_ = new TclBind(Core::getMediaPathPOSIXString());
         this->tclThreadManager_ = new TclThreadManager(tclBind_->getTclInterpreter());
 

code/branches/buildsystem3/src/orxonox/gui/GUIManager.cc

@@ -42 +42 @@
 #include <CEGUIDefaultLogger.h>
 #include <ogreceguirenderer/OgreCEGUIRenderer.h>
+#include "SpecialConfig.h" // Configures the macro below
 #ifdef CEGUILUA_USE_INTERNAL_LIBRARY
 #   include <ceguilua/CEGUILua.h>
@@ -151 +152 @@
 
                 // Create our own logger to specify the filepath
-                boost::filesystem::path ceguiLogFilepath(Core::getLogPath() + "cegui.log");
+                boost::filesystem::path ceguiLogFilepath(Core::getLogPath() / "cegui.log");
                 this->ceguiLogger_ = new DefaultLogger();
                 this->ceguiLogger_->setLogFilename(ceguiLogFilepath.file_string());

code/branches/buildsystem3/src/orxonox/objects/Level.cc

@@ -55 +55 @@
         this->xmlfilename_ = this->getFilename();
 
-        if (this->xmlfilename_.length() >= Core::getMediaPath().length())
-            this->xmlfilename_ = this->xmlfilename_.substr(Core::getMediaPath().length());
+        if (this->xmlfilename_.length() >= Core::getMediaPathString().length())
+            this->xmlfilename_ = this->xmlfilename_.substr(Core::getMediaPathString().length());
     }
 
@@ -97 +97 @@
         mask.include(Class(OverlayGroup)); // HACK to include the ChatOverlay
 
-        this->xmlfile_ = new XMLFile(Core::getMediaPath() + this->xmlfilename_, mask);
+        this->xmlfile_ = new XMLFile(Core::getMediaPathString() + this->xmlfilename_, mask);
 
         Loader::open(this->xmlfile_);