Mac OS support: set DYLD_LIBRARY_PATH for testing and remove en@{bold…

…,}quot translations.
gvlx · Sep 22, 2012 · 6e94a92 · 6e94a92
1 parent 8032808
commit 6e94a92
Show file tree

Hide file tree

Showing 16 changed files with 37 additions and 15 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-22         Andrew J. Schorr     <[email protected]>
+
+	* configure.ac: Version 0.4.0.
+
 2012-08-31         Andrew J. Schorr     <[email protected]>
 
 	* configure.ac: Version 0.3.9.

diff --git a/configure.ac b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([Gawk Extension Libraries], 0.3.9, [email protected], gawkextlib)
+AC_INIT([Gawk Extension Libraries], 0.4.0, [email protected], gawkextlib)
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])

diff --git a/po/ChangeLog b/po/ChangeLog
@@ -1,3 +1,13 @@
+2012-09-22         Andrew J. Schorr     <[email protected]>
+
+	* LINGUAS: Remove en@boldquot and en@quot, since they were causing
+	errors from msgfmt on Mac OS:
+		`msgid' and `msgstr' entries do not both end with '\n'
+	I guess that msgmerge is somehow corrupting the .po file.
+	It is not worth troubleshooting further at this point without
+	direct access to a Mac OS system.
+	*.po: Update for new release.
+
 2012-08-31         Andrew J. Schorr     <[email protected]>
 
 	Makevars (MSGID_BUGS_ADDRESS): Replace xmlgawk with gawkextlib.

diff --git a/po/LINGUAS b/po/LINGUAS
@@ -1,7 +1,5 @@
 da
 de
-en@boldquot
-en@quot
 es
 fr
 it

diff --git a/po/da.po b/po/da.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gawk 3.1.31\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2012-08-31 10:10-0400\n"
+"POT-Creation-Date: 2012-09-22 15:14-0400\n"
 "PO-Revision-Date: 2002-11-09 10:09+0100\n"
 "Last-Translator: Keld Simonsen <[email protected]>\n"
 "Language-Team: Danish <[email protected]>\n"

diff --git a/po/de.po b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gawk 3.1.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2012-08-31 10:10-0400\n"
+"POT-Creation-Date: 2012-09-22 15:14-0400\n"
 "PO-Revision-Date: 2002-04-03 18:55+02:00\n"
 "Last-Translator: Christian Kirsch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"

diff --git a/po/es.po b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gawk 3.1.5f\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2012-08-31 10:10-0400\n"
+"POT-Creation-Date: 2012-09-22 15:14-0400\n"
 "PO-Revision-Date: 2007-07-20 01:10-0500\n"
 "Last-Translator: Cristian Othón Martínez Vera <[email protected]>\n"
 "Language-Team: Spanish <[email protected]>\n"

diff --git a/po/fr.po b/po/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gawk 3.1.4l\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2012-08-31 10:10-0400\n"
+"POT-Creation-Date: 2012-09-22 15:14-0400\n"
 "PO-Revision-Date: 2005-06-29 08:00-0500\n"
 "Last-Translator: Michel Robitaille <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"

diff --git a/po/it.po b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gawk 3.1.5h\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2012-08-31 10:10-0400\n"
+"POT-Creation-Date: 2012-09-22 15:14-0400\n"
 "PO-Revision-Date: 2007-09-30 23:20+0100\n"
 "Last-Translator: Antonio Colombo <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"

diff --git a/po/ja.po b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gawk 3.1.4l\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2012-08-31 10:10-0400\n"
+"POT-Creation-Date: 2012-09-22 15:14-0400\n"
 "PO-Revision-Date: 2005-06-27 02:37+1000\n"
 "Last-Translator: Makoto Hosoya <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"

diff --git a/po/nl.po b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gawk 3.1.6\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2012-08-31 10:10-0400\n"
+"POT-Creation-Date: 2012-09-22 15:14-0400\n"
 "PO-Revision-Date: 2007-11-26 00:23+0100\n"
 "Last-Translator: Benno Schulenberg <[email protected]>\n"
 "Language-Team: Dutch <[email protected]>\n"

diff --git a/po/pl.po b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gawk 3.1.5f\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2012-08-31 10:10-0400\n"
+"POT-Creation-Date: 2012-09-22 15:14-0400\n"
 "PO-Revision-Date: 2007-08-17 20:05+0200\n"
 "Last-Translator: Wojciech Polak <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"

diff --git a/po/sv.po b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gawk 3.1.1m\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2012-08-31 10:10-0400\n"
+"POT-Creation-Date: 2012-09-22 15:14-0400\n"
 "PO-Revision-Date: 2003-02-27 19:54+0100\n"
 "Last-Translator: Martin Sjögren <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"

diff --git a/po/vi.po b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gawk 3.1.6\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2012-08-31 10:10-0400\n"
+"POT-Creation-Date: 2012-09-22 15:14-0400\n"
 "PO-Revision-Date: 2007-11-30 22:29+1030\n"
 "Last-Translator: Clytie Siddall <[email protected]>\n"
 "Language-Team: Vietnamese <[email protected]>\n"

diff --git a/test/ChangeLog b/test/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-22         Andrew J. Schorr     <[email protected]>
+
+	* Makefile.am (AWK): For Mac OS to find the libgawkextlib shared
+	library, we need to set DYLD_LIBRARY_PATH (just as we had to
+	set PATH on Cygwin).  To be safe, we also set LD_LIBRARY_PATH.
+
 2012-08-01         Andrew J. Schorr     <[email protected]>
 
 	* beginfile.ok: Update so test passes.

diff --git a/test/Makefile.am b/test/Makefile.am
@@ -76,8 +76,12 @@ VALGRIND =
 # This can also be done in individual tests where we wish to
 # check things specifically not in the C locale.
 
-# For Cygwin to find libgawkextlib, we need to set the PATH
-AWK = LC_ALL=$${GAWKLOCALE:-C} LANG=$${GAWKLOCALE:-C} AWKLIBPATH=../extension/.libs PATH=../.libs$(PATH_SEPARATOR)$$PATH $(VALGRIND) $(GAWKPROG)
+# For Cygwin to find libgawkextlib, we need to set the PATH.
+# Similarly, Mac OS requires us to set DYLD_LIBRARY_PATH.  Just to
+# be safe, we will set LD_LIBRARY_PATH also.  I hope that covers all
+# platforms.
+GELIBPFX=../.libs$(PATH_SEPARATOR)
+AWK = LC_ALL=$${GAWKLOCALE:-C} LANG=$${GAWKLOCALE:-C} AWKLIBPATH=../extension/.libs PATH=$(GELIBPFX)$$PATH LD_LIBRARY_PATH=$(GELIBPFX)$$LD_LIBRARY_PATH DYLD_LIBRARY_PATH=$(GELIBPFX)$$DYLD_LIBRARY_PATH $(VALGRIND) $(GAWKPROG)
 
 if BUILD_XML
 CHECKXML = xml-msg-start    xml             xml-msg-end
-Original file line number
+Diff line change
@@ -1,7 +1,5 @@
     da
     de
-    en@boldquot
-    en@quot
     es
     fr
     it
@@ Expand Down @@