X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frelocate.cc;h=879377a1cc0928bae14c6fd92c5fd8f032eacac2;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=698f06ac64373bfd0475c882d0e990e62c4b4892;hpb=bc95f4434f760d41191341ab4508b2064eb19025;p=lilypond.git diff --git a/lily/relocate.cc b/lily/relocate.cc index 698f06ac64..879377a1cc 100644 --- a/lily/relocate.cc +++ b/lily/relocate.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2005--2010 Han-Wen Nienhuys + Copyright (C) 2005--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,7 +21,6 @@ #include "config.hh" - /* TODO: autoconf support */ #include @@ -40,47 +39,52 @@ #include "version.hh" #include "warn.hh" +#ifdef __MINGW32__ +#include +#endif + #define FRAMEWORKDIR ".." int -sane_putenv (char const *key, string value, bool overwrite) +sane_putenv (char const *key, const string &value, bool overwrite) { if (overwrite || !getenv (key)) { string combine = string (key) + "=" + value; char *s = strdup (combine.c_str ()); - if (be_verbose_global) - progress_indication (_f ("Setting %s to %s" , key, value.c_str ()) - + "\n"); - - int retval = putenv (s); + debug_output (_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 - */ + 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, string value, bool overwrite = false) +set_env_file (char const *key, const string &value, bool overwrite = false) { if (is_file (value)) return sane_putenv (key, value, overwrite); - else if (be_verbose_global) + else if (is_loglevel (LOG_DEBUG)) + // this warning should only be printed in debug mode! warning (_f ("no such file: %s for %s", value, key)); return -1; } static int -set_env_dir (char const *key, string value) +set_env_dir (char const *key, const string &value) { if (is_dir (value)) return sane_putenv (key, value, false); - else if (be_verbose_global) + else if (is_loglevel (LOG_DEBUG)) + // this warning should only be printed in debug mode! warning (_f ("no such directory: %s for %s", value, key)); return -1; } @@ -90,25 +94,21 @@ prepend_env_path (char const *key, string value) { if (is_dir (value)) { - if (be_verbose_global) - progress_indication (_f ("%s=%s (prepend)\n", key, value.c_str ())); + debug_output (_f ("%s=%s (prepend)\n", key, value.c_str ()), false); if (char const *cur = getenv (key)) - value += to_string (PATHSEP) + cur; + value += to_string (PATHSEP) + cur; return sane_putenv (key, value.c_str (), true); } - else if (be_verbose_global) + else if (is_loglevel (LOG_DEBUG)) + // this warning should only be printed in debug mode warning (_f ("no such directory: %s for %s", value, key)); return -1; } -#ifdef __MINGW32__ -#include -#endif - static void -prefix_relocation (string prefix) +prefix_relocation (const string &prefix) { string bindir = prefix + "/bin"; string datadir = prefix + "/share"; @@ -122,8 +122,8 @@ prefix_relocation (string prefix) lilypond_datadir = package_datadir + "/current"; else warning (_f ("not relocating, no %s/ or current/ found under %s", - TOPLEVEL_VERSION, package_datadir.c_str ())); - + TOPLEVEL_VERSION, package_datadir.c_str ())); + #if HAVE_GETTEXT if (is_dir (localedir)) bindtextdomain ("lilypond", localedir.c_str ()); @@ -131,10 +131,9 @@ prefix_relocation (string prefix) 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 ())); + debug_output (_f ("Relocation: compile datadir=%s, new datadir=%s", + old_lilypond_datadir.c_str (), + lilypond_datadir.c_str ())); } /* @@ -142,17 +141,16 @@ prefix_relocation (string prefix) */ static void -framework_relocation (string prefix) +framework_relocation (const string &prefix) { - if (be_verbose_global) - warning (_f ("Relocation: framework_prefix=%s", prefix)); + debug_output (_f ("Relocation: framework_prefix=%s", prefix)); sane_putenv ("INSTALLER_PREFIX", prefix, true); - + read_relocation_dir (prefix + "/etc/relocate/"); string bindir = prefix + "/bin"; - + prepend_env_path ("PATH", bindir); } @@ -163,76 +161,61 @@ void setup_paths (char const *argv0_ptr) { File_name argv0_filename (argv0_ptr); - + if (relocate_binary) { string prefix_directory; - if (getenv ("LILYPOND_RELOCATE_PREFIX")) - { - prefix_directory = getenv ("LILYPOND_RELOCATE_PREFIX"); -#ifdef __MINGW32__ - /* Normalize file name. */ - prefix_directory = File_name (prefix_directory).to_string (); -#endif /* __MINGW32__ */ - - prefix_relocation (prefix_directory); - string bindir = prefix_directory + "/bin"; - framework_relocation (bindir); - } - else if (relocate_binary) - { - 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)); + string argv0_abs; + if (argv0_filename.is_absolute ()) + { + argv0_abs = argv0_filename.to_string (); + debug_output (_f ("Relocation: is absolute: argv0=%s\n", argv0_ptr)); + } + else if (argv0_filename.dir_.length ()) + { + argv0_abs = get_working_directory () + + "/" + string (argv0_filename.to_string ()); + debug_output (_f ("Relocation : from cwd: argv0=%s\n", argv0_ptr)); + } + else + { + /* Find absolute ARGV0 name, using PATH. */ + File_path path; + char *p = getenv ("PATH"); + if (p) + path.parse_path (p); #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); + path.prepend (get_working_directory ()); + char const *ext[] = {"exe", "", 0 }; + argv0_abs = path.find (argv0_filename.to_string (), ext); #endif /* __MINGW32__ */ - 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; - } - } + debug_output (_f ("Relocation: from PATH=%s\nargv0=%s\n", + path.to_string ().c_str (), argv0_ptr), true); + + 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; + } lilypond_datadir = prefix_directory - + "/share/lilypond/" TOPLEVEL_VERSION; + + "/share/lilypond/" TOPLEVEL_VERSION; } if (getenv ("LILYPONDPREFIX")) @@ -252,32 +235,31 @@ setup_paths (char const *argv0_ptr) && is_dir (build_datadir_current.c_str ())) lilypond_datadir = build_datadir_current; + lilypond_datadir = File_name (lilypond_datadir).canonicalized ().to_string (); - 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]); } string -expand_environment_variables (string orig) +expand_environment_variables (const string &orig) { char const *start_ptr = orig.c_str (); char const *ptr = orig.c_str (); @@ -287,57 +269,57 @@ expand_environment_variables (string orig) while (ptr < start_ptr + len) { char const *dollar = strchr (ptr, '$'); - + if (dollar != NULL) - { - char const *start_var = dollar + 1; - char const *end_var = start_var; - char const *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); - char const *value = getenv (var_name.c_str ()); - if (value != NULL) - out += string (value); - - ptr = start_next; - } - } + { + char const *start_var = dollar + 1; + char const *end_var = start_var; + char const *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); + char const *value = getenv (var_name.c_str ()); + if (value != NULL) + out += string (value); + + ptr = start_next; + } + } else - break; + break; } @@ -351,21 +333,18 @@ static string read_line (FILE *f) { string out; - + int c = 0; while ((c = fgetc (f)) != EOF && c != '\n') - out += char(c); + out += char (c); return out; } void -read_relocation_file (string filename) +read_relocation_file (const string &filename) { - if (be_verbose_global) - progress_indication (_f ("Relocation file: %s", filename.c_str ()) - + "\n"); - + debug_output (_f ("Relocation file: %s", filename.c_str ()) + "\n"); char const *cname = filename.c_str (); FILE *f = fopen (cname, "r"); if (!f) @@ -376,13 +355,13 @@ read_relocation_file (string filename) string line = read_line (f); size_t idx = line.find (' '); if (idx == NPOS) - continue; - + continue; + string command = line.substr (0, idx); line = line.substr (idx + 1); - + if (idx == NPOS) - continue; + continue; idx = line.find ('='); string variable = line.substr (0, idx); @@ -391,28 +370,28 @@ read_relocation_file (string filename) value = expand_environment_variables (value); if (command == "set") - sane_putenv (variable.c_str (), value, true); + sane_putenv (variable.c_str (), value, true); else if (command == "setdir") - set_env_dir (variable.c_str (), value); + set_env_dir (variable.c_str (), value); else if (command == "setfile") - set_env_file (variable.c_str (), value); + set_env_file (variable.c_str (), value); else if (command == "prependdir") - prepend_env_path (variable.c_str (), value); + prepend_env_path (variable.c_str (), value); else - error (_f ("Unknown relocation command %s", command)); + error (_f ("Unknown relocation command %s", command)); } fclose (f); } void -read_relocation_dir (string dirname) +read_relocation_dir (const 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 ()); + File_name name (ent->d_name); + if (name.ext_ == "reloc") + read_relocation_file (dirname + "/" + name.to_string ()); } }