Add shutdown hook interface to Lua API

[minetest.git] / src / porting.cpp

diff --git a/src/porting.cpp b/src/porting.cpp
index 522afa9efef160a566cdcf7a476ed2bfc8210184..945aea6eb3887085ab20dea571c40d236ad91707 100644 (file)
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -3,16 +3,16 @@ Minetest-c55
 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.
 */
@@ -28,6 +28,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "debug.h"
 #include "filesys.h"
 #include "log.h"
+#include "util/string.h"
+#include <list>
 
 #ifdef __APPLE__
        #include "CoreFoundation/CoreFoundation.h"
@@ -144,9 +146,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
        */
@@ -167,9 +176,16 @@ void initializePaths()
        len = GetModuleFileName(GetModuleHandle(NULL), buf, buflen);
        assert(len < buflen);
        pathRemoveFile(buf, '\\');
-
-       path_share = std::string(buf) + "\\..";
-       path_user = std::string(buf) + "\\..";
+       
+       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
@@ -237,19 +253,41 @@ void initializePaths()
        #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: system-wide share not found at \""<<path_share<<"\"";
-               path_share = std::string(buf) + "/..";
-               dstream<<"WARNING: Using \""<<path_share<<"\" instead."<<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;
@@ -282,7 +320,7 @@ void initializePaths()
 
        #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