* make/mutopia-vars.make:

[lilypond.git] / lily / main.cc

diff --git a/lily/main.cc b/lily/main.cc
index 3fc4637273fef75ecfb01678f162d57381d35090..7dd752baf45f477a1113f0ebe78311595907b7f7 100644 (file)
--- 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 <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "main.hh"
@@ -55,7 +55,7 @@ Array<String> 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 = "";
@@ -96,7 +96,7 @@ File_path global_path;
  */
 
 static char const *AUTHORS
-= "  Han-Wen Nienhuys <hanwen@cs.uu.nl>\n"
+= "  Han-Wen Nienhuys <hanwen@xs4all.nl>\n"
   "  Jan Nieuwenhuizen <janneke@gnu.org>\n";
 
 static char const *PROGRAM_NAME = "lilypond";
@@ -140,7 +140,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 [default],eps,\nscm, svg, tex, texstr)")},
 
   {_i ("SYM=VAL"), "define-default", 'd',
    _i ("set a Scheme program option. Uses #t if VAL is not specified\n"
@@ -166,7 +166,7 @@ static Long_option_init options_static[]
 #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")},
@@ -245,7 +245,10 @@ 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 to %s or via %s",
+             "bug-lilypond@gnu.org"
+             "http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs"
+             ).to_str0 ());
   printf ("\n");
   printf ("\n");
   return SCM_UNSPECIFIED;
@@ -322,13 +325,47 @@ setup_paths (char const *argv0)
   if (getenv ("LILYPOND_VERBOSE"))
     be_verbose_global = true;
 
-  String bindir = dir_name (argv0);
+  /* Find absolute ARGV0 name, using PATH.  */
+  File_path path;
+  path.parse_path (getenv ("PATH"));
+
+#if defined (__CYGWIN__) || defined (__MINGW32__)
+  String s = argv0;
+  s.substitute ('\\', '/');
+  argv0 = s.to_str0 ();
+#endif /* __CYGWIN__ || __MINGW32__ */
+
+#ifndef __MINGW32__
+  String argv0_abs = path.find (argv0);
+#else /* __MINGW32__ */
+  char const *ext[] = {"exe", "", 0 };
+  String argv0_abs = path.find (argv0, ext);
+#endif /* __MINGW32__ */
+
+  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] != '/')
+       {
+         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: argv0=%s, prefix=%s", argv0,
-                    prefix_directory));
+       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";
@@ -381,10 +418,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<String> dirs;
   for (char **s = suffixes; *s; s++)
     {
@@ -392,22 +448,11 @@ 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]);
 }