Make the makefile pass $MAJORVERSION to genbki.pl, not $VERSION which is

tglsfdc · tglsfdc · commit d7085f24064c · 2010-01-06T19:56:29.000Z
overridden in the snapshot build script.  $MAJORVERSION is what it really
wanted anyway, so we can tighten up the parsing of --set-version's argument.
diff --git a/src/backend/catalog/Makefile b/src/backend/catalog/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for backend/catalog
 #
-# $PostgreSQL: pgsql/src/backend/catalog/Makefile,v 1.75 2010/01/05 01:06:56 tgl Exp $
+# $PostgreSQL: pgsql/src/backend/catalog/Makefile,v 1.76 2010/01/06 19:56:29 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -55,7 +55,7 @@ postgres.shdescription: postgres.bki ;
 schemapg.h: postgres.bki ;
 
 postgres.bki: genbki.pl Catalog.pm $(POSTGRES_BKI_SRCS)
-	$(PERL) -I $(catalogdir) $< $(pg_includes) --set-version=$(VERSION) $(POSTGRES_BKI_SRCS)
+	$(PERL) -I $(catalogdir) $< $(pg_includes) --set-version=$(MAJORVERSION) $(POSTGRES_BKI_SRCS)
 
 .PHONY: install-data
 install-data: $(BKIFILES) installdirs
diff --git a/src/backend/catalog/genbki.pl b/src/backend/catalog/genbki.pl
@@ -10,7 +10,7 @@
 # Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/backend/catalog/genbki.pl,v 1.4 2010/01/05 20:23:32 tgl Exp $
+# $PostgreSQL: pgsql/src/backend/catalog/genbki.pl,v 1.5 2010/01/06 19:56:29 tgl Exp $
 #
 #----------------------------------------------------------------------
 
@@ -40,7 +40,7 @@
     {
         push @include_path, length($arg) > 2 ? substr($arg, 2) : shift @ARGV;
     }
-    elsif ($arg =~ /^--set-version=(\d+\.\d+).*$/)
+    elsif ($arg =~ /^--set-version=(\d+\.\d+)$/)
     {
         $major_version = $1;
     }

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`#`
`3`	`3`	`# Makefile for backend/catalog`
`4`	`4`	`#`
`5`		`-# $PostgreSQL: pgsql/src/backend/catalog/Makefile,v 1.75 2010/01/05 01:06:56 tgl Exp $`
	`5`	`+# $PostgreSQL: pgsql/src/backend/catalog/Makefile,v 1.76 2010/01/06 19:56:29 tgl Exp $`
`6`	`6`	`#`
`7`	`7`	`#-------------------------------------------------------------------------`
`8`	`8`
`@@ -55,7 +55,7 @@ postgres.shdescription: postgres.bki ;`
`55`	`55`	`schemapg.h: postgres.bki ;`
`56`	`56`
`57`	`57`	`postgres.bki: genbki.pl Catalog.pm $(POSTGRES_BKI_SRCS)`
`58`		`- $(PERL) -I $(catalogdir) $< $(pg_includes) --set-version=$(VERSION) $(POSTGRES_BKI_SRCS)`
	`58`	`+ $(PERL) -I $(catalogdir) $< $(pg_includes) --set-version=$(MAJORVERSION) $(POSTGRES_BKI_SRCS)`
`59`	`59`
`60`	`60`	`.PHONY: install-data`
`61`	`61`	`install-data: $(BKIFILES) installdirs`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`# Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group`
`11`	`11`	`# Portions Copyright (c) 1994, Regents of the University of California`
`12`	`12`	`#`
`13`		`-# $PostgreSQL: pgsql/src/backend/catalog/genbki.pl,v 1.4 2010/01/05 20:23:32 tgl Exp $`
	`13`	`+# $PostgreSQL: pgsql/src/backend/catalog/genbki.pl,v 1.5 2010/01/06 19:56:29 tgl Exp $`
`14`	`14`	`#`
`15`	`15`	`#----------------------------------------------------------------------`
`16`	`16`
`@@ -40,7 +40,7 @@`
`40`	`40`	`{`
`41`	`41`	`push @include_path, length($arg) > 2 ? substr($arg, 2) : shift @ARGV;`
`42`	`42`	`}`
`43`		`- elsif ($arg =~ /^--set-version=(\d+\.\d+).*$/)`
	`43`	`+ elsif ($arg =~ /^--set-version=(\d+\.\d+)$/)`
`44`	`44`	`{`
`45`	`45`	`$major_version = $1;`
`46`	`46`	`}`