X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fporting.cpp;h=de15de9ce2309b200a59cb8e80c3e364a093cae1;hb=8e5b33d3590719ff2cf1138f563e928d05754d7a;hp=f2ca601eb3098ad0d0a4dec210249b91c112a697;hpb=f79082a46d5b2385ae5aebf9048d4ca8b87940c3;p=oweals%2Fminetest.git diff --git a/src/porting.cpp b/src/porting.cpp index f2ca601eb..de15de9ce 100644 --- a/src/porting.cpp +++ b/src/porting.cpp @@ -3,16 +3,16 @@ Minetest-c55 Copyright (C) 2010 celeron55, Perttu Ahola 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. */ @@ -23,11 +23,24 @@ with this program; if not, write to the Free Software Foundation, Inc., See comments in porting.h */ +#if defined(linux) + #include +#elif defined(__APPLE__) + #include + #include +#elif defined(__FreeBSD__) + #include + #include + #include +#endif + #include "porting.h" #include "config.h" #include "debug.h" #include "filesys.h" #include "log.h" +#include "util/string.h" +#include #ifdef __APPLE__ #include "CoreFoundation/CoreFoundation.h" @@ -56,7 +69,7 @@ void sigint_handler(int sig) { dstream< - #include - + BOOL WINAPI event_handler(DWORD sig) { switch(sig) @@ -108,10 +120,10 @@ void signal_handler_init(void) case CTRL_BREAK_EVENT: break; } - + return TRUE; } - + void signal_handler_init(void) { SetConsoleCtrlHandler( (PHANDLER_ROUTINE)event_handler,TRUE); @@ -123,8 +135,9 @@ void signal_handler_init(void) 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) { @@ -143,9 +156,16 @@ void pathRemoveFile(char *path, char delim) 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 */ @@ -156,46 +176,84 @@ void initializePaths() Windows */ #if defined(_WIN32) - #include const DWORD buflen = 1000; char buf[buflen]; DWORD len; - + // Find path of executable and set path_share relative to it 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"< - + char buf[BUFSIZ]; memset(buf, 0, BUFSIZ); // Get path to executable assert(readlink("/proc/self/exe", buf, BUFSIZ-1) != -1); - + 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 */ - #elif defined(__APPLE__) || defined(__FreeBSD__) - + #elif defined(__APPLE__) + + //https://developer.apple.com/library/mac/#documentation/Darwin/Reference/ManPages/man3/dyld.3.html + //TODO: Test this code + char buf[BUFSIZ]; + uint32_t len = sizeof(buf); + assert(_NSGetExecutablePath(buf, &len) != 0); + + pathRemoveFile(buf, '/'); + + path_share = std::string(buf) + "/.."; + path_user = std::string(buf) + "/.."; + + /* + FreeBSD + */ + #elif defined(__FreeBSD__) + + int mib[4]; + char buf[BUFSIZ]; + size_t len = sizeof(buf); + + mib[0] = CTL_KERN; + mib[1] = KERN_PROC; + mib[2] = KERN_PROC_PATHNAME; + mib[3] = -1; + assert(sysctl(mib, 4, buf, &len, NULL, 0) != -1); + + pathRemoveFile(buf, '/'); + + path_share = std::string(buf) + "/.."; + path_user = std::string(buf) + "/.."; + + #else + //TODO: Get path of executable. This assumes working directory is bin/ - dstream<<"WARNING: Relative path not properly supported on OS X and FreeBSD" + dstream<<"WARNING: Relative path not properly supported on this platform" < const DWORD buflen = 1000; char buf[buflen]; DWORD len; - + // Find path of executable and set path_share relative to it len = GetModuleFileName(GetModuleHandle(NULL), buf, buflen); 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\" len = GetEnvironmentVariable("APPDATA", buf, buflen); assert(len < buflen); @@ -234,30 +291,50 @@ void initializePaths() Linux */ #elif defined(linux) - #include - - 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 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::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 \"" + < // Code based on // http://stackoverflow.com/questions/516200/relative-paths-not-working-in-xcode-c @@ -276,14 +353,14 @@ void initializePaths() dstream<<"WARNING: Could not determine bundle resource path"<