🌐 AI搜索 & 代理 主页
Skip to content

Commit 6bef82b

Browse files
tglsfdctglsfdc
committed
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.
1 parent 9ab6c30 commit 6bef82b

File tree

8 files changed

+23
-23
lines changed

8 files changed

+23
-23
lines changed

‎src/backend/utils/mb/conversion_procs/Makefile‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for utils/mb/conversion_procs
55
#
66
# IDENTIFICATION
7-
# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/Makefile,v 1.23 2009/08/26 22:24:43 petere Exp $
7+
# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/Makefile,v 1.24 2009/11/04 23:47:04 tgl Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -14,7 +14,7 @@ include $(top_builddir)/src/Makefile.global
1414

1515
SQLSCRIPT = conversion_create.sql
1616

17-
# This file can be placed as src/test/regress/conversion.sql
17+
# This file can be placed as src/test/regress/sql/conversion.sql
1818
REGRESSION_SCRIPT = conversion.sql
1919

2020
SUBDIRS = \
@@ -24,7 +24,7 @@ SUBDIRS = \
2424
utf8_and_euc_jp utf8_and_euc_kr utf8_and_euc_tw utf8_and_gb18030 \
2525
utf8_and_gbk utf8_and_iso8859 utf8_and_iso8859_1 utf8_and_johab \
2626
utf8_and_sjis utf8_and_win utf8_and_uhc \
27-
utf8_and_euc_jis_2004 utf8_and_shift_jis_2004 euc_jis_2004_and_shift_jis_2004
27+
utf8_and_euc2004 utf8_and_sjis2004 euc2004_sjis2004
2828

2929
# conversion_name source_encoding destination_encoding function object
3030
CONVERSIONS = \
@@ -154,12 +154,12 @@ CONVERSIONS = \
154154
utf8_to_sjis UTF8 SJIS utf8_to_sjis utf8_and_sjis \
155155
uhc_to_utf8 UHC UTF8 uhc_to_utf8 utf8_and_uhc \
156156
utf8_to_uhc UTF8 UHC utf8_to_uhc utf8_and_uhc \
157-
euc_jis_2004_to_utf8 EUC_JIS_2004 UTF8 euc_jis_2004_to_utf8 utf8_and_euc_jis_2004 \
158-
utf8_to_euc_jis_2004 UTF8 EUC_JIS_2004 utf8_to_euc_jis_2004 utf8_and_euc_jis_2004 \
159-
shift_jis_2004_to_utf8 SHIFT_JIS_2004 UTF8 shift_jis_2004_to_utf8 utf8_and_shift_jis_2004 \
160-
utf8_to_shift_jis_2004 UTF8 SHIFT_JIS_2004 utf8_to_shift_jis_2004 utf8_and_shift_jis_2004 \
161-
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 \
162-
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
157+
euc_jis_2004_to_utf8 EUC_JIS_2004 UTF8 euc_jis_2004_to_utf8 utf8_and_euc2004 \
158+
utf8_to_euc_jis_2004 UTF8 EUC_JIS_2004 utf8_to_euc_jis_2004 utf8_and_euc2004 \
159+
shift_jis_2004_to_utf8 SHIFT_JIS_2004 UTF8 shift_jis_2004_to_utf8 utf8_and_sjis2004 \
160+
utf8_to_shift_jis_2004 UTF8 SHIFT_JIS_2004 utf8_to_shift_jis_2004 utf8_and_sjis2004 \
161+
euc_jis_2004_to_shift_jis_2004 EUC_JIS_2004 SHIFT_JIS_2004 euc_jis_2004_to_shift_jis_2004 euc2004_sjis2004 \
162+
shift_jis_2004_to_euc_jis_2004 SHIFT_JIS_2004 EUC_JIS_2004 shift_jis_2004_to_euc_jis_2004 euc2004_sjis2004
163163

164164
all: $(SQLSCRIPT)
165165
@for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@ || exit; done

src/backend/utils/mb/conversion_procs/euc_jis_2004_and_shift_jis_2004/Makefile renamed to src/backend/utils/mb/conversion_procs/euc2004_sjis2004/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#-------------------------------------------------------------------------
22
#
3-
# $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 $
3+
# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc2004_sjis2004/Makefile,v 1.1 2009/11/04 23:47:04 tgl Exp $
44
#
55
#-------------------------------------------------------------------------
6-
subdir = src/backend/utils/mb/conversion_procs/euc_jis_2004_and_shift_jis_2004
6+
subdir = src/backend/utils/mb/conversion_procs/euc2004_sjis2004
77
top_builddir = ../../../../../..
88
include $(top_builddir)/src/Makefile.global
99

10-
NAME = euc_jis_2004_and_shift_jis_2004
10+
NAME = euc2004_sjis2004
1111

1212
include $(srcdir)/../proc.mk

src/backend/utils/mb/conversion_procs/euc_jis_2004_and_shift_jis_2004/euc_jis_2004_and_shift_jis_2004.c renamed to src/backend/utils/mb/conversion_procs/euc2004_sjis2004/euc2004_sjis2004.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Copyright (c) 2007-2009, PostgreSQL Global Development Group
66
*
77
* IDENTIFICATION
8-
* $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 $
8+
* $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc2004_sjis2004/euc2004_sjis2004.c,v 1.1 2009/11/04 23:47:04 tgl Exp $
99
*
1010
*-------------------------------------------------------------------------
1111
*/

src/backend/utils/mb/conversion_procs/utf8_and_euc_jis_2004/Makefile renamed to src/backend/utils/mb/conversion_procs/utf8_and_euc2004/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#-------------------------------------------------------------------------
22
#
3-
# $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 $
3+
# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc2004/Makefile,v 1.1 2009/11/04 23:47:04 tgl Exp $
44
#
55
#-------------------------------------------------------------------------
6-
subdir = src/backend/utils/mb/conversion_procs/utf8_and_euc_jis_2004
6+
subdir = src/backend/utils/mb/conversion_procs/utf8_and_euc2004
77
top_builddir = ../../../../../..
88
include $(top_builddir)/src/Makefile.global
99

10-
NAME = utf8_and_euc_jis_2004
10+
NAME = utf8_and_euc2004
1111

1212
include $(srcdir)/../proc.mk

src/backend/utils/mb/conversion_procs/utf8_and_euc_jis_2004/utf8_and_euc_jis_2004.c renamed to src/backend/utils/mb/conversion_procs/utf8_and_euc2004/utf8_and_euc2004.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 1994, Regents of the University of California
77
*
88
* IDENTIFICATION
9-
* $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 $
9+
* $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 $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/

src/backend/utils/mb/conversion_procs/utf8_and_shift_jis_2004/Makefile renamed to src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#-------------------------------------------------------------------------
22
#
3-
# $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 $
3+
# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/Makefile,v 1.1 2009/11/04 23:47:04 tgl Exp $
44
#
55
#-------------------------------------------------------------------------
6-
subdir = src/backend/utils/mb/conversion_procs/utf8_and_shift_jis_2004
6+
subdir = src/backend/utils/mb/conversion_procs/utf8_and_sjis2004
77
top_builddir = ../../../../../..
88
include $(top_builddir)/src/Makefile.global
99

10-
NAME = utf8_and_shift_jis_2004
10+
NAME = utf8_and_sjis2004
1111

1212
include $(srcdir)/../proc.mk

src/backend/utils/mb/conversion_procs/utf8_and_shift_jis_2004/utf8_and_shift_jis_2004.c renamed to src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/utf8_and_sjis2004.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 1994, Regents of the University of California
77
*
88
* IDENTIFICATION
9-
* $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 $
9+
* $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 $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/

‎src/include/catalog/catversion.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
3838
* Portions Copyright (c) 1994, Regents of the University of California
3939
*
40-
* $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.548 2009/10/28 14:55:44 tgl Exp $
40+
* $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.549 2009/11/04 23:47:04 tgl Exp $
4141
*
4242
*-------------------------------------------------------------------------
4343
*/
@@ -53,6 +53,6 @@
5353
*/
5454

5555
/* yyyymmddN */
56-
#define CATALOG_VERSION_NO 200910281
56+
#define CATALOG_VERSION_NO 200911041
5757

5858
#endif

0 commit comments

Comments
 (0)