From: Bruno Haible Date: Tue, 6 Dec 2005 11:48:47 +0000 (+0000) Subject: Improve csharpcomp module. X-Git-Tag: v0.15~338 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c899ca1e28538596f718c0ad4b42d65742caa77;p=thirdparty%2Fgettext.git Improve csharpcomp module. --- diff --git a/gettext-runtime/intl-csharp/ChangeLog b/gettext-runtime/intl-csharp/ChangeLog index 82cd3be18..26fd7f18e 100644 --- a/gettext-runtime/intl-csharp/ChangeLog +++ b/gettext-runtime/intl-csharp/ChangeLog @@ -1,3 +1,7 @@ +2005-12-04 Bruno Haible + + * Makefile.am (CSHARPCOMPFLAGS): Use value set by csharpcomp.m4. + 2005-05-23 Bruno Haible * gettext-0.14.5 released. diff --git a/gettext-runtime/intl-csharp/Makefile.am b/gettext-runtime/intl-csharp/Makefile.am index 53678b316..67519bc2c 100644 --- a/gettext-runtime/intl-csharp/Makefile.am +++ b/gettext-runtime/intl-csharp/Makefile.am @@ -27,7 +27,7 @@ docdir = @docdir@ htmldir = $(docdir) CSHARPCOMP = $(SHELL) ../lib/csharpcomp.sh -CSHARPCOMPFLAGS = -O -g +CSHARPCOMPFLAGS = @CSHARPCOMPFLAGS@ all-local: all-dll all-doc diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog index 70b9ecd88..24533438b 100644 --- a/gettext-tools/lib/ChangeLog +++ b/gettext-tools/lib/ChangeLog @@ -1,3 +1,7 @@ +2005-12-04 Bruno Haible + + * csharpcomp.sh.in: Suffix for resources is .resources, not .resource. + 2005-12-04 Bruno Haible Cygwin portability. diff --git a/gettext-tools/lib/csharpcomp.c b/gettext-tools/lib/csharpcomp.c index 2344a9962..47a582919 100644 --- a/gettext-tools/lib/csharpcomp.c +++ b/gettext-tools/lib/csharpcomp.c @@ -129,9 +129,9 @@ compile_csharp_using_pnet (const char * const *sources, for (i = 0; i < sources_count; i++) { const char *source_file = sources[i]; - if (strlen (source_file) >= 9 - && memcmp (source_file + strlen (source_file) - 9, ".resource", - 9) == 0) + if (strlen (source_file) >= 10 + && memcmp (source_file + strlen (source_file) - 10, ".resources", + 10) == 0) { char *option = (char *) xallocsa (12 + strlen (source_file) + 1); @@ -239,9 +239,9 @@ compile_csharp_using_mono (const char * const *sources, for (i = 0; i < sources_count; i++) { const char *source_file = sources[i]; - if (strlen (source_file) >= 9 - && memcmp (source_file + strlen (source_file) - 9, ".resource", - 9) == 0) + if (strlen (source_file) >= 10 + && memcmp (source_file + strlen (source_file) - 10, ".resources", + 10) == 0) { char *option = (char *) xallocsa (10 + strlen (source_file) + 1); @@ -417,9 +417,9 @@ compile_csharp_using_sscli (const char * const *sources, for (i = 0; i < sources_count; i++) { const char *source_file = sources[i]; - if (strlen (source_file) >= 9 - && memcmp (source_file + strlen (source_file) - 9, ".resource", - 9) == 0) + if (strlen (source_file) >= 10 + && memcmp (source_file + strlen (source_file) - 10, ".resources", + 10) == 0) { char *option = (char *) xallocsa (10 + strlen (source_file) + 1); diff --git a/gettext-tools/lib/csharpcomp.sh.in b/gettext-tools/lib/csharpcomp.sh.in index da0d1ba2d..0a79d909c 100644 --- a/gettext-tools/lib/csharpcomp.sh.in +++ b/gettext-tools/lib/csharpcomp.sh.in @@ -113,7 +113,7 @@ while test $# != 0; do echo "csharpcomp: unknown option '$1'" 1>&2 exit 1 ;; - *.resource) + *.resources) options_cscc="$options_cscc -fresources="`echo "$1" | sed -e "$sed_quote_subst"` options_mcs="$options_mcs -resource:"`echo "$1" | sed -e "$sed_quote_subst"` options_csc="$options_csc -resource:"`echo "$1" | sed -e "$sed_quote_subst"` diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog index e80342bd3..9bdf2446e 100644 --- a/gettext-tools/m4/ChangeLog +++ b/gettext-tools/m4/ChangeLog @@ -1,3 +1,7 @@ +2005-12-04 Bruno Haible + + * csharpcomp.m4 (gt_CSHARPCOMP): Also set CSHARPCOMPFLAGS. + 2005-11-24 Bruno Haible Cygwin portability. diff --git a/gettext-tools/m4/csharpcomp.m4 b/gettext-tools/m4/csharpcomp.m4 index b107f9f55..dab35a785 100644 --- a/gettext-tools/m4/csharpcomp.m4 +++ b/gettext-tools/m4/csharpcomp.m4 @@ -1,12 +1,14 @@ -# csharpcomp.m4 serial 5 (gettext-0.15) +# csharpcomp.m4 serial 6 (gettext-0.15) dnl Copyright (C) 2003-2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. # Prerequisites of csharpcomp.sh. +# Checks for a C# compiler. +# Sets at most one of HAVE_CSCC, HAVE_MCS, HAVE_CSC. # Sets HAVE_CSHARPCOMP to nonempty if csharpcomp.sh will work. - +# Also sets CSHARPCOMPFLAGS. AC_DEFUN([gt_CSHARPCOMP], [ AC_REQUIRE([gt_CSHARP_CHOICE]) @@ -67,4 +69,9 @@ AC_DEFUN([gt_CSHARPCOMP], AC_SUBST(HAVE_CSCC) AC_SUBST(HAVE_MCS) AC_SUBST(HAVE_CSC) + dnl Provide a default for CSHARPCOMPFLAGS. + if test -z "${CSHARPCOMPFLAGS+set}"; then + CSHARPCOMPFLAGS="-O -g" + fi + AC_SUBST(CSHARPCOMPFLAGS) ]) diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog index a76d9a484..f6ac94b67 100644 --- a/gettext-tools/src/ChangeLog +++ b/gettext-tools/src/ChangeLog @@ -1,3 +1,7 @@ +2005-12-04 Bruno Haible + + * Makefile.am (CSHARPCOMPFLAGS): Use value set by csharpcomp.m4. + 2005-11-29 Colin Watson * msggrep.c (invert_match): New variable. diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am index c25e91a5f..3c4a07505 100644 --- a/gettext-tools/src/Makefile.am +++ b/gettext-tools/src/Makefile.am @@ -87,7 +87,7 @@ GCJFLAGS = @GCJFLAGS@ JAR = @JAR@ JAVACOMP = $(SHELL) ../lib/javacomp.sh CSHARPCOMP = $(SHELL) ../lib/csharpcomp.sh -CSHARPCOMPFLAGS = -O -g +CSHARPCOMPFLAGS = @CSHARPCOMPFLAGS@ # All programs deal with message lists.