X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmain.cc;h=419f407772aa3dbb7b5813b057ab4ebad27242cc;hb=86e05e8735d97d1f5fb64e3e2274bcfa40793976;hp=9ffbc3e0e327686b7eae739b04e7687a5366bea0;hpb=a05473991227d235087a751b778e78d1c3991ac6;p=lilypond.git diff --git a/lily/main.cc b/lily/main.cc index 9ffbc3e0e3..419f407772 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. @@ -55,7 +54,7 @@ Array dump_header_fieldnames_global; String init_name_global; /* Selected output backend - One of (gnome, ps [default], scm, svg, tex, texstr)") */ + One of (gnome, ps [default], eps, scm, svg, tex, texstr)") */ String output_backend_global = "ps"; /* Output formats to generate. */ String output_format_global = ""; @@ -86,6 +85,16 @@ bool make_preview = false; /* Generate printed output. */ bool make_print = true; + +bool relocate_binary = +#if ARGV0_RELOCATION + true; +#else + false +#endif + ; + + /* * Miscellaneous global stuff. */ @@ -140,7 +149,7 @@ static Getopt_long *option_parser = 0; static Long_option_init options_static[] = { - {_i ("BACK"), "backend", 'b', _i ("use backend BACK (gnome, ps [default],\nscm, svg, tex, texstr)")}, + {_i ("BACK"), "backend", 'b', _i ("use backend BACK (gnome, ps,eps,\nscm, svg, tex, texstr)\ndefault: PS")}, {_i ("SYM=VAL"), "define-default", 'd', _i ("set a Scheme program option. Uses #t if VAL is not specified\n" @@ -151,6 +160,7 @@ static Long_option_init options_static[] for --output-format. */ {_i ("FORMATs"), "formats", 'f', _i ("dump FORMAT,... Also as separate options:")}, {0, "dvi", 0, _i ("generate DVI (tex backend only)")}, + {0, "relocate", 0, _i ("relocate using directory of lilypond program")}, {0, "pdf", 0, _i ("generate PDF (default)")}, {0, "png", 0, _i ("generate PNG")}, {0, "ps", 0, _i ("generate PostScript")}, @@ -159,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")}, @@ -173,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) @@ -192,15 +202,16 @@ dir_info (FILE *out) fprintf (out, "\nEffective prefix: \"%s\"\n", prefix_directory.to_str0 ()); -#if ARGV0_RELOCATION - env_var_info (out, "FONTCONFIG_FILE"); - env_var_info (out, "FONTCONFIG_PATH"); - env_var_info (out, "GS_FONTPATH"); - env_var_info (out, "GS_LIB"); - env_var_info (out, "GUILE_LOAD_PATH"); - env_var_info (out, "PANGO_RC_FILE"); - env_var_info (out, "PATH"); -#endif + if (relocate_binary) + { + env_var_info (out, "FONTCONFIG_FILE"); + env_var_info (out, "FONTCONFIG_PATH"); + env_var_info (out, "GS_FONTPATH"); + env_var_info (out, "GS_LIB"); + env_var_info (out, "GUILE_LOAD_PATH"); + env_var_info (out, "PANGO_RC_FILE"); + env_var_info (out, "PATH"); + } } static void @@ -245,8 +256,7 @@ LY_DEFINE (ly_usage, "ly:usage", printf ("\n"); printf (Long_option_init::table_string (options_static).to_str0 ()); printf ("\n"); - printf (_f ("Report bugs to %s or via %s", - "bug-lilypond@gnu.org" + printf (_f ("Report bugs via %s", "http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs" ).to_str0 ()); printf ("\n"); @@ -264,186 +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; -} - -#if ARGV0_RELOCATION -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 (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", value)); - return -1; -} - -String -dir_name (String const file_name) -{ - String s = file_name; - s.substitute ('\\', '/'); - s = s.left_string (s.index_last ('/')); - return s; -} -#endif - -#ifdef __MINGW32__ -#include -#endif - -static void -setup_paths (char const *argv0) -{ - prefix_directory = LILYPOND_DATADIR; - -#if ARGV0_RELOCATION - - if (getenv ("LILYPOND_VERBOSE")) - be_verbose_global = true; - - /* Find absolute ARGV0 name, using PATH. */ - File_path p; - p.parse_path (getenv ("PATH")); - String argv0_abs = p.find (argv0); - 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] != DIRSEP) - { - char cwd[PATH_MAX]; - getcwd (cwd, PATH_MAX); - argv0_abs = String (cwd) + "/" + 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)))) - { - if (be_verbose_global) - warning (_f ("argv0 relocation: prefix=%s, argv0=%s, argv0_prefix=%s", - prefix_directory, - argv0, - argv0_prefix.to_str0 ())); - String datadir = argv0_prefix + "/share"; - String libdir = argv0_prefix + "/lib"; - String localedir = datadir + "/locale"; - String sysconfdir = argv0_prefix + "/etc"; - String argv0_lilypond_datadir = datadir + "/lilypond/" TOPLEVEL_VERSION; - - if (is_dir (argv0_lilypond_datadir)) - prefix_directory = argv0_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"); - - 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); - } -#else - (void) argv0; -#endif /* ARGV0_RELOCATION */ - - /* 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) { @@ -557,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 (); @@ -659,6 +487,8 @@ parse_argv (int argc, char **argv) make_preview = true; else if (String (opt->longname_str0_) == "no-pages") make_print = false; + else if (String (opt->longname_str0_) == "relocate") + relocate_binary = true; break; case 'd': @@ -772,13 +602,16 @@ setup_guile_env () int main (int argc, char **argv) { + if (getenv ("LILYPOND_VERBOSE")) + be_verbose_global = true; + setup_localisation (); - setup_paths (argv[0]); - setup_guile_env (); parse_argv (argc, argv); if (isatty (STDIN_FILENO)) identify (stderr); + setup_paths (argv[0]); + setup_guile_env (); scm_boot_guile (argc, argv, main_with_guile, 0); /* Only reachable if GUILE exits. That is an error. */