From 6bef82b38a67b493fc82990e41946c1bd2ea1b03 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Wed, 4 Nov 2009 23:47:04 +0000 Subject: [PATCH] Rename some encoding conversion modules to keep pathnames in our source tarballs under 100 characters. This should avoid failures with certain untarring tools (WinZip and Midnight Commander have been mentioned as likely suspects). Per my proposal of yesterday. catversion bumped since the initial contents of pg_proc change. --- src/backend/utils/mb/conversion_procs/Makefile | 18 +++++++++--------- .../Makefile | 6 +++--- .../euc2004_sjis2004.c} | 2 +- .../Makefile | 6 +++--- .../utf8_and_euc2004.c} | 2 +- .../Makefile | 6 +++--- .../utf8_and_sjis2004.c} | 2 +- src/include/catalog/catversion.h | 4 ++-- 8 files changed, 23 insertions(+), 23 deletions(-) rename src/backend/utils/mb/conversion_procs/{euc_jis_2004_and_shift_jis_2004 => euc2004_sjis2004}/Makefile (50%) rename src/backend/utils/mb/conversion_procs/{euc_jis_2004_and_shift_jis_2004/euc_jis_2004_and_shift_jis_2004.c => euc2004_sjis2004/euc2004_sjis2004.c} (98%) rename src/backend/utils/mb/conversion_procs/{utf8_and_euc_jis_2004 => utf8_and_euc2004}/Makefile (66%) rename src/backend/utils/mb/conversion_procs/{utf8_and_euc_jis_2004/utf8_and_euc_jis_2004.c => utf8_and_euc2004/utf8_and_euc2004.c} (96%) rename src/backend/utils/mb/conversion_procs/{utf8_and_shift_jis_2004 => utf8_and_sjis2004}/Makefile (65%) rename src/backend/utils/mb/conversion_procs/{utf8_and_shift_jis_2004/utf8_and_shift_jis_2004.c => utf8_and_sjis2004/utf8_and_sjis2004.c} (96%) diff --git a/src/backend/utils/mb/conversion_procs/Makefile b/src/backend/utils/mb/conversion_procs/Makefile index 7bdd9f1f24..33fc6b9f3a 100644 --- a/src/backend/utils/mb/conversion_procs/Makefile +++ b/src/backend/utils/mb/conversion_procs/Makefile @@ -4,7 +4,7 @@ # Makefile for utils/mb/conversion_procs # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/Makefile,v 1.23 2009/08/26 22:24:43 petere Exp $ +# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/Makefile,v 1.24 2009/11/04 23:47:04 tgl Exp $ # #------------------------------------------------------------------------- @@ -14,7 +14,7 @@ include $(top_builddir)/src/Makefile.global SQLSCRIPT = conversion_create.sql -# This file can be placed as src/test/regress/conversion.sql +# This file can be placed as src/test/regress/sql/conversion.sql REGRESSION_SCRIPT = conversion.sql SUBDIRS = \ @@ -24,7 +24,7 @@ SUBDIRS = \ utf8_and_euc_jp utf8_and_euc_kr utf8_and_euc_tw utf8_and_gb18030 \ utf8_and_gbk utf8_and_iso8859 utf8_and_iso8859_1 utf8_and_johab \ utf8_and_sjis utf8_and_win utf8_and_uhc \ - utf8_and_euc_jis_2004 utf8_and_shift_jis_2004 euc_jis_2004_and_shift_jis_2004 + utf8_and_euc2004 utf8_and_sjis2004 euc2004_sjis2004 # conversion_name source_encoding destination_encoding function object CONVERSIONS = \ @@ -154,12 +154,12 @@ CONVERSIONS = \ utf8_to_sjis UTF8 SJIS utf8_to_sjis utf8_and_sjis \ uhc_to_utf8 UHC UTF8 uhc_to_utf8 utf8_and_uhc \ utf8_to_uhc UTF8 UHC utf8_to_uhc utf8_and_uhc \ - euc_jis_2004_to_utf8 EUC_JIS_2004 UTF8 euc_jis_2004_to_utf8 utf8_and_euc_jis_2004 \ - utf8_to_euc_jis_2004 UTF8 EUC_JIS_2004 utf8_to_euc_jis_2004 utf8_and_euc_jis_2004 \ - shift_jis_2004_to_utf8 SHIFT_JIS_2004 UTF8 shift_jis_2004_to_utf8 utf8_and_shift_jis_2004 \ - utf8_to_shift_jis_2004 UTF8 SHIFT_JIS_2004 utf8_to_shift_jis_2004 utf8_and_shift_jis_2004 \ - euc_jis_2004_to_shift_jis_2004 EUC_JIS_2004 SHIFT_JIS_2004 euc_jis_2004_to_shift_jis_2004 euc_jis_2004_and_shift_jis_2004 \ - shift_jis_2004_to_euc_jis_2004 SHIFT_JIS_2004 EUC_JIS_2004 shift_jis_2004_to_euc_jis_2004 euc_jis_2004_and_shift_jis_2004 + euc_jis_2004_to_utf8 EUC_JIS_2004 UTF8 euc_jis_2004_to_utf8 utf8_and_euc2004 \ + utf8_to_euc_jis_2004 UTF8 EUC_JIS_2004 utf8_to_euc_jis_2004 utf8_and_euc2004 \ + shift_jis_2004_to_utf8 SHIFT_JIS_2004 UTF8 shift_jis_2004_to_utf8 utf8_and_sjis2004 \ + utf8_to_shift_jis_2004 UTF8 SHIFT_JIS_2004 utf8_to_shift_jis_2004 utf8_and_sjis2004 \ + euc_jis_2004_to_shift_jis_2004 EUC_JIS_2004 SHIFT_JIS_2004 euc_jis_2004_to_shift_jis_2004 euc2004_sjis2004 \ + shift_jis_2004_to_euc_jis_2004 SHIFT_JIS_2004 EUC_JIS_2004 shift_jis_2004_to_euc_jis_2004 euc2004_sjis2004 all: $(SQLSCRIPT) @for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@ || exit; done diff --git a/src/backend/utils/mb/conversion_procs/euc_jis_2004_and_shift_jis_2004/Makefile b/src/backend/utils/mb/conversion_procs/euc2004_sjis2004/Makefile similarity index 50% rename from src/backend/utils/mb/conversion_procs/euc_jis_2004_and_shift_jis_2004/Makefile rename to src/backend/utils/mb/conversion_procs/euc2004_sjis2004/Makefile index 7d02519321..e12c8dd905 100644 --- a/src/backend/utils/mb/conversion_procs/euc_jis_2004_and_shift_jis_2004/Makefile +++ b/src/backend/utils/mb/conversion_procs/euc2004_sjis2004/Makefile @@ -1,12 +1,12 @@ #------------------------------------------------------------------------- # -# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_jis_2004_and_shift_jis_2004/Makefile,v 1.2 2007/03/27 14:29:51 momjian Exp $ +# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc2004_sjis2004/Makefile,v 1.1 2009/11/04 23:47:04 tgl Exp $ # #------------------------------------------------------------------------- -subdir = src/backend/utils/mb/conversion_procs/euc_jis_2004_and_shift_jis_2004 +subdir = src/backend/utils/mb/conversion_procs/euc2004_sjis2004 top_builddir = ../../../../../.. include $(top_builddir)/src/Makefile.global -NAME = euc_jis_2004_and_shift_jis_2004 +NAME = euc2004_sjis2004 include $(srcdir)/../proc.mk diff --git a/src/backend/utils/mb/conversion_procs/euc_jis_2004_and_shift_jis_2004/euc_jis_2004_and_shift_jis_2004.c b/src/backend/utils/mb/conversion_procs/euc2004_sjis2004/euc2004_sjis2004.c similarity index 98% rename from src/backend/utils/mb/conversion_procs/euc_jis_2004_and_shift_jis_2004/euc_jis_2004_and_shift_jis_2004.c rename to src/backend/utils/mb/conversion_procs/euc2004_sjis2004/euc2004_sjis2004.c index e65d755368..d0914c2eb1 100644 --- a/src/backend/utils/mb/conversion_procs/euc_jis_2004_and_shift_jis_2004/euc_jis_2004_and_shift_jis_2004.c +++ b/src/backend/utils/mb/conversion_procs/euc2004_sjis2004/euc2004_sjis2004.c @@ -5,7 +5,7 @@ * Copyright (c) 2007-2009, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_jis_2004_and_shift_jis_2004/euc_jis_2004_and_shift_jis_2004.c,v 1.6 2009/01/29 19:23:39 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc2004_sjis2004/euc2004_sjis2004.c,v 1.1 2009/11/04 23:47:04 tgl Exp $ * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_euc_jis_2004/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_euc2004/Makefile similarity index 66% rename from src/backend/utils/mb/conversion_procs/utf8_and_euc_jis_2004/Makefile rename to src/backend/utils/mb/conversion_procs/utf8_and_euc2004/Makefile index ff97965a6a..7abd09424e 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_euc_jis_2004/Makefile +++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc2004/Makefile @@ -1,12 +1,12 @@ #------------------------------------------------------------------------- # -# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc_jis_2004/Makefile,v 1.1 2007/03/25 11:56:02 ishii Exp $ +# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc2004/Makefile,v 1.1 2009/11/04 23:47:04 tgl Exp $ # #------------------------------------------------------------------------- -subdir = src/backend/utils/mb/conversion_procs/utf8_and_euc_jis_2004 +subdir = src/backend/utils/mb/conversion_procs/utf8_and_euc2004 top_builddir = ../../../../../.. include $(top_builddir)/src/Makefile.global -NAME = utf8_and_euc_jis_2004 +NAME = utf8_and_euc2004 include $(srcdir)/../proc.mk diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_euc_jis_2004/utf8_and_euc_jis_2004.c b/src/backend/utils/mb/conversion_procs/utf8_and_euc2004/utf8_and_euc2004.c similarity index 96% rename from src/backend/utils/mb/conversion_procs/utf8_and_euc_jis_2004/utf8_and_euc_jis_2004.c rename to src/backend/utils/mb/conversion_procs/utf8_and_euc2004/utf8_and_euc2004.c index efc0153632..59c540f1e3 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_euc_jis_2004/utf8_and_euc_jis_2004.c +++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc2004/utf8_and_euc2004.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc_jis_2004/utf8_and_euc_jis_2004.c,v 1.5 2009/01/29 19:23:40 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc2004/utf8_and_euc2004.c,v 1.1 2009/11/04 23:47:04 tgl Exp $ * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_shift_jis_2004/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/Makefile similarity index 65% rename from src/backend/utils/mb/conversion_procs/utf8_and_shift_jis_2004/Makefile rename to src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/Makefile index 8a2d052441..ea471286f3 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_shift_jis_2004/Makefile +++ b/src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/Makefile @@ -1,12 +1,12 @@ #------------------------------------------------------------------------- # -# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_shift_jis_2004/Makefile,v 1.1 2007/03/25 11:56:03 ishii Exp $ +# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/Makefile,v 1.1 2009/11/04 23:47:04 tgl Exp $ # #------------------------------------------------------------------------- -subdir = src/backend/utils/mb/conversion_procs/utf8_and_shift_jis_2004 +subdir = src/backend/utils/mb/conversion_procs/utf8_and_sjis2004 top_builddir = ../../../../../.. include $(top_builddir)/src/Makefile.global -NAME = utf8_and_shift_jis_2004 +NAME = utf8_and_sjis2004 include $(srcdir)/../proc.mk diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_shift_jis_2004/utf8_and_shift_jis_2004.c b/src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/utf8_and_sjis2004.c similarity index 96% rename from src/backend/utils/mb/conversion_procs/utf8_and_shift_jis_2004/utf8_and_shift_jis_2004.c rename to src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/utf8_and_sjis2004.c index c006a11e9d..e10a9a8417 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_shift_jis_2004/utf8_and_shift_jis_2004.c +++ b/src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/utf8_and_sjis2004.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_shift_jis_2004/utf8_and_shift_jis_2004.c,v 1.5 2009/01/29 19:23:42 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/utf8_and_sjis2004.c,v 1.1 2009/11/04 23:47:04 tgl Exp $ * *------------------------------------------------------------------------- */ diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h index 74bf01d29c..fca4e8f608 100644 --- a/src/include/catalog/catversion.h +++ b/src/include/catalog/catversion.h @@ -37,7 +37,7 @@ * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.548 2009/10/28 14:55:44 tgl Exp $ + * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.549 2009/11/04 23:47:04 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -53,6 +53,6 @@ */ /* yyyymmddN */ -#define CATALOG_VERSION_NO 200910281 +#define CATALOG_VERSION_NO 200911041 #endif -- 2.40.0