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

Commit0a42a2e

Browse files
committed
Remove win32ver.rc from version_stamp.pl
This removes another relic from the old nmake-based Windows build.version_stamp.pl put version number information into win32ver.rc. Butwin32ver.rc already gets other version number information from thepreprocessor at build time, so it would make more sense if all versionnumber information would be handled in the same way and we don't havetwo places that do it.What we need for this is having the major version number and the minorversion number as separate integer symbols. Both configure andSolution.pm already have that logic, because they computePG_VERSION_NUM. So we just keep all the logic there now. Put theminor version number into a new symbol PG_MINORVERSION_NUM. Also, adda symbol PG_MAJORVERSION_NUM, which is a number, alongside theexisting PG_MAJORVERSION, which is a string.Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>Discussion:https://www.postgresql.org/message-id/flat/1ee46ac4-a9b2-4531-bf54-5ec2e374634d@2ndquadrant.com
1 parent3c173a5 commit0a42a2e

File tree

6 files changed

+36
-26
lines changed

6 files changed

+36
-26
lines changed

‎configure

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2805,13 +2805,25 @@ _ACEOF
28052805

28062806

28072807
PG_MAJORVERSION=`expr "$PACKAGE_VERSION" : '\([0-9][0-9]*\)'`
2808+
PG_MINORVERSION=`expr "$PACKAGE_VERSION" : '.*\.\([0-9][0-9]*\)'`
2809+
test -n "$PG_MINORVERSION" || PG_MINORVERSION=0
28082810

28092811

28102812
cat >>confdefs.h <<_ACEOF
28112813
#define PG_MAJORVERSION "$PG_MAJORVERSION"
28122814
_ACEOF
28132815

28142816

2817+
cat >>confdefs.h <<_ACEOF
2818+
#define PG_MAJORVERSION_NUM $PG_MAJORVERSION
2819+
_ACEOF
2820+
2821+
2822+
cat >>confdefs.h <<_ACEOF
2823+
#define PG_MINORVERSION_NUM $PG_MINORVERSION
2824+
_ACEOF
2825+
2826+
28152827

28162828

28172829

@@ -18875,8 +18887,7 @@ _ACEOF
1887518887

1887618888
# Supply a numeric version string for use by 3rd party add-ons
1887718889
# awk -F is a regex on some platforms, and not on others, so make "." a tab
18878-
PG_VERSION_NUM="`echo "$PACKAGE_VERSION" | sed 's/[A-Za-z].*$//' |
18879-
tr '.' '' |
18890+
PG_VERSION_NUM="`echo "$PG_MAJORVERSION$PG_MINORVERSION" |
1888018891
$AWK '{printf "%d%04d", $1, $2}'`"
1888118892

1888218893
cat >>confdefs.h <<_ACEOF

‎configure.in

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,12 @@ AC_PREFIX_DEFAULT(/usr/local/pgsql)
3030
AC_DEFINE_UNQUOTED(CONFIGURE_ARGS, ["$ac_configure_args"], [Saved arguments from configure])
3131

3232
[PG_MAJORVERSION=`expr "$PACKAGE_VERSION" : '\([0-9][0-9]*\)'`]
33+
[PG_MINORVERSION=`expr "$PACKAGE_VERSION" : '.*\.\([0-9][0-9]*\)'`]
34+
test -n "$PG_MINORVERSION" || PG_MINORVERSION=0
3335
AC_SUBST(PG_MAJORVERSION)
3436
AC_DEFINE_UNQUOTED(PG_MAJORVERSION, "$PG_MAJORVERSION", [PostgreSQL major version as a string])
37+
AC_DEFINE_UNQUOTED(PG_MAJORVERSION_NUM, $PG_MAJORVERSION, [PostgreSQL major version number])
38+
AC_DEFINE_UNQUOTED(PG_MINORVERSION_NUM, $PG_MINORVERSION, [PostgreSQL minor version number])
3539

3640
PGAC_ARG_REQ(with, extra-version, [STRING], [append STRING to version],
3741
[PG_VERSION="$PACKAGE_VERSION$withval"],
@@ -2318,8 +2322,7 @@ AC_DEFINE_UNQUOTED(PG_VERSION_STR,
23182322

23192323
# Supply a numeric version string for use by 3rd party add-ons
23202324
# awk -F is a regex on some platforms, and not on others, so make "." a tab
2321-
[PG_VERSION_NUM="`echo "$PACKAGE_VERSION" | sed 's/[A-Za-z].*$//' |
2322-
tr '.' '' |
2325+
[PG_VERSION_NUM="`echo "$PG_MAJORVERSION$PG_MINORVERSION" |
23232326
$AWK '{printf "%d%04d", $1, $2}'`"]
23242327
AC_DEFINE_UNQUOTED(PG_VERSION_NUM, $PG_VERSION_NUM, [PostgreSQL version as a number])
23252328
AC_SUBST(PG_VERSION_NUM)

‎src/include/pg_config.h.in

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -780,6 +780,12 @@
780780
/* PostgreSQL major version as a string */
781781
#undef PG_MAJORVERSION
782782

783+
/* PostgreSQL major version number */
784+
#undef PG_MAJORVERSION_NUM
785+
786+
/* PostgreSQL minor version number */
787+
#undef PG_MINORVERSION_NUM
788+
783789
/* Define to best printf format archetype, usually gnu_printf if available. */
784790
#undef PG_PRINTF_ATTRIBUTE
785791

‎src/port/win32ver.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
// https://docs.microsoft.com/en-us/windows/win32/menurc/versioninfo-resource
55

66
VS_VERSION_INFO VERSIONINFO
7-
FILEVERSION13,0,0,0
8-
PRODUCTVERSION13,0,0,0
7+
FILEVERSIONPG_MAJORVERSION_NUM,0,PG_MINORVERSION_NUM,0
8+
PRODUCTVERSIONPG_MAJORVERSION_NUM,0,PG_MINORVERSION_NUM,0
99
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
1010
FILEFLAGS 0x0L
1111
FILEOS VOS_NT_WINDOWS32

‎src/tools/msvc/Solution.pm

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ sub _new
1919
my$self = {
2020
projects=> {},
2121
options=>$options,
22-
numver=>'',
2322
VisualStudioVersion=>undef,
2423
MinimumVisualStudioVersion=>undef,
2524
vcver=>undef,
@@ -151,6 +150,7 @@ sub GenerateFiles
151150
my$package_version;
152151
my$package_bugreport;
153152
my$package_url;
153+
my ($majorver,$minorver);
154154

155155
# Parse configure.in to get version numbers
156156
open(my$c,'<',"configure.in")
@@ -171,8 +171,8 @@ sub GenerateFiles
171171
{
172172
confess"Bad format of version:$self->{strver}\n";
173173
}
174-
$self->{numver} =sprintf("%d%04d",$1,$2 ?$2 : 0);
175-
$self->{majorver} =sprintf("%d",$1);
174+
$majorver =sprintf("%d",$1);
175+
$minorver =sprintf("%d",$2 ?$2 : 0);
176176
}
177177
}
178178
close($c);
@@ -440,11 +440,13 @@ sub GenerateFiles
440440
PG_INT128_TYPE=>undef,
441441
PG_INT64_TYPE=>'long long int',
442442
PG_KRB_SRVNAM=>qq{"postgres"},
443-
PG_MAJORVERSION=>qq{"$self->{majorver}"},
443+
PG_MAJORVERSION=>qq{"$majorver"},
444+
PG_MAJORVERSION_NUM=>$majorver,
445+
PG_MINORVERSION_NUM=>$minorver,
444446
PG_PRINTF_ATTRIBUTE=>undef,
445447
PG_USE_STDBOOL=> 1,
446448
PG_VERSION=>qq{"$package_version$extraver"},
447-
PG_VERSION_NUM=>$self->{numver},
449+
PG_VERSION_NUM=>sprintf("%d%04d",$majorver,$minorver),
448450
PG_VERSION_STR=>
449451
qq{"PostgreSQL$package_version$extraver, compiled by Visual C++ build " CppAsString2(_MSC_VER) ",$bits-bit"},
450452
PROFILE_PID_DIR=>undef,
@@ -778,7 +780,7 @@ EOF
778780
chdir('src/backend/catalog');
779781
my$bki_srcs =join(' ../../../src/include/catalog/',@bki_srcs);
780782
system(
781-
"perl genbki.pl --include-path ../../../src/include/ --set-version=$self->{majorver}$bki_srcs"
783+
"perl genbki.pl --include-path ../../../src/include/ --set-version=$majorver$bki_srcs"
782784
);
783785
open(my$f,'>','bki-stamp')
784786
|| confess"Could not touch bki-stamp";
@@ -813,7 +815,7 @@ EOF
813815
|| croak"Could not write to version.sgml\n";
814816
print$o<<EOF;
815817
<!ENTITY version "$package_version">
816-
<!ENTITY majorversion "$self->{majorver}">
818+
<!ENTITY majorversion "$majorver">
817819
EOF
818820
close($o);
819821
return;

‎src/tools/version_stamp.pl

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,32 +30,27 @@
3030
my$minor =shift;
3131
defined($minor) ||die"$0: missing required argument: minor-version\n";
3232

33-
my ($dotneeded,$numericminor);
33+
my ($dotneeded);
3434

3535
if ($minor =~m/^\d+$/)
3636
{
3737
$dotneeded = 1;
38-
$numericminor =$minor;
3938
}
4039
elsif ($minoreq"devel")
4140
{
4241
$dotneeded = 0;
43-
$numericminor = 0;
4442
}
4543
elsif ($minor =~m/^alpha\d+$/)
4644
{
4745
$dotneeded = 0;
48-
$numericminor = 0;
4946
}
5047
elsif ($minor =~m/^beta\d+$/)
5148
{
5249
$dotneeded = 0;
53-
$numericminor = 0;
5450
}
5551
elsif ($minor =~m/^rc\d+$/)
5652
{
5753
$dotneeded = 0;
58-
$numericminor = 0;
5954
}
6055
else
6156
{
@@ -73,8 +68,6 @@
7368
{
7469
$fullversion =$majorversion .$minor;
7570
}
76-
my$numericversion =$majorversion ."." .$numericminor;
77-
my$padnumericversion =sprintf("%d%04d",$majorversion,$numericminor);
7871

7972
# Get the autoconf version number for eventual nag message
8073
# (this also ensures we're in the right directory)
@@ -102,11 +95,6 @@
10295
"-e 's/AC_INIT(\\[PostgreSQL\\],\\[[0-9a-z.]*\\]/AC_INIT([PostgreSQL], [$fullversion]/'"
10396
);
10497

105-
sed_file("src/port/win32ver.rc",
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-
);
109-
11098
print"Stamped these files with version number$fullversion:\n$fixedfiles";
11199
print"Don't forget to run autoconf$aconfver before committing.\n";
112100

0 commit comments

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