Changeset 2685 for code/branches/buildsystem3/src

Timestamp:

Feb 20, 2009, 5:32:04 PM (16 years ago)

Author:

rgrieder

Message:

Fixed install target:

• log and config file go a to separate folder each
• The SignalHandler crash log is now "orxonox_crash.log" to avoid opening the file twice which might result in problems
• moved tcl scripts to media/tcl8.#/ as a temporary solution. I've also created a ticket to fix this.
• UPDATE YOUR MEDIA REPOSITORY
• orxonox.log pre-main gets written to either %TEMP% (windows) or /tmp (Unix) and when the path was set, the content is copied.
• removed Settings class and moved media path to Core
• media, log and config path are now all in Core where only the media path can be configured via ini file or command line
• Core::isDevBuild() tells whether we are running in the build or the installation directory (determined by the presence of "orxonox_dev_build.kepp_me" in the binary dir)
• renamed Settings::getDataPath to Core::getMediaPath

Location:

code/branches/buildsystem3/src

Files:

• CMakeLists.txt (modified) (1 diff)
• OrxonoxConfig.h.in (modified) (3 diffs)
• core/CMakeLists.txt (modified) (1 diff)
• core/CommandLine.cc (modified) (2 diffs)
• core/ConfigFileManager.cc (modified) (3 diffs)
• core/Core.cc (modified) (7 diffs)
• core/Core.h (modified) (6 diffs)
• core/Language.cc (modified) (4 diffs)
• core/LuaBind.cc (modified) (3 diffs)
• core/input/KeyBinder.cc (modified) (3 diffs)
• orxonox/CMakeLists.txt (modified) (2 diffs)
• orxonox/Main.cc (modified) (5 diffs)
• orxonox/Settings.cc (deleted)
• orxonox/Settings.h (deleted)
• orxonox/gamestates/GSGraphics.cc (modified) (8 diffs)
• orxonox/gamestates/GSLevel.cc (modified) (2 diffs)
• orxonox/gamestates/GSRoot.cc (modified) (4 diffs)
• orxonox/gamestates/GSRoot.h (modified) (1 diff)
• orxonox/gui/GUIManager.cc (modified) (2 diffs)
• orxonox/gui/GUIManager.h (modified) (2 diffs)
• orxonox/objects/Level.cc (modified) (3 diffs)
• orxonox/objects/gametypes/Gametype.cc (modified) (1 diff)
• util/OutputBuffer.cc (modified) (3 diffs)
• util/OutputHandler.cc (modified) (5 diffs)
• util/OutputHandler.h (modified) (2 diffs)
• util/SignalHandler.cc (modified) (1 diff)

code/branches/buildsystem3/src/CMakeLists.txt

@@ -65 +65 @@
 INCLUDE(CheckIncludeFileCXX)
 CHECK_INCLUDE_FILE_CXX(iso646.h HAVE_ISO646_H)
+
+# XCode and Visual Studio support multiple configurations. In order to tell the
+# which one we have to define the macros separately for each configuration
+ADD_COMPILER_FLAGS("-DCMAKE_BUILD_TYPE=Debug"          Debug)
+ADD_COMPILER_FLAGS("-DCMAKE_BIULD_TYPE=Release"        Release)
+ADD_COMPILER_FLAGS("-DCMAKE_BUILD_TYPE=RelWithDebInfo" RelWithDebInfo)
+ADD_COMPILER_FLAGS("-DCMAKE_BUILD_TYPE=MinSizeRel"     MinSizeRel)
 
 SET(GENERATED_FILE_COMMENT

code/branches/buildsystem3/src/OrxonoxConfig.h.in

@@ -164 +164 @@
 
 #cmakedefine HAVE_STDDEF_H
+/* Quite large, do not include unless necessary
 #ifdef HAVE_STDDEF_H
 #  include <stddef.h>
 #endif
+*/
 
 /* Visual Leak Detector looks for memory leaks */
@@ -185 +187 @@
 #cmakedefine USE_DEPENDENCY_PACKAGE
 
+/* Using MSVC or XCode IDE */
+#cmakedefine CMAKE_CONFIGURATION_TYPES
+
+/* Macros used in the next section */
+#define MACRO_CONCATENATE(str1, str2) str1##str2
+#define MACRO_QUOTEME_AUX(x) #x
+#define MACRO_QUOTEME(x) MACRO_QUOTEME_AUX(x)
+
 /* Handle default ConfigValues */
 namespace orxonox
 {
-#ifdef ORXONOX_PLATFORM_WINDOWS
-    const char* const ORXONOX_MEDIA_PATH("../media");
-#elif defined(ORXONOX_PLATFORM_LINUX)
-    const char* const ORXONOX_MEDIA_PATH("../../share/orxonox");
-#else
-    /* TODO: Apple? */
-    const char* const ORXONOX_MEDIA_PATH("../../share/orxonox");
+    const char* const ORXONOX_MEDIA_INSTALL_PATH ("@ORXONOX_MEDIA_INSTALL_PATH@/");
+    const char* const ORXONOX_CONFIG_INSTALL_PATH("@ORXONOX_CONFIG_INSTALL_PATH@/");
+    const char* const ORXONOX_LOG_INSTALL_PATH   ("@ORXONOX_LOG_INSTALL_PATH@/");
+
+    const char* const ORXONOX_MEDIA_DEV_PATH     ("@ORXONOX_MEDIA_DEV_PATH@/");
+#ifdef CMAKE_CONFIGURATION_TYPES
+    const char* const ORXONOX_CONFIG_DEV_PATH    ("@ORXONOX_CONFIG_DEV_PATH@/" MACRO_QUOTEME(CMAKE_BUILD_TYPE) "/");
+    const char* const ORXONOX_LOG_DEV_PATH       ("@ORXONOX_LOG_DEV_PATH@/"    MACRO_QUOTEME(CMAKE_BUILD_TYPE) "/");
+#else
+    const char* const ORXONOX_CONFIG_DEV_PATH    ("@ORXONOX_CONFIG_DEV_PATH@/");
+    const char* const ORXONOX_LOG_DEV_PATH       ("@ORXONOX_LOG_DEV_PATH@/");
 #endif
     
+    /* OGRE Plugins */
 #ifdef NDEBUG
     const char* const ORXONOX_OGRE_PLUGINS("@OGRE_PLUGINS_RELEASE@");
@@ -214 +229 @@
 }
 
-
 #endif /* _OrxonoxConfig_H__ */

code/branches/buildsystem3/src/core/CMakeLists.txt

@@ -70 +70 @@
 IF(GCC_NO_SYSTEM_HEADER_SUPPORT)
   # Get around displaying a few hundred lines of warning code
-  SET_SOURCE_FILES_PROPERTIES(ArgumentCompletionFunctions.cc PROPERTIES COMPILE_FLAGS "-w")
+  SET_SOURCE_FILES_PROPERTIES(
+    ArgumentCompletionFunctions.cc
+    CommandLine.cc
+    ConfigFileManager.cc
+    Language.cc
+    LuaBind.cc
+    input/KeyBinder.cc
+    PROPERTIES COMPILE_FLAGS "-Wno-sign-compare")
 ENDIF()
 

code/branches/buildsystem3/src/core/CommandLine.cc

@@ -29 +29 @@
 #include "CommandLine.h"
 
+#include <boost/filesystem.hpp>
 #include "util/String.h"
 #include "util/SubString.h"
+#include "Core.h"
 
 namespace orxonox
@@ -299 +301 @@
         this->_parse(args);
 
+        std::string filename = CommandLine::getValue("optionsFile").getString();
+        boost::filesystem::path folder(Core::getConfigPath());
+        boost::filesystem::path filepath(folder/filename);
+
         // look for additional arguments in given file or start.ini as default
         // They will not overwrite the arguments given directly
         std::ifstream file;
-        std::string filename = CommandLine::getValue("optionsFile").getString();
-        file.open(filename.c_str());
+        file.open(filepath.native_file_string().c_str());
         args.clear();
         if (file)

code/branches/buildsystem3/src/core/ConfigFileManager.cc

@@ -30 +30 @@
 
 #include <cassert>
+#include <boost/filesystem.hpp>
+
 #include "util/Convert.h"
 #include "util/String.h"
 #include "ConsoleCommand.h"
 #include "ConfigValueContainer.h"
+#include "Core.h"
 
 namespace orxonox
@@ -223 +226 @@
         this->clear();
 
+        boost::filesystem::path filepath(Core::getConfigPath() + "/" + this->filename_);
+
         // This creates the config file if it's not existing
         std::ofstream createFile;
-        createFile.open(this->filename_.c_str(), std::fstream::app);
+        createFile.open(filepath.native_file_string().c_str(), std::fstream::app);
         createFile.close();
 
         // Open the file
         std::ifstream file;
-        file.open(this->filename_.c_str(), std::fstream::in);
+        file.open(filepath.native_file_string().c_str(), std::fstream::in);
 
         if (!file.is_open())
@@ -337 +342 @@
     void ConfigFile::save() const
     {
+        boost::filesystem::path filepath(Core::getConfigPath() + "/" + this->filename_);
+
         std::ofstream file;
-        file.open(this->filename_.c_str(), std::fstream::out);
+        file.open(filepath.native_file_string().c_str(), std::fstream::out);
         file.setf(std::ios::fixed, std::ios::floatfield);
         file.precision(6);

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

@@ -37 +37 @@
 #include "CoreIncludes.h"
 #include "ConfigValueIncludes.h"
+#include "LuaBind.h"
+#include "CommandLine.h"
 
 namespace orxonox
@@ -46 +48 @@
     bool Core::bIsMaster_s      = false;
 
+    bool Core::isDevBuild_s     = false;
+    std::string Core::configPath_s(ORXONOX_CONFIG_INSTALL_PATH); // from OrxonoxConfig.h
+    std::string Core::logPath_s   (ORXONOX_LOG_INSTALL_PATH);    // from OrxonoxConfig.h
+
     Core* Core::singletonRef_s = 0;
+
+    SetCommandLineArgument(mediaPath, "").information("PATH");
 
     /**
@@ -58 +66 @@
         assert(Core::singletonRef_s == 0);
         Core::singletonRef_s = this;
+
         this->bInitializeRandomNumberGenerator_ = false;
-
         this->setConfigValues();
+
+        // Set the correct log path. Before this call, /tmp (Unix) or %TEMP% was used
+        OutputHandler::getOutStream().setLogPath(Core::logPath_s);
+
+        // Possible media path override by the command line
+        if (!CommandLine::getArgument("mediaPath")->hasDefaultValue())
+        {
+            std::string mediaPath = CommandLine::getValue("mediaPath");
+            Core::tsetMediaPath(mediaPath);
+        }
     }
 
@@ -77 +95 @@
     void Core::setConfigValues()
     {
-        SetConfigValue(softDebugLevelConsole_, 3).description("The maximal level of debug output shown in the console").callback(this, &Core::debugLevelChanged);
-        SetConfigValue(softDebugLevelLogfile_, 3).description("The maximal level of debug output shown in the logfile").callback(this, &Core::debugLevelChanged);
-        SetConfigValue(softDebugLevelShell_, 1).description("The maximal level of debug output shown in the ingame shell").callback(this, &Core::debugLevelChanged);
+#ifdef NDEBUG
+        const unsigned int defaultLevelConsole = 1;
+        const unsigned int defaultLevelLogfile = 3;
+        const unsigned int defaultLevelShell   = 1;
+#else
+        const unsigned int defaultLevelConsole = 3;
+        const unsigned int defaultLevelLogfile = 4;
+        const unsigned int defaultLevelShell   = 3;
+#endif
+        SetConfigValue(softDebugLevelConsole_, defaultLevelConsole)
+            .description("The maximal level of debug output shown in the console").callback(this, &Core::debugLevelChanged);
+        SetConfigValue(softDebugLevelLogfile_, defaultLevelLogfile)
+            .description("The maximal level of debug output shown in the logfile").callback(this, &Core::debugLevelChanged);
+        SetConfigValue(softDebugLevelShell_, defaultLevelShell)
+            .description("The maximal level of debug output shown in the ingame shell").callback(this, &Core::debugLevelChanged);
+
         SetConfigValue(language_, Language::getLanguage().defaultLanguage_).description("The language of the ingame text").callback(this, &Core::languageChanged);
         SetConfigValue(bInitializeRandomNumberGenerator_, true).description("If true, all random actions are different each time you start the game").callback(this, &Core::initializeRandomNumberGenerator);
+
+        // Media path (towards config and log path) is ini-configurable
+        const char* defaultMediaPath = ORXONOX_MEDIA_INSTALL_PATH;
+        if (Core::isDevBuild())
+            defaultMediaPath = ORXONOX_MEDIA_DEV_PATH;
+
+        SetConfigValue(mediaPath_, defaultMediaPath)
+            .description("Relative path to the game data.").callback(this, &Core::mediaPathChanged);
+
     }
 
@@ -109 +149 @@
         // Read the translation file after the language was configured
         Language::getLanguage().readTranslatedLanguageFile();
+    }
+
+    /**
+    @brief
+        Callback function if the media path has changed.
+    */
+    void Core::mediaPathChanged()
+    {
+        if (mediaPath_ != "" && mediaPath_[mediaPath_.size() - 1] != '/')
+        {
+            ModifyConfigValue(mediaPath_, set, mediaPath_ + "/");
+        }
+
+        if (mediaPath_ == "")
+        {
+            ModifyConfigValue(mediaPath_, set, "/");
+            COUT(2) << "Warning: Data path set to \"/\", is that really correct?" << std::endl;
+        }
     }
 
@@ -177 +235 @@
     }
 
+    /**
+    @brief
+        Temporary sets the media path
+    @param path
+        The new media path
+    */
+    void Core::_tsetMediaPath(const std::string& path)
+    {
+        if (*path.end() != '/' && *path.end() != '\\')
+        {
+            ModifyConfigValue(mediaPath_, tset, path + "/");
+        }
+        else
+        {
+            ModifyConfigValue(mediaPath_, tset, path);
+        }
+    }
+
     void Core::initializeRandomNumberGenerator()
     {
@@ -187 +263 @@
         }
     }
+
+    /*static*/ void Core::setDevBuild()
+    {
+        // Be careful never to call this function before main()!
+
+        Core::isDevBuild_s = true;
+        // Constants taken from OrxonoxConfig.h
+        Core::configPath_s = ORXONOX_CONFIG_DEV_PATH;
+        Core::logPath_s    = ORXONOX_LOG_DEV_PATH;
+    }
 }

code/branches/buildsystem3/src/core/Core.h

@@ -44 +44 @@
 #include "util/OutputHandler.h"
 
+// Only allow main to access setDevBuild, so we need a forward declaration
+int main(int, char**);
+
 namespace orxonox
 {
@@ -49 +52 @@
     class _CoreExport Core : public OrxonoxClass
     {
+        friend int ::main(int, char**); // sets isDevBuild_s
+
         public:
             Core();
             ~Core();
             void setConfigValues();
-            void debugLevelChanged();
-            void languageChanged();
 
             static Core& getInstance() { assert(Core::singletonRef_s); return *Core::singletonRef_s; }
@@ -62 +65 @@
             static const std::string& getLanguage();
             static void  resetLanguage();
+
+            static bool isDevBuild() { return Core::isDevBuild_s; }
+
+            static const std::string& getMediaPath()
+            { assert(singletonRef_s); return singletonRef_s->mediaPath_; }
+            static void tsetMediaPath(const std::string& path)
+            { assert(singletonRef_s); singletonRef_s->_tsetMediaPath(path); }
+            static const std::string& getConfigPath() { return configPath_s; }
+            static const std::string& getLogPath()    { return logPath_s; }
 
             // fast access global variables.
@@ -79 +91 @@
             void resetLanguageIntern();
             void initializeRandomNumberGenerator();
+            void debugLevelChanged();
+            void languageChanged();
+            void mediaPathChanged();
+            void _tsetMediaPath(const std::string& path);
+
+            static void setDevBuild();
 
             int softDebugLevel_;                            //!< The debug level
@@ -85 +103 @@
             int softDebugLevelShell_;                       //!< The debug level for the ingame shell
             std::string language_;                          //!< The language
-            bool bInitializeRandomNumberGenerator_;          //!< If true, srand(time(0)) is called
+            bool bInitializeRandomNumberGenerator_;         //!< If true, srand(time(0)) is called
+            std::string mediaPath_;                         //!< Path to the data/media file folder
 
             static bool bShowsGraphics_s;                   //!< global variable that tells whether to show graphics
@@ -93 +112 @@
             static bool bIsMaster_s;
 
+            static bool isDevBuild_s;                       //!< True for builds in the build directory (not installed)
+            static std::string configPath_s;                //!< Path to the config file folder
+            static std::string logPath_s;                   //!< Path to the log file folder
+
             static Core* singletonRef_s;
     };

code/branches/buildsystem3/src/core/Language.cc

@@ -35 +35 @@
 
 #include <fstream>
+#include <boost/filesystem.hpp>
 
 #include "Core.h"
@@ -205 +206 @@
         COUT(4) << "Read default language file." << std::endl;
 
+        boost::filesystem::path folder(Core::getConfigPath());
+        boost::filesystem::path filepath(folder/getFilename(this->defaultLanguage_));
+
         // This creates the file if it's not existing
         std::ofstream createFile;
-        createFile.open(getFilename(this->defaultLanguage_).c_str(), std::fstream::app);
+        createFile.open(filepath.native_file_string().c_str(), std::fstream::app);
         createFile.close();
 
         // Open the file
         std::ifstream file;
-        file.open(getFilename(this->defaultLanguage_).c_str(), std::fstream::in);
+        file.open(filepath.native_file_string().c_str(), std::fstream::in);
 
         if (!file.is_open())
@@ -254 +258 @@
         COUT(4) << "Read translated language file (" << Core::getLanguage() << ")." << std::endl;
 
+        boost::filesystem::path folder(Core::getConfigPath());
+        boost::filesystem::path filepath(folder/getFilename(Core::getLanguage()));
+
         // Open the file
         std::ifstream file;
-        file.open(getFilename(Core::getLanguage()).c_str(), std::fstream::in);
+        file.open(filepath.native_file_string().c_str(), std::fstream::in);
 
         if (!file.is_open())
@@ -308 +315 @@
         COUT(4) << "Language: Write default language file." << std::endl;
 
+        boost::filesystem::path folder(Core::getConfigPath());
+        boost::filesystem::path filepath(folder/getFilename(this->defaultLanguage_));
+
         // Open the file
         std::ofstream file;
-        file.open(getFilename(this->defaultLanguage_).c_str(), std::fstream::out);
+        file.open(filepath.native_file_string().c_str(), std::fstream::out);
 
         if (!file.is_open())

code/branches/buildsystem3/src/core/LuaBind.cc

@@ -37 +37 @@
 }
 #include <tolua/tolua++.h>
-
+#include <boost/filesystem.hpp>
+
+#include "util/String.h"
+#include "util/Debug.h"
 #include "ToluaBindCore.h"
-#include "util/String.h"
-#include "CoreIncludes.h"
+#include "Core.h"
 
 namespace orxonox
@@ -50 +52 @@
     assert(LuaBind::singletonRef_s == 0);
     LuaBind::singletonRef_s = this;
+
+    this->includePath_ = Core::getMediaPath();
 
     luaState_ = lua_open();
@@ -82 +86 @@
   void LuaBind::loadFile(std::string filename, bool luaTags)
   {
+    boost::filesystem::path filepath(filename);
+
     output_ = "";
     std::ifstream file;
-    file.open(filename.c_str(), std::fstream::in);
+    file.open(filepath.native_file_string().c_str(), std::fstream::in);
 
     if (!file.is_open())

code/branches/buildsystem3/src/core/input/KeyBinder.cc

@@ -36 +36 @@
 #include <fstream>
 #include <string>
+#include <boost/filesystem.hpp>
 
 #include "util/Convert.h"
@@ -42 +43 @@
 #include "core/CoreIncludes.h"
 #include "core/ConfigFileManager.h"
+#include "core/Core.h"
 #include "InputCommands.h"
 #include "InputManager.h"
@@ -253 +255 @@
             return;
 
+        boost::filesystem::path folder(Core::getConfigPath());
+        boost::filesystem::path filepath(folder/filename);
+
         // get bindings from default file if filename doesn't exist.
         std::ifstream infile;
-        infile.open(filename.c_str());
+        infile.open(filepath.native_file_string().c_str());
         if (!infile)
         {

code/branches/buildsystem3/src/orxonox/CMakeLists.txt

@@ -25 +25 @@
   PawnManager.cc
   PlayerManager.cc
-  Settings.cc
 )
 ADD_SUBDIRECTORY(gamestates)
@@ -43 +42 @@
 IF(GCC_NO_SYSTEM_HEADER_SUPPORT)
   # Get around displaying a few hundred lines of warning code
-  SET_SOURCE_FILES_PROPERTIES(gamestates/GSGraphics.cc PROPERTIES COMPILE_FLAGS "-w")
+  SET_SOURCE_FILES_PROPERTIES(
+    gamestates/GSGraphics.cc
+    gui/GUIManager.cc
+    PROPERTIES COMPILE_FLAGS "-Wno-sign-compare"
+  )
 ENDIF()
 

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

@@ -30 +30 @@
  /**
  @file
- @brief Entry point of the program. Platform specific code.
+ @brief Entry point of the program.
   */
 
@@ -37 +37 @@
 #include <exception>
 #include <cassert>
+#include <fstream>
 
 #include "OrxonoxConfig.h"
@@ -85 +86 @@
 
 
-//#ifdef __cplusplus
-//extern "C" {
-//#endif
-
 SetCommandLineArgument(settingsFile, "orxonox.ini");
+SetCommandLineArgument(configFileDirectory, "");
 
 int main(int argc, char** argv)
@@ -95 +93 @@
     using namespace orxonox;
 
-    // create a signal handler (only works for linux)
+    // First, determine whether we have an installed or a binary dir run
+    // The latter occurs when simply running from the build directory
+    std::ifstream probe;
+    probe.open("orxonox_dev_build.keep_me");
+    if (probe)
+    {
+        Core::setDevBuild();
+        probe.close();
+    }
+
+    // create a signal handler (only active for linux)
     SignalHandler signalHandler;
-    signalHandler.doCatch(argv[0], "orxonox.log");
+    signalHandler.doCatch(argv[0], Core::getLogPath() + "orxonox_crash.log");
 
     // Parse command line arguments
@@ -157 +165 @@
     return 0;
 }
-
-//#ifdef __cplusplus
-//}
-//#endif

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

@@ -61 +61 @@
 #include "gui/GUIManager.h"
 #include "tools/WindowEventListener.h"
-#include "Settings.h"
 
 // for compatibility
@@ -138 +137 @@
         // load debug overlay
         COUT(3) << "Loading Debug Overlay..." << std::endl;
-        this->debugOverlay_ = new XMLFile(Settings::getDataPath() + "overlay/debug.oxo");
+        this->debugOverlay_ = new XMLFile(Core::getMediaPath() + "overlay/debug.oxo");
         Loader::open(debugOverlay_);
 
@@ -211 +210 @@
         delete this->ogreRoot_;
 
-//#ifdef ORXONOX_PLATFORM_WINDOWS
         // delete the ogre log and the logManager (since we have created it).
         this->ogreLogger_->getDefaultLog()->removeListener(this);
         this->ogreLogger_->destroyLog(Ogre::LogManager::getSingleton().getDefaultLog());
         delete this->ogreLogger_;
-//#endif
 
         delete graphicsEngine_;
@@ -287 +284 @@
         COUT(3) << "Setting up Ogre..." << std::endl;
 
-        // TODO: LogManager doesn't work on oli platform. The why is yet unknown.
-//#ifdef ORXONOX_PLATFORM_WINDOWS
+        if (ogreConfigFile_ == "")
+        {
+            COUT(2) << "Warning: Ogre config file set to \"\". Defaulting to config.cfg" << std::endl;
+            ModifyConfigValue(ogreConfigFile_, tset, "config.cfg");
+        }
+        if (ogreLogFile_ == "")
+        {
+            COUT(2) << "Warning: Ogre log file set to \"\". Defaulting to ogre.log" << std::endl;
+            ModifyConfigValue(ogreLogFile_, tset, "ogre.log");
+        }
+
+        boost::filesystem::path ogreConfigFilepath(Core::getConfigPath() + ogreConfigFile_);
+        boost::filesystem::path ogreLogFilepath(Core::getLogPath() + ogreLogFile_);
+
         // create a new logManager
+        // Ogre::Root will detect that we've already created a Log
         ogreLogger_ = new Ogre::LogManager();
         COUT(4) << "Ogre LogManager created" << std::endl;
@@ -295 +305 @@
         // create our own log that we can listen to
         Ogre::Log *myLog;
-        if (this->ogreLogFile_ == "")
-            myLog = ogreLogger_->createLog("ogre.log", true, false, true);
-        else
-            myLog = ogreLogger_->createLog(this->ogreLogFile_, true, false, false);
+        myLog = ogreLogger_->createLog(ogreLogFilepath.native_file_string(), true, false, false);
         COUT(4) << "Ogre Log created" << std::endl;
 
         myLog->setLogDetail(Ogre::LL_BOREME);
         myLog->addListener(this);
-//#endif
-
-        // Root will detect that we've already created a Log
+
         COUT(4) << "Creating Ogre Root..." << std::endl;
-
-        if (ogreConfigFile_ == "")
-        {
-            COUT(2) << "Warning: Ogre config file set to \"\". Defaulting to config.cfg" << std::endl;
-            ModifyConfigValue(ogreConfigFile_, tset, "config.cfg");
-        }
-        if (ogreLogFile_ == "")
-        {
-            COUT(2) << "Warning: Ogre log file set to \"\". Defaulting to ogre.log" << std::endl;
-            ModifyConfigValue(ogreLogFile_, tset, "ogre.log");
-        }
 
         // check for config file existence because Ogre displays (caught) exceptions if not
         std::ifstream probe;
-        probe.open(ogreConfigFile_.c_str());
+        probe.open(ogreConfigFilepath.native_file_string().c_str());
         if (!probe)
         {
             // create a zero sized file
             std::ofstream creator;
-            creator.open(ogreConfigFile_.c_str());
+            creator.open(ogreConfigFilepath.native_file_string().c_str());
             creator.close();
         }
@@ -333 +327 @@
 
         // Leave plugins file empty. We're going to do that part manually later
-        ogreRoot_ = new Ogre::Root("", ogreConfigFile_, ogreLogFile_);
-
-#if 0 // Ogre 1.4.3 doesn't yet support setDebugOutputEnabled(.)
-#ifndef ORXONOX_PLATFORM_WINDOWS
-        // tame the ogre ouput so we don't get all the mess in the console
-        Ogre::Log* defaultLog = Ogre::LogManager::getSingleton().getDefaultLog();
-        defaultLog->setDebugOutputEnabled(false);
-        defaultLog->setLogDetail(Ogre::LL_BOREME);
-        defaultLog->addListener(this);
-#endif
-#endif
+        ogreRoot_ = new Ogre::Root("", ogreConfigFilepath.native_file_string(), ogreLogFilepath.native_file_string());
 
         COUT(3) << "Ogre set up done." << std::endl;
@@ -377 +361 @@
         try
         {
-            cf.load(Settings::getDataPath() + resourceFile_);
+            cf.load(Core::getMediaPath() + resourceFile_);
         }
         catch (...)
@@ -403 +387 @@
 
                     Ogre::ResourceGroupManager::getSingleton().addResourceLocation(
-                        std::string(Settings::getDataPath() + archName), typeName, secName);
+                        std::string(Core::getMediaPath() + archName), typeName, secName);
                 }
             }

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

@@ -46 +46 @@
 #include "LevelManager.h"
 #include "PlayerManager.h"
-#include "Settings.h"
 
 namespace orxonox
@@ -205 +204 @@
         std::string levelName;
         CommandLine::getValue("level", &levelName);
-        startFile_ = new XMLFile(Settings::getDataPath() + std::string("levels/") + levelName);
+        startFile_ = new XMLFile(Core::getMediaPath() + std::string("levels/") + levelName);
         Loader::open(startFile_);
     }

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

@@ -44 +44 @@
 #include "tools/Timer.h"
 #include "objects/Tickable.h"
-#include "Settings.h"
 
 #ifdef ORXONOX_PLATFORM_WINDOWS
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
-#  include "windows.h"
-
-   //Get around Windows hackery
-#  ifdef max
-#    undef max
-#  endif
-#  ifdef min
-#    undef min
-#  endif
+#  include <winbase.h>
 #endif
 
 namespace orxonox
 {
-    SetCommandLineArgument(dataPath, "").information("PATH");
     SetCommandLineArgument(limitToCPU, 1).information("0: off | #cpu");
 
@@ -71 +58 @@
         , bPaused_(false)
         , timeFactorPauseBackup_(1.0f)
-        , settings_(0)
         , tclBind_(0)
         , tclThreadManager_(0)
@@ -113 +99 @@
         this->luaBind_ = new LuaBind();
 
-        // instantiate Settings class
-        this->settings_ = new Settings();
-
-        std::string dataPath = CommandLine::getValue("dataPath");
-        if (dataPath != "")
-        {
-            if (*dataPath.end() != '/' && *dataPath.end() != '\\')
-                Settings::tsetDataPath(dataPath + "/");
-            else
-                Settings::tsetDataPath(dataPath);
-        }
-
         // initialise TCL
-        this->tclBind_ = new TclBind(Settings::getDataPath());
+        this->tclBind_ = new TclBind(Core::getMediaPath());
         this->tclThreadManager_ = new TclThreadManager(tclBind_->getTclInterpreter());
 
@@ -182 +156 @@
         delete this->tclBind_;
 
-        delete this->settings_;
         delete this->luaBind_;
 

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

@@ -81 +81 @@
         bool                  bPaused_;
         float                 timeFactorPauseBackup_;
-        Settings*             settings_;
         TclBind*              tclBind_;
         TclThreadManager*     tclThreadManager_;

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

@@ -36 +36 @@
 #include "GUIManager.h"
 
+#include <boost/filesystem.hpp>
 #include <OgreRenderWindow.h>
 #include <OgreRoot.h>
 #include <CEGUI.h>
+#include <CEGUIDefaultLogger.h>
 #include <ogreceguirenderer/OgreCEGUIRenderer.h>
 #ifdef CEGUILUA_USE_INTERNAL_LIBRARY
@@ -148 +150 @@
                 this->luaState_ = this->scriptModule_->getLuaState();
 
+                // Create our own logger to specify the filepath
+                boost::filesystem::path ceguiLogFilepath(Core::getLogPath() + "cegui.log");
+                this->ceguiLogger_ = new DefaultLogger();
+                this->ceguiLogger_->setLogFilename(ceguiLogFilepath.native_file_string());
+                // set the log level according to ours (translate by subtracting 1)
+                this->ceguiLogger_->setLoggingLevel(
+                    (LoggingLevel)(Core::getSoftDebugLevel(OutputHandler::LD_Logfile) - 1));
+
                 // create the CEGUI system singleton
                 this->guiSystem_ = new System(this->guiRenderer_, this->resourceProvider_, 0, this->scriptModule_);
-
-                // set the log level according to ours (translate by subtracting 1)
-                Logger::getSingleton().setLoggingLevel(
-                    (LoggingLevel)(Core::getSoftDebugLevel(OutputHandler::LD_Logfile) - 1));
 
                 // do this after 'new CEGUI::Sytem' because that creates the lua state in the first place

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

@@ -41 +41 @@
 #include <CEGUISystem.h>
 #include "core/input/InputInterfaces.h"
+
+// Forward declaration
+namespace CEGUI { class DefaultLogger; }
 
 // tolua_begin
@@ -119 +122 @@
         CEGUI::ResourceProvider*  resourceProvider_;
         CEGUI::LuaScriptModule*   scriptModule_;
+        CEGUI::DefaultLogger*     ceguiLogger_;
         CEGUI::System*            guiSystem_;
         CEGUI::Imageset*          backgroundImage_;

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

@@ -35 +35 @@
 #include "core/XMLFile.h"
 #include "core/Template.h"
+#include "core/Core.h"
 
-#include "Settings.h"
 #include "LevelManager.h"
 #include "objects/infos/PlayerInfo.h"
@@ -55 +55 @@
         this->xmlfilename_ = this->getFilename();
 
-        if (this->xmlfilename_.length() >= Settings::getDataPath().length())
-            this->xmlfilename_ = this->xmlfilename_.substr(Settings::getDataPath().length());
+        if (this->xmlfilename_.length() >= Core::getMediaPath().length())
+            this->xmlfilename_ = this->xmlfilename_.substr(Core::getMediaPath().length());
     }
 
@@ -97 +97 @@
         mask.include(Class(OverlayGroup)); // HACK to include the ChatOverlay
 
-        this->xmlfile_ = new XMLFile(Settings::getDataPath() + this->xmlfilename_, mask);
+        this->xmlfile_ = new XMLFile(Core::getMediaPath() + this->xmlfilename_, mask);
 
         Loader::open(this->xmlfile_);

code/branches/buildsystem3/src/orxonox/objects/gametypes/Gametype.cc

@@ -43 +43 @@
 #include "objects/worldentities/SpawnPoint.h"
 #include "objects/worldentities/Camera.h"
-#include "Settings.h"
 
 #include "network/Host.h"

code/branches/buildsystem3/src/util/OutputBuffer.cc

@@ -68 +68 @@
     OutputBuffer& OutputBuffer::operator<<(std::ostream& (*manipulator)(std::ostream&))
     {
-                this->stream_ << manipulator;
-                this->callListeners();
-                return *this;
+        this->stream_ << manipulator;
+        this->callListeners();
+        return *this;
     }
 
@@ -79 +79 @@
     OutputBuffer& OutputBuffer::operator<<(std::ios& (*manipulator)(std::ios&))
     {
-                this->stream_ << manipulator;
-                this->callListeners();
-                return *this;
+        this->stream_ << manipulator;
+        this->callListeners();
+        return *this;
     }
 
@@ -90 +90 @@
     OutputBuffer& OutputBuffer::operator<<(std::ios_base& (*manipulator)(std::ios_base&))
     {
-                this->stream_ << manipulator;
-                this->callListeners();
-                return *this;
+        this->stream_ << manipulator;
+        this->callListeners();
+        return *this;
     }
 

code/branches/buildsystem3/src/util/OutputHandler.cc

@@ -33 +33 @@
 
 #include "OutputHandler.h"
-#include <time.h>
+
+#include <ctime>
+#include <cstdlib>
 
 namespace orxonox
@@ -41 +43 @@
         @param logfilename The name of the logfile
     */
-    OutputHandler::OutputHandler(const std::string& logfilename)
-    {
+    OutputHandler::OutputHandler()
+    {
+#ifdef ORXONOX_PLATFORM_WINDOWS
+        char* pTempDir = getenv("TEMP");
+        this->logfilename_ = std::string(pTempDir) + "/orxonox.log";
+#else
+        this->logfilename_ = "/tmp/orxonox.log";
+#endif
+#ifdef NDEBUG
+        this->softDebugLevel_[LD_All] = this->softDebugLevel_[LD_Logfile] = 2;
+        this->softDebugLevel_[LD_Console] = this->softDebugLevel_[LD_Shell] = 1;
+#else
+        this->softDebugLevel_[LD_All] = this->softDebugLevel_[LD_Logfile] = 3;
+        this->softDebugLevel_[LD_Console] = this->softDebugLevel_[LD_Shell] = 2;
+#endif
+
         this->outputBuffer_ = &this->fallbackBuffer_;
-        this->softDebugLevel_[0] = this->softDebugLevel_[1] = this->softDebugLevel_[2] = this->softDebugLevel_[3] = 2;
-        this->logfilename_ = logfilename;
         this->logfile_.open(this->logfilename_.c_str(), std::fstream::out);
 
@@ -53 +67 @@
         timeinfo = localtime(&rawtime);
 
-        this->logfile_ << "Started log at " << asctime(timeinfo) << std::endl;
+        this->logfile_ << "Started log on " << asctime(timeinfo) << std::endl;
         this->logfile_.flush();
     }
@@ -72 +86 @@
     OutputHandler& OutputHandler::getOutStream()
     {
-        static OutputHandler orxout("orxonox.log");
+        static OutputHandler orxout;
         return orxout;
     }
@@ -112 +126 @@
 
     /**
+        @brief Sets the path where to create orxonox.log
+        @param Path string with trailing slash
+    */
+    void OutputHandler::setLogPath(const std::string& path)
+    {
+        OutputHandler::getOutStream().logfile_.close();
+        // store old content
+        std::ifstream old;
+        old.open(OutputHandler::getOutStream().logfilename_.c_str());
+        OutputHandler::getOutStream().logfilename_ = path + "orxonox.log";
+        OutputHandler::getOutStream().logfile_.open(OutputHandler::getOutStream().logfilename_.c_str(), std::fstream::out);
+        OutputHandler::getOutStream().logfile_ << old.rdbuf();
+        old.close();
+        OutputHandler::getOutStream().logfile_.flush();
+    }
+
+    /**
         @brief Overloaded << operator, redirects the output to the console and the logfile.
         @param sb The streambuffer that should be shown in the console

code/branches/buildsystem3/src/util/OutputHandler.h

@@ -101 +101 @@
             static int getSoftDebugLevel(OutputHandler::OutputDevice device = OutputHandler::LD_All);
 
+            static void setLogPath(const std::string& path);
+
             void setOutputBuffer(OutputBuffer* buffer);
 
@@ -142 +144 @@
 
         private:
-            explicit OutputHandler(const std::string& logfilename);
-            OutputHandler(const OutputHandler& oh);  // don't copy
+            explicit OutputHandler();
+            OutputHandler(const OutputHandler& oh);
             virtual ~OutputHandler();
 

code/branches/buildsystem3/src/util/SignalHandler.cc

@@ -159 +159 @@
       }
 
-      COUT(0) << "recieved signal " << sigName.c_str() << std::endl << "try to write backtrace to file orxonox.log" << std::endl;
+      COUT(0) << "recieved signal " << sigName.c_str() << std::endl << "try to write backtrace to file orxonox_crash.log" << std::endl;
 
       int sigPipe[2];