Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit16a4a3d

Browse files
committed
Remove libpq.rc, use win32ver.rc for libpq
For historical reasons, libpq used a separate libpq.rc file for theWindows builds while all other components use a common filewin32ver.rc. With a bit of tweaking, the libpq build can also use thewin32ver.rc file. This removes a bit of duplicative code.Reviewed-by: Kyotaro Horiguchi <horikyota.ntt@gmail.com>Reviewed-by: Michael Paquier <michael@paquier.xyz>Discussion:https://www.postgresql.org/message-id/flat/ad505e61-a923-e114-9f38-9867d161073f@2ndquadrant.com
1 parentac5bdf6 commit16a4a3d

File tree

12 files changed

+30
-85
lines changed

12 files changed

+30
-85
lines changed

‎src/bin/pgevent/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
PGFILEDESC = "Eventlog message formatter"
1010
PGAPPICON=win32
1111

12-
PGFILESHLIB = 1
1312
subdir = src/bin/pgevent
1413
top_builddir = ../../..
1514
include$(top_builddir)/src/Makefile.global

‎src/interfaces/libpq/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/exports.list
2-
/libpq.rc
32
# .c files that are symlinked in from elsewhere
43
/encnames.c
54
/wchar.c

‎src/interfaces/libpq/Makefile

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ top_builddir = ../../..
1414
include$(top_builddir)/src/Makefile.global
1515

1616

17+
PGFILEDESC = "PostgreSQL Access Library"
18+
1719
# shared library parameters
1820
NAME= pq
1921
SO_MAJOR_VERSION= 5
@@ -28,6 +30,7 @@ endif
2830
# the conditional additions of files to OBJS, update Mkvcbuild.pm to match.
2931

3032
OBJS =\
33+
$(WIN32RES)\
3134
fe-auth-scram.o\
3235
fe-connect.o\
3336
fe-exec.o\
@@ -65,12 +68,8 @@ endif
6568

6669
ifeq ($(PORTNAME), win32)
6770
OBJS +=\
68-
libpqrc.o\
6971
win32.o
7072

71-
libpqrc.o: libpq.rc
72-
$(WINDRES) -i$< -o$@
73-
7473
ifeq ($(enable_thread_safety), yes)
7574
OBJS += pthread-win32.o
7675
endif
@@ -113,12 +112,6 @@ encnames.c wchar.c: % : $(backend_src)/utils/mb/%
113112
rm -f$@&&$(LN_S)$<.
114113

115114

116-
libpq.rc: libpq.rc.in
117-
sed -e's/\(VERSION.*\),0 *$$/\1,'`date'+%y%j'| sed's/^0*//'`'/'$<>$@
118-
119-
# Depend on Makefile.global to force rebuild on re-run of configure.
120-
libpq.rc:$(top_builddir)/src/Makefile.global
121-
122115
# Make dependencies on pg_config_paths.h visible, too.
123116
fe-connect.o: fe-connect.c$(top_builddir)/src/port/pg_config_paths.h
124117
fe-misc.o: fe-misc.c$(top_builddir)/src/port/pg_config_paths.h
@@ -148,7 +141,7 @@ uninstall: uninstall-lib
148141

149142
cleandistclean: clean-lib
150143
$(MAKE) -Ctest$@
151-
rm -f$(OBJS) pthread.h libpq.rc
144+
rm -f$(OBJS) pthread.h
152145
# Might be left over from a Win32 client-only build
153146
rm -f pg_config_paths.h
154147
# Remove files we (may have) symlinked in from other places

‎src/interfaces/libpq/libpq.rc.in

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎src/makefiles/Makefile.win32

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,7 @@ endif
5656
# Build rules to add versioninfo resources to win32 binaries
5757

5858
WIN32RES += win32ver.o
59-
ifeq ($(PGFILESHLIB),1)
60-
PGFTYPE = VFT_DLL
61-
else
62-
PGFTYPE = VFT_APP
63-
endif
59+
PGFTYPE = $(if $(shlib),VFT_DLL,VFT_APP)
6460
ifneq (,$(PGAPPICON))
6561
PGICOSTR = $(subst /,\/,IDI_ICON ICON \"$(top_builddir)/src/port/$(PGAPPICON).ico\")
6662
endif
@@ -71,7 +67,16 @@ endif
7167
# signal win32ver.rc availability to the dll build rule below.
7268
ifndef PGXS
7369
win32ver.rc: $(top_srcdir)/src/port/win32ver.rc
74-
sed -e 's;FILEDESC;$(PGFILEDESC);' -e 's;VFT_APP;$(PGFTYPE);' -e 's;_ICO_;$(PGICOSTR);' -e 's;\(VERSION.*\),0 *$$;\1,'`date '+%y%j' | sed 's/^0*//'`';' $< >$@
70+
sed -e 's;FILEDESC;$(PGFILEDESC);' \
71+
-e 's;VFT_APP;$(PGFTYPE);' \
72+
-e 's;_ICO_;$(PGICOSTR);' \
73+
-e 's;\(VERSION.*\),0 *$$;\1,'`date '+%y%j' | sed 's/^0*//'`';' \
74+
-e '/_INTERNAL_NAME_/$(if $(shlib),s;_INTERNAL_NAME_;"$(basename $(shlib))";,d)' \
75+
-e '/_ORIGINAL_NAME_/$(if $(shlib),s;_ORIGINAL_NAME_;"$(shlib)";,d)' \
76+
$< >$@
77+
78+
# Depend on Makefile.global to force rebuild on re-run of configure.
79+
win32ver.rc: $(top_builddir)/src/Makefile.global
7580
endif
7681

7782
win32ver.o: win32ver.rc

‎src/port/win32ver.rc

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,34 @@
11
#include <winver.h>
22
#include "pg_config.h"
33

4+
// https://docs.microsoft.com/en-us/windows/win32/menurc/versioninfo-resource
5+
46
VS_VERSION_INFO VERSIONINFO
57
FILEVERSION 13,0,0,0
68
PRODUCTVERSION 13,0,0,0
7-
FILEFLAGSMASK0x17L
9+
FILEFLAGSMASKVS_FFI_FILEFLAGSMASK
810
FILEFLAGS 0x0L
911
FILEOS VOS_NT_WINDOWS32
1012
FILETYPEVFT_APP
1113
FILESUBTYPE 0x0L
1214
BEGIN
1315
BLOCK "StringFileInfo"
1416
BEGIN
15-
BLOCK "000004b0"
17+
BLOCK "040904B0"// U.S. English, Unicode
1618
BEGIN
1719
VALUE "CompanyName", "PostgreSQL Global Development Group"
1820
VALUE "FileDescription", FILEDESC
1921
VALUE "FileVersion", PG_VERSION
22+
VALUE "InternalName", _INTERNAL_NAME_
2023
VALUE "LegalCopyright", "Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group. Portions Copyright (c) 1994, Regents of the University of California."
24+
VALUE "OriginalFileName", _ORIGINAL_NAME_
2125
VALUE "ProductName", "PostgreSQL"
2226
VALUE "ProductVersion", PG_VERSION
2327
END
2428
END
2529
BLOCK "VarFileInfo"
2630
BEGIN
27-
VALUE "Translation",0x0, 1200
31+
VALUE "Translation",0x0409, 1200// U.S. English, Unicode
2832
END
2933
END
3034

‎src/tools/copyright.pl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,5 @@ sub wanted
6666
}
6767

6868
print"Manually update:\n";
69-
print" ./src/interfaces/libpq/libpq.rc.in in head\n";
7069
print" ./doc/src/sgml/legal.sgml in head and back branches\n";
7170
print" ./COPYRIGHT in back branches\n";

‎src/tools/msvc/Mkvcbuild.pm

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,6 @@ sub mkvcbuild
250250
$libpq->AddLibrary('ws2_32.lib');
251251
$libpq->AddLibrary('wldap32.lib')if ($solution->{options}->{ldap});
252252
$libpq->UseDef('src/interfaces/libpq/libpqdll.def');
253-
$libpq->ReplaceFile('src/interfaces/libpq/libpqrc.c',
254-
'src/interfaces/libpq/libpq.rc');
255253
$libpq->AddReference($libpgcommon,$libpgport);
256254

257255
# The OBJS scraper doesn't know about ifdefs, so remove appropriate files

‎src/tools/msvc/Project.pm

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,14 @@ sub AddResourceFile
338338
if ($self->{type}eq"dll")
339339
{
340340
s/VFT_APP/VFT_DLL/gm;
341+
my$name =$self->{name};
342+
s/_INTERNAL_NAME_/"$name"/;
343+
s/_ORIGINAL_NAME_/"$name.dll"/;
344+
}
345+
else
346+
{
347+
/_INTERNAL_NAME_/ &&next;
348+
/_ORIGINAL_NAME_/ &&next;
341349
}
342350
print$o$_;
343351
}

‎src/tools/msvc/Solution.pm

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -668,27 +668,6 @@ sub GenerateFiles
668668
);
669669
}
670670

671-
if (IsNewer(
672-
'src/interfaces/libpq/libpq.rc',
673-
'src/interfaces/libpq/libpq.rc.in'))
674-
{
675-
print"Generating libpq.rc...\n";
676-
my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =
677-
localtime(time);
678-
my$d = ($year - 100) ."$yday";
679-
open(my$i,'<','src/interfaces/libpq/libpq.rc.in')
680-
|| confess"Could not open libpq.rc.in";
681-
open(my$o,'>','src/interfaces/libpq/libpq.rc')
682-
|| confess"Could not open libpq.rc";
683-
while (<$i>)
684-
{
685-
s/(VERSION.*),0/$1,$d/;
686-
print$o$_;
687-
}
688-
close($i);
689-
close($o);
690-
}
691-
692671
if (IsNewer('src/bin/psql/sql_help.h','src/bin/psql/create_help.pl'))
693672
{
694673
print"Generating sql_help.h...\n";

‎src/tools/msvc/clean.bat

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ if %DIST%==1 if exist src\backend\replication\syncrep_scanner.c del /q src\backe
8989
if%DIST%==1ifexist src\backend\replication\syncrep_gram.cdel /q src\backend\replication\syncrep_gram.c
9090

9191

92-
ifexist src\interfaces\libpq\libpq.rcdel /q src\interfaces\libpq\libpq.rc
9392
ifexist src\interfaces\libpq\libpqdll.defdel /q src\interfaces\libpq\libpqdll.def
9493
ifexist src\interfaces\ecpg\compatlib\compatlib.defdel /q src\interfaces\ecpg\compatlib\compatlib.def
9594
ifexist src\interfaces\ecpg\ecpglib\ecpglib.defdel /q src\interfaces\ecpg\ecpglib\ecpglib.def

‎src/tools/version_stamp.pl

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,6 @@
102102
"-e 's/AC_INIT(\\[PostgreSQL\\],\\[[0-9a-z.]*\\]/AC_INIT([PostgreSQL], [$fullversion]/'"
103103
);
104104

105-
sed_file("src/interfaces/libpq/libpq.rc.in",
106-
"-e 's/FILEVERSION [0-9]*,[0-9]*,[0-9]*,0/FILEVERSION$majorversion,0,$numericminor,0/'"
107-
."-e 's/PRODUCTVERSION [0-9]*,[0-9]*,[0-9]*,0/PRODUCTVERSION$majorversion,0,$numericminor,0/'"
108-
."-e 's/VALUE\"FileVersion\",\"[0-9.]*/VALUE\"FileVersion\",\"$numericversion/'"
109-
."-e 's/VALUE\"ProductVersion\",\"[0-9.]*/VALUE\"ProductVersion\",\"$numericversion/'"
110-
);
111-
112105
sed_file("src/port/win32ver.rc",
113106
"-e 's/FILEVERSION [0-9]*,[0-9]*,[0-9]*,0/FILEVERSION$majorversion,0,$numericminor,0/'"
114107
."-e 's/PRODUCTVERSION [0-9]*,[0-9]*,[0-9]*,0/PRODUCTVERSION$majorversion,0,$numericminor,0/'"

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp