Add Win32 version stamps that increment each day for proper SYSTEM32
DLL pginstaller installs.
This commit is contained in:
parent
08690d0688
commit
9af9320750
@ -1,5 +1,5 @@
|
||||
# -*-makefile-*-
|
||||
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.207 2004/12/16 18:13:07 momjian Exp $
|
||||
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.208 2004/12/19 02:16:18 momjian Exp $
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# All PostgreSQL makefiles include this file and use the variables it sets,
|
||||
@ -415,9 +415,9 @@ ifneq (,$(PGAPPICON))
|
||||
PGICOSTR=$(subst /,\/,IDI_ICON ICON \"$(top_builddir)/src/port/$(PGAPPICON).ico\")
|
||||
endif
|
||||
win32ver.rc: $(top_builddir)/src/port/win32ver.rc
|
||||
sed -e 's;FILEDESC;$(PGFILEDESC);' -e 's;VFT_APP;$(PGFTYPE);' -e 's;_ICO_;$(PGICOSTR);' $(top_builddir)/src/port/win32ver.rc > win32ver.rc
|
||||
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
|
||||
win32ver.o: $(top_builddir)/src/port/win32ver.rc
|
||||
sed -e 's;FILEDESC;$(PGFILEDESC);' -e 's;VFT_APP;$(PGFTYPE);' -e 's;_ICO_;$(PGICOSTR);' $(top_builddir)/src/port/win32ver.rc > win32ver.rc
|
||||
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
|
||||
windres -i win32ver.rc -o win32ver.o --include-dir=$(top_builddir)/src/include
|
||||
rm -f win32ver.rc
|
||||
endif
|
||||
|
@ -5,7 +5,7 @@
|
||||
# Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
|
||||
# Portions Copyright (c) 1994, Regents of the University of California
|
||||
#
|
||||
# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.122 2004/11/20 21:13:06 tgl Exp $
|
||||
# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.123 2004/12/19 02:16:24 momjian Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
@ -59,7 +59,7 @@ SHLIB_LINK += -lwsock32 -lws2_32 $(filter -leay32 -lssleay32, $(LIBS))
|
||||
endif
|
||||
|
||||
|
||||
all: $(PTHREAD_H_WIN32) def-files all-lib
|
||||
all: $(PTHREAD_H_WIN32) def-files $(srcdir)/libpq.rc all-lib
|
||||
|
||||
# Shared library stuff
|
||||
include $(top_srcdir)/src/Makefile.shlib
|
||||
@ -118,6 +118,9 @@ $(srcdir)/blibpqdll.def: exports.txt
|
||||
echo '; Aliases for MS compatible names' >> $@
|
||||
sed -e '/^#/d' -e 's/^\(.* \)\([0-9][0-9]*\)/ \1= _\1/' < $< | sed 's/ *$$//' >> $@
|
||||
|
||||
# depend on Makefile.global to force rebuild on re-run of configure
|
||||
$(srcdir)/libpq.rc: libpq.rc.in $(top_builddir)/src/Makefile.global
|
||||
sed -e 's/\(VERSION.*\),0 *$$/\1,'`date '+%y%j' | sed 's/^0*//'`'/' < $< > $@
|
||||
|
||||
ifneq ($(PTHREAD_H_WIN32), "")
|
||||
pthread.h: $(top_srcdir)/src/interfaces/libpq/pthread.h.win
|
||||
|
@ -15,13 +15,13 @@ BEGIN
|
||||
BEGIN
|
||||
VALUE "CompanyName", "\0"
|
||||
VALUE "FileDescription", "PostgreSQL Access Library\0"
|
||||
VALUE "FileVersion", "8, 0, 0, 0\0"
|
||||
VALUE "FileVersion", "8.0.0\0"
|
||||
VALUE "InternalName", "libpq\0"
|
||||
VALUE "LegalCopyright", "Copyright (C) 2004\0"
|
||||
VALUE "LegalTrademarks", "\0"
|
||||
VALUE "OriginalFilename", "libpq.dll\0"
|
||||
VALUE "ProductName", "PostgreSQL\0"
|
||||
VALUE "ProductVersion", "8, 0, 0, 0\0"
|
||||
VALUE "ProductVersion", "8.0.0\0"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
@ -2,8 +2,8 @@
|
||||
#include "pg_config.h"
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 8,0,000,000
|
||||
PRODUCTVERSION 8,0,000,000
|
||||
FILEVERSION 8,0,0,0
|
||||
PRODUCTVERSION 8,0,0,0
|
||||
FILEFLAGSMASK 0x17L
|
||||
FILEFLAGS 0x0L
|
||||
FILEOS VOS_NT_WINDOWS32
|
||||
|
Loading…
x
Reference in New Issue
Block a user