Changeset 2685 for code/branches/buildsystem3/src/core/LuaBind.cc

Timestamp:

Feb 20, 2009, 5:32:04 PM (15 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

File:

• code/branches/buildsystem3/src/core/LuaBind.cc (modified) (3 diffs)

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())