From 56fa0a3bf9e81a69660591acc6803db4f5b985c9 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 20 Dec 2005 00:30:54 +0000 Subject: [PATCH] * lily/include/relocate.hh: new file. * lily/relocate.cc: new file. Contain relocation logic. * lily/main.cc (setup_paths): fix: LILYPOND_RELOCATE_PREFIX. (main): read LILYPOND_VERBOSE as the first thing. --- ChangeLog | 4 + lily/include/main.hh | 2 + lily/include/relocate.hh | 21 ++++ lily/main.cc | 232 +----------------------------------- lily/relocate.cc | 251 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 280 insertions(+), 230 deletions(-) create mode 100644 lily/include/relocate.hh create mode 100644 lily/relocate.cc diff --git a/ChangeLog b/ChangeLog index a0c6d7427c..bb113899ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2005-12-20 Han-Wen Nienhuys + * lily/include/relocate.hh: new file. + + * lily/relocate.cc: new file. Contain relocation logic. + * lily/main.cc (setup_paths): fix: LILYPOND_RELOCATE_PREFIX. (main): read LILYPOND_VERBOSE as the first thing. diff --git a/lily/include/main.hh b/lily/include/main.hh index 86df6746b2..4dcda0f86a 100644 --- a/lily/include/main.hh +++ b/lily/include/main.hh @@ -49,6 +49,8 @@ extern bool make_print; extern Array failed_files; extern int exit_status_global; extern File_path global_path; +extern const char *LILYPOND_DATADIR; + /* Debugging options: switch on diff --git a/lily/include/relocate.hh b/lily/include/relocate.hh new file mode 100644 index 0000000000..41e1174e26 --- /dev/null +++ b/lily/include/relocate.hh @@ -0,0 +1,21 @@ +/* + relocate.hh -- declare + + source file of the GNU LilyPond music typesetter + + (c) 2005 Han-Wen Nienhuys + +*/ + +#ifndef RELOCATE_HH +#define RELOCATE_HH + + + +#include "string.hh" + +int sane_putenv (char const *key, String value, bool overwrite); +void setup_paths (char const *argv0); +extern bool relocate_binary; + +#endif /* RELOCATE_HH */ diff --git a/lily/main.cc b/lily/main.cc index f770d59854..d7505465e4 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -16,8 +16,6 @@ using namespace std; #include #include -#include - #include "config.hh" #if HAVE_GRP_H @@ -43,6 +41,7 @@ using namespace std; #include "version.hh" #include "warn.hh" #include "program-option.hh" +#include "relocate.hh" /* * Global options that can be overridden through command line. @@ -184,7 +183,7 @@ static Long_option_init options_static[] {0, 0, 0, 0} }; -#define LILYPOND_DATADIR PACKAGE_DATADIR "/" TOPLEVEL_VERSION +const char *LILYPOND_DATADIR = PACKAGE_DATADIR "/" TOPLEVEL_VERSION; static void env_var_info (FILE *out, char const *key) @@ -275,233 +274,6 @@ warranty () printf (_ (WARRANTY).to_str0 ()); } -static int -sane_putenv (char const *key, String value, bool overwrite = true) -{ - if (overwrite || !getenv (key)) - { - String combine = String (key) + "=" + value; - char *s = strdup (combine.to_str0 ()); - return putenv (s); - } - return -1; -} - -static int -set_env_file (char const *key, String value) -{ - if (is_file (value)) - return sane_putenv (key, value, false); - else if (be_verbose_global) - warning (_f ("no such file: %s", value)); - return -1; -} - -static int -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 ())); - - if (char const *cur = getenv (key)) - value += to_string (PATHSEP) + cur; - - return sane_putenv (key, value.to_str0 ()); - } - 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 ('\\', '/'); - s = s.left_string (s.index_last ('/')); - return s; -} - -#ifdef __MINGW32__ -#include -#endif - -void -set_relocation (String bindir, String prefix) -{ - if (be_verbose_global) - warning (_f ("Relocation: compile prefix=%s, new prefix=%s", - prefix_directory, - prefix.to_str0 ())); - - String datadir = prefix + "/share"; - String libdir = prefix + "/lib"; - String localedir = datadir + "/locale"; - String sysconfdir = prefix + "/etc"; - String lilypond_datadir = datadir + "/lilypond/" TOPLEVEL_VERSION; - - if (is_dir (lilypond_datadir)) - prefix_directory = lilypond_datadir; - -#if HAVE_GETTEXT - if (is_dir (localedir)) - bindtextdomain ("lilypond", localedir.to_str0 ()); -#endif - - set_env_file ("FONTCONFIG_FILE", sysconfdir + "/fonts/fonts.conf"); -#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"); - - /* need otherwise dynamic .so's aren't found. */ - prepend_env_path ("DYLD_LIBRARY_PATH", libdir); - - 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"); - prepend_env_path ("PATH", bindir); -} - -String -get_working_directory () -{ - char cwd[PATH_MAX]; - getcwd (cwd, PATH_MAX); - - return String (cwd); -} - -static void -setup_paths (char const *argv0) -{ - prefix_directory = LILYPOND_DATADIR; - - - if (relocate_binary - && getenv ("LILYPOND_RELOCATE_PREFIX")) - { - String prefix = getenv ("LILYPOND_RELOCATE_PREFIX"); - /* - fixme: need different sep for mingw? - */ - set_relocation (prefix + "/bin", prefix); - } - else if (relocate_binary) - { -#if defined (__CYGWIN__) || defined (__MINGW32__) - String s = argv0; - s.substitute ('\\', '/'); - argv0 = s.to_str0 (); -#endif /* __CYGWIN__ || __MINGW32__ */ - - - /* if name contains slashes, we should not look in $PATH */ - String argv0_abs; - if (argv0[0] == '/') - argv0_abs = argv0_abs; - else if (String (argv0).index ('/') > 0) - argv0_abs = get_working_directory () + "/" + String (argv0); - else - { - /* Find absolute ARGV0 name, using PATH. */ - File_path path; - path.parse_path (getenv ("PATH")); - - -#ifndef __MINGW32__ - String argv0_abs = path.find (argv0); -#else /* __MINGW32__ */ - char const *ext[] = {"exe", "", 0 }; - String argv0_abs = path.find (argv0, ext); -#endif /* __MINGW32__ */ - - if (argv0_abs.is_empty ()) - { - File_name name (argv0); - /* If NAME contains slashes and its DIR is not absolute, it can - only be referenced from CWD. */ - if (name.to_string ().index ('/') >= 0 && name.dir_[0] != '/') - { - argv0_abs = get_working_directory () + "/" + argv0; - } - else - programming_error ("can't find absolute argv0"); - } - } - - String bindir = dir_name (argv0_abs); - String argv0_prefix = dir_name (bindir); - if (argv0_prefix != dir_name (dir_name (dir_name (prefix_directory)))) - set_relocation (bindir, argv0_prefix); - } - else - (void) argv0; - - /* 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 = env; - } - - global_path.append (""); - - - /* - When running from build dir, a full LILYPOND_PREFIX is set-up at - - $(OUTBASE)/share/lilypond/TOPLEVEL_VERSION - - This historical hack will allow the shorthand - - LILYPONDPREFIX=out lily/out/lilypond ... - - */ - - struct stat statbuf; - String build_prefix = prefix_directory + "/share/lilypond/" TOPLEVEL_VERSION; - if (stat (build_prefix.to_str0 (), &statbuf) == 0) - prefix_directory = build_prefix; - - - /* Adding mf/out make lilypond unchanged source directory, when setting - LILYPONDPREFIX to lilypond-x.y.z */ - char *suffixes[] = {"ly", "ps", "scm", 0 }; - - - Array dirs; - for (char **s = suffixes; *s; s++) - { - String path = prefix_directory + to_string ('/') + String (*s); - dirs.push (path); - } - - - dirs.push (prefix_directory + "/fonts/otf/"); - dirs.push (prefix_directory + "/fonts/type1/"); - dirs.push (prefix_directory + "/fonts/svg/"); - - for (int i = 0; i < dirs.size (); i++) - global_path.prepend (dirs[i]); -} - static void prepend_load_path (String dir) { diff --git a/lily/relocate.cc b/lily/relocate.cc new file mode 100644 index 0000000000..7ae2374e45 --- /dev/null +++ b/lily/relocate.cc @@ -0,0 +1,251 @@ +/* + relocate.cc -- implement relocation based on argv0 + + source file of the GNU LilyPond music typesetter + + (c) 2005 Han-Wen Nienhuys + +*/ + +#include "relocate.hh" + +#include "string.hh" +#include "file-name.hh" +#include "file-path.hh" +#include "main.hh" +#include "warn.hh" +#include "config.hh" +#include "version.hh" + +#include "lily-guile.hh" +#include "lily-version.hh" + +#include +#include + +int +sane_putenv (char const *key, String value, bool overwrite) +{ + if (overwrite || !getenv (key)) + { + String combine = String (key) + "=" + value; + char *s = strdup (combine.to_str0 ()); + return putenv (s); + } + + return -1; +} + +static int +set_env_file (char const *key, String value) +{ + if (is_file (value)) + return sane_putenv (key, value, false); + else if (be_verbose_global) + warning (_f ("no such file: %s", value)); + return -1; +} + +static int +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 ())); + + if (char const *cur = getenv (key)) + value += to_string (PATHSEP) + cur; + + return sane_putenv (key, value.to_str0 (), 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 ('\\', '/'); + s = s.left_string (s.index_last ('/')); + return s; +} + +#ifdef __MINGW32__ +#include +#endif + +void +set_relocation (String bindir, String prefix) +{ + if (be_verbose_global) + warning (_f ("Relocation: compile prefix=%s, new prefix=%s", + prefix_directory, + prefix.to_str0 ())); + + String datadir = prefix + "/share"; + String libdir = prefix + "/lib"; + String localedir = datadir + "/locale"; + String sysconfdir = prefix + "/etc"; + String lilypond_datadir = datadir + "/lilypond/" TOPLEVEL_VERSION; + + if (is_dir (lilypond_datadir)) + prefix_directory = lilypond_datadir; + +#if HAVE_GETTEXT + if (is_dir (localedir)) + bindtextdomain ("lilypond", localedir.to_str0 ()); +#endif + + set_env_file ("FONTCONFIG_FILE", sysconfdir + "/fonts/fonts.conf"); +#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"); + + /* need otherwise dynamic .so's aren't found. */ + prepend_env_path ("DYLD_LIBRARY_PATH", libdir); + + 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"); + prepend_env_path ("PATH", bindir); +} + +String +get_working_directory () +{ + char cwd[PATH_MAX]; + getcwd (cwd, PATH_MAX); + + return String (cwd); +} + +void +setup_paths (char const *argv0) +{ + prefix_directory = LILYPOND_DATADIR; + + if (relocate_binary + && getenv ("LILYPOND_RELOCATE_PREFIX")) + { + String prefix = getenv ("LILYPOND_RELOCATE_PREFIX"); + /* + fixme: need different sep for mingw? + */ + set_relocation (prefix + "/bin", prefix); + } + else if (relocate_binary) + { +#if defined (__CYGWIN__) || defined (__MINGW32__) + String s = argv0; + s.substitute ('\\', '/'); + argv0 = s.to_str0 (); +#endif /* __CYGWIN__ || __MINGW32__ */ + + + /* if name contains slashes, we should not look in $PATH */ + String argv0_abs; + if (argv0[0] == '/') + argv0_abs = argv0_abs; + else if (String (argv0).index ('/') > 0) + argv0_abs = get_working_directory () + "/" + String (argv0); + else + { + /* Find absolute ARGV0 name, using PATH. */ + File_path path; + path.parse_path (getenv ("PATH")); + + +#ifndef __MINGW32__ + String argv0_abs = path.find (argv0); +#else /* __MINGW32__ */ + char const *ext[] = {"exe", "", 0 }; + String argv0_abs = path.find (argv0, ext); +#endif /* __MINGW32__ */ + + if (argv0_abs.is_empty ()) + { + File_name name (argv0); + /* If NAME contains slashes and its DIR is not absolute, it can + only be referenced from CWD. */ + if (name.to_string ().index ('/') >= 0 && name.dir_[0] != '/') + { + argv0_abs = get_working_directory () + "/" + argv0; + } + else + programming_error ("can't find absolute argv0"); + } + } + + String bindir = dir_name (argv0_abs); + String argv0_prefix = dir_name (bindir); + if (argv0_prefix != dir_name (dir_name (dir_name (prefix_directory)))) + set_relocation (bindir, argv0_prefix); + } + else + (void) argv0; + + /* 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 = env; + } + + global_path.append (""); + + + /* + When running from build dir, a full LILYPOND_PREFIX is set-up at + + $(OUTBASE)/share/lilypond/TOPLEVEL_VERSION + + This historical hack will allow the shorthand + + LILYPONDPREFIX=out lily/out/lilypond ... + + */ + + struct stat statbuf; + String build_prefix = prefix_directory + "/share/lilypond/" TOPLEVEL_VERSION; + if (stat (build_prefix.to_str0 (), &statbuf) == 0) + prefix_directory = build_prefix; + + + /* Adding mf/out make lilypond unchanged source directory, when setting + LILYPONDPREFIX to lilypond-x.y.z */ + char *suffixes[] = {"ly", "ps", "scm", 0 }; + + + Array dirs; + for (char **s = suffixes; *s; s++) + { + String path = prefix_directory + to_string ('/') + String (*s); + dirs.push (path); + } + + + dirs.push (prefix_directory + "/fonts/otf/"); + dirs.push (prefix_directory + "/fonts/type1/"); + dirs.push (prefix_directory + "/fonts/svg/"); + + for (int i = 0; i < dirs.size (); i++) + global_path.prepend (dirs[i]); +} -- 2.39.5