X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmain.cc;h=6430874bdedcf10f9e6d4cf2561ad65d5022fadc;hb=480ef3ac6cc360ea5622ac55058231233bdb858d;hp=6ebaae182639d11120cd152b78e6fa8b4a680bdb;hpb=f92f963bfd75db1e431dd6ed19d425ea3964d528;p=lilypond.git diff --git a/lily/main.cc b/lily/main.cc index 6ebaae1826..6430874bde 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -11,8 +11,10 @@ #include #include #include +#include +using namespace std; + #include -#include #include #include @@ -20,10 +22,10 @@ #if HAVE_GRP_H #include -#endif +#endif #if HAVE_PWD_H #include -#endif +#endif #if HAVE_GETTEXT #include #endif @@ -56,7 +58,7 @@ String init_name_global; One of (gnome, ps [default], 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; @@ -161,10 +163,10 @@ static Long_option_init options_static[] #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")}, {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")}, @@ -174,7 +176,7 @@ static Long_option_init options_static[] #define 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); @@ -198,7 +200,7 @@ dir_info (FILE *out) env_var_info (out, "GUILE_LOAD_PATH"); env_var_info (out, "PANGO_RC_FILE"); env_var_info (out, "PATH"); -#endif +#endif } static void @@ -259,9 +261,8 @@ warranty () printf (_ (WARRANTY).to_str0 ()); } -#if ARGV0_RELOCATION static int -sane_putenv (char const* key, String value, bool overwrite = true) +sane_putenv (char const *key, String value, bool overwrite = true) { if (overwrite || !getenv (key)) { @@ -272,8 +273,9 @@ sane_putenv (char const* key, String value, bool overwrite = true) return -1; } +#if ARGV0_RELOCATION static int -set_env_file (char const* key, String value) +set_env_file (char const *key, String value) { if (is_file (value)) return sane_putenv (key, value, false); @@ -287,7 +289,7 @@ prepend_env_path (char const *key, String value) { if (is_dir (value)) { - if (char const* cur = getenv (key)) + if (char const *cur = getenv (key)) value += to_string (PATHSEP) + cur; return sane_putenv (key, value.to_str0 ()); } @@ -307,11 +309,11 @@ dir_name (String const file_name) #endif #ifdef __MINGW32__ -# include +#include #endif static void -setup_paths (char const* argv0) +setup_paths (char const *argv0) { prefix_directory = LILYPOND_DATADIR; @@ -379,10 +381,29 @@ setup_paths (char const* argv0) 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++) { @@ -390,28 +411,15 @@ setup_paths (char const* argv0) 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/"); - } + 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]); + global_path.prepend (dirs[i]); } - + static void prepend_load_path (String dir) { @@ -507,8 +515,6 @@ do_chroot_jail () } #endif - - static void main_with_guile (void *, int, char **) { @@ -529,7 +535,6 @@ main_with_guile (void *, int, char **) call_constructors (); ly_set_option (ly_symbol2scm ("verbose"), scm_from_bool (be_verbose_global)); - init_global_tweak_registry (); init_fontconfig (); @@ -537,13 +542,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 +555,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 +601,7 @@ setup_localisation () String localedir = LOCALEDIR; if (char const *env = getenv ("LILYPOND_LOCALEDIR")) localedir = env; - + bindtextdomain ("lilypond", localedir.to_str0 ()); textdomain ("lilypond"); #endif @@ -641,7 +644,7 @@ parse_argv (int argc, char **argv) String key = arg; String val = "#t"; - + if (eq >= 0) { key = arg.left_string (eq); @@ -649,10 +652,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 +677,7 @@ parse_argv (int argc, char **argv) warranty (); exit (0); break; - + case 'b': output_backend_global = option_parser->optional_argument_str0_; break; @@ -682,7 +685,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 +716,9 @@ parse_argv (int argc, char **argv) } } + if (output_format_global == "") + output_format_global = "pdf"; + if (show_help) { identify (stdout); @@ -723,11 +729,28 @@ 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) { setup_localisation (); setup_paths (argv[0]); + setup_guile_env (); parse_argv (argc, argv); if (isatty (STDIN_FILENO)) identify (stderr);