diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2020-01-15 10:15:06 +0100 |
|---|---|---|
| committer | Peter Eisentraut <peter@eisentraut.org> | 2020-01-15 15:06:12 +0100 |
| commit | 16a4a3d59cd5574fdc697ea16ef5692ce34c54d5 (patch) | |
| tree | e0d2ee9337cb9c2b05e0fcc3389c128be16cf283 /src/interfaces/libpq | |
| parent | ac5bdf62617507b1942f6124a2696c04a16fca04 (diff) | |
Remove libpq.rc, use win32ver.rc for libpq
For historical reasons, libpq used a separate libpq.rc file for the
Windows builds while all other components use a common file
win32ver.rc. With a bit of tweaking, the libpq build can also use the
win32ver.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
Diffstat (limited to 'src/interfaces/libpq')
| -rw-r--r-- | src/interfaces/libpq/.gitignore | 1 | ||||
| -rw-r--r-- | src/interfaces/libpq/Makefile | 15 | ||||
| -rw-r--r-- | src/interfaces/libpq/libpq.rc.in | 31 |
3 files changed, 4 insertions, 43 deletions
diff --git a/src/interfaces/libpq/.gitignore b/src/interfaces/libpq/.gitignore index 9be338dec89..7b438f37650 100644 --- a/src/interfaces/libpq/.gitignore +++ b/src/interfaces/libpq/.gitignore @@ -1,5 +1,4 @@ /exports.list -/libpq.rc # .c files that are symlinked in from elsewhere /encnames.c /wchar.c diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile index 773ef2723d2..f5f1c0c08da 100644 --- a/src/interfaces/libpq/Makefile +++ b/src/interfaces/libpq/Makefile @@ -14,6 +14,8 @@ top_builddir = ../../.. include $(top_builddir)/src/Makefile.global +PGFILEDESC = "PostgreSQL Access Library" + # shared library parameters NAME= pq SO_MAJOR_VERSION= 5 @@ -28,6 +30,7 @@ endif # the conditional additions of files to OBJS, update Mkvcbuild.pm to match. OBJS = \ + $(WIN32RES) \ fe-auth-scram.o \ fe-connect.o \ fe-exec.o \ @@ -65,12 +68,8 @@ endif ifeq ($(PORTNAME), win32) OBJS += \ - libpqrc.o \ win32.o -libpqrc.o: libpq.rc - $(WINDRES) -i $< -o $@ - ifeq ($(enable_thread_safety), yes) OBJS += pthread-win32.o endif @@ -113,12 +112,6 @@ encnames.c wchar.c: % : $(backend_src)/utils/mb/% rm -f $@ && $(LN_S) $< . -libpq.rc: libpq.rc.in - sed -e 's/\(VERSION.*\),0 *$$/\1,'`date '+%y%j' | sed 's/^0*//'`'/' $< >$@ - -# Depend on Makefile.global to force rebuild on re-run of configure. -libpq.rc: $(top_builddir)/src/Makefile.global - # Make dependencies on pg_config_paths.h visible, too. fe-connect.o: fe-connect.c $(top_builddir)/src/port/pg_config_paths.h fe-misc.o: fe-misc.c $(top_builddir)/src/port/pg_config_paths.h @@ -148,7 +141,7 @@ uninstall: uninstall-lib clean distclean: clean-lib $(MAKE) -C test $@ - rm -f $(OBJS) pthread.h libpq.rc + rm -f $(OBJS) pthread.h # Might be left over from a Win32 client-only build rm -f pg_config_paths.h # Remove files we (may have) symlinked in from other places diff --git a/src/interfaces/libpq/libpq.rc.in b/src/interfaces/libpq/libpq.rc.in deleted file mode 100644 index 3669a17c3c0..00000000000 --- a/src/interfaces/libpq/libpq.rc.in +++ /dev/null @@ -1,31 +0,0 @@ -#include <winver.h> - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 13,0,0,0 - PRODUCTVERSION 13,0,0,0 - FILEFLAGSMASK 0x3fL - FILEFLAGS 0 - FILEOS VOS__WINDOWS32 - FILETYPE VFT_DLL - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904B0" - BEGIN - VALUE "CompanyName", "\0" - VALUE "FileDescription", "PostgreSQL Access Library\0" - VALUE "FileVersion", "13.0\0" - VALUE "InternalName", "libpq\0" - VALUE "LegalCopyright", "Copyright (C) 2020\0" - VALUE "LegalTrademarks", "\0" - VALUE "OriginalFilename", "libpq.dll\0" - VALUE "ProductName", "PostgreSQL\0" - VALUE "ProductVersion", "13.0\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END |