X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frelocate.cc;h=0d9e9c9a6a08850b1e35e421e29c01c4e160a4a4;hb=40b0a6f7045d76b2d289df757a72ed18942e10f1;hp=753557dc0b848ebc9d573e23cd0f136ae3bfbad7;hpb=89d91900e92074780acaadc4361b2d99c8ec0ac3;p=lilypond.git diff --git a/lily/relocate.cc b/lily/relocate.cc index 753557dc0b..0d9e9c9a6a 100644 --- a/lily/relocate.cc +++ b/lily/relocate.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2005 Han-Wen Nienhuys + (c) 2005--2006 Han-Wen Nienhuys */ @@ -20,20 +20,23 @@ #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 ()); return putenv (s); } @@ -41,17 +44,17 @@ sane_putenv (char const *key, String value, bool overwrite) } static int -set_env_file (char const *key, String value) +set_env_file (char const *key, string value, bool overwrite = false) { if (is_file (value)) - return sane_putenv (key, value, false); + return sane_putenv (key, value, overwrite); else if (be_verbose_global) 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, string value) { if (is_dir (value)) return sane_putenv (key, value, false); @@ -61,32 +64,32 @@ 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\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 +dir_name (string const file_name) { - String s = file_name; - s.substitute ('\\', '/'); - int n = s.length (); + string s = file_name; + replace_all (s, '\\', '/'); + ssize n = s.length (); if (n && s[n - 1] == '/') s[n - 1] = 0; - s = s.left_string (s.index_last ('/')); + s = s.substr (0, s.rfind ('/')); return s; } @@ -95,44 +98,46 @@ dir_name (String const file_name) #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); } 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"; + 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"); + set_env_file ("FONTCONFIG_FILE", sysconfdir + "/fonts/fonts.conf", true); set_env_dir ("FONTCONFIG_PATH", sysconfdir + "/fonts"); #ifdef __MINGW32__ @@ -141,10 +146,20 @@ framework_relocation (String prefix) 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"); + string gs_version = +#ifdef GHOSTSCRIPT_VERSION + GHOSTSCRIPT_VERSION +#else + "ghostscript-version-undefined" +#endif + ; + + if (char const *cur = getenv ("LILYPOND_GS_VERSION")) + gs_version = cur; + + prepend_env_path ("GS_FONTPATH", datadir + "/ghostscript/" + gs_version + "/fonts"); + prepend_env_path ("GS_LIB", datadir + "/ghostscript/" + gs_version + "/Resource"); + prepend_env_path ("GS_LIB", datadir + "/ghostscript/" + gs_version + "/lib"); prepend_env_path ("GS_FONTPATH", datadir + "/gs/fonts"); prepend_env_path ("GS_LIB", datadir + "/gs/Resource"); @@ -156,17 +171,17 @@ framework_relocation (String prefix) set_env_file ("PANGO_RC_FILE", sysconfdir + "/pango/pangorc"); set_env_dir ("PANGO_PREFIX", prefix); - + prepend_env_path ("PATH", bindir); } -String +string get_working_directory () { char cwd[PATH_MAX]; getcwd (cwd, PATH_MAX); - return String (cwd); + return string (cwd); } void @@ -178,57 +193,71 @@ setup_paths (char const *argv0_ptr) if (relocate_binary && getenv ("LILYPOND_RELOCATE_PREFIX")) { - String prefix = getenv ("LILYPOND_RELOCATE_PREFIX"); + string prefix = getenv ("LILYPOND_RELOCATE_PREFIX"); #ifdef __MINGW32__ /* Normalize file name. */ - prefix = File_name (prefix).to_string ().get_copy_str0 (); + prefix = File_name (prefix).to_string (); #endif /* __MINGW32__ */ prefix_relocation (prefix); - String bindir = prefix + "/bin"; - framework_relocation (bindir + "/" FRAMEWORKDIR); + string bindir = prefix + "/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 (); + { + 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 ()); + { + 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__ - String argv0_abs = path.find (argv0_filename.to_string ()); + argv0_abs = path.find (argv0_filename.to_string ()); #else /* __MINGW32__ */ char const *ext[] = {"exe", "", 0 }; - String argv0_abs = path.find (argv0_filename.to_string (), ext); + argv0_abs = path.find (argv0_filename.to_string (), ext); #endif /* __MINGW32__ */ - if (argv0_abs.is_empty ()) + if (argv0_abs.empty ()) programming_error ("can't 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); + if (argv0_prefix != compile_prefix || string (FRAMEWORKDIR) != "..") + framework_relocation (bindir + "/" + FRAMEWORKDIR); } /* FIXME: use LILYPOND_DATADIR. */ if (char const *env = getenv ("LILYPONDPREFIX")) { + #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 (""); @@ -246,28 +275,31 @@ 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 (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; /* 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 }; - Array dirs; - for (char **s = suffixes; *s; s++) + vector dirs; + for (char const **s = suffixes; *s; s++) { - String path = prefix_directory + to_string ('/') + String (*s); - dirs.push (path); + string path = prefix_directory + to_string ('/') + string (*s); + dirs.push_back (path); } - dirs.push (prefix_directory + "/fonts/otf/"); - dirs.push (prefix_directory + "/fonts/type1/"); - dirs.push (prefix_directory + "/fonts/svg/"); + dirs.push_back (prefix_directory + "/fonts/otf/"); + dirs.push_back (prefix_directory + "/fonts/type1/"); + dirs.push_back (prefix_directory + "/fonts/svg/"); - for (int i = 0; i < dirs.size (); i++) + for (vsize i = 0; i < dirs.size (); i++) global_path.prepend (dirs[i]); }