bugfixes for git-update-changelog.py

[lilypond.git] / lily / main.cc

diff --git a/lily/main.cc b/lily/main.cc
index 481d4542a69ca7a0d1e4c1edf9da03b7a8efd87a..4e72121d122c8546a0c94f93ab6094bd31ece499 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -57,6 +57,7 @@ string init_name_global;
 /* Selected output backend
    One of (gnome, ps [default], eps, scm, svg, tex, texstr)") */
 string output_backend_global = "ps";
+
 /* Output formats to generate.  */
 string output_format_global = "";
 
@@ -88,7 +89,7 @@ bool make_print = true;
 
 
 bool relocate_binary =
-#if ARGV0_RELOCATION
+#if 1
   true;
 #else
   false
@@ -128,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");
@@ -305,7 +306,7 @@ do_chroot_jail ()
   if (components.size () != JAIL_MAX)
     {
       error (_f ("expected %d arguments with jail, found: %u", JAIL_MAX,
-                components.size ()));
+                (unsigned) components.size ()));
       exit (2);
     }
 
@@ -426,6 +427,7 @@ main_with_guile (void *, int, char **)
       *tail = scm_cons (scm_makfrom0str (arg), SCM_EOL);
       tail = SCM_CDRLOC (*tail);
     }
+  
   delete option_parser;
   option_parser = 0;
 
@@ -539,7 +541,12 @@ parse_argv (int argc, char **argv)
          break;
 
        case 'f':
-         output_format_global = option_parser->optional_argument_str0_;
+         {
+           vector<string> components
+             = string_split (option_parser->optional_argument_str0_, ',');
+           for (vsize i = 0; i < components.size (); i++)
+             add_output_format (components[i]);
+         }
          break;
 
        case 'H':
@@ -604,15 +611,15 @@ setup_guile_env ()
   sane_putenv ("GUILE_MIN_YIELD_MALLOC", yield, overwrite);
 }
 
-void read_relocation_file(string);
+void
+read_relocation_dir (string);
+
 int
 main (int argc, char **argv)
 {
   if (getenv ("LILYPOND_VERBOSE"))
     be_verbose_global = true;
 
-  read_relocation_file ("test.reloc");
-
   setup_localisation ();
   parse_argv (argc, argv);
   if (isatty (STDIN_FILENO))