Commitd82e7c8

Michael Meskes

committed

Link in keywords file instead of copying it.

Use #define/#ifdef instead of sed to fix include files, this should work on Windows too.

1 parent42ad663 commitd82e7c8Copy full SHA for d82e7c8

File tree

+10

-7

lines changed

+10

-7

lines changed

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $PostgreSQL: pgsql/src/backend/parser/keywords.c,v 1.196 2008/05/16 23:36:05 tgl Exp $`
	`14`	`+ * $PostgreSQL: pgsql/src/backend/parser/keywords.c,v 1.197 2008/05/21 19:51:01 meskes Exp $`
`15`	`15`	`*`
`16`	`16`	`*-------------------------------------------------------------------------`
`17`	`17`	`*/`
`@@ -29,8 +29,11 @@`
`29`	`29`	`#defineYYSTYPE int`
`30`	`30`
`31`	`31`	`#include"parser/keywords.h"`
	`32`	`+#ifndefECPG_COMPILE`
`32`	`33`	`#include"parser/parse.h"`
`33`		`-`
	`34`	`+#else`
	`35`	`+#include"preproc.h"`
	`36`	`+#endif`
`34`	`37`
`35`	`38`	`/*`
`36`	`39`	`* List of keyword (name, token-value, category) entries.`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`# Copyright (c) 1998-2008, PostgreSQL Global Development Group`
`6`	`6`	`#`
`7`		`-# $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.134 2008/05/2100:26:26 meskes Exp $`
	`7`	`+# $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.135 2008/05/2119:51:01 meskes Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`@@ -22,7 +22,7 @@ override CPPFLAGS := -I../include -I$(top_srcdir)/src/interfaces/ecpg/include \`
`22`	`22`	`-DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL)\`
`23`	`23`	`$(CPPFLAGS)`
`24`	`24`
`25`		`-overrideCFLAGS +=$(PTHREAD_CFLAGS)`
	`25`	`+overrideCFLAGS +=$(PTHREAD_CFLAGS) -DECPG_COMPILE`
`26`	`26`
`27`	`27`	`OBJS=preproc.o type.o ecpg.o output.o parser.o\`
`28`	`28`	`keywords.o c_keywords.o ecpg_keywords.o ../ecpglib/typename.o descriptor.o variable.o\`
`@@ -59,7 +59,7 @@ ecpg_keywords.o c_keywords.o keywords.o preproc.o parser.o: preproc.h`
`59`	`59`	`# instead of maintaining our own list, take the one from the backend`
`60`	`60`	`# we cannot just link it in, but must copy and make some minor changes`
`61`	`61`	`keywords.c:% :$(top_srcdir)/src/backend/parser/%`
`62`		`-sed -e's/#include "parser\/parse.h"/#include "preproc.h"/'$<>$@`
	`62`	`+rm -f$@&&$(LN_S)$<.`
`63`	`63`
`64`	`64`	`distprep:$(srcdir)/preproc.c$(srcdir)/preproc.h$(srcdir)/pgc.c`
`65`	`65`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package Mkvcbuild;`
`3`	`3`	`#`
`4`	`4`	`# Package that generates build files for msvc build`
`5`	`5`	`#`
`6`		`-# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.30 2008/05/2118:15:29 mha Exp $`
	`6`	`+# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.31 2008/05/2119:51:01 meskes Exp $`
`7`	`7`	`#`
`8`	`8`	`use Carp;`
`9`	`9`	`use Win32;`
`@@ -162,12 +162,12 @@ sub mkvcbuild`
`162`	`162`	`my$ecpg =$solution->AddProject('ecpg','exe','interfaces','src\interfaces\ecpg\preproc');`
`163`	`163`	`$ecpg->AddIncludeDir('src\interfaces\ecpg\include');`
`164`	`164`	`$ecpg->AddIncludeDir('src\interfaces\libpq');`
`165`		`-$ecpg->AddIncludeDir('src\backend');# needed for parse.h`
`166`	`165`	`$ecpg->AddPrefixInclude('src\interfaces\ecpg\preproc');`
`167`	`166`	`$ecpg->AddFiles('src\interfaces\ecpg\preproc','pgc.l','preproc.y');`
`168`	`167`	`$ecpg->AddDefine('MAJOR_VERSION=4');`
`169`	`168`	`$ecpg->AddDefine('MINOR_VERSION=2');`
`170`	`169`	`$ecpg->AddDefine('PATCHLEVEL=1');`
	`170`	`+$ecpg->AddDefine('ECPG_COMPILE');`
`171`	`171`	`$ecpg->AddReference($libpgport);`
`172`	`172`
`173`	`173`	`my$pgregress_ecpg =$solution->AddProject('pg_regress_ecpg','exe','misc');`

Comments

(0)