#include "config.h"
#include "debug.h"
#include "filesys.h"
+#include "log.h"
#ifdef __APPLE__
#include "CoreFoundation/CoreFoundation.h"
void signal_handler_init(void)
{
- dstream<<"signal_handler_init()"<<std::endl;
(void)signal(SIGINT, sigint_handler);
}
void signal_handler_init(void)
{
- dstream<<"signal_handler_init()"<<std::endl;
SetConsoleCtrlHandler( (PHANDLER_ROUTINE)event_handler,TRUE);
}
Path mangler
*/
-std::string path_data = ".." DIR_DELIM "data";
-std::string path_userdata = "..";
+std::string path_share = ".." DIR_DELIM "share";
+std::string path_user = ".." DIR_DELIM "user";
std::string getDataPath(const char *subpath)
{
- return path_data + DIR_DELIM + subpath;
+ return path_share + DIR_DELIM + subpath;
}
void pathRemoveFile(char *path, char delim)
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
char buf[buflen];
DWORD len;
- // Find path of executable and set path_data relative to it
+ // Find path of executable and set path_share relative to it
len = GetModuleFileName(GetModuleHandle(NULL), buf, buflen);
assert(len < buflen);
pathRemoveFile(buf, '\\');
- // Use "./bin/../data"
- path_data = std::string(buf) + DIR_DELIM ".." DIR_DELIM "data";
-
- // Use "./bin/.."
- path_userdata = std::string(buf) + DIR_DELIM "..";
+ path_share = std::string(buf) + "\\..\\share";
+ path_user = std::string(buf) + "\\..\\user";
/*
Linux
pathRemoveFile(buf, '/');
- // Use "./bin/../data"
- path_data = std::string(buf) + "/../data";
-
- // Use "./bin/../"
- path_userdata = std::string(buf) + "/..";
+ path_share = std::string(buf) + "/../share";
+ path_user = std::string(buf) + "/../user";
/*
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_data = std::string("../data");
- path_userdata = std::string("..");
+ path_share = std::string("../share");
+ path_user = std::string("../user");
#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
char buf[buflen];
DWORD len;
- // Find path of executable and set path_data relative to it
+ // Find path of executable and set path_share relative to it
len = GetModuleFileName(GetModuleHandle(NULL), buf, buflen);
assert(len < buflen);
pathRemoveFile(buf, '\\');
- // Use "./bin/../data"
- path_data = std::string(buf) + DIR_DELIM ".." DIR_DELIM "data";
- //path_data = std::string(buf) + "/../share/" + PROJECT_NAME;
+ // Use ".\bin\..\share"
+ path_share = std::string(buf) + "\\..\\share";
// Use "C:\Documents and Settings\user\Application Data\<PROJECT_NAME>"
len = GetEnvironmentVariable("APPDATA", buf, buflen);
assert(len < buflen);
- path_userdata = std::string(buf) + DIR_DELIM + PROJECT_NAME;
+ path_user = std::string(buf) + DIR_DELIM + PROJECT_NAME;
/*
Linux
pathRemoveFile(buf, '/');
- path_data = std::string(buf) + "/../share/" + PROJECT_NAME;
- //path_data = std::string(INSTALL_PREFIX) + "/share/" + PROJECT_NAME;
- if (!fs::PathExists(path_data)) {
- dstream<<"WARNING: data path " << path_data << " not found!";
- path_data = std::string(buf) + "/../data";
- dstream<<" Trying " << path_data << std::endl;
+ 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) + "/../share";
+ dstream<<"WARNING: Using \""<<path_share<<"\" instead."<<std::endl;
}
- path_userdata = std::string(getenv("HOME")) + "/." + PROJECT_NAME;
+ path_user = std::string(getenv("HOME")) + "/." + PROJECT_NAME;
/*
OS X
{
dstream<<"Bundle resource path: "<<path<<std::endl;
//chdir(path);
- path_data = std::string(path) + "/data";
+ path_share = std::string(path) + "/share";
}
else
{
}
CFRelease(resources_url);
- path_userdata = std::string(getenv("HOME")) + "/Library/Application Support/" + PROJECT_NAME;
+ path_user = std::string(getenv("HOME")) + "/Library/Application Support/" + PROJECT_NAME;
#elif defined(__FreeBSD__)
- path_data = std::string(INSTALL_PREFIX) + "/share/" + PROJECT_NAME;
- path_userdata = std::string(getenv("HOME")) + "/." + PROJECT_NAME;
+ path_share = std::string(INSTALL_PREFIX) + "/share/" + PROJECT_NAME;
+ path_user = std::string(getenv("HOME")) + "/." + PROJECT_NAME;
#endif
#endif // RUN_IN_PLACE
-
- dstream<<"path_data = "<<path_data<<std::endl;
- dstream<<"path_userdata = "<<path_userdata<<std::endl;
}
} //namespace porting