summaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
authorTom Lane2016-08-16 16:49:30 +0000
committerTom Lane2016-08-16 16:49:30 +0000
commita7b5573d665c8a37fad9bc69f44c5b4e8760a73b (patch)
tree2aa22bd2be5fbfb6eead8b0d44e67130d76ba72d /src/tools
parent9b002cc9fec557fcfe17d67f55b53804447230e5 (diff)
Remove separate version numbering for ecpg preprocessor.
Once upon a time, it made sense for the ecpg preprocessor to have its own version number, because it used a manually-maintained grammar that wasn't always in sync with the core grammar. But those days are thankfully long gone, leaving only a maintenance nuisance behind. Let's use the PG v10 version numbering changeover as an excuse to get rid of the ecpg version number and just have ecpg identify itself by PG_VERSION. From the user's standpoint, ecpg will go from "4.12" in the 9.6 branch to "10" in the 10 branch, so there's no failure of monotonicity. Discussion: <[email protected]>
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/RELEASE_CHANGES4
-rw-r--r--src/tools/msvc/Mkvcbuild.pm3
2 files changed, 1 insertions, 6 deletions
diff --git a/src/tools/RELEASE_CHANGES b/src/tools/RELEASE_CHANGES
index ad492205926..e6e294b07e6 100644
--- a/src/tools/RELEASE_CHANGES
+++ b/src/tools/RELEASE_CHANGES
@@ -80,13 +80,11 @@ Starting a New Development Cycle
* Add version tag to src/tools/git_changelog
* Bump minor library versions, major if appropriate (see below)
- o Look for SO_MINOR_VERSION and MINOR_VERSION macros in
+ o Look for SO_MINOR_VERSION macros in
src/interfaces/ecpg/compatlib/Makefile
src/interfaces/ecpg/ecpglib/Makefile
src/interfaces/ecpg/pgtypeslib/Makefile
- src/interfaces/ecpg/preproc/Makefile
src/interfaces/libpq/Makefile
- src/tools/msvc/Mkvcbuild.pm
Creating Back-Branch Release Notes
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index 16180f68edf..da4d9847fc5 100644
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -269,9 +269,6 @@ sub mkvcbuild
$ecpg->AddIncludeDir('src/interfaces/libpq');
$ecpg->AddPrefixInclude('src/interfaces/ecpg/preproc');
$ecpg->AddFiles('src/interfaces/ecpg/preproc', 'pgc.l', 'preproc.y');
- $ecpg->AddDefine('MAJOR_VERSION=4');
- $ecpg->AddDefine('MINOR_VERSION=13');
- $ecpg->AddDefine('PATCHLEVEL=0');
$ecpg->AddDefine('ECPG_COMPILE');
$ecpg->AddReference($libpgcommon, $libpgport);