X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmain.cc;h=9fa362c6c233c1db93791c9a4f6d2ab7189689cb;hb=75eebcb49e52d296b1da3e1074e0825d2c780db4;hp=f770d59854d8bf1a17c89db8e7101d9d255e8c94;hpb=22f2a38919a7df625532494bf1a35884bfc791e1;p=lilypond.git diff --git a/lily/main.cc b/lily/main.cc index f770d59854..9fa362c6c2 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2005 Han-Wen Nienhuys + (c) 1997--2006 Han-Wen Nienhuys */ #include "main.hh" @@ -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. @@ -88,7 +87,7 @@ bool make_print = true; bool relocate_binary = -#ifdef __MINGW32__ +#if ARGV0_RELOCATION true; #else false @@ -170,12 +169,12 @@ static Long_option_init options_static[] {_i ("FIELD"), "header", 'H', _i ("dump a header field to file BASENAME.FIELD")}, {_i ("DIR"), "include", 'I', _i ("add DIR to search path")}, {_i ("FILE"), "init", 'i', _i ("use FILE as init file")}, - {_i ("FILE"), "output", 'o', _i ("write output to FILE (suffix will be added)")}, #if HAVE_CHROOT {_i ("USER,GROUP,JAIL,DIR"), "jail", 'j', _i ("chroot to JAIL, become USER:GROUP\n" "and cd into DIR")}, #endif {0, "no-print", 0, _i ("do not generate printed output")}, + {_i ("FILE"), "output", 'o', _i ("write output to FILE (suffix will be added)")}, {0, "preview", 'p', _i ("generate a preview of the first system")}, {0, "safe-mode", 's', _i ("disallow unsafe Scheme and PostScript operations")}, {0, "version", 'v', _i ("print version number")}, @@ -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) @@ -219,7 +218,7 @@ static void copyright () { printf (_f ("Copyright (c) %s by\n%s and others.", - "1996--2005", + "1996--2006", AUTHORS).to_str0 ()); printf ("\n"); } @@ -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) { @@ -615,8 +387,6 @@ main_with_guile (void *, int, char **) ly_c_init_guile (); call_constructors (); - ly_set_option (ly_symbol2scm ("verbose"), scm_from_bool (be_verbose_global)); - init_global_tweak_registry (); init_fontconfig ();