#include "config.h"
#include "debug.h"
#include "filesys.h"
+#include "log.h"
+#include "utility_string.h"
#ifdef __APPLE__
#include "CoreFoundation/CoreFoundation.h"
dstream<<DTIME<<"INFO: sigint_handler(): "
<<"Ctrl-C pressed, shutting down."<<std::endl;
- dstream<<DTIME<<"INFO: sigint_handler(): "
+ // Comment out for less clutter when testing scripts
+ /*dstream<<DTIME<<"INFO: sigint_handler(): "
<<"Printing debug stacks"<<std::endl;
- debug_stacks_print();
+ debug_stacks_print();*/
g_killed = true;
}
void signal_handler_init(void)
{
- dstream<<"signal_handler_init()"<<std::endl;
(void)signal(SIGINT, sigint_handler);
}
{
dstream<<DTIME<<"INFO: event_handler(): "
<<"Ctrl+C, Close Event, Logoff Event or Shutdown Event, shutting down."<<std::endl;
- dstream<<DTIME<<"INFO: event_handler(): "
+ // Comment out for less clutter when testing scripts
+ /*dstream<<DTIME<<"INFO: event_handler(): "
<<"Printing debug stacks"<<std::endl;
- debug_stacks_print();
+ debug_stacks_print();*/
g_killed = true;
}
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 = "..";
+// Default to RUN_IN_PLACE style relative paths
+std::string path_share = "..";
+std::string path_user = "..";
+
+std::string getDataPath(const char *subpath)
+{
+ return path_share + DIR_DELIM + subpath;
+}
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
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 "..";
+
+ 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, '/');
- // Use "./bin/../data"
- path_data = std::string(buf) + "/../data";
-
- // Use "./bin/../"
- path_userdata = std::string(buf) + "/..";
+ 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_data = std::string("../data");
- path_userdata = std::string("..");
+ 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
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\.."
+ path_share = std::string(buf) + "\\..";
// 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) + "/..";
+ 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