convert paths to string

fixes error: cannot convert ‘std::filesystem::__cxx11::path’ to ‘const agi::fs::path&’

Author: darealshinji

libaegisub/osx/path.mm

@@ -17,13 +17,15 @@
 #include <libaegisub/path.h>
 #include <libaegisub/util_osx.h>
 
+namespace sfs = std::filesystem;
+
 namespace agi {
 void Path::FillPlatformSpecificPaths() {
-	std::filesystem::path app_support = agi::util::GetApplicationSupportDirectory();
-	SetToken("?user", app_support/"Aegisub");
-	SetToken("?local", app_support/"Aegisub");
+	agi::fs::path user_dir = agi::fs::path(sfs::path(agi::util::GetApplicationSupportDirectory()))/"Aegisub";
+	SetToken("?user", user_dir);
+	SetToken("?local", user_dir);
 	SetToken("?data", agi::util::GetBundleSharedSupportDirectory());
 	SetToken("?dictionary", Decode("?data/dictionaries"));
-	SetToken("?temp", std::filesystem::temp_directory_path());
+	SetToken("?temp", agi::fs::path(sfs::temp_directory_path()));
 }
 }

libaegisub/unix/path.cpp

@@ -23,20 +23,20 @@
 namespace sfs = std::filesystem;
 
 namespace {
-std::string home_dir() {
+agi::fs::path home_dir() {
 	const char *env = getenv("HOME");
-	if (env) return env;
+	if (env) return agi::fs::path(sfs::path(env));
 
 	if ((env = getenv("USER")) || (env = getenv("LOGNAME"))) {
 		if (passwd *user_info = getpwnam(env))
-			return user_info->pw_dir;
+			return agi::fs::path(sfs::path(user_info->pw_dir));
 	}
 
 	throw agi::EnvironmentError("Could not get home directory. Make sure HOME is set.");
 }
 
 #ifdef APPIMAGE_BUILD
-sfs::path data_dir() {
+agi::fs::path data_dir() {
 	char *exe = realpath("/proc/self/exe", NULL);
 	if (!exe) return "";
 
@@ -45,30 +45,29 @@ sfs::path data_dir() {
 
 	if (p.filename() == "bin") {
 		// assume unix prefix layout
-		return p.parent_path()/"share";
+		return agi::fs::path(p.parent_path()/"share");
 	}
 
-	return p;
+	return agi::fs::path(p);
 }
 #endif
 }
 
 namespace agi {
 void Path::FillPlatformSpecificPaths() {
-	sfs::path home = home_dir();
-	SetToken("?user", home/".aegisub");
-	SetToken("?local", home/".aegisub");
+	agi::fs::path dotdir = home_dir()/".aegisub";
+	SetToken("?user", dotdir);
+	SetToken("?local", dotdir);
 
 #ifdef APPIMAGE_BUILD
-	sfs::path data = data_dir();
-	if (data == "") data = home/".aegisub";
-	SetToken("?data", data);
+	agi::fs::path data = data_dir();
+	SetToken("?data", (data == "") ? dotdir : data);
 	SetToken("?dictionary", Decode("?data/dictionaries"));
 #else
 	SetToken("?data", P_DATA);
 	SetToken("?dictionary", "/usr/share/hunspell");
 #endif
 
-	SetToken("?temp", sfs::temp_directory_path());
+	SetToken("?temp", agi::fs::path(sfs::temp_directory_path()));
 }
 }

meson.build

@@ -75,9 +75,6 @@ if get_option('enable_update_checker')
     conf.set_quoted('UPDATE_CHECKER_SERVER', get_option('update_server'))
     conf.set_quoted('UPDATE_CHECKER_BASE_URL', get_option('update_url'))
 endif
-if get_option('relocatable') and host_machine.system() == 'linux'
-    conf.set('APPIMAGE_BUILD', 1)
-endif
 
 deps = []
 deps_inc = []

meson_options.txt

@@ -26,5 +26,3 @@ option('update_server', type: 'string', value: 'https://aegisub-updates.redvice.
 option('update_url', type: 'string', value: '/trunk', description: 'Base path to use for the update checker')
 
 option('build_osx_bundle', type: 'boolean', value: false, description: 'Package Aegisub.app on OSX')
-
-option('relocatable', type: 'boolean', value: false, description: 'Enable relocatable build')