Changeset 2687 for code/branches/buildsystem3/src/core

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/src/core

Files:

• CommandLine.cc (modified) (1 diff)
• ConfigFileManager.cc (modified) (2 diffs)
• Language.cc (modified) (3 diffs)
• LuaBind.cc (modified) (1 diff)
• input/KeyBinder.cc (modified) (1 diff)

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