X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmain.cc;h=9fa362c6c233c1db93791c9a4f6d2ab7189689cb;hb=75eebcb49e52d296b1da3e1074e0825d2c780db4;hp=6ebaae182639d11120cd152b78e6fa8b4a680bdb;hpb=f92f963bfd75db1e431dd6ed19d425ea3964d528;p=lilypond.git diff --git a/lily/main.cc b/lily/main.cc index 6ebaae1826..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" @@ -11,19 +11,19 @@ #include #include #include +#include +using namespace std; + #include -#include #include -#include - #include "config.hh" #if HAVE_GRP_H #include -#endif +#endif #if HAVE_PWD_H #include -#endif +#endif #if HAVE_GETTEXT #include #endif @@ -41,6 +41,7 @@ #include "version.hh" #include "warn.hh" #include "program-option.hh" +#include "relocate.hh" /* * Global options that can be overridden through command line. @@ -53,10 +54,10 @@ 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 = "pdf"; +String output_format_global = ""; bool is_pango_format_global; bool is_TeX_format_global; @@ -84,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. */ @@ -94,7 +105,7 @@ File_path global_path; */ static char const *AUTHORS -= " Han-Wen Nienhuys \n" += " Han-Wen Nienhuys \n" " Jan Nieuwenhuizen \n"; static char const *PROGRAM_NAME = "lilypond"; @@ -138,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" @@ -149,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")}, @@ -157,24 +169,24 @@ 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 +#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 ("run in safe mode")}, + {0, "safe-mode", 's', _i ("disallow unsafe Scheme and PostScript operations")}, {0, "version", 'v', _i ("print version number")}, {0, "verbose", 'V', _i ("be verbose")}, {0, "warranty", 'w', _i ("show warranty and copyright")}, {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) +env_var_info (FILE *out, char const *key) { if (char const *value = getenv (key)) fprintf (out, "%s=\"%s\"\n", key, value); @@ -190,22 +202,23 @@ 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 copyright () { printf (_f ("Copyright (c) %s by\n%s and others.", - "1996--2005", + "1996--2006", AUTHORS).to_str0 ()); printf ("\n"); } @@ -243,7 +256,9 @@ 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.", "bug-lilypond@gnu.org").to_str0 ()); + printf (_f ("Report bugs via %s", + "http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs" + ).to_str0 ()); printf ("\n"); printf ("\n"); return SCM_UNSPECIFIED; @@ -259,159 +274,6 @@ warranty () printf (_ (WARRANTY).to_str0 ()); } -#if ARGV0_RELOCATION -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 (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; - - String bindir = dir_name (argv0); - 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: argv0=%s, prefix=%s", argv0, - prefix_directory)); - 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 (""); - - /* 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); - } - - /* - ugh. C&P font-config.cc - */ - struct stat statbuf; - String builddir = prefix_directory + "/mf/out/"; - if (stat (builddir.to_str0 (), &statbuf) == 0) - { - dirs.push (builddir.to_str0 ()); - } - else - { - dirs.push (prefix_directory + "/fonts/otf/"); - dirs.push (prefix_directory + "/fonts/type1/"); - dirs.push (prefix_directory + "/fonts/cff/"); - dirs.push (prefix_directory + "/fonts/svg/"); - dirs.push (prefix_directory + "/fonts/cff/"); - } - - for (int i = 0; i < dirs.size (); i++) - global_path.prepend (dirs[i]); -} - static void prepend_load_path (String dir) { @@ -507,8 +369,6 @@ do_chroot_jail () } #endif - - static void main_with_guile (void *, int, char **) { @@ -527,9 +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 (); @@ -537,13 +394,12 @@ main_with_guile (void *, int, char **) all_fonts_global = new All_font_metrics (global_path.to_string ()); - if (!init_scheme_variables.is_empty () || !init_scheme_code_string.is_empty ()) { init_scheme_variables = "(map (lambda (x) (ly:set-option (car x) (cdr x))) (list " + init_scheme_variables + "))"; - + init_scheme_code_string += "(begin #t " + init_scheme_variables @@ -551,13 +407,12 @@ main_with_guile (void *, int, char **) + ")"; char const *str0 = init_scheme_code_string.to_str0 (); - + if (be_verbose_global) - progress_indication (_f("Evaluating %s", str0)); + progress_indication (_f ("Evaluating %s", str0)); scm_c_eval_string ((char *) str0); } - /* We accept multiple independent music files on the command line to reduce compile time when processing lots of small files. Starting the GUILE engine is very time consuming. */ @@ -598,7 +453,7 @@ setup_localisation () String localedir = LOCALEDIR; if (char const *env = getenv ("LILYPOND_LOCALEDIR")) localedir = env; - + bindtextdomain ("lilypond", localedir.to_str0 ()); textdomain ("lilypond"); #endif @@ -632,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': @@ -641,7 +498,7 @@ parse_argv (int argc, char **argv) String key = arg; String val = "#t"; - + if (eq >= 0) { key = arg.left_string (eq); @@ -649,10 +506,10 @@ parse_argv (int argc, char **argv) } init_scheme_variables - += "(cons \'" + key + " " + val + ")\n"; + += "(cons \'" + key + " " + val + ")\n"; } break; - + case 'v': notice (); exit (0); @@ -674,7 +531,7 @@ parse_argv (int argc, char **argv) warranty (); exit (0); break; - + case 'b': output_backend_global = option_parser->optional_argument_str0_; break; @@ -682,7 +539,7 @@ parse_argv (int argc, char **argv) case 'f': output_format_global = option_parser->optional_argument_str0_; break; - + case 'H': dump_header_fieldnames_global .push (option_parser->optional_argument_str0_); @@ -713,6 +570,9 @@ parse_argv (int argc, char **argv) } } + if (output_format_global == "") + output_format_global = "pdf"; + if (show_help) { identify (stdout); @@ -723,15 +583,35 @@ parse_argv (int argc, char **argv) } } +void +setup_guile_env () +{ + char *yield = getenv ("LILYPOND_GC_YIELD"); + bool overwrite = true; + if (!yield) + { + yield = "70"; + overwrite = false; + } + + sane_putenv ("GUILE_MIN_YIELD_1", yield, overwrite); + sane_putenv ("GUILE_MIN_YIELD_2", yield, overwrite); + sane_putenv ("GUILE_MIN_YIELD_MALLOC", yield, overwrite); +} + int main (int argc, char **argv) { + if (getenv ("LILYPOND_VERBOSE")) + be_verbose_global = true; + setup_localisation (); - setup_paths (argv[0]); 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. */