Store compiler path inside OS dependant code.

Author: dmsc

src/compiler/main.cc

@@ -78,13 +78,11 @@ static std::string to_lower(std::string in)
 int main(int argc, char **argv)
 {
     // OS specific initializations
-    os::init();
+    os::init(argv[0]);
 
-    auto program_name = std::string(argv[0]);
-    // Tries to guess install folder given the program name
-    auto install_folder = os::dir_name(program_name);
-    auto syntax_folder = os::full_path(install_folder, "syntax");
-    auto target_folder = install_folder;
+    // Default folders for target and syntax files
+    auto syntax_folder = os::compiler_path("syntax");
+    auto target_folder = os::compiler_path("");
     std::vector<std::string> args(argv + 1, argv + argc);
     std::string out_name;
     std::string exe_name;
@@ -283,9 +281,9 @@ int main(int argc, char **argv)
         std::cerr << e.what() << "\n";
         return 1;
     }
-    std::string lib_name = os::full_path(install_folder, tgt.lib());
+    std::string lib_name = os::compiler_path(tgt.lib());
     std::string cfg_file =
-        cfg_file_def.size() ? cfg_file_def : os::full_path(install_folder, tgt.cfg());
+        cfg_file_def.size() ? cfg_file_def : os::compiler_path(tgt.cfg());
     asm_opts.insert(asm_opts.end(), tgt.ca65_args().begin(), tgt.ca65_args().end());
 
     // Guess final exe file name
@@ -308,13 +306,13 @@ int main(int argc, char **argv)
     }
     for(auto &f : asm_files)
     {
-        auto ca65 = os::full_path(install_folder, "ca65");
+        auto ca65 = os::compiler_path("ca65");
         auto asm_name = std::get<0>(f), obj_name = std::get<1>(f);
         auto lst_name = os::add_extension(obj_name, ".lst");
 
         std::cerr << "ASM assemble '" << asm_name << "' to '" << obj_name << "'\n";
         std::vector<std::string> args{
-            "ca65", "-I",    os::full_path(install_folder, "asminc"), "-o", obj_name};
+            "ca65", "-I",    os::compiler_path("asminc"), "-o", obj_name};
         if(do_listing)
             args.insert(args.end(), {"-l",   lst_name});
         for(auto &o : asm_opts)
@@ -328,7 +326,7 @@ int main(int argc, char **argv)
     }
     if(link_files.size())
     {
-        auto ld65 = os::full_path(install_folder, "ld65");
+        auto ld65 = os::compiler_path("ld65");
         //$LD65" -C "$CFGFILE" "$@" -o "$XEX" -Ln "$LBL" "$FB.lib"
         std::cerr << "LINK " << exe_name << "\n";
         std::vector<std::string> args{"ld65",

src/compiler/os.cc

@@ -33,6 +33,8 @@ static const char *path_sep = "\\/";
 static const char *path_sep = "/";
 #endif
 
+static std::string compiler_search_path;
+
 bool os::path_absolute(const std::string &path)
 {
     if(path.find_first_of(path_sep) == 0)
@@ -100,14 +102,21 @@ std::string os::get_extension_lower(std::string name)
     return ret;
 }
 
-void os::init()
+void os::init(const std::string &prog)
 {
 #ifdef _WIN32
     // On windows, we need to set console output to UTF-8:
     SetConsoleOutputCP(CP_UTF8);
 #else
     // No init needed.
 #endif
+    // Store out program name
+    compiler_search_path = dir_name(prog);
+}
+
+std::string os::compiler_path(const std::string &filename)
+{
+    return full_path(compiler_search_path, filename);
 }
 
 int os::prog_exec(std::string exe, std::vector<std::string> &args)

src/compiler/os.h

@@ -24,6 +24,9 @@
 
 namespace os
 {
+// Locates a file or folder in the compiler data and
+// returns the path
+std::string compiler_path(const std::string &filename);
 // Appends a file name to a path
 std::string full_path(const std::string &path, const std::string &filename);
 // Returns the file name from a full path
@@ -41,7 +44,7 @@ std::string get_extension_lower(std::string name);
 // Execute external program, waiting for the result
 int prog_exec(std::string exe, std::vector<std::string> &args);
 // OS specific initializations
-void init();
+void init(const std::string &prog);
 // Remove a file
 void remove_file(const std::string &path);