X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmain.cc;h=2eb6cec0bad9765e704859aeb7f01cfa317b4e9b;hb=6f664e0e318a1651f6fe9317a842bf9c7f476f08;hp=9ffbc3e0e327686b7eae739b04e7687a5366bea0;hpb=a05473991227d235087a751b778e78d1c3991ac6;p=lilypond.git diff --git a/lily/main.cc b/lily/main.cc index 9ffbc3e0e3..2eb6cec0ba 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 @@ -35,36 +33,39 @@ using namespace std; #include "freetype.hh" #include "getopt-long.hh" #include "global-ctor.hh" +#include "international.hh" #include "lily-guile.hh" #include "lily-version.hh" #include "misc.hh" #include "output-def.hh" +#include "program-option.hh" +#include "relocate.hh" #include "string-convert.hh" #include "version.hh" #include "warn.hh" -#include "program-option.hh" /* * Global options that can be overridden through command line. */ /* Names of header fields to be dumped to a separate file. */ -Array dump_header_fieldnames_global; +vector dump_header_fieldnames_global; /* Name of initialisation file. */ -String init_name_global; +string init_name_global; /* Selected output backend - One of (gnome, ps [default], scm, svg, tex, texstr)") */ -String output_backend_global = "ps"; + One of (gnome, ps [default], eps, scm, svg, tex, texstr)") */ +string output_backend_global = "ps"; + /* Output formats to generate. */ -String output_format_global = ""; +string output_format_global = ""; bool is_pango_format_global; bool is_TeX_format_global; /* Current output name. */ -String output_name_global; +string output_name_global; /* Run in safe mode? */ bool be_safe_global = false; @@ -77,8 +78,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; -String init_scheme_variables; +string init_scheme_code_string; +string init_scheme_variables; /* Generate preview of first system. */ bool make_preview = false; @@ -86,6 +87,16 @@ bool make_preview = false; /* Generate printed output. */ bool make_print = true; + +bool relocate_binary = +#if 1 + true; +#else + false +#endif + ; + + /* * Miscellaneous global stuff. */ @@ -118,7 +129,7 @@ static char const *WARRANTY "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n" "General Public License for more details.\n" "\n" - " You should have received a copy (refer to the file COPYING) of the\n" + " You should have received a copy of the\n" "GNU General Public License along with this program; if not, write to\n" "the Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n" "Boston, MA 02111-1307, USA.\n"); @@ -126,10 +137,10 @@ static char const *WARRANTY /* Where the init files live. Typically: LILYPOND_DATADIR = /usr/share/lilypond */ -String prefix_directory; +string prefix_directory; /* The jail specification: USER,GROUP,JAIL,DIR. */ -String jail_spec; +string jail_spec; /* The option parser */ static Getopt_long *option_parser = 0; @@ -140,7 +151,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 +162,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 +171,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 +185,7 @@ static Long_option_init options_static[] {0, 0, 0, 0} }; -#define LILYPOND_DATADIR PACKAGE_DATADIR "/" TOPLEVEL_VERSION +char const *LILYPOND_DATADIR = PACKAGE_DATADIR "/" TOPLEVEL_VERSION; static void env_var_info (FILE *out, char const *key) @@ -190,32 +202,34 @@ dir_info (FILE *out) env_var_info (out, "LILYPONDPREFIX"); fprintf (out, "LOCALEDIR=\"%s\"\n", LOCALEDIR); - fprintf (out, "\nEffective prefix: \"%s\"\n", prefix_directory.to_str0 ()); + fprintf (out, "\nEffective prefix: \"%s\"\n", prefix_directory.c_str ()); -#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, "PANGO_PREFIX"); + env_var_info (out, "PATH"); + } } static void copyright () { printf (_f ("Copyright (c) %s by\n%s and others.", - "1996--2005", - AUTHORS).to_str0 ()); + "1996--2006", + AUTHORS).c_str ()); printf ("\n"); } static void identify (FILE *out) { - fputs (gnu_lilypond_version_string ().to_str0 (), out); + fputs (gnu_lilypond_version_string ().c_str (), out); fputs ("\n", out); } @@ -223,7 +237,7 @@ static void notice () { identify (stdout); - puts (_f (NOTICE, PROGRAM_NAME).to_str0 ()); + puts (_f (NOTICE, PROGRAM_NAME).c_str ()); printf ("\n"); copyright (); } @@ -233,22 +247,21 @@ LY_DEFINE (ly_usage, "ly:usage", "Print usage message.") { /* No version number or newline here. It confuses help2man. */ - printf (_f ("Usage: %s [OPTION]... FILE...", PROGRAM_NAME).to_str0 ()); + printf (_f ("Usage: %s [OPTION]... FILE...", PROGRAM_NAME).c_str ()); printf ("\n\n"); - printf (_ ("Typeset music and/or produce MIDI from FILE.").to_str0 ()); + printf (_ ("Typeset music and/or produce MIDI from FILE.").c_str ()); printf ("\n\n"); - printf (_ ("LilyPond produces beautiful music notation.").to_str0 ()); + printf (_ ("LilyPond produces beautiful music notation.").c_str ()); printf ("\n"); - printf (_f ("For more information, see %s", PROGRAM_URL).to_str0 ()); + printf (_f ("For more information, see %s", PROGRAM_URL).c_str ()); printf ("\n\n"); - printf (_ ("Options:").to_str0 ()); + printf (_ ("Options:").c_str ()); printf ("\n"); - printf (Long_option_init::table_string (options_static).to_str0 ()); + printf (Long_option_init::table_string (options_static).c_str ()); 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 ()); + ).c_str ()); printf ("\n"); printf ("\n"); return SCM_UNSPECIFIED; @@ -261,194 +274,14 @@ warranty () printf ("\n"); copyright (); printf ("\n"); - printf (_ (WARRANTY).to_str0 ()); + printf (_ (WARRANTY).c_str ()); } -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) +prepend_load_path (string dir) { - 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) -{ - String s = "(set! %load-path (cons \"" + dir + "\" %load-path))"; - scm_c_eval_string (s.to_str0 ()); + string s = "(set! %load-path (cons \"" + dir + "\" %load-path))"; + scm_c_eval_string (s.c_str ()); } void init_global_tweak_registry (); @@ -469,11 +302,11 @@ do_chroot_jail () USER_NAME, GROUP_NAME, JAIL, DIR, JAIL_MAX }; - Array components = String_convert::split (jail_spec, ','); + vector components = string_split (jail_spec, ','); if (components.size () != JAIL_MAX) { - error (_f ("expected %d arguments with jail, found: %d", JAIL_MAX, - components.size ())); + error (_f ("expected %d arguments with jail, found: %u", JAIL_MAX, + (unsigned) components.size ())); exit (2); } @@ -481,7 +314,7 @@ do_chroot_jail () errno = 0; int uid; - if (passwd * passwd = getpwnam (components[USER_NAME].to_str0 ())) + if (passwd * passwd = getpwnam (components[USER_NAME].c_str ())) uid = passwd->pw_uid; else { @@ -498,7 +331,7 @@ do_chroot_jail () errno = 0; int gid; - if (group * group = getgrnam (components[GROUP_NAME].to_str0 ())) + if (group * group = getgrnam (components[GROUP_NAME].c_str ())) gid = group->gr_gid; else { @@ -511,7 +344,7 @@ do_chroot_jail () exit (3); } - if (chroot (components[JAIL].to_str0 ())) + if (chroot (components[JAIL].c_str ())) { error (_f ("can't chroot to: %s: %s", components[JAIL], strerror (errno))); @@ -530,7 +363,7 @@ do_chroot_jail () exit (3); } - if (chdir (components[DIR].to_str0 ())) + if (chdir (components[DIR].c_str ())) { error (_f ("can't change working directory to: %s: %s", components[DIR], strerror (errno))); @@ -557,8 +390,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 (); @@ -566,19 +397,19 @@ 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 ()) + if (!init_scheme_variables.empty () + || !init_scheme_code_string.empty ()) { init_scheme_variables = "(map (lambda (x) (ly:set-option (car x) (cdr x))) (list " + init_scheme_variables + "))"; init_scheme_code_string - += "(begin #t " + = "(begin #t " + init_scheme_variables + init_scheme_code_string + ")"; - char const *str0 = init_scheme_code_string.to_str0 (); + char const *str0 = init_scheme_code_string.c_str (); if (be_verbose_global) progress_indication (_f ("Evaluating %s", str0)); @@ -596,11 +427,12 @@ main_with_guile (void *, int, char **) *tail = scm_cons (scm_makfrom0str (arg), SCM_EOL); tail = SCM_CDRLOC (*tail); } + delete option_parser; option_parser = 0; #if HAVE_CHROOT - if (!jail_spec.is_empty ()) + if (!jail_spec.empty ()) do_chroot_jail (); #endif @@ -622,17 +454,17 @@ setup_localisation () Disable localisation of float values. This breaks TeX output. */ setlocale (LC_NUMERIC, "C"); - String localedir = LOCALEDIR; + string localedir = LOCALEDIR; if (char const *env = getenv ("LILYPOND_LOCALEDIR")) localedir = env; - bindtextdomain ("lilypond", localedir.to_str0 ()); + bindtextdomain ("lilypond", localedir.c_str ()); textdomain ("lilypond"); #endif } static void -add_output_format (String format) +add_output_format (string format) { if (output_format_global != "") output_format_global += ","; @@ -649,30 +481,32 @@ parse_argv (int argc, char **argv) switch (opt->shortname_char_) { case 0: - if (String (opt->longname_str0_) == "dvi" - || String (opt->longname_str0_) == "pdf" - || String (opt->longname_str0_) == "png" - || String (opt->longname_str0_) == "ps" - || String (opt->longname_str0_) == "tex") + if (string (opt->longname_str0_) == "dvi" + || string (opt->longname_str0_) == "pdf" + || string (opt->longname_str0_) == "png" + || string (opt->longname_str0_) == "ps" + || string (opt->longname_str0_) == "tex") add_output_format (opt->longname_str0_); - else if (String (opt->longname_str0_) == "preview") + else if (string (opt->longname_str0_) == "preview") make_preview = true; - else if (String (opt->longname_str0_) == "no-pages") + else if (string (opt->longname_str0_) == "no-pages") make_print = false; + else if (string (opt->longname_str0_) == "relocate") + relocate_binary = true; break; case 'd': { - String arg (option_parser->optional_argument_str0_); - int eq = arg.index ('='); + string arg (option_parser->optional_argument_str0_); + ssize eq = arg.find ('='); - String key = arg; - String val = "#t"; + string key = arg; + string val = "#t"; - if (eq >= 0) + if (eq != NPOS) { - key = arg.left_string (eq); - val = arg.right_string (arg.length () - eq - 1); + key = arg.substr (0, eq); + val = arg.substr (eq + 1, key.length () - 1); } init_scheme_variables @@ -686,7 +520,7 @@ parse_argv (int argc, char **argv) break; case 'o': { - String s = option_parser->optional_argument_str0_; + string s = option_parser->optional_argument_str0_; File_name file_name (s); output_name_global = file_name.to_string (); } @@ -707,12 +541,17 @@ parse_argv (int argc, char **argv) break; case 'f': - output_format_global = option_parser->optional_argument_str0_; + { + vector components + = string_split (option_parser->optional_argument_str0_, ','); + for (vsize i = 0; i < components.size (); i++) + add_output_format (components[i]); + } break; case 'H': dump_header_fieldnames_global - .push (option_parser->optional_argument_str0_); + .push_back (option_parser->optional_argument_str0_); break; case 'I': global_path.append (option_parser->optional_argument_str0_); @@ -728,6 +567,9 @@ parse_argv (int argc, char **argv) break; case 's': be_safe_global = true; + init_scheme_variables + += "(cons \'safe #t)\n"; + break; case 'p': make_preview = true; @@ -756,7 +598,7 @@ parse_argv (int argc, char **argv) void setup_guile_env () { - char *yield = getenv ("LILYPOND_GC_YIELD"); + const char *yield = getenv ("LILYPOND_GC_YIELD"); bool overwrite = true; if (!yield) { @@ -769,18 +611,55 @@ setup_guile_env () sane_putenv ("GUILE_MIN_YIELD_MALLOC", yield, overwrite); } +void +read_relocation_dir (string); + 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); - scm_boot_guile (argc, argv, main_with_guile, 0); + setup_paths (argv[0]); + setup_guile_env (); + + /* Debugging aid. */ + try + { + scm_boot_guile (argc, argv, main_with_guile, 0); + } + catch (exception e) + { + error (_f ("exception caught: %s", e.what ())); + }; /* Only reachable if GUILE exits. That is an error. */ return 1; } + +SCM atexit_list = SCM_EOL; + +LY_DEFINE (ly_atexit, "ly:atexit", + 2, 0, 0, (SCM proc, SCM args), + "Just before exiting, call the procedure given. " +"If this is called multiple times, the procedures are called " +"in LIFO order.") +{ + atexit_list = scm_cons (scm_cons (proc, args), atexit_list); + scm_gc_protect_object (atexit_list); + return SCM_UNSPECIFIED; +} + +LY_DEFINE (ly_do_atexit, "ly:do-atexit", + 0, 0, 0, (), + "Call the atexit procedures.") +{ + for (SCM s = atexit_list; scm_is_pair (s); s = scm_cdr (s)) + scm_apply_0 (scm_caar (s), scm_cdar (s)); + return SCM_UNSPECIFIED; +}