Skip to content

Commit ee9569e

Browse files
nmischnmisch
committed
Finish adding file version information to installed Windows binaries.
In support of this, have the MSVC build follow GNU make in preferring GNUmakefile over Makefile when a directory contains both. Michael Paquier, reviewed by MauMau.
1 parent fb2aece commit ee9569e

File tree

8 files changed

+66
-22
lines changed

8 files changed

+66
-22
lines changed

‎src/backend/snowball/Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,17 @@
66
#
77
#-------------------------------------------------------------------------
88

9+
PGFILEDESC = "snowball - natural language stemmers"
10+
PGAPPICON = win32
11+
912
subdir = src/backend/snowball
1013
top_builddir = ../../..
1114
include $(top_builddir)/src/Makefile.global
1215

1316
override CPPFLAGS := -I$(top_srcdir)/src/include/snowball \
1417
-I$(top_srcdir)/src/include/snowball/libstemmer $(CPPFLAGS)
1518

16-
OBJS= dict_snowball.o api.o utilities.o \
19+
OBJS= $(WIN32RES) dict_snowball.o api.o utilities.o \
1720
stem_ISO_8859_1_danish.o \
1821
stem_ISO_8859_1_dutch.o \
1922
stem_ISO_8859_1_english.o \

‎src/interfaces/ecpg/test/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# src/interfaces/ecpg/test/Makefile
22

3+
PGFILEDESC = "ECPG Test - regression tests for ECPG"
4+
PGAPPICON = win32
5+
36
subdir = src/interfaces/ecpg/test
47
top_builddir = ../../../..
58
include $(top_builddir)/src/Makefile.global
@@ -13,8 +16,6 @@ override CPPFLAGS := \
1316
'-DDLSUFFIX="$(DLSUFFIX)"' \
1417
$(CPPFLAGS)
1518

16-
PGFILEDESC = "ECPG Test - regression tests for ECPG"
17-
1819
# where to find psql for testing an existing installation
1920
PSQLDIR = $(bindir)
2021

‎src/test/isolation/Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
# Makefile for isolation tests
33
#
44

5+
PGFILEDESC = "pg_isolation_regress/isolationtester - multi-client test driver"
6+
PGAPPICON = win32
7+
58
subdir = src/test/isolation
69
top_builddir = ../../..
710
include $(top_builddir)/src/Makefile.global
@@ -11,7 +14,7 @@ PSQLDIR = $(bindir)
1114

1215
override CPPFLAGS := -I$(srcdir) -I$(libpq_srcdir) -I$(srcdir)/../regress $(CPPFLAGS)
1316

14-
OBJS = specparse.o isolationtester.o
17+
OBJS = specparse.o isolationtester.o $(WIN32RES)
1518

1619
all: isolationtester$(X) pg_isolation_regress$(X)
1720

@@ -21,7 +24,7 @@ submake-regress:
2124
pg_regress.o: | submake-regress
2225
rm -f $@ && $(LN_S) $(top_builddir)/src/test/regress/pg_regress.o .
2326

24-
pg_isolation_regress$(X): isolation_main.o pg_regress.o
27+
pg_isolation_regress$(X): isolation_main.o pg_regress.o $(WIN32RES)
2528
$(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@
2629

2730
isolationtester$(X): $(OBJS) | submake-libpq submake-libpgport

‎src/test/regress/GNUmakefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
#
1111
#-------------------------------------------------------------------------
1212

13+
PGFILEDESC = "pg_regress - test driver"
14+
PGAPPICON = win32
15+
1316
subdir = src/test/regress
1417
top_builddir = ../../..
1518
include $(top_builddir)/src/Makefile.global
@@ -43,7 +46,7 @@ EXTRADEFS = '-DHOST_TUPLE="$(host_tuple)"' \
4346

4447
all: pg_regress$(X)
4548

46-
pg_regress$(X): pg_regress.o pg_regress_main.o | submake-libpgport
49+
pg_regress$(X): pg_regress.o pg_regress_main.o $(WIN32RES) | submake-libpgport
4750
$(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@
4851

4952
# dependencies ensure that path changes propagate
@@ -66,7 +69,7 @@ uninstall:
6669
# Build dynamically-loaded object file for CREATE FUNCTION ... LANGUAGE C.
6770

6871
NAME = regress
69-
OBJS = regress.o
72+
OBJS = $(WIN32RES) regress.o
7073

7174
include $(top_srcdir)/src/Makefile.shlib
7275

‎src/timezone/Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
#
99
#-------------------------------------------------------------------------
1010

11+
PGFILEDESC = "zic - time zone compiler"
12+
PGAPPICON = win32
13+
1114
subdir = src/timezone
1215
top_builddir = ../..
1316
include $(top_builddir)/src/Makefile.global
@@ -16,7 +19,7 @@ include $(top_builddir)/src/Makefile.global
1619
OBJS= localtime.o strftime.o pgtz.o
1720

1821
# files needed to build zic utility program
19-
ZICOBJS= zic.o ialloc.o scheck.o localtime.o
22+
ZICOBJS= zic.o ialloc.o scheck.o localtime.o $(WIN32RES)
2023

2124
# timezone data files
2225
TZDATA = africa antarctica asia australasia europe northamerica southamerica \

‎src/tools/msvc/Mkvcbuild.pm

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,9 @@ sub mkvcbuild
106106
$postgres->AddFiles('src\port', @pgportfiles);
107107
$postgres->AddFiles('src\common', @pgcommonbkndfiles);
108108
$postgres->AddDir('src\timezone');
109+
# We need source files from src\timezone, but that directory's resource
110+
# file pertains to "zic", not to the backend.
111+
$postgres->RemoveFile('src\timezone\win32ver.rc');
109112
$postgres->AddFiles('src\backend\parser', 'scan.l', 'gram.y');
110113
$postgres->AddFiles('src\backend\bootstrap', 'bootscanner.l',
111114
'bootparse.y');
@@ -126,10 +129,11 @@ sub mkvcbuild
126129

127130
my $snowball = $solution->AddProject('dict_snowball', 'dll', '',
128131
'src\backend\snowball');
132+
# This Makefile uses VPATH to find most source files in a subdirectory.
129133
$snowball->RelocateFiles(
130134
'src\backend\snowball\libstemmer',
131135
sub {
132-
return shift !~ /dict_snowball.c$/;
136+
return shift !~ /(dict_snowball.c|win32ver.rc)$/;
133137
});
134138
$snowball->AddIncludeDir('src\include\snowball');
135139
$snowball->AddReference($postgres);
@@ -341,6 +345,7 @@ sub mkvcbuild
341345
$pgregress_ecpg->AddIncludeDir('src\test\regress');
342346
$pgregress_ecpg->AddDefine('HOST_TUPLE="i686-pc-win32vc"');
343347
$pgregress_ecpg->AddDefine('FRONTEND');
348+
$pgregress_ecpg->AddDirResourceFile('src\interfaces\ecpg\test');
344349
$pgregress_ecpg->AddReference($libpgcommon, $libpgport);
345350

346351
my $isolation_tester =
@@ -356,6 +361,7 @@ sub mkvcbuild
356361
$isolation_tester->AddDefine('HOST_TUPLE="i686-pc-win32vc"');
357362
$isolation_tester->AddDefine('FRONTEND');
358363
$isolation_tester->AddLibrary('ws2_32.lib');
364+
$isolation_tester->AddDirResourceFile('src\test\isolation');
359365
$isolation_tester->AddReference($libpq, $libpgcommon, $libpgport);
360366

361367
my $pgregress_isolation =
@@ -366,6 +372,7 @@ sub mkvcbuild
366372
$pgregress_isolation->AddIncludeDir('src\test\regress');
367373
$pgregress_isolation->AddDefine('HOST_TUPLE="i686-pc-win32vc"');
368374
$pgregress_isolation->AddDefine('FRONTEND');
375+
$pgregress_isolation->AddDirResourceFile('src\test\isolation');
369376
$pgregress_isolation->AddReference($libpgcommon, $libpgport);
370377

371378
# src/bin
@@ -448,6 +455,7 @@ sub mkvcbuild
448455
my $zic = $solution->AddProject('zic', 'exe', 'utils');
449456
$zic->AddFiles('src\timezone', 'zic.c', 'ialloc.c', 'scheck.c',
450457
'localtime.c');
458+
$zic->AddDirResourceFile('src\timezone');
451459
$zic->AddReference($libpgcommon, $libpgport);
452460

453461
if ($solution->{options}->{xml})
@@ -582,21 +590,22 @@ sub mkvcbuild
582590
$proj->AddIncludeDir('src\bin\pg_dump');
583591
$proj->AddIncludeDir('src\bin\psql');
584592
$proj->AddReference($libpq, $libpgcommon, $libpgport);
585-
$proj->AddResourceFile('src\bin\scripts', 'PostgreSQL Utility',
586-
'win32');
593+
$proj->AddDirResourceFile('src\bin\scripts');
587594
$proj->AddLibrary('ws2_32.lib');
588595
}
589596

590597
# Regression DLL and EXE
591598
my $regress = $solution->AddProject('regress', 'dll', 'misc');
592599
$regress->AddFile('src\test\regress\regress.c');
600+
$regress->AddDirResourceFile('src\test\regress');
593601
$regress->AddReference($postgres);
594602

595603
my $pgregress = $solution->AddProject('pg_regress', 'exe', 'misc');
596604
$pgregress->AddFile('src\test\regress\pg_regress.c');
597605
$pgregress->AddFile('src\test\regress\pg_regress_main.c');
598606
$pgregress->AddIncludeDir('src\port');
599607
$pgregress->AddDefine('HOST_TUPLE="i686-pc-win32vc"');
608+
$pgregress->AddDirResourceFile('src\test\regress');
600609
$pgregress->AddReference($libpgcommon, $libpgport);
601610

602611
# fix up pg_xlogdump once it's been set up

‎src/tools/msvc/Project.pm

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -183,15 +183,7 @@ sub UseDef
183183
sub AddDir
184184
{
185185
my ($self, $reldir) = @_;
186-
my $MF;
187-
188-
my $t = $/;
189-
undef $/;
190-
open($MF, "$reldir\\Makefile")
191-
|| open($MF, "$reldir\\GNUMakefile")
192-
|| croak "Could not open $reldir\\Makefile\n";
193-
my $mf = <$MF>;
194-
close($MF);
186+
my $mf = read_makefile($reldir);
195187

196188
$mf =~ s{\\\r?\n}{}g;
197189
if ($mf =~ m{^(?:SUB)?DIRS[^=]*=\s*(.*)$}mg)
@@ -292,15 +284,22 @@ sub AddDir
292284
$mf =~ s{$replace_re}{}m;
293285
}
294286

295-
# See if this Makefile contains a description, and should have a RC file
287+
$self->AddDirResourceFile($reldir);
288+
}
289+
290+
# If the directory's Makefile bears a description string, add a resource file.
291+
sub AddDirResourceFile
292+
{
293+
my ($self, $reldir) = @_;
294+
my $mf = read_makefile($reldir);
295+
296296
if ($mf =~ /^PGFILEDESC\s*=\s*\"([^\"]+)\"/m)
297297
{
298298
my $desc = $1;
299299
my $ico;
300300
if ($mf =~ /^PGAPPICON\s*=\s*(.*)$/m) { $ico = $1; }
301301
$self->AddResourceFile($reldir, $desc, $ico);
302302
}
303-
$/ = $t;
304303
}
305304

306305
sub AddResourceFile
@@ -409,4 +408,21 @@ sub read_file
409408
return $txt;
410409
}
411410

411+
sub read_makefile
412+
{
413+
my $reldir = shift;
414+
my $F;
415+
my $t = $/;
416+
417+
undef $/;
418+
open($F, "$reldir\\GNUmakefile")
419+
|| open($F, "$reldir\\Makefile")
420+
|| croak "Could not open $reldir\\Makefile\n";
421+
my $txt = <$F>;
422+
close($F);
423+
$/ = $t;
424+
425+
return $txt;
426+
}
427+
412428
1;

‎src/tools/msvc/clean.bat

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,16 @@ del /s /q src\bin\win32ver.rc 2> NUL
2020
del /s /q src\interfaces\win32ver.rc 2> NUL
2121
if exist src\backend\win32ver.rc del /q src\backend\win32ver.rc
2222
if exist src\backend\replication\libpqwalreceiver\win32ver.rc del /q src\backend\replication\libpqwalreceiver\win32ver.rc
23+
if exist src\backend\snowball\win32ver.rc del /q src\backend\snowball\win32ver.rc
24+
if exist src\interfaces\ecpg\test\win32ver.rc del /q src\interfaces\ecpg\test\win32ver.rc
2325
if exist src\pl\plperl\win32ver.rc del /q src\pl\plperl\win32ver.rc
2426
if exist src\pl\plpgsql\src\win32ver.rc del /q src\pl\plpgsql\src\win32ver.rc
2527
if exist src\pl\plpython\win32ver.rc del /q src\pl\plpython\win32ver.rc
2628
if exist src\pl\tcl\win32ver.rc del /q src\pl\tcl\win32ver.rc
29+
if exist src\test\isolation\win32ver.rc del /q src\test\isolation\win32ver.rc
30+
if exist src\test\regress\win32ver.rc del /q src\test\regress\win32ver.rc
31+
if exist src\timezone\win32ver.rc del /q src\timezone\win32ver.rc
32+
2733
for /d %%f in (src\interfaces\ecpg\*) do if exist %%f\win32ver.rc del /q %%f\win32ver.rc
2834
for /d %%f in (contrib\*) do if exist %%f\win32ver.rc del /q %%f\win32ver.rc
2935
for /d %%f in (src\backend\utils\mb\conversion_procs\*) do if exist %%f\win32ver.rc del /q %%f\win32ver.rc

0 commit comments

Comments
 (0)