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

Commit9af9320

Browse files
committed
Add Win32 version stamps that increment each day for proper SYSTEM32
DLL pginstaller installs.
1 parent08690d0 commit9af9320

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

‎src/Makefile.global.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*-makefile-*-
2-
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.207 2004/12/16 18:13:07 momjian Exp $
2+
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.208 2004/12/19 02:16:18 momjian Exp $
33

44
#------------------------------------------------------------------------------
55
# All PostgreSQL makefiles include this file and use the variables it sets,
@@ -415,9 +415,9 @@ ifneq (,$(PGAPPICON))
415415
PGICOSTR=$(subst /,\/,IDI_ICON ICON \"$(top_builddir)/src/port/$(PGAPPICON).ico\")
416416
endif
417417
win32ver.rc:$(top_builddir)/src/port/win32ver.rc
418-
sed -e's;FILEDESC;$(PGFILEDESC);' -e's;VFT_APP;$(PGFTYPE);' -e's;_ICO_;$(PGICOSTR);'$(top_builddir)/src/port/win32ver.rc> win32ver.rc
418+
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*//'`';'$(top_builddir)/src/port/win32ver.rc> win32ver.rc
419419
win32ver.o:$(top_builddir)/src/port/win32ver.rc
420-
sed -e's;FILEDESC;$(PGFILEDESC);' -e's;VFT_APP;$(PGFTYPE);' -e's;_ICO_;$(PGICOSTR);'$(top_builddir)/src/port/win32ver.rc> win32ver.rc
420+
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*//'`';'$(top_builddir)/src/port/win32ver.rc> win32ver.rc
421421
windres -i win32ver.rc -o win32ver.o --include-dir=$(top_builddir)/src/include
422422
rm -f win32ver.rc
423423
endif

‎src/interfaces/libpq/Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
66
# Portions Copyright (c) 1994, Regents of the University of California
77
#
8-
# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.122 2004/11/20 21:13:06 tgl Exp $
8+
# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.123 2004/12/19 02:16:24 momjian Exp $
99
#
1010
#-------------------------------------------------------------------------
1111

@@ -59,7 +59,7 @@ SHLIB_LINK += -lwsock32 -lws2_32 $(filter -leay32 -lssleay32, $(LIBS))
5959
endif
6060

6161

62-
all:$(PTHREAD_H_WIN32) def-files all-lib
62+
all:$(PTHREAD_H_WIN32) def-files$(srcdir)/libpq.rcall-lib
6363

6464
# Shared library stuff
6565
include$(top_srcdir)/src/Makefile.shlib
@@ -118,6 +118,9 @@ $(srcdir)/blibpqdll.def: exports.txt
118118
echo'; Aliases for MS compatible names'>>$@
119119
sed -e'/^#/d' -e's/^\(.* \)\([0-9][0-9]*\)/ \1= _\1/'<$<| sed's/ *$$//'>>$@
120120

121+
# depend on Makefile.global to force rebuild on re-run of configure
122+
$(srcdir)/libpq.rc: libpq.rc.in$(top_builddir)/src/Makefile.global
123+
sed -e's/\(VERSION.*\),0 *$$/\1,'`date'+%y%j'| sed's/^0*//'`'/'<$<>$@
121124

122125
ifneq ($(PTHREAD_H_WIN32), "")
123126
pthread.h:$(top_srcdir)/src/interfaces/libpq/pthread.h.win

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ BEGIN
1515
BEGIN
1616
VALUE "CompanyName", "\0"
1717
VALUE "FileDescription", "PostgreSQL Access Library\0"
18-
VALUE "FileVersion", "8, 0, 0,0\0"
18+
VALUE "FileVersion", "8.0.0\0"
1919
VALUE "InternalName", "libpq\0"
2020
VALUE "LegalCopyright", "Copyright (C) 2004\0"
2121
VALUE "LegalTrademarks", "\0"
2222
VALUE "OriginalFilename", "libpq.dll\0"
2323
VALUE "ProductName", "PostgreSQL\0"
24-
VALUE "ProductVersion", "8, 0, 0,0\0"
24+
VALUE "ProductVersion", "8.0.0\0"
2525
END
2626
END
2727
BLOCK "VarFileInfo"

‎src/port/win32ver.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#include "pg_config.h"
33

44
VS_VERSION_INFO VERSIONINFO
5-
FILEVERSION 8,0,000,000
6-
PRODUCTVERSION 8,0,000,000
5+
FILEVERSION 8,0,0,0
6+
PRODUCTVERSION 8,0,0,0
77
FILEFLAGSMASK 0x17L
88
FILEFLAGS 0x0L
99
FILEOS VOS_NT_WINDOWS32

0 commit comments

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