Changeset 2687 for code/branches

Timestamp:

Feb 21, 2009, 12:20:23 AM (16 years ago)

Author:

rgrieder

Message:

Installation paths should be relative when using in C++ code if they're actually relative.
This ensures copy & paste installations under windows. For Unix it is only useful when installation to an arbitrary folder instead of /usr
(also resolves a problem the with tcl lib path; Apparently Tcl cannot cope with spaces in the path (and neither "\") so C:/Program Files/ was not working at all)

• boost::filesystem::path::native_file_string is depricated, using file_string now.

Location:

code/branches/buildsystem3

Files:

• cmake/BuildConfig.cmake (modified) (2 diffs)
• src/OrxonoxConfig.h.in (modified) (1 diff)
• src/core/CommandLine.cc (modified) (1 diff)
• src/core/ConfigFileManager.cc (modified) (2 diffs)
• src/core/Language.cc (modified) (3 diffs)
• src/core/LuaBind.cc (modified) (1 diff)
• src/core/input/KeyBinder.cc (modified) (1 diff)
• src/orxonox/gamestates/GSGraphics.cc (modified) (4 diffs)
• src/orxonox/gui/GUIManager.cc (modified) (1 diff)

code/branches/buildsystem3/cmake/BuildConfig.cmake

@@ -126 +126 @@
   SET(ORXONOX_LOG_INSTALL_PATH     ${USER_DIR}/.orxonox/log)
   SET(ORXONOX_CONFIG_INSTALL_PATH  ${USER_DIR}/.orxonox/config)
+
+  # Execution paths, either relative to the binary dir or absolute
+  # For Windows copy&paste installs relative paths are much better
+  SET(ORXONOX_MEDIA_INSTALL_PATH_EXEC ../../share/orxonox)
+  SET(ORXONOX_CONFIG_INSTALL_PATH_EXEC ${ORXONOX_CONFIG_INSTALL_PATH})
+  SET(ORXONOX_LOG_INSTALL_PATH_EXEC    ${ORXONOX_LOG_INSTALL_PATH})
 ELSEIF(WIN32)
   SET(ORXONOX_RUNTIME_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/bin)
@@ -134 +140 @@
   SET(ORXONOX_LOG_INSTALL_PATH     ${CMAKE_INSTALL_PREFIX}/log)
   SET(ORXONOX_CONFIG_INSTALL_PATH  ${CMAKE_INSTALL_PREFIX}/config)
+
+  # Execution paths, either relative to the binary dir or absolute
+  # For Windows copy&paste installs relative paths are much better
+  SET(ORXONOX_MEDIA_INSTALL_PATH_EXEC ../media)
+  SET(ORXONOX_CONFIG_INSTALL_PATH_EXEC ../config)
+  SET(ORXONOX_LOG_INSTALL_PATH_EXEC ../log)
 ENDIF()
 

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

@@ -198 +198 @@
 namespace 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_INSTALL_PATH ("@ORXONOX_MEDIA_INSTALL_PATH_EXEC@/");
+    const char* const ORXONOX_CONFIG_INSTALL_PATH("@ORXONOX_CONFIG_INSTALL_PATH_EXEC@/");
+    const char* const ORXONOX_LOG_INSTALL_PATH   ("@ORXONOX_LOG_INSTALL_PATH_EXEC@/");
 
     const char* const ORXONOX_MEDIA_DEV_PATH     ("@ORXONOX_MEDIA_DEV_PATH@/");

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

@@ -308 +308 @@
         // They will not overwrite the arguments given directly
         std::ifstream file;
-        file.open(filepath.native_file_string().c_str());
+        file.open(filepath.file_string().c_str());
         args.clear();
         if (file)

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

@@ -230 +230 @@
         // This creates the config file if it's not existing
         std::ofstream createFile;
-        createFile.open(filepath.native_file_string().c_str(), std::fstream::app);
+        createFile.open(filepath.file_string().c_str(), std::fstream::app);
         createFile.close();
 
         // Open the file
         std::ifstream file;
-        file.open(filepath.native_file_string().c_str(), std::fstream::in);
+        file.open(filepath.file_string().c_str(), std::fstream::in);
 
         if (!file.is_open())
@@ -345 +345 @@
 
         std::ofstream file;
-        file.open(filepath.native_file_string().c_str(), std::fstream::out);
+        file.open(filepath.file_string().c_str(), std::fstream::out);
         file.setf(std::ios::fixed, std::ios::floatfield);
         file.precision(6);

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

@@ -211 +211 @@
         // This creates the file if it's not existing
         std::ofstream createFile;
-        createFile.open(filepath.native_file_string().c_str(), std::fstream::app);
+        createFile.open(filepath.file_string().c_str(), std::fstream::app);
         createFile.close();
 
         // Open the file
         std::ifstream file;
-        file.open(filepath.native_file_string().c_str(), std::fstream::in);
+        file.open(filepath.file_string().c_str(), std::fstream::in);
 
         if (!file.is_open())
@@ -263 +263 @@
         // Open the file
         std::ifstream file;
-        file.open(filepath.native_file_string().c_str(), std::fstream::in);
+        file.open(filepath.file_string().c_str(), std::fstream::in);
 
         if (!file.is_open())
@@ -320 +320 @@
         // Open the file
         std::ofstream file;
-        file.open(filepath.native_file_string().c_str(), std::fstream::out);
+        file.open(filepath.file_string().c_str(), std::fstream::out);
 
         if (!file.is_open())

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

@@ -90 +90 @@
     output_ = "";
     std::ifstream file;
-    file.open(filepath.native_file_string().c_str(), std::fstream::in);
+    file.open(filepath.file_string().c_str(), std::fstream::in);
 
     if (!file.is_open())

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

@@ -260 +260 @@
         // get bindings from default file if filename doesn't exist.
         std::ifstream infile;
-        infile.open(filepath.native_file_string().c_str());
+        infile.open(filepath.file_string().c_str());
         if (!infile)
         {

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

@@ -305 +305 @@
         // create our own log that we can listen to
         Ogre::Log *myLog;
-        myLog = ogreLogger_->createLog(ogreLogFilepath.native_file_string(), true, false, false);
+        myLog = ogreLogger_->createLog(ogreLogFilepath.file_string(), true, false, false);
         COUT(4) << "Ogre Log created" << std::endl;
 
@@ -315 +315 @@
         // check for config file existence because Ogre displays (caught) exceptions if not
         std::ifstream probe;
-        probe.open(ogreConfigFilepath.native_file_string().c_str());
+        probe.open(ogreConfigFilepath.file_string().c_str());
         if (!probe)
         {
             // create a zero sized file
             std::ofstream creator;
-            creator.open(ogreConfigFilepath.native_file_string().c_str());
+            creator.open(ogreConfigFilepath.file_string().c_str());
             creator.close();
         }
@@ -327 +327 @@
 
         // Leave plugins file empty. We're going to do that part manually later
-        ogreRoot_ = new Ogre::Root("", ogreConfigFilepath.native_file_string(), ogreLogFilepath.native_file_string());
+        ogreRoot_ = new Ogre::Root("", ogreConfigFilepath.file_string(), ogreLogFilepath.file_string());
 
         COUT(3) << "Ogre set up done." << std::endl;
@@ -342 +342 @@
         SubString plugins(ogrePlugins_, ",", " ", false, 92, false, 34, false, 40, 41, false, '\0');
         for (unsigned int i = 0; i < plugins.size(); ++i)
-            ogreRoot_->loadPlugin((folder / plugins[i]).native_file_string());
+            ogreRoot_->loadPlugin((folder / plugins[i]).file_string());
     }
 

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

@@ -153 +153 @@
                 boost::filesystem::path ceguiLogFilepath(Core::getLogPath() + "cegui.log");
                 this->ceguiLogger_ = new DefaultLogger();
-                this->ceguiLogger_->setLogFilename(ceguiLogFilepath.native_file_string());
+                this->ceguiLogger_->setLogFilename(ceguiLogFilepath.file_string());
                 // set the log level according to ours (translate by subtracting 1)
                 this->ceguiLogger_->setLoggingLevel(