X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frelocate.cc;h=6e3b2ab71e84b251aa82208f7a6cabbfd02eff49;hb=744614ec4497e540fbaa6ad9bf6e842f4b99442a;hp=1c6c422ad1e918eb7c5c5b0e6a73ebd03da9ac25;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git diff --git a/lily/relocate.cc b/lily/relocate.cc index 1c6c422ad1..6e3b2ab71e 100644 --- a/lily/relocate.cc +++ b/lily/relocate.cc @@ -11,8 +11,11 @@ #include "config.hh" -#include -#include + +/* TODO: autoconf support */ + +#include +#include #if HAVE_GETTEXT #include @@ -20,20 +23,26 @@ #include "file-name.hh" #include "file-path.hh" +#include "international.hh" #include "lily-guile.hh" #include "lily-version.hh" #include "main.hh" #include "version.hh" #include "warn.hh" +#define FRAMEWORKDIR ".." int -sane_putenv (char const *key, String value, bool overwrite) +sane_putenv (char const *key, string value, bool overwrite) { if (overwrite || !getenv (key)) { - String combine = String (key) + "=" + value; - char *s = strdup (combine.to_str0 ()); + string combine = string (key) + "=" + value; + char *s = strdup (combine.c_str ()); + + if (be_verbose_global) + progress_indication (_f ("Setting %s to %s\n" , key, value.c_str ())); + return putenv (s); } @@ -41,7 +50,7 @@ sane_putenv (char const *key, String value, bool overwrite) } static int -set_env_file (char const *key, String value, bool overwrite = false) +set_env_file (char const *key, string value, bool overwrite = false) { if (is_file (value)) return sane_putenv (key, value, overwrite); @@ -51,7 +60,7 @@ set_env_file (char const *key, String value, bool overwrite = false) } static int -set_env_dir (char const *key, String value) +set_env_dir (char const *key, string value) { if (is_dir (value)) return sane_putenv (key, value, false); @@ -61,114 +70,75 @@ set_env_dir (char const *key, String value) } static int -prepend_env_path (char const *key, String value) +prepend_env_path (char const *key, string value) { if (is_dir (value)) { if (be_verbose_global) - progress_indication (_f ("%s=%s\n", key, value.to_str0 ())); + progress_indication (_f ("%s=%s (prepend)\n", key, value.c_str ())); if (char const *cur = getenv (key)) value += to_string (PATHSEP) + cur; - return sane_putenv (key, value.to_str0 (), true); + return sane_putenv (key, value.c_str (), true); } else if (be_verbose_global) warning (_f ("no such directory: %s for %s", value, key)); return -1; } -String -dir_name (String const file_name) -{ - String s = file_name; - s.substitute ('\\', '/'); - int n = s.length (); - if (n && s[n - 1] == '/') - s[n - 1] = 0; - s = s.left_string (s.index_last ('/')); - return s; -} - #ifdef __MINGW32__ #include #endif void -prefix_relocation (String prefix) +prefix_relocation (string prefix) { if (be_verbose_global) warning (_f ("Relocation: compile prefix=%s, new prefix=%s", prefix_directory, - prefix.to_str0 ())); + prefix.c_str ())); - String bindir = prefix + "/bin"; - String datadir = prefix + "/share"; - String localedir = datadir + "/locale"; - String lilypond_datadir = datadir + "/lilypond/" TOPLEVEL_VERSION; + string bindir = prefix + "/bin"; + string datadir = prefix + "/share"; + string localedir = datadir + "/locale"; + string lilypond_datadir = datadir + "/lilypond/"; - if (is_dir (lilypond_datadir)) - prefix_directory = lilypond_datadir; + if (is_dir (lilypond_datadir + "/" + TOPLEVEL_VERSION)) + prefix_directory = lilypond_datadir + "/" + TOPLEVEL_VERSION; + else if (is_dir (lilypond_datadir + "/current")) + prefix_directory = lilypond_datadir + "/current"; #if HAVE_GETTEXT if (is_dir (localedir)) - bindtextdomain ("lilypond", localedir.to_str0 ()); + bindtextdomain ("lilypond", localedir.c_str ()); #endif prepend_env_path ("PATH", bindir); } +/* + UGH : this is a complete mess. + */ + void -framework_relocation (String prefix) +framework_relocation (string prefix) { if (be_verbose_global) warning (_f ("Relocation: framework_prefix=%s", prefix)); - String bindir = prefix + "/bin"; - String datadir = prefix + "/share"; - String libdir = prefix + "/lib"; - String sysconfdir = prefix + "/etc"; - - /* need otherwise dynamic .so's aren't found. */ - prepend_env_path ("DYLD_LIBRARY_PATH", libdir); - - set_env_file ("FONTCONFIG_FILE", sysconfdir + "/fonts/fonts.conf", true); - set_env_dir ("FONTCONFIG_PATH", sysconfdir + "/fonts"); - -#ifdef __MINGW32__ - char font_dir[PATH_MAX]; - ExpandEnvironmentStrings ("%windir%/fonts", font_dir, sizeof (font_dir)); - prepend_env_path ("GS_FONTPATH", font_dir); -#endif - - /* FIXME: *cough* 8.15 *cough* */ - prepend_env_path ("GS_FONTPATH", datadir + "/ghostscript/8.15/fonts"); - prepend_env_path ("GS_LIB", datadir + "/ghostscript/8.15/Resource"); - prepend_env_path ("GS_LIB", datadir + "/ghostscript/8.15/lib"); - - prepend_env_path ("GS_FONTPATH", datadir + "/gs/fonts"); - prepend_env_path ("GS_LIB", datadir + "/gs/Resource"); - prepend_env_path ("GS_LIB", datadir + "/gs/lib"); + sane_putenv ("INSTALLER_PREFIX", prefix, true); + + read_relocation_dir (prefix + "/etc/relocate/"); - prepend_env_path ("GUILE_LOAD_PATH", datadir - + to_string ("/guile/%d.%d", - SCM_MAJOR_VERSION, SCM_MINOR_VERSION)); - - set_env_file ("PANGO_RC_FILE", sysconfdir + "/pango/pangorc"); - set_env_dir ("PANGO_PREFIX", prefix); + string bindir = prefix + "/bin"; prepend_env_path ("PATH", bindir); } -String -get_working_directory () -{ - char cwd[PATH_MAX]; - getcwd (cwd, PATH_MAX); - - return String (cwd); -} - +/* + UGH : this is a complete mess. + */ void setup_paths (char const *argv0_ptr) { @@ -178,18 +148,19 @@ setup_paths (char const *argv0_ptr) if (relocate_binary && getenv ("LILYPOND_RELOCATE_PREFIX")) { - String prefix = getenv ("LILYPOND_RELOCATE_PREFIX"); + prefix_directory = getenv ("LILYPOND_RELOCATE_PREFIX"); #ifdef __MINGW32__ /* Normalize file name. */ - prefix = File_name (prefix).to_string ().get_copy_str0 (); + prefix_directory = File_name (prefix_directory).to_string (); #endif /* __MINGW32__ */ - prefix_relocation (prefix); - String bindir = prefix + "/bin"; - framework_relocation (bindir + "/" FRAMEWORKDIR); + + prefix_relocation (prefix_directory); + string bindir = prefix_directory + "/bin"; + framework_relocation (bindir); } else if (relocate_binary) { - String argv0_abs; + string argv0_abs; if (argv0_filename.is_absolute ()) { argv0_abs = argv0_filename.to_string (); @@ -199,7 +170,7 @@ setup_paths (char const *argv0_ptr) else if (argv0_filename.dir_.length ()) { argv0_abs = get_working_directory () - + "/" + String (argv0_filename.to_string ()); + + "/" + string (argv0_filename.to_string ()); if (be_verbose_global) warning (_f ("Relocation: from cwd: argv0=%s", argv0_ptr)); } @@ -211,7 +182,7 @@ setup_paths (char const *argv0_ptr) if (be_verbose_global) warning (_f ("Relocation: from PATH=%s\nargv0=%s", - path.to_string ().get_str0 (), argv0_ptr)); + path.to_string ().c_str (), argv0_ptr)); #ifndef __MINGW32__ argv0_abs = path.find (argv0_filename.to_string ()); @@ -220,17 +191,23 @@ setup_paths (char const *argv0_ptr) argv0_abs = path.find (argv0_filename.to_string (), ext); #endif /* __MINGW32__ */ - if (argv0_abs.is_empty ()) - programming_error ("can't find absolute argv0."); + if (argv0_abs.empty ()) + programming_error (cannot find absolute argv0."); } - String bindir = dir_name (argv0_abs); - String argv0_prefix = dir_name (bindir); - String compile_prefix = dir_name (dir_name (dir_name (prefix_directory))); + string bindir = dir_name (argv0_abs); + string argv0_prefix = dir_name (bindir); + string compile_prefix = dir_name (dir_name (dir_name (prefix_directory))); if (argv0_prefix != compile_prefix) - prefix_relocation (argv0_prefix); - if (argv0_prefix != compile_prefix || String (FRAMEWORKDIR) != "..") - framework_relocation (bindir + "/" FRAMEWORKDIR); + { + prefix_relocation (argv0_prefix); + prefix_directory = argv0_prefix; + } + if (argv0_prefix != compile_prefix || string (FRAMEWORKDIR) != "..") + { + framework_relocation (bindir + "/" + FRAMEWORKDIR); + prefix_directory = bindir + "/" + FRAMEWORKDIR; + } } /* FIXME: use LILYPOND_DATADIR. */ @@ -238,9 +215,10 @@ setup_paths (char const *argv0_ptr) { #ifdef __MINGW32__ /* Normalize file name. */ - env = File_name (env).to_string ().get_copy_str0 (); -#endif + prefix_directory = File_name (env).to_string (); +#else prefix_directory = env; +#endif } global_path.append (""); @@ -257,29 +235,170 @@ setup_paths (char const *argv0_ptr) */ - struct stat statbuf; - String build_prefix = prefix_directory + "/share/lilypond/" TOPLEVEL_VERSION; - if (stat (build_prefix.to_str0 (), &statbuf) == 0) - prefix_directory = build_prefix; - + string build_prefix_current = prefix_directory + "/share/lilypond/" "current"; + string build_prefix_version = prefix_directory + "/share/lilypond/" TOPLEVEL_VERSION; + if (is_dir (build_prefix_version.c_str ())) + prefix_directory = build_prefix_version; + else if (is_dir (build_prefix_current.c_str ())) + prefix_directory = build_prefix_current; /* Adding mf/out make lilypond unchanged source directory, when setting LILYPONDPREFIX to lilypond-x.y.z */ - char *suffixes[] = {"ly", "ps", "scm", 0 }; - + char const *suffixes[] = {"ly", "ps", "scm", 0 }; + + vector dirs; + for (char const **s = suffixes; *s; s++) + { + string path = prefix_directory + to_string ('/') + string (*s); + dirs.push_back (path); + } + + dirs.push_back (prefix_directory + "/fonts/otf/"); + dirs.push_back (prefix_directory + "/fonts/type1/"); + dirs.push_back (prefix_directory + "/fonts/svg/"); - Array dirs; - for (char **s = suffixes; *s; s++) + for (vsize i = 0; i < dirs.size (); i++) + global_path.prepend (dirs[i]); +} + + + +string +expand_environment_variables (string orig) +{ + const char *start_ptr = orig.c_str(); + const char *ptr = orig.c_str(); + size_t len = orig.length(); + + string out; + while (ptr < start_ptr + len) { - String path = prefix_directory + to_string ('/') + String (*s); - dirs.push (path); + char *dollar = strchr (ptr, '$'); + + if (dollar != NULL) + { + char *start_var = dollar + 1; + char *end_var = start_var; + char *start_next = end_var; + + out += string (ptr, dollar - ptr); + ptr = dollar; + + if (*start_var == '{') + { + start_var ++; + + end_var = strchr (start_var, '}'); + + if (end_var == NULL) + { + end_var = start_var + len; + start_next = end_var; + } + else + { + start_next = end_var + 1; + } + } + else + { + /* + Hmm. what to do for $1 , $~ etc.? + */ + do + { + end_var ++; + } + while (isalnum (*end_var) || *end_var == '_'); + start_next = end_var; + } + + if (start_var < end_var) + { + string var_name (start_var, end_var - start_var); + const char *value = getenv (var_name.c_str()); + if (value != NULL) + out += string (value); + + ptr = start_next; + } + } + else + break; + } + out += ptr; + + return out; +} + - dirs.push (prefix_directory + "/fonts/otf/"); - dirs.push (prefix_directory + "/fonts/type1/"); - dirs.push (prefix_directory + "/fonts/svg/"); +string +read_line (FILE *f) +{ + string out; - for (int i = 0; i < dirs.size (); i++) - global_path.prepend (dirs[i]); + int c = 0; + while ((c = fgetc (f)) != EOF && c != '\n') + out += c; + + return out; +} + +void +read_relocation_file (string filename) +{ + if (be_verbose_global) + progress_indication (_f ("Relocation file %s\n", filename.c_str ())); + + char const *cname = filename.c_str (); + FILE *f = fopen (cname, "r"); + if (!f) + error (_f (cannot open file %s", cname)); + + while (!feof (f)) + { + string line = read_line (f); + size_t idx = line.find (' '); + if (idx == NPOS) + continue; + + string command = line.substr (0, idx); + line = line.substr (idx + 1); + + if (idx == NPOS) + continue; + idx = line.find ('='); + + string variable = line.substr (0, idx); + string value = line.substr (idx + 1); + + value = expand_environment_variables (value); + + if (command == "set") + sane_putenv (variable.c_str(), value, true); + else if (command == "setdir") + set_env_dir (variable.c_str(), value); + else if (command == "setfile") + set_env_file (variable.c_str(), value); + else if (command == "prependdir") + prepend_env_path (variable.c_str (), value); + else + error (_f ("Unknown relocation command %s", command)); + } + + fclose (f); +} + +void +read_relocation_dir (string dirname) +{ + if (DIR *dir = opendir (dirname.c_str ())) + while (struct dirent *ent = readdir (dir)) + { + File_name name (ent->d_name); + if (name.ext_ == "reloc") + read_relocation_file (dirname + "/" + name.to_string ()); + } }