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

Commitca9112a

Browse files
committed
Stamp HEAD as 10devel.
This is a good bit more complicated than the average new-version stampingcommit, because it includes various adjustments in pursuit of changingfrom three-part to two-part version numbers. It's likely some furtherwork will be needed around that change; but this is enough to get throughthe regression tests, at least in Unix builds.Peter Eisentraut and Tom Lane
1 parentb5bce6c commitca9112a

File tree

13 files changed

+71
-64
lines changed

13 files changed

+71
-64
lines changed

‎configure

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.69 for PostgreSQL9.6beta4.
3+
# Generated by GNU Autoconf 2.69 for PostgreSQL10devel.
44
#
55
# Report bugs to <pgsql-bugs@postgresql.org>.
66
#
@@ -582,8 +582,8 @@ MAKEFLAGS=
582582
# Identity of this package.
583583
PACKAGE_NAME='PostgreSQL'
584584
PACKAGE_TARNAME='postgresql'
585-
PACKAGE_VERSION='9.6beta4'
586-
PACKAGE_STRING='PostgreSQL9.6beta4'
585+
PACKAGE_VERSION='10devel'
586+
PACKAGE_STRING='PostgreSQL10devel'
587587
PACKAGE_BUGREPORT='pgsql-bugs@postgresql.org'
588588
PACKAGE_URL=''
589589

@@ -1398,7 +1398,7 @@ if test "$ac_init_help" = "long"; then
13981398
# Omit some internal or obsolete options to make the list less imposing.
13991399
# This message is too long to be a string in the A/UX 3.1 sh.
14001400
cat<<_ACEOF
1401-
\`configure' configures PostgreSQL9.6beta4 to adapt to many kinds of systems.
1401+
\`configure' configures PostgreSQL10devel to adapt to many kinds of systems.
14021402
14031403
Usage:$0 [OPTION]... [VAR=VALUE]...
14041404
@@ -1463,7 +1463,7 @@ fi
14631463

14641464
iftest -n"$ac_init_help";then
14651465
case$ac_init_helpin
1466-
short | recursive )echo"Configuration of PostgreSQL9.6beta4:";;
1466+
short | recursive )echo"Configuration of PostgreSQL10devel:";;
14671467
esac
14681468
cat<<\_ACEOF
14691469
@@ -1615,7 +1615,7 @@ fi
16151615
test -n "$ac_init_help" && exit $ac_status
16161616
if $ac_init_version; then
16171617
cat <<\_ACEOF
1618-
PostgreSQL configure9.6beta4
1618+
PostgreSQL configure10devel
16191619
generated by GNU Autoconf 2.69
16201620
16211621
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2326,7 +2326,7 @@ cat >config.log <<_ACEOF
23262326
This file contains any messages produced by compilers while
23272327
running configure, to aid debugging if configure makes a mistake.
23282328
2329-
It was created by PostgreSQL$as_me9.6beta4, which was
2329+
It was created by PostgreSQL$as_me10devel, which was
23302330
generated by GNU Autoconf 2.69. Invocation command line was
23312331
23322332
$$0$@
@@ -2711,7 +2711,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
27112711
configure_args=$ac_configure_args
27122712

27132713

2714-
PG_MAJORVERSION=`expr"$PACKAGE_VERSION":'\([0-9][0-9]*\.[0-9][0-9]*\)'`
2714+
PG_MAJORVERSION=`expr"$PACKAGE_VERSION":'\([0-9][0-9]*\)'`
27152715

27162716

27172717
cat>>confdefs.h<<_ACEOF
@@ -16433,7 +16433,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1643316433
# report actual input values of CONFIG_FILES etc. instead of their
1643416434
# values after options handling.
1643516435
ac_log="
16436-
This file was extended by PostgreSQL $as_me9.6beta4, which was
16436+
This file was extended by PostgreSQL $as_me10devel, which was
1643716437
generated by GNU Autoconf 2.69. Invocation command line was
1643816438
1643916439
CONFIG_FILES = $CONFIG_FILES
@@ -16503,7 +16503,7 @@ _ACEOF
1650316503
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1650416504
ac_cs_config="`$as_echo"$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1650516505
ac_cs_version="\\
16506-
PostgreSQL config.status9.6beta4
16506+
PostgreSQL config.status10devel
1650716507
configured by$0, generated by GNU Autoconf 2.69,
1650816508
with options\\"\$ac_cs_config\\"
1650916509

‎configure.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dnl Read the Autoconf manual for details.
1717
dnl
1818
m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
1919

20-
AC_INIT([PostgreSQL], [9.6beta4], [pgsql-bugs@postgresql.org])
20+
AC_INIT([PostgreSQL], [10devel], [pgsql-bugs@postgresql.org])
2121

2222
m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
2323
Untested combinations of 'autoconf' and PostgreSQL versions are not
@@ -29,7 +29,7 @@ AC_CONFIG_AUX_DIR(config)
2929
AC_PREFIX_DEFAULT(/usr/local/pgsql)
3030
AC_SUBST(configure_args, [$ac_configure_args])
3131

32-
[PG_MAJORVERSION=`expr "$PACKAGE_VERSION" : '\([0-9][0-9]*\.[0-9][0-9]*\)'`]
32+
[PG_MAJORVERSION=`expr "$PACKAGE_VERSION" : '\([0-9][0-9]*\)'`]
3333
AC_SUBST(PG_MAJORVERSION)
3434
AC_DEFINE_UNQUOTED(PG_MAJORVERSION, "$PG_MAJORVERSION", [PostgreSQL major version as a string])
3535

‎doc/bug.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ System Configuration:
2727

2828
Operating System (example: Linux 2.4.18):
2929

30-
PostgreSQL version (example: PostgreSQL9.6beta4): PostgreSQL9.6beta4
30+
PostgreSQL version (example: PostgreSQL10devel): PostgreSQL10devel
3131

3232
Compiler used (example: gcc 3.3.5):
3333

‎doc/src/sgml/runtime.sgml

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1601,17 +1601,26 @@ $ <userinput>kill -INT `head -1 /usr/local/pgsql/data/postmaster.pid`</userinput
16011601
</para>
16021602

16031603
<para>
1604-
<productname>PostgreSQL</> major versions are represented by the
1605-
first two digit groups of the version number, e.g., 8.4.
1606-
<productname>PostgreSQL</> minor versions are represented by the
1607-
third group of version digits, e.g., 8.4.2 is the second minor
1608-
release of 8.4. Minor releases never change the internal storage
1609-
format and are always compatible with earlier and later minor
1610-
releases of the same major version number, e.g., 8.4.2 is compatible
1611-
with 8.4, 8.4.1 and 8.4.6. To update between compatible versions,
1612-
you simply replace the executables while the server is down and
1613-
restart the server. The data directory remains unchanged &mdash;
1614-
minor upgrades are that simple.
1604+
Current <productname>PostgreSQL</productname> version numbers consist of a
1605+
major and a minor version number. For example, in the version number 10.1,
1606+
the 10 is the major version number and the 1 is the minor version number,
1607+
meaning this would be the first minor release of the major release 10. For
1608+
releases before <productname>PostgreSQL</productname> version 10.0, version
1609+
numbers consist of three numbers, for example, 9.5.3. In those cases, the
1610+
major version consists of the first two digit groups of the version number,
1611+
e.g., 9.5, and the minor version is the third number, e.g., 3, meaning this
1612+
would be the third minor release of the major release 9.5.
1613+
</para>
1614+
1615+
<para>
1616+
Minor releases never change the internal storage format and are always
1617+
compatible with earlier and later minor releases of the same major version
1618+
number. For example, version 10.1 is compatible with version 10.0 and
1619+
version 10.6. Similarly, for example, 9.5.3 is compatible with 9.5.0,
1620+
9.5.1, and 9.5.6. To update between compatible versions, you simply
1621+
replace the executables while the server is down and restart the server.
1622+
The data directory remains unchanged &mdash; minor upgrades are that
1623+
simple.
16151624
</para>
16161625

16171626
<para>

‎src/backend/catalog/genbki.pl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
elsif ($arg =~/^--set-version=(.*)$/)
4444
{
4545
$major_version =$1;
46-
die"Version must be in format nn.nn.\n"
47-
if !($major_version =~/^\d+\.\d+$/);
46+
die"Invalid version string.\n"
47+
if !($major_version =~/^\d+$/);
4848
}
4949
else
5050
{

‎src/backend/utils/init/miscinit.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1334,16 +1334,13 @@ ValidatePgVersion(const char *path)
13341334
charfull_path[MAXPGPATH];
13351335
FILE*file;
13361336
intret;
1337-
longfile_major,
1338-
file_minor;
1339-
longmy_major=0,
1340-
my_minor=0;
1337+
longfile_major;
1338+
longmy_major;
13411339
char*endptr;
1342-
constchar*version_string=PG_VERSION;
1340+
charfile_version_string[64];
1341+
constchar*my_version_string=PG_VERSION;
13431342

1344-
my_major=strtol(version_string,&endptr,10);
1345-
if (*endptr=='.')
1346-
my_minor=strtol(endptr+1,NULL,10);
1343+
my_major=strtol(my_version_string,&endptr,10);
13471344

13481345
snprintf(full_path,sizeof(full_path),"%s/PG_VERSION",path);
13491346

@@ -1362,8 +1359,11 @@ ValidatePgVersion(const char *path)
13621359
errmsg("could not open file \"%s\": %m",full_path)));
13631360
}
13641361

1365-
ret=fscanf(file,"%ld.%ld",&file_major,&file_minor);
1366-
if (ret!=2)
1362+
file_version_string[0]='\0';
1363+
ret=fscanf(file,"%63s",file_version_string);
1364+
file_major=strtol(file_version_string,&endptr,10);
1365+
1366+
if (ret!=1||endptr==file_version_string)
13671367
ereport(FATAL,
13681368
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
13691369
errmsg("\"%s\" is not a valid data directory",
@@ -1374,13 +1374,13 @@ ValidatePgVersion(const char *path)
13741374

13751375
FreeFile(file);
13761376

1377-
if (my_major!=file_major||my_minor!=file_minor)
1377+
if (my_major!=file_major)
13781378
ereport(FATAL,
13791379
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
13801380
errmsg("database files are incompatible with server"),
1381-
errdetail("The data directory was initialized by PostgreSQL version %ld.%ld, "
1381+
errdetail("The data directory was initialized by PostgreSQL version %s, "
13821382
"which is not compatible with this version %s.",
1383-
file_major,file_minor,version_string)));
1383+
file_version_string,my_version_string)));
13841384
}
13851385

13861386
/*-------------------------------------------------------------------------

‎src/bin/pg_upgrade/check.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1082,8 +1082,8 @@ get_bin_version(ClusterInfo *cluster)
10821082
charcmd[MAXPGPATH],
10831083
cmd_output[MAX_STRING];
10841084
FILE*output;
1085-
intpre_dot,
1086-
post_dot;
1085+
intpre_dot=0,
1086+
post_dot=0;
10871087

10881088
snprintf(cmd,sizeof(cmd),"\"%s/pg_ctl\" --version",cluster->bindir);
10891089

@@ -1098,7 +1098,7 @@ get_bin_version(ClusterInfo *cluster)
10981098
if (strchr(cmd_output,'\n')!=NULL)
10991099
*strchr(cmd_output,'\n')='\0';
11001100

1101-
if (sscanf(cmd_output,"%*s %*s %d.%d",&pre_dot,&post_dot)!=2)
1101+
if (sscanf(cmd_output,"%*s %*s %d.%d",&pre_dot,&post_dot)<1)
11021102
pg_fatal("could not get version from %s\n",cmd);
11031103

11041104
cluster->bin_version= (pre_dot*100+post_dot)*100;

‎src/bin/pg_upgrade/server.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ get_major_server_version(ClusterInfo *cluster)
166166

167167
if (fscanf(version_fd,"%63s",cluster->major_version_str)==0||
168168
sscanf(cluster->major_version_str,"%d.%d",&integer_version,
169-
&fractional_version)!=2)
169+
&fractional_version)<1)
170170
pg_fatal("could not get version from %s\n",cluster->pgdata);
171171

172172
fclose(version_fd);

‎src/include/pg_config.h.win32

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -554,10 +554,10 @@
554554
#define PACKAGE_NAME "PostgreSQL"
555555

556556
/* Define to the full name and version of this package. */
557-
#define PACKAGE_STRING "PostgreSQL9.6beta4"
557+
#define PACKAGE_STRING "PostgreSQL10devel"
558558

559559
/* Define to the version of this package. */
560-
#define PACKAGE_VERSION "9.6beta4"
560+
#define PACKAGE_VERSION "10devel"
561561

562562
/* Define to the name of a signed 128-bit integer type. */
563563
#undef PG_INT128_TYPE
@@ -566,10 +566,10 @@
566566
#define PG_INT64_TYPE long long int
567567

568568
/* PostgreSQL version as a string */
569-
#define PG_VERSION "9.6beta4"
569+
#define PG_VERSION "10devel"
570570

571571
/* PostgreSQL version as a number */
572-
#define PG_VERSION_NUM90600
572+
#define PG_VERSION_NUM100000
573573

574574
/* Define to the one symbol short name of this package. */
575575
#define PACKAGE_TARNAME "postgresql"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include <winver.h>
22

33
VS_VERSION_INFO VERSIONINFO
4-
FILEVERSION9,6,0,0
5-
PRODUCTVERSION9,6,0,0
4+
FILEVERSION10,0,0,0
5+
PRODUCTVERSION10,0,0,0
66
FILEFLAGSMASK 0x3fL
77
FILEFLAGS 0
88
FILEOS VOS__WINDOWS32
@@ -15,13 +15,13 @@ BEGIN
1515
BEGIN
1616
VALUE "CompanyName", "\0"
1717
VALUE "FileDescription", "PostgreSQL Access Library\0"
18-
VALUE "FileVersion", "9.6.0\0"
18+
VALUE "FileVersion", "10.0\0"
1919
VALUE "InternalName", "libpq\0"
2020
VALUE "LegalCopyright", "Copyright (C) 2016\0"
2121
VALUE "LegalTrademarks", "\0"
2222
VALUE "OriginalFilename", "libpq.dll\0"
2323
VALUE "ProductName", "PostgreSQL\0"
24-
VALUE "ProductVersion", "9.6.0\0"
24+
VALUE "ProductVersion", "10.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-
FILEVERSION9,6,0,0
6-
PRODUCTVERSION9,6,0,0
5+
FILEVERSION10,0,0,0
6+
PRODUCTVERSION10,0,0,0
77
FILEFLAGSMASK 0x17L
88
FILEFLAGS 0x0L
99
FILEOS VOS_NT_WINDOWS32

‎src/tools/msvc/Solution.pm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,12 @@ sub GenerateFiles
131131
if (/^AC_INIT\(\[PostgreSQL\],\[([^\]]+)\]/)
132132
{
133133
$self->{strver} =$1;
134-
if ($self->{strver} !~/^(\d+)\.(\d+)(?:\.(\d+))?/)
134+
if ($self->{strver} !~/^(\d+)(?:\.(\d+))?/)
135135
{
136136
confess"Bad format of version:$self->{strver}\n";
137137
}
138-
$self->{numver} =sprintf("%d%02d%02d",$1,$2,$3?$3 : 0);
139-
$self->{majorver} =sprintf("%d.%d",$1,$2);
138+
$self->{numver} =sprintf("%d%04d",$1,$2?$2 : 0);
139+
$self->{majorver} =sprintf("%d",$1);
140140
}
141141
}
142142
close(C);

‎src/tools/version_stamp.pl

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222

2323
# Major version is hard-wired into the script. We update it when we branch
2424
# a new development version.
25-
$major1 = 9;
26-
$major2 = 6;
25+
$majorversion = 10;
2726

2827
# Validate argument and compute derived variables
2928
$minor =shift;
@@ -60,7 +59,6 @@
6059
}
6160

6261
# Create various required forms of the version number
63-
$majorversion =$major1 ."." .$major2;
6462
if ($dotneeded)
6563
{
6664
$fullversion =$majorversion ."." .$minor;
@@ -70,7 +68,7 @@
7068
$fullversion =$majorversion .$minor;
7169
}
7270
$numericversion =$majorversion ."." .$numericminor;
73-
$padnumericversion =sprintf("%d%02d%02d",$major1,$major2,$numericminor);
71+
$padnumericversion =sprintf("%d%04d",$majorversion,$numericminor);
7472

7573
# Get the autoconf version number for eventual nag message
7674
# (this also ensures we're in the right directory)
@@ -110,15 +108,15 @@
110108
);
111109

112110
sed_file("src/interfaces/libpq/libpq.rc.in",
113-
"-e 's/FILEVERSION [0-9]*,[0-9]*,[0-9]*,0/FILEVERSION$major1,$major2,$numericminor,0/'"
114-
."-e 's/PRODUCTVERSION [0-9]*,[0-9]*,[0-9]*,0/PRODUCTVERSION$major1,$major2,$numericminor,0/'"
111+
"-e 's/FILEVERSION [0-9]*,[0-9]*,[0-9]*,0/FILEVERSION$majorversion,0,$numericminor,0/'"
112+
."-e 's/PRODUCTVERSION [0-9]*,[0-9]*,[0-9]*,0/PRODUCTVERSION$majorversion,0,$numericminor,0/'"
115113
."-e 's/VALUE\"FileVersion\",\"[0-9.]*/VALUE\"FileVersion\",\"$numericversion/'"
116114
."-e 's/VALUE\"ProductVersion\",\"[0-9.]*/VALUE\"ProductVersion\",\"$numericversion/'"
117115
);
118116

119117
sed_file("src/port/win32ver.rc",
120-
"-e 's/FILEVERSION [0-9]*,[0-9]*,[0-9]*,0/FILEVERSION$major1,$major2,$numericminor,0/'"
121-
."-e 's/PRODUCTVERSION [0-9]*,[0-9]*,[0-9]*,0/PRODUCTVERSION$major1,$major2,$numericminor,0/'"
118+
"-e 's/FILEVERSION [0-9]*,[0-9]*,[0-9]*,0/FILEVERSION$majorversion,0,$numericminor,0/'"
119+
."-e 's/PRODUCTVERSION [0-9]*,[0-9]*,[0-9]*,0/PRODUCTVERSION$majorversion,0,$numericminor,0/'"
122120
);
123121

124122
print"Stamped these files with version number$fullversion:\n$fixedfiles";

0 commit comments

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