X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmain.cc;h=6430874bdedcf10f9e6d4cf2561ad65d5022fadc;hb=087a4bf794b39cbfd99eb032183101013386f475;hp=252ebecf7fbf40bf2989ca4f7b4f0ac972171cad;hpb=57be7394ffa2e7d7ba6d60548dba563f3409d472;p=lilypond.git diff --git a/lily/main.cc b/lily/main.cc index 252ebecf7f..6430874bde 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -11,15 +11,21 @@ #include #include #include +#include +using namespace std; + #include -#include -#include -#include #include #include #include "config.hh" +#if HAVE_GRP_H +#include +#endif +#if HAVE_PWD_H +#include +#endif #if HAVE_GETTEXT #include #endif @@ -36,6 +42,7 @@ #include "string-convert.hh" #include "version.hh" #include "warn.hh" +#include "program-option.hh" /* * Global options that can be overridden through command line. @@ -51,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; @@ -70,7 +77,8 @@ bool be_verbose_global = false; /* Scheme code to execute before parsing, after .scm init. This is where -e arguments are appended to. */ -String init_scheme_code_string = "(begin #t "; +String init_scheme_code_string; +String init_scheme_variables; /* Generate preview of first system. */ bool make_preview = false; @@ -132,8 +140,13 @@ static Getopt_long *option_parser = 0; static Long_option_init options_static[] = { - {_i ("BACK"), "backend", 'b', _i ("use backend BACK (gnome, ps [default],\n scm, svg, tex, texstr)")}, - {_i ("EXPR"), "evaluate", 'e', _i ("set scheme option, for help use\n -e '(ly:option-usage)'")}, + {_i ("BACK"), "backend", 'b', _i ("use backend BACK (gnome, ps [default],\nscm, svg, tex, texstr)")}, + + {_i ("SYM=VAL"), "define-default", 'd', + _i ("set a Scheme program option. Uses #t if VAL is not specified\n" + "Try -dhelp for help.")}, + + {_i ("EXPR"), "evaluate", 'e', _i ("evaluate scheme code")}, /* Bug in option parser: --output =foe is taken as an abbreviation for --output-format. */ {_i ("FORMATs"), "formats", 'f', _i ("dump FORMAT,... Also as separate options:")}, @@ -143,14 +156,17 @@ static Long_option_init options_static[] {0, "ps", 0, _i ("generate PostScript")}, {0, "tex", 0, _i ("generate TeX (tex backend only)")}, {0, "help", 'h', _i ("print this help")}, - {_i ("FIELD"), "header", 'H', _i ("write header field to BASENAME.FIELD")}, + {_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)")}, - {_i ("USER,GROUP,JAIL,DIR"), "jail", 'j', _i ("chroot to JAIL, become USER:GROUP\n and cd into DIR")}, +#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")}, {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")}, @@ -159,16 +175,32 @@ static Long_option_init options_static[] #define LILYPOND_DATADIR PACKAGE_DATADIR "/" TOPLEVEL_VERSION +static void +env_var_info (FILE *out, char const *key) +{ + if (char const *value = getenv (key)) + fprintf (out, "%s=\"%s\"\n", key, value); +} + static void dir_info (FILE *out) { fputs ("\n", out); fprintf (out, "LILYPOND_DATADIR=\"%s\"\n", LILYPOND_DATADIR); - if (char const *env = getenv ("LILYPONDPREFIX")) - fprintf (out, "LILYPONDPREFIX=\"%s\"\n", env); + env_var_info (out, "LILYPONDPREFIX"); fprintf (out, "LOCALEDIR=\"%s\"\n", LOCALEDIR); 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 } static void @@ -196,8 +228,9 @@ notice () copyright (); } -static void -usage () +LY_DEFINE (ly_usage, "ly:usage", + 0, 0, 0, (), + "Print usage message.") { /* No version number or newline here. It confuses help2man. */ printf (_f ("Usage: %s [OPTION]... FILE...", PROGRAM_NAME).to_str0 ()); @@ -215,6 +248,7 @@ usage () printf (_f ("Report bugs to %s.", "bug-lilypond@gnu.org").to_str0 ()); printf ("\n"); printf ("\n"); + return SCM_UNSPECIFIED; } static void @@ -227,19 +261,149 @@ 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 () +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")) - prefix_directory = env; + { +#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++) { @@ -247,28 +411,15 @@ setup_paths () 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) { @@ -279,6 +430,7 @@ prepend_load_path (String dir) void init_global_tweak_registry (); void init_fontconfig (); +#if HAVE_CHROOT static void do_chroot_jail () { @@ -361,8 +513,7 @@ do_chroot_jail () exit (3); } } - -void test_pango (); +#endif static void main_with_guile (void *, int, char **) @@ -382,6 +533,8 @@ 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 (); @@ -389,8 +542,24 @@ main_with_guile (void *, int, char **) all_fonts_global = new All_font_metrics (global_path.to_string ()); - init_scheme_code_string += ")"; - scm_c_eval_string ((char *) init_scheme_code_string.to_str0 ()); + 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 + + init_scheme_code_string + + ")"; + + char const *str0 = init_scheme_code_string.to_str0 (); + + if (be_verbose_global) + 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. @@ -406,17 +575,10 @@ main_with_guile (void *, int, char **) delete option_parser; option_parser = 0; - if (files == SCM_EOL) - { - /* No FILE arguments is now a usage error to help newbies. If you - want a filter, you're not a newbie and should know to use file - argument `-'. */ - usage (); - exit (2); - } - - if (! jail_spec.is_empty ()) +#if HAVE_CHROOT + if (!jail_spec.is_empty ()) do_chroot_jail (); +#endif SCM result = scm_call_1 (ly_lily_module_constant ("lilypond-main"), files); (void) result; @@ -436,10 +598,12 @@ setup_localisation () Disable localisation of float values. This breaks TeX output. */ setlocale (LC_NUMERIC, "C"); - String name (PACKAGE); - name.to_lower (); - bindtextdomain (name.to_str0 (), LOCALEDIR); - textdomain (name.to_str0 ()); + String localedir = LOCALEDIR; + if (char const *env = getenv ("LILYPOND_LOCALEDIR")) + localedir = env; + + bindtextdomain ("lilypond", localedir.to_str0 ()); + textdomain ("lilypond"); #endif } @@ -473,6 +637,25 @@ parse_argv (int argc, char **argv) make_print = false; break; + case 'd': + { + String arg (option_parser->optional_argument_str0_); + int eq = arg.index ('='); + + String key = arg; + String val = "#t"; + + if (eq >= 0) + { + key = arg.left_string (eq); + val = arg.right_string (arg.length () - eq - 1); + } + + init_scheme_variables + += "(cons \'" + key + " " + val + ")\n"; + } + break; + case 'v': notice (); exit (0); @@ -494,7 +677,7 @@ parse_argv (int argc, char **argv) warranty (); exit (0); break; - + case 'b': output_backend_global = option_parser->optional_argument_str0_; break; @@ -502,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_); @@ -533,26 +716,47 @@ parse_argv (int argc, char **argv) } } + if (output_format_global == "") + output_format_global = "pdf"; + if (show_help) { identify (stdout); - usage (); + ly_usage (); if (be_verbose_global) dir_info (stdout); exit (0); } } +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 (); + setup_paths (argv[0]); + setup_guile_env (); parse_argv (argc, argv); - identify (stderr); + if (isatty (STDIN_FILENO)) + identify (stderr); scm_boot_guile (argc, argv, main_with_guile, 0); - /* Unreachable */ - return 0; + /* Only reachable if GUILE exits. That is an error. */ + return 1; }