Avoid warnings from mcs-1.1.13.

diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog
index fccac101ec67e9ae9ad7ff127a16a62398f51277..e85ad8af3b0f87b0b6f1e917ab587d0abbcfec9e 100644 (file)
--- a/gettext-tools/lib/ChangeLog
+++ b/gettext-tools/lib/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-21  Bruno Haible  <bruno@clisp.org>
+
+       Avoid warnings from recent versions of mcs.
+       * csharpcomp.sh.in (options_mcs): Don't use options -o, -L, -r any
+       more. Use options documented since mcs-1.0 instead.
+       * csharpcomp.c (compile_csharp_using_mono): Likewise.
+
 2006-06-17  Bruno Haible  <bruno@clisp.org>
 
        * iconvstring.c (UNSAFE_ICONV): New macro.

diff --git a/gettext-tools/lib/csharpcomp.c b/gettext-tools/lib/csharpcomp.c
index 47a58291986016b5bd570fdc26ba2ee87af68588..71f8ae82bbb687e547492439fdac187f85d583f7 100644 (file)
--- a/gettext-tools/lib/csharpcomp.c
+++ b/gettext-tools/lib/csharpcomp.c
@@ -1,5 +1,5 @@
 /* Compile a C# program.
-   Copyright (C) 2003-2005 Free Software Foundation, Inc.
+   Copyright (C) 2003-2006 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software; you can redistribute it and/or modify
@@ -214,25 +214,34 @@ compile_csharp_using_mono (const char * const *sources,
       unsigned int i;
 
       argc =
-       1 + (output_is_library ? 1 : 0) + 2 + 2 * libdirs_count
-       + 2 * libraries_count + (debug ? 1 : 0) + sources_count;
+       1 + (output_is_library ? 1 : 0) + 1 + libdirs_count + libraries_count
+       + (debug ? 1 : 0) + sources_count;
       argv = (char **) xallocsa ((argc + 1) * sizeof (char *));
 
       argp = argv;
       *argp++ = "mcs";
       if (output_is_library)
        *argp++ = "-target:library";
-      *argp++ = "-o";
-      *argp++ = (char *) output_file;
+      {
+       char *option = (char *) xallocsa (5 + strlen (output_file) + 1);
+       memcpy (option, "-out:", 5);
+       strcpy (option + 5, output_file);
+       *argp++ = option;
+      }
       for (i = 0; i < libdirs_count; i++)
        {
-         *argp++ = "-L";
-         *argp++ = (char *) libdirs[i];
+         char *option = (char *) xallocsa (5 + strlen (libdirs[i]) + 1);
+         memcpy (option, "-lib:", 5);
+         strcpy (option + 5, libdirs[i]);
+         *argp++ = option;
        }
       for (i = 0; i < libraries_count; i++)
        {
-         *argp++ = "-r";
-         *argp++ = (char *) libraries[i];
+         char *option = (char *) xallocsa (11 + strlen (libraries[i]) + 4 + 1);
+         memcpy (option, "-reference:", 11);
+         memcpy (option + 11, libraries[i], strlen (libraries[i]));
+         strcpy (option + 11 + strlen (libraries[i]), ".dll");
+         *argp++ = option;
        }
       if (debug)
        *argp++ = "-g";
@@ -297,6 +306,11 @@ compile_csharp_using_mono (const char * const *sources,
       /* Remove zombie process from process list, and retrieve exit status.  */
       exitstatus = wait_subprocess (child, "mcs", false, false, true, true);
 
+      for (i = 1 + (output_is_library ? 1 : 0);
+          i < 1 + (output_is_library ? 1 : 0)
+              + 1 + libdirs_count + libraries_count;
+          i++)
+       freesa (argv[i]);
       for (i = 0; i < sources_count; i++)
        if (argv[argc - sources_count + i] != sources[i])
          freesa (argv[argc - sources_count + i]);

diff --git a/gettext-tools/lib/csharpcomp.sh.in b/gettext-tools/lib/csharpcomp.sh.in
index 0a79d909c07e309eaf14c4e2d8f580fda3ea3dc5..e4b1a4e33a762a755e4aa3980df320e719a0d8db 100644 (file)
--- a/gettext-tools/lib/csharpcomp.sh.in
+++ b/gettext-tools/lib/csharpcomp.sh.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Compile a C# program.
 
-# Copyright (C) 2003-2005 Free Software Foundation, Inc.
+# Copyright (C) 2003-2006 Free Software Foundation, Inc.
 # Written by Bruno Haible <bruno@clisp.org>, 2003.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -84,19 +84,19 @@ while test $# != 0; do
           ;;
       esac
       options_cscc="$options_cscc -o "`echo "$2" | sed -e "$sed_quote_subst"`
-      options_mcs="$options_mcs -o "`echo "$2" | sed -e "$sed_quote_subst"`
+      options_mcs="$options_mcs -out:"`echo "$2" | sed -e "$sed_quote_subst"`
       options_csc="$options_csc -out:"`echo "$2" | sed -e "$sed_quote_subst"`
       shift
       ;;
     -L)
       options_cscc="$options_cscc -L "`echo "$2" | sed -e "$sed_quote_subst"`
-      options_mcs="$options_mcs -L "`echo "$2" | sed -e "$sed_quote_subst"`
+      options_mcs="$options_mcs -lib:"`echo "$2" | sed -e "$sed_quote_subst"`
       options_csc="$options_csc -lib:"`echo "$2" | sed -e "$sed_quote_subst"`
       shift
       ;;
     -l)
       options_cscc="$options_cscc -l "`echo "$2" | sed -e "$sed_quote_subst"`
-      options_mcs="$options_mcs -r "`echo "$2" | sed -e "$sed_quote_subst"`
+      options_mcs="$options_mcs -reference:"`echo "$2" | sed -e "$sed_quote_subst"`
       options_csc="$options_csc -reference:"`echo "$2" | sed -e "$sed_quote_subst"`".dll"
       shift
       ;;