Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "config.h"
#include "debug.h"
#include "filesys.h"
+#include "log.h"
+#include "util/string.h"
+#include <list>
#ifdef __APPLE__
#include "CoreFoundation/CoreFoundation.h"
Path mangler
*/
-std::string path_share = ".." DIR_DELIM "share";
-std::string path_user = ".." DIR_DELIM "user";
+// Default to RUN_IN_PLACE style relative paths
+std::string path_share = "..";
+std::string path_user = "..";
std::string getDataPath(const char *subpath)
{
path[i] = 0;
}
+bool detectMSVCBuildDir(char *c_path)
+{
+ std::string path(c_path);
+ const char *ends[] = {"bin\\Release", "bin\\Build", NULL};
+ return (removeStringEnd(path, ends) != "");
+}
+
void initializePaths()
{
-#ifdef RUN_IN_PLACE
+#if RUN_IN_PLACE
/*
Use relative paths if RUN_IN_PLACE
*/
- dstream<<"Using relative paths (RUN_IN_PLACE)"<<std::endl;
+ infostream<<"Using relative paths (RUN_IN_PLACE)"<<std::endl;
/*
Windows
len = GetModuleFileName(GetModuleHandle(NULL), buf, buflen);
assert(len < buflen);
pathRemoveFile(buf, '\\');
-
- path_share = std::string(buf) + "\\..\\share";
- path_user = std::string(buf) + "\\..\\user";
+
+ if(detectMSVCBuildDir(buf)){
+ infostream<<"MSVC build directory detected"<<std::endl;
+ path_share = std::string(buf) + "\\..\\..";
+ path_user = std::string(buf) + "\\..\\..";
+ }
+ else{
+ path_share = std::string(buf) + "\\..";
+ path_user = std::string(buf) + "\\..";
+ }
/*
Linux
pathRemoveFile(buf, '/');
- path_share = std::string(buf) + "/../share";
- path_user = std::string(buf) + "/../user";
+ path_share = std::string(buf) + "/..";
+ path_user = std::string(buf) + "/..";
/*
OS X
//TODO: Get path of executable. This assumes working directory is bin/
dstream<<"WARNING: Relative path not properly supported on OS X and FreeBSD"
<<std::endl;
- path_share = std::string("../share");
- path_user = std::string("../user");
+ path_share = std::string("..");
+ path_user = std::string("..");
#endif
Use platform-specific paths otherwise
*/
- dstream<<"Using system-wide paths (NOT RUN_IN_PLACE)"<<std::endl;
+ infostream<<"Using system-wide paths (NOT RUN_IN_PLACE)"<<std::endl;
/*
Windows
assert(len < buflen);
pathRemoveFile(buf, '\\');
- // Use ".\bin\..\share"
- path_share = std::string(buf) + "\\..\\share";
+ // Use ".\bin\.."
+ path_share = std::string(buf) + "\\..";
// Use "C:\Documents and Settings\user\Application Data\<PROJECT_NAME>"
len = GetEnvironmentVariable("APPDATA", buf, buflen);
#elif defined(linux)
#include <unistd.h>
- char buf[BUFSIZ];
- memset(buf, 0, BUFSIZ);
// Get path to executable
- assert(readlink("/proc/self/exe", buf, BUFSIZ-1) != -1);
-
- pathRemoveFile(buf, '/');
+ std::string bindir = "";
+ {
+ char buf[BUFSIZ];
+ memset(buf, 0, BUFSIZ);
+ assert(readlink("/proc/self/exe", buf, BUFSIZ-1) != -1);
+ pathRemoveFile(buf, '/');
+ bindir = buf;
+ }
- path_share = std::string(buf) + "/../share/" + PROJECT_NAME;
- //path_share = std::string(INSTALL_PREFIX) + "/share/" + PROJECT_NAME;
- if (!fs::PathExists(path_share)) {
- dstream<<"WARNING: data path " << path_share << " not found!";
- path_share = std::string(buf) + "/../data";
- dstream<<" Trying " << path_share << std::endl;
+ // Find share directory from these.
+ // It is identified by containing the subdirectory "builtin".
+ std::list<std::string> trylist;
+ std::string static_sharedir = STATIC_SHAREDIR;
+ if(static_sharedir != "" && static_sharedir != ".")
+ trylist.push_back(static_sharedir);
+ trylist.push_back(bindir + "/../share/" + PROJECT_NAME);
+ trylist.push_back(bindir + "/..");
+
+ for(std::list<std::string>::const_iterator i = trylist.begin();
+ i != trylist.end(); i++)
+ {
+ const std::string &trypath = *i;
+ if(!fs::PathExists(trypath) || !fs::PathExists(trypath + "/builtin")){
+ dstream<<"WARNING: system-wide share not found at \""
+ <<trypath<<"\""<<std::endl;
+ continue;
+ }
+ // Warn if was not the first alternative
+ if(i != trylist.begin()){
+ dstream<<"WARNING: system-wide share found at \""
+ <<trypath<<"\""<<std::endl;
+ }
+ path_share = trypath;
+ break;
}
path_user = std::string(getenv("HOME")) + "/." + PROJECT_NAME;
#elif defined(__FreeBSD__)
- path_share = std::string(INSTALL_PREFIX) + "/share/" + PROJECT_NAME;
+ path_share = STATIC_SHAREDIR;
path_user = std::string(getenv("HOME")) + "/." + PROJECT_NAME;
#endif
projects / dragonfireclient.git / blobdiff