[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commits] r19532 - in /fsf/glibc-2_16-branch/libc: ./ catgets/ intl/
- To: commits@xxxxxxxxxx
- Subject: [Commits] r19532 - in /fsf/glibc-2_16-branch/libc: ./ catgets/ intl/
- From: eglibc@xxxxxxxxxx
- Date: Sun, 08 Jul 2012 00:02:26 -0000
Author: eglibc
Date: Sun Jul 8 00:02:25 2012
New Revision: 19532
Log:
Import glibc-2.16 for 2012-07-08
Added:
fsf/glibc-2_16-branch/libc/catgets/xopen-msg.awk
fsf/glibc-2_16-branch/libc/intl/po2test.awk
Removed:
fsf/glibc-2_16-branch/libc/catgets/xopen-msg.sed
fsf/glibc-2_16-branch/libc/intl/po2test.sed
Modified:
fsf/glibc-2_16-branch/libc/ChangeLog
fsf/glibc-2_16-branch/libc/catgets/Makefile
fsf/glibc-2_16-branch/libc/intl/Makefile
Modified: fsf/glibc-2_16-branch/libc/ChangeLog
==============================================================================
--- fsf/glibc-2_16-branch/libc/ChangeLog (original)
+++ fsf/glibc-2_16-branch/libc/ChangeLog Sun Jul 8 00:02:25 2012
@@ -1,3 +1,17 @@
+2012-07-04 Andreas Schwab <schwab@xxxxxxxxxxxxxx>
+
+ * catgets/Makefile ($(objpfx)de.msg): Use xopen-msg.awk instead of
+ xopen-msg.sed.
+ * catgets/xopen-msg.awk: New file.
+ * catgets/xopen-msg.sed: Removed.
+
+2012-07-04 Andreas Schwab <schwab@xxxxxxxxxxxxxx>
+
+ * intl/Makefile ($(objpfx)msgs.h): Use po2test.awk instead of
+ po2text.sed.
+ * intl/po2test.awk: New file.
+ * intl/po2test.sed: Removed.
+
2012-07-03 Andreas Jaeger <aj@xxxxxxx>
* po/bg.po: Update from translation team.
Modified: fsf/glibc-2_16-branch/libc/catgets/Makefile
==============================================================================
--- fsf/glibc-2_16-branch/libc/catgets/Makefile (original)
+++ fsf/glibc-2_16-branch/libc/catgets/Makefile Sun Jul 8 00:02:25 2012
@@ -70,8 +70,8 @@
$(objpfx)tst-catgets.out: $(objpfx)de/libc.cat
# Generate a non-simple input file.
-$(objpfx)de.msg: $(..)po/de.po
- LC_ALL=C sed -f xopen-msg.sed $< > $@
+$(objpfx)de.msg: xopen-msg.awk $(..)po/de.po
+ LC_ALL=C $(AWK) -f $^ $< > $@
$(objpfx)test-gencat.out: test-gencat.sh $(objpfx)test-gencat \
$(objpfx)sample.SJIS.cat
Added: fsf/glibc-2_16-branch/libc/catgets/xopen-msg.awk
==============================================================================
--- fsf/glibc-2_16-branch/libc/catgets/xopen-msg.awk (added)
+++ fsf/glibc-2_16-branch/libc/catgets/xopen-msg.awk Sun Jul 8 00:02:25 2012
@@ -1,0 +1,72 @@
+# xopen-msg.awk - Convert Uniforum style .po file to X/Open style .msg file
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+#
+# The first directive in the .msg should be the definition of the
+# message set number. We use always set number 1.
+#
+BEGIN {
+ print "$set 1 # Automatically created by xopen-msg.awk"
+ num = 0
+}
+
+#
+# The .msg file contains, other then the .po file, only the translations
+# but each given a unique ID. Starting from 1 and incrementing by 1 for
+# each message we assign them to the messages.
+# It is important that the .po file used to generate the ../intl/msg.h file
+# (with po2test.awk) is the same as the one used here. (At least the order
+# of declarations must not be changed.)
+#
+function output_message() {
+ # Ignore messages containing <PRI.*> which would have to be replaced
+ # by the correct format depending on the word size
+ if (msg && msg !~ /<PRI.*>/) {
+ if (msgtype == "msgid") {
+ # We copy the original message as a comment into the .msg file.
+ gsub(/\n/, "\n$ ", msg)
+ printf "$ Original Message: %s\n", msg
+ } else {
+ gsub(/\n/, "\\\n", msg)
+ printf "%d %s\n", ++num, msg
+ }
+ }
+ msg = 0
+}
+
+$1 ~ "msg(id|str)" {
+ # Output collected message
+ output_message()
+ # Collect next message
+ msgtype = $1
+ sub(/^msg(id|str)[ \t]*"/, "", $0)
+ sub(/"$/, "", $0)
+ msg = $0
+ next
+}
+
+/^".*"/ {
+ # Append to current message
+ sub(/^"/, "", $0)
+ sub(/"$/, "", $0)
+ msg = msg "\n" $0
+ next
+}
+
+END {
+ # Output last collected message
+ output_message()
+}
Removed: fsf/glibc-2_16-branch/libc/catgets/xopen-msg.sed
==============================================================================
--- fsf/glibc-2_16-branch/libc/catgets/xopen-msg.sed (original)
+++ fsf/glibc-2_16-branch/libc/catgets/xopen-msg.sed (removed)
@@ -1,103 +1,0 @@
-# po2msg.sed - Convert Uniforum style .po file to X/Open style .msg file
-# Copyright (C) 1995 Free Software Foundation, Inc.
-# Ulrich Drepper <drepper@xxxxxxxxxxxxxx>, 1995.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
-#
-#
-# The first directive in the .msg should be the definition of the
-# message set number. We use always set number 1.
-#
-1 {
- i\
-$set 1 # Automatically created by po2msg.sed
- h
- s/.*/0/
- x
-}
-#
-# We copy all comments into the .msg file. Perhaps they can help.
-#
-/^#/ s/^#[ ]*/$ /p
-#
-# We copy the original message as a comment into the .msg file.
-#
-/^msgid/ {
-# Does not work now
-# /"$/! {
-# s/\\$//
-# s/$/ ... (more lines following)"/
-# }
- s/^msgid[ ]*"\(.*\)"$/$ Original Message: \1/
- p
-}
-#
-# The .msg file contains, other then the .po file, only the translations
-# but each given a unique ID. Starting from 1 and incrementing by 1 for
-# each message we assign them to the messages.
-# It is important that the .po file used to generate the cat-id-tbl.c file
-# (with po-to-tbl) is the same as the one used here. (At least the order
-# of declarations must not be changed.)
-#
-/^msgstr/ {
- s/msgstr[ ]*"\(.*\)"/\1/
- x
-# The following nice solution is by
-# Bruno <Haible@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
- td
-# Increment a decimal number in pattern space.
-# First hide trailing `9' digits.
- :d
- s/9\(_*\)$/_\1/
- td
-# Assure at least one digit is available.
- s/^\(_*\)$/0\1/
-# Increment the last digit.
- s/8\(_*\)$/9\1/
- s/7\(_*\)$/8\1/
- s/6\(_*\)$/7\1/
- s/5\(_*\)$/6\1/
- s/4\(_*\)$/5\1/
- s/3\(_*\)$/4\1/
- s/2\(_*\)$/3\1/
- s/1\(_*\)$/2\1/
- s/0\(_*\)$/1\1/
-# Convert the hidden `9' digits to `0's.
- s/_/0/g
- x
-# Bring the line in the format `<number> <message>'
- G
- s/^[^\n]*$/& /
- s/\(.*\)\n\([0-9]*\)/\2 \1/
-# Clear flag from last substitution.
- tb
-# Append the next line.
- :b
- N
-# Look whether second part is a continuation line.
- s/\(.*\n\)"\(.*\)"/\1\2/
-# Yes, then branch.
- ta
- P
- D
-# Note that `D' includes a jump to the start!!
-# We found a continuation line. But before printing insert '\'.
- :a
- s/\(.*\)\(\n.*\)/\1\\\2/
- P
-# We cannot use the sed command `D' here
- s/.*\n\(.*\)/\1/
- tb
-}
-d
Modified: fsf/glibc-2_16-branch/libc/intl/Makefile
==============================================================================
--- fsf/glibc-2_16-branch/libc/intl/Makefile (original)
+++ fsf/glibc-2_16-branch/libc/intl/Makefile Sun Jul 8 00:02:25 2012
@@ -83,9 +83,9 @@
endif
endif
-$(objpfx)msgs.h: po2test.sed ../po/de.po
+$(objpfx)msgs.h: po2test.awk ../po/de.po
$(make-target-directory)
- LC_ALL=C sed -f $^ > $@
+ LC_ALL=C $(AWK) -f $^ > $@
CFLAGS-tst-gettext.c = -DTESTSTRS_H=\"$(objpfx)msgs.h\"
CFLAGS-tst-translit.c = -DOBJPFX=\"$(objpfx)\"
Added: fsf/glibc-2_16-branch/libc/intl/po2test.awk
==============================================================================
--- fsf/glibc-2_16-branch/libc/intl/po2test.awk (added)
+++ fsf/glibc-2_16-branch/libc/intl/po2test.awk Sun Jul 8 00:02:25 2012
@@ -1,0 +1,46 @@
+# po2test.awk - Convert Uniforum style .po file to C code for testing.
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+
+# Output current message (in msg) as argument of the INPUT or OUTPUT macro,
+# depending on msgtype
+function output_message() {
+ # Ignore messages containing <PRI.*> markers which would have to be
+ # replaced by the correct format depending on the word size
+ if (msg && msg !~ /<PRI.*>/)
+ printf ("%s(%s)\n", msgtype == "msgid" ? "INPUT" : "OUTPUT", msg)
+ msg = 0
+}
+
+$1 ~ /msg(id|str)/ {
+ # Output collected message
+ output_message()
+ # Collect next message
+ msgtype = $1
+ sub(/^msg(id|str)[ \t]*/, "", $0)
+ msg = $0
+ next
+}
+
+/^".*"/ {
+ # Append to current message
+ msg = msg "\n" $0
+}
+
+END {
+ # Output last collected message
+ output_message()
+}
Removed: fsf/glibc-2_16-branch/libc/intl/po2test.sed
==============================================================================
--- fsf/glibc-2_16-branch/libc/intl/po2test.sed (original)
+++ fsf/glibc-2_16-branch/libc/intl/po2test.sed (removed)
@@ -1,51 +1,0 @@
-# po2test.sed - Convert Uniforum style .po file to C code for testing.
-# Copyright (C) 2000,2003 Free Software Foundation, Inc.
-# Ulrich Drepper <drepper@xxxxxxxxxx>, 2000.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
-#
-
-#
-# We copy the original message as a comment into the .msg file. But enclose
-# them with INPUT ( ).
-#
-s/^msgid[ ]*"\(.*\)"/INPUT ("\1")/
-# Clear flag from last substitution and jump if matching
-tb
-
-#
-# Copy the translations as well and enclose them with OUTPUT ( ).
-#
-s/^msgstr[ ]*"\(.*\)"/OUTPUT ("\1")/
-# Clear flag from last substitution and jump if matching
-tb
-
-d
-
-:b
-# Append the next line.
-$!N
-# Check whether second part is a continuation line. If so, before printing
-# insert '\'.
-s/\(.*\)")\(\n\)"\(.*\)"/\1\\\2\3")/
-P
-ta
-# No, go to the top and process it. Note that `D' includes a jump to the start!!
-D
-# Yes, we found a continuation line.
-:a
-# We cannot use the sed command `D' here
-s/[^\n]*\n//
-# Clear the substitution flag and do the next line.
-tb
_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits