X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frelocate.cc;h=fd6cf85c458f2fbac7dd76ae8c3bae1f8c8b3714;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=9972db3fb984353ef4865044543d02e102bf3b1d;hpb=cf4a98db1b2d2f25914b8c3c826f13e8edd3885b;p=lilypond.git diff --git a/lily/relocate.cc b/lily/relocate.cc index 9972db3fb9..fd6cf85c45 100644 --- a/lily/relocate.cc +++ b/lily/relocate.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2005--2006 Han-Wen Nienhuys + (c) 2005--2008 Han-Wen Nienhuys */ @@ -11,8 +11,11 @@ #include "config.hh" -#include -#include + +/* TODO: autoconf support */ + +#include +#include #if HAVE_GETTEXT #include @@ -27,22 +30,33 @@ #include "version.hh" #include "warn.hh" +#define FRAMEWORKDIR ".." int -sane_putenv (char const *key, std::string value, bool overwrite) +sane_putenv (char const *key, string value, bool overwrite) { if (overwrite || !getenv (key)) { - std::string combine = std::string (key) + "=" + value; + string combine = string (key) + "=" + value; char *s = strdup (combine.c_str ()); - return putenv (s); + + if (be_verbose_global) + progress_indication (_f ("Setting %s to %s" , key, value.c_str ()) + + "\n"); + + int retval = putenv (s); + /* + unfortunately, we can't portably free S here, + due to various bugs in glibc prior to 2.1.1 + */ + return retval; } return -1; } static int -set_env_file (char const *key, std::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); @@ -52,7 +66,7 @@ set_env_file (char const *key, std::string value, bool overwrite = false) } static int -set_env_dir (char const *key, std::string value) +set_env_dir (char const *key, string value) { if (is_dir (value)) return sane_putenv (key, value, false); @@ -62,12 +76,12 @@ set_env_dir (char const *key, std::string value) } static int -prepend_env_path (char const *key, std::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.c_str ())); + progress_indication (_f ("%s=%s (prepend)\n", key, value.c_str ())); if (char const *cur = getenv (key)) value += to_string (PATHSEP) + cur; @@ -79,215 +93,316 @@ prepend_env_path (char const *key, std::string value) return -1; } -std::string -dir_name (std::string const file_name) -{ - std::string s = file_name; - replace_all (s, '\\', '/'); - ssize n = s.length (); - if (n && s[n - 1] == '/') - s[n - 1] = 0; - s = s.substr (0, s.rfind ('/')); - return s; -} - #ifdef __MINGW32__ #include #endif -void -prefix_relocation (std::string prefix) +static void +prefix_relocation (string prefix) { - if (be_verbose_global) - warning (_f ("Relocation: compile prefix=%s, new prefix=%s", - prefix_directory, - prefix.c_str ())); + string bindir = prefix + "/bin"; + string datadir = prefix + "/share"; + string localedir = datadir + "/locale"; + string package_datadir = datadir + "/lilypond/"; + string old_lilypond_datadir = lilypond_datadir; + + if (is_dir (package_datadir + "/" + TOPLEVEL_VERSION)) + lilypond_datadir = package_datadir + "/" + TOPLEVEL_VERSION; + else if (is_dir (package_datadir + "/current")) + lilypond_datadir = package_datadir + "/current"; + else + warning (_f ("not relocating, no %s/ or current/ found under %s", + TOPLEVEL_VERSION, package_datadir.c_str ())); - std::string bindir = prefix + "/bin"; - std::string datadir = prefix + "/share"; - std::string localedir = datadir + "/locale"; - std::string lilypond_datadir = datadir + "/lilypond/"; - - 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.c_str ()); #endif prepend_env_path ("PATH", bindir); + + if (be_verbose_global) + warning (_f ("Relocation: compile datadir=%s, new datadir=%s", + old_lilypond_datadir.c_str (), + lilypond_datadir.c_str ())); } -void -framework_relocation (std::string prefix) +/* + UGH : this is a complete mess. +*/ + +static void +framework_relocation (string prefix) { if (be_verbose_global) warning (_f ("Relocation: framework_prefix=%s", prefix)); - std::string bindir = prefix + "/bin"; - std::string datadir = prefix + "/share"; - std::string libdir = prefix + "/lib"; - std::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); } -std::string -get_working_directory () -{ - char cwd[PATH_MAX]; - getcwd (cwd, PATH_MAX); - - return std::string (cwd); -} - +/* + UGH : this is a complete mess. +*/ void setup_paths (char const *argv0_ptr) { File_name argv0_filename (argv0_ptr); - prefix_directory = LILYPOND_DATADIR; - if (relocate_binary - && getenv ("LILYPOND_RELOCATE_PREFIX")) + if (relocate_binary) { - std::string prefix = getenv ("LILYPOND_RELOCATE_PREFIX"); + string prefix_directory; + if (getenv ("LILYPOND_RELOCATE_PREFIX")) + { + prefix_directory = getenv ("LILYPOND_RELOCATE_PREFIX"); #ifdef __MINGW32__ - /* Normalize file name. */ - prefix = File_name (prefix).to_string (); + /* Normalize file name. */ + prefix_directory = File_name (prefix_directory).to_string (); #endif /* __MINGW32__ */ - prefix_relocation (prefix); - std::string bindir = prefix + "/bin"; - framework_relocation (bindir + "/" FRAMEWORKDIR); - } - else if (relocate_binary) - { - std::string argv0_abs; - if (argv0_filename.is_absolute ()) - { - argv0_abs = argv0_filename.to_string (); - if (be_verbose_global) - warning (_f ("Relocation: is absolute: argv0=%s", argv0_ptr)); - } - else if (argv0_filename.dir_.length ()) - { - argv0_abs = get_working_directory () - + "/" + std::string (argv0_filename.to_string ()); - if (be_verbose_global) - warning (_f ("Relocation: from cwd: argv0=%s", argv0_ptr)); + + prefix_relocation (prefix_directory); + string bindir = prefix_directory + "/bin"; + framework_relocation (bindir); } - else + else if (relocate_binary) { - /* Find absolute ARGV0 name, using PATH. */ - File_path path; - path.parse_path (getenv ("PATH")); - - if (be_verbose_global) - warning (_f ("Relocation: from PATH=%s\nargv0=%s", - path.to_string ().c_str (), argv0_ptr)); + string argv0_abs; + if (argv0_filename.is_absolute ()) + { + argv0_abs = argv0_filename.to_string (); + if (be_verbose_global) + warning (_f ("Relocation: is absolute: argv0=%s", argv0_ptr)); + } + else if (argv0_filename.dir_.length ()) + { + argv0_abs = get_working_directory () + + "/" + string (argv0_filename.to_string ()); + if (be_verbose_global) + warning (_f ("Relocation: from cwd: argv0=%s", argv0_ptr)); + } + else + { + /* Find absolute ARGV0 name, using PATH. */ + File_path path; + path.parse_path (getenv ("PATH")); + + if (be_verbose_global) + warning (_f ("Relocation: from PATH=%s\nargv0=%s", + path.to_string ().c_str (), argv0_ptr)); #ifndef __MINGW32__ - argv0_abs = path.find (argv0_filename.to_string ()); + argv0_abs = path.find (argv0_filename.to_string ()); #else /* __MINGW32__ */ - char const *ext[] = {"exe", "", 0 }; - argv0_abs = path.find (argv0_filename.to_string (), ext); + char const *ext[] = {"exe", "", 0 }; + argv0_abs = path.find (argv0_filename.to_string (), ext); #endif /* __MINGW32__ */ - if (argv0_abs.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 (lilypond_datadir))); + if (argv0_prefix != compile_prefix) + { + prefix_relocation (argv0_prefix); + prefix_directory = argv0_prefix; + } + if (argv0_prefix != compile_prefix || string (FRAMEWORKDIR) != "..") + { + framework_relocation (bindir + "/" + FRAMEWORKDIR); + prefix_directory = bindir + "/" + FRAMEWORKDIR; + } } - std::string bindir = dir_name (argv0_abs); - std::string argv0_prefix = dir_name (bindir); - std::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 || std::string (FRAMEWORKDIR) != "..") - framework_relocation (bindir + "/" FRAMEWORKDIR); + lilypond_datadir = prefix_directory + + "/share/lilypond/" TOPLEVEL_VERSION; } - /* FIXME: use LILYPOND_DATADIR. */ - if (char const *env = getenv ("LILYPONDPREFIX")) - { + if (getenv ("LILYPONDPREFIX")) + error (_ ("LILYPONDPREFIX is obsolete, use LILYPOND_DATADIR")); -#ifdef __MINGW32__ + if (char const *env = getenv ("LILYPOND_DATADIR")) + { /* Normalize file name. */ - prefix_directory = File_name (env).to_string (); -#else - prefix_directory = env; -#endif + lilypond_datadir = File_name (env).to_string (); } + /* When running from build dir, a full LILYPOND_DATADIR is set-up at + $(OUTBASE)/{share, lib}/lilypond/current. Configure lily using + ./configure --prefix=$(pwd)/out */ + string build_datadir_current = dir_name (lilypond_datadir) + "/current"; + if (!is_dir (lilypond_datadir.c_str ()) + && is_dir (build_datadir_current.c_str ())) + lilypond_datadir = build_datadir_current; + + + lilypond_datadir = File_name (lilypond_datadir).canonicalized().to_string(); + global_path.append (""); + /* Adding mf/out make lilypond unchanged source directory, when setting + LILYPONDPREFIX to lilypond-x.y.z */ + char const *suffixes[] = {"ly", "ps", "scm", 0 }; + + vector dirs; + for (char const **s = suffixes; *s; s++) + { + string path = lilypond_datadir + to_string ('/') + string (*s); + dirs.push_back (path); + } + + dirs.push_back (lilypond_datadir + "/fonts/otf/"); + dirs.push_back (lilypond_datadir + "/fonts/type1/"); + dirs.push_back (lilypond_datadir + "/fonts/svg/"); + + for (vsize i = 0; i < dirs.size (); i++) + global_path.prepend (dirs[i]); +} - /* - When running from build dir, a full LILYPOND_PREFIX is set-up at +string +expand_environment_variables (string orig) +{ + const char *start_ptr = orig.c_str (); + const char *ptr = orig.c_str (); + size_t len = orig.length (); - $(OUTBASE)/share/lilypond/TOPLEVEL_VERSION + string out; + while (ptr < start_ptr + len) + { + 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; - This historical hack will allow the shorthand + } - LILYPONDPREFIX=out lily/out/lilypond ... + out += ptr; - */ - - struct stat statbuf; - std::string build_prefix_current = prefix_directory + "/share/lilypond/" "current"; - std::string build_prefix_version = prefix_directory + "/share/lilypond/" TOPLEVEL_VERSION; - if (stat (build_prefix_version.c_str (), &statbuf) == 0) - prefix_directory = build_prefix_version; - else if (stat (build_prefix_current.c_str (), &statbuf) == 0) - prefix_directory = build_prefix_current; + return out; +} +// Ugh - very inefficient, but safer than fgets. +static string +read_line (FILE *f) +{ + string out; - /* Adding mf/out make lilypond unchanged source directory, when setting - LILYPONDPREFIX to lilypond-x.y.z */ - char *suffixes[] = {"ly", "ps", "scm", 0 }; + int c = 0; + while ((c = fgetc (f)) != EOF && c != '\n') + out += char(c); - - std::vector dirs; - for (char **s = suffixes; *s; s++) + return out; +} + +void +read_relocation_file (string filename) +{ + if (be_verbose_global) + progress_indication (_f ("Relocation file: %s", filename.c_str ()) + + "\n"); + + char const *cname = filename.c_str (); + FILE *f = fopen (cname, "r"); + if (!f) + error (_f ("cannot open file: `%s'", cname)); + + while (!feof (f)) { - std::string path = prefix_directory + to_string ('/') + std::string (*s); - dirs.push_back (path); + 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); +} - dirs.push_back (prefix_directory + "/fonts/otf/"); - dirs.push_back (prefix_directory + "/fonts/type1/"); - dirs.push_back (prefix_directory + "/fonts/svg/"); - - for (vsize i = 0; i < dirs.size (); i++) - global_path.prepend (dirs[i]); +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 ()); + } }