Commit2890c33

committed

Build two more .DEF files for ecpg instead of using default ones.

1 parentab8d123 commit2890c33Copy full SHA for 2890c33

File tree

+10

-3

lines changed

+10

-3

lines changed

Lines changed: 3 additions & 1 deletion

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.20 2007/10/0312:34:29 mha Exp $`
	`6`	`+# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.21 2007/10/0313:43:24 mha Exp $`
`7`	`7`	`#`
`8`	`8`	`use Carp;`
`9`	`9`	`use Win32;`
`@@ -137,6 +137,7 @@ sub mkvcbuild`
`137`	`137`	`$solution->AddProject('libpgtypes','dll','interfaces','src\interfaces\ecpg\pgtypeslib');`
`138`	`138`	`$pgtypes->AddDefine('FRONTEND');`
`139`	`139`	`$pgtypes->AddReference($libpgport);`
	`140`	`+$pgtypes->UseDef('src\interfaces\ecpg\pgtypeslib\pgtypeslib.def');`
`140`	`141`	`$pgtypes->AddIncludeDir('src\interfaces\ecpg\include');`
`141`	`142`
`142`	`143`	`my$libecpg =$solution->AddProject('libecpg','dll','interfaces','src\interfaces\ecpg\ecpglib');`
`@@ -152,6 +153,7 @@ sub mkvcbuild`
`152`	`153`	`$solution->AddProject('libecpg_compat','dll','interfaces','src\interfaces\ecpg\compatlib');`
`153`	`154`	`$libecpgcompat->AddIncludeDir('src\interfaces\ecpg\include');`
`154`	`155`	`$libecpgcompat->AddIncludeDir('src\interfaces\libpq');`
	`156`	`+$libecpgcompat->UseDef('src\interfaces\ecpg\compatlib\compatlib.def');`
`155`	`157`	`$libecpgcompat->AddReference($pgtypes,$libecpg,$libpgport);`
`156`	`158`
`157`	`159`	`my$ecpg =$solution->AddProject('ecpg','exe','interfaces','src\interfaces\ecpg\preproc');`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package Solution;`
`3`	`3`	`#`
`4`	`4`	`# Package that encapsulates a Visual C++ solution file generation`
`5`	`5`	`#`
`6`		`-# $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.33 2007/10/0312:11:00 mha Exp $`
	`6`	`+# $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.34 2007/10/0313:43:24 mha Exp $`
`7`	`7`	`#`
`8`	`8`	`use Carp;`
`9`	`9`	`use strict;`
`@@ -141,6 +141,8 @@ s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY`
`141`	`141`
`142`	`142`	`$self->GenerateDefFile("src\\interfaces\\libpq\\libpqdll.def","src\\interfaces\\libpq\\exports.txt","LIBPQ");`
`143`	`143`	`$self->GenerateDefFile("src\\interfaces\\ecpg\\ecpglib\\ecpglib.def","src\\interfaces\\ecpg\\ecpglib\\exports.txt","LIBECPG");`
	`144`	`+$self->GenerateDefFile("src\\interfaces\\ecpg\\compatlib\\compatlib.def","src\\interfaces\\ecpg\\compatlib\\exports.txt","LIBECPG_COMPAT");`
	`145`	`+$self->GenerateDefFile("src\\interfaces\\ecpg\\pgtypeslib\\pgtypeslib.def","src\\interfaces\\ecpg\\pgtypeslib\\exports.txt","LIBPGTYPES");`
`144`	`146`
`145`	`147`	`if (IsNewer("src\\backend\\utils\\fmgrtab.c","src\\include\\catalog\\pg_proc.h"))`
`146`	`148`	`{`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`@echooff`
`2`		`-REM $PostgreSQL: pgsql/src/tools/msvc/clean.bat,v 1.6 2007/07/07 07:43:21 mha Exp $`
	`2`	`+REM $PostgreSQL: pgsql/src/tools/msvc/clean.bat,v 1.7 2007/10/03 13:43:24 mha Exp $`
`3`	`3`
`4`	`4`	`setD=%CD%`
`5`	`5`	`ifexist ..\msvcifexist ..\..\..\srccd ..\..\..`
`@@ -31,7 +31,10 @@ call :del src\bin\psql\sql_help.h`
`31`	`31`
`32`	`32`	`call :del src\interfaces\libpq\libpq.rc`
`33`	`33`	`call :del src\interfaces\libpq\libpqdll.def`
	`34`	`+call :del src\interfaces\ecpg\compatlib\compatlib.def`
	`35`	`+call :del src\interfaces\ecpg\ecpglib\ecpglib.def`
`34`	`36`	`call :del src\interfaces\ecpg\include\ecpg_config.h`
	`37`	`+call :del src\interfaces\ecpg\pgtypeslib\pgtypeslib.def`
`35`	`38`	`call :del src\interfaces\ecpg\preproc\preproc.c`
`36`	`39`	`call :del src\interfaces\ecpg\preproc\preproc.h`
`37`	`40`

Comments

(0)