Add build_macros element to winbuild/configuration(_template).xml so that buildXxx...

diff --git a/buildx64.ps1 b/buildx64.ps1
index e9e70403217b3fd38cf17154d17132cb2e9217be..8301a8cab5a98c5fe41d0f7ba8708b99937c2dd6 100644 (file)
--- a/buildx64.ps1
+++ b/buildx64.ps1
@@ -2,9 +2,9 @@
 . ".\winbuild\configuration.ps1"
 $configInfo = GetConfiguration
 $x64info = $configInfo.Configuration.x64
-Write-Host "setvcvars :" $x64info.setvcvars
 if ($x64info.setvcvars -ne "") {
    $envcmd = [String] $x64info.setvcvars
+   Write-Host "setvcvars :" $envcmd
    if ($envcmd.StartsWith(". ")) {
        . $envcmd.substring(2)
    } else {
@@ -25,6 +25,7 @@ $SSL_INC=$x64info.ssl.include
 $SSL_LIB=$x64info.ssl.lib
 $GSS_INC=$x64info.gss.include
 $GSS_LIB=$x64info.gss.lib
+$BUILD_MACROS=$x64info.build_macros
 if ($USE_LIBPQ -eq "yes")
 {
    if ($env:PROCESSOR_ARCHITECTURE -eq "x86") {
@@ -45,6 +46,6 @@ Write-Host "USE GSS    : $USE_GSS ($GSS_INC $GSS_LIB)"
 Write-Host "USE SSPI   : $USE_SSPI"
 Write-Host "SSL DIR    : ($SSL_INC $SSL_LIB)"
 
-$MACROS = "USE_LIBPQ=$USE_LIBPQ USE_SSPI=$USE_SSPI USE_GSS=$USE_GSS PG_LIB=`"$PG_LIB`" PG_INC=`"$PG_INC`" SSL_LIB=`"$SSL_LIB`" SSL_INC=`"$SSL_INC`"GSS_LIB=`"$GSS_LIB`" GSS_INC=`"$GSS_INC`" $args"
-invoke-expression "nmake.exe /f win64.mak $MACROS"
-invoke-expression "nmake.exe /f win64.mak ANSI_VERSION=yes $MACROS"
+$MACROS = "USE_LIBPQ=$USE_LIBPQ USE_SSPI=$USE_SSPI USE_GSS=$USE_GSS PG_LIB=`"$PG_LIB`" PG_INC=`"$PG_INC`" SSL_LIB=`"$SSL_LIB`" SSL_INC=`"$SSL_INC`" GSS_LIB=`"$GSS_LIB`" GSS_INC=`"$GSS_INC`" $BUILD_MACROS"
+invoke-expression "nmake.exe /f win64.mak $MACROS $args"
+invoke-expression "nmake.exe /f win64.mak ANSI_VERSION=yes $MACROS $args"

diff --git a/buildx86.ps1 b/buildx86.ps1
index eca6f968718fdf6a36316c827b02843f561f7d7b..8de2fad1e42cca466586cd90409ea335f73b3b83 100755 (executable)
--- a/buildx86.ps1
+++ b/buildx86.ps1
@@ -4,6 +4,7 @@ $configInfo = GetConfiguration
 $x86info = $configInfo.Configuration.x86
 if ($x86info.setvcvars -ne "") {
    $envcmd = [String] $x86info.setvcvars
+   Write-Host "setvcvars :" $envcmd
    if ($envcmd.StartsWith(". ")) {
        . $envcmd.substring(2)
    } else {
@@ -20,6 +21,7 @@ $PG_INC=$x86info.libpq.include
 $PG_LIB=$x86info.libpq.lib
 $SSL_INC=$x86info.ssl.include
 $SSL_LIB=$x86info.ssl.lib
+$BUILD_MACROS=$x86info.build_macros
 if ($USE_LIBPQ -eq "yes")
 {
    if ($env:PROCESSOR_ARCHITECTURE -eq "x86") {
@@ -38,5 +40,6 @@ Write-Host "USE LIBPQ  : $USE_LIBPQ ($PG_INC $PG_LIB)"
 # Write-Host "USE GSS    : $USE_GSS"
 Write-Host "USE SSPI   : $USE_SSPI"
 Write-Host "SSL       : ($SSL_INC $SSL_LIB)"
-invoke-expression "nmake.exe /f win32.mak USE_LIBPQ=$USE_LIBPQ USE_SSPI=$USE_SSPI PG_LIB=`"$PG_LIB`" PG_INC=`"$PG_INC`" SSL_LIB=`"$SSL_LIB`" SSL_INC=`"$SSL_INC`" $args"
-invoke-expression "nmake.exe /f win32.mak ANSI_VERSION=yes USE_LIBPQ=$USE_LIBPQ USE_SSPI=$USE_SSPI PG_LIB=`"$PG_LIB`" PG_INC=`"$PG_INC`" SSL_LIB=`"$SSL_LIB`" SSL_INC=`"$SSLINC`" $args"
+$MACROS = "USE_LIBPQ=$USE_LIBPQ USE_SSPI=$USE_SSPI PG_LIB=`"$PG_LIB`" PG_INC=`"$PG_INC`" SSL_LIB=`"$SSL_LIB`" SSL_INC=`"$SSL_INC`" $BUILD_MACROS"
+invoke-expression "nmake.exe /f win32.mak $MACROS $args"
+invoke-expression "nmake.exe /f win32.mak ANSI_VERSION=yes $MACROS $args"

diff --git a/win32.mak b/win32.mak
index 8ae0094e1a7552e65daa9742cbacc0bcb7129495..b3922a535ddf7e54d152a6eff0efaa497d0fa3ee 100644 (file)
--- a/win32.mak
+++ b/win32.mak
@@ -38,14 +38,22 @@ CFG=Release
 !ENDIF 
 
 #
+#  Please replace the default options from the commandline if necessary 
+#
+!IFNDEF    CUSTOMCLOPT
+CUSTOMCLOPT=/nologo /W3
+!ELSE
+!MESSAGE CL option $(CUSTOMCLOPT) specified
+!ENDIF
+
 #
 !IFNDEF PG_INC
-PG_INC=$(PROGRAMFILES)\PostgreSQL\9.2\include
+PG_INC=$(PROGRAMFILES)\PostgreSQL\9.3\include
 !MESSAGE Using default PostgreSQL Include directory: $(PG_INC)
 !ENDIF
 
 !IFNDEF PG_LIB
-PG_LIB=$(PROGRAMFILES)\PostgreSQL\9.2\lib
+PG_LIB=$(PROGRAMFILES)\PostgreSQL\9.3\lib
 !MESSAGE Using default PostgreSQL Library directory: $(PG_LIB)
 !ENDIF
 
@@ -215,11 +223,11 @@ $(INTDIR)\connection.obj $(INTDIR)\psqlodbc.res: version.h
 
 CPP=cl.exe
 !IF  "$(CFG)" == "Release"
-CPP_PROJ=/nologo /$(LINKMT) /O2 /D "NDEBUG"
+CPP_PROJ=/$(LINKMT) /O2 /D "NDEBUG"
 !ELSEIF  "$(CFG)" == "Debug"
-CPP_PROJ=/nologo /$(LINKMT)d /Gm /ZI /Od /RTC1 /D "_DEBUG"
+CPP_PROJ=/$(LINKMT)d /Gm /ZI /Od /RTC1 /D "_DEBUG"
 !ENDIF
-CPP_PROJ=$(CPP_PROJ) /W3 $(VC_FLAGS) $(INC_OPT) /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /D "PSQLODBC_EXPORTS" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbc.pch" /Fo"$(INTDIR)"\ /Fd"$(INTDIR)"\ /FD
+CPP_PROJ=$(CPP_PROJ) $(CUSTOMCLOPT) $(VC_FLAGS) $(INC_OPT) /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /D "PSQLODBC_EXPORTS" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbc.pch" /Fo"$(INTDIR)"\ /Fd"$(INTDIR)"\ /FD
 !MESSAGE CPP_PROJ=$(CPP_PROJ)
 .c{$(INTDIR)}.obj::
    $(CPP) @<<

diff --git a/win64.mak b/win64.mak
index 65ee05dfca3418d6ef97f14b66709100b7326c8d..baeed2080d8c9bdc8fd02f35abe519a99fcdd662 100755 (executable)
--- a/win64.mak
+++ b/win64.mak
@@ -44,6 +44,15 @@ CFG=Release
 !ERROR An invalid configuration was specified.
 !ENDIF 
 
+#
+#  Please replace the default options from the commandline if necessary 
+#
+!IFNDEF    CUSTOMCLOPT
+CUSTOMCLOPT=/nologo /MD /W3 /EHsc
+!ELSE
+!MESSAGE CL option $(CUSTOMCLOPT) specified
+!ENDIF 
+
 ADD_DEFINES=/D _WIN64
 #
 #  Include libraries as well as import libraries
@@ -52,7 +61,7 @@ ADD_DEFINES=/D _WIN64
 #  variables to appropriate ones. 
 #
 !IFNDEF PG_INC
-PG_INC=$(PROGRAMFILES)\PostgreSQL\9.2\include
+PG_INC=$(PROGRAMFILES)\PostgreSQL\9.3\include
 !MESSAGE Using default PostgreSQL Include directory: $(PG_INC)
 !ENDIF
 
@@ -224,7 +233,7 @@ CLEAN :
 !ENDIF
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /EHsc $(INC_OPT) /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /D "PSQLODBC_EXPORTS" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbc.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD 
+CPP_PROJ=$(CUSTOMCLOPT) $(INC_OPT) /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /D "PSQLODBC_EXPORTS" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbc.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD 
 !IF  "$(CFG)" == "Release"
 CPP_PROJ=$(CPP_PROJ) /O2 /D "NDEBUG"
 !ELSEIF  "$(CFG)" == "Debug"
@@ -276,9 +285,11 @@ RSC_PROJ=$(RSC_PROJ) /d "_DEBUG"
 !ENDIF
 BSC32_SBRS= \
    
+#BUFOVFLIB=bufferoverflowu.lib
+BUFOVFLIB=
 LINK32=link.exe
 LIB32=lib.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib advapi32.lib odbc32.lib odbccp32.lib wsock32.lib ws2_32.lib XOleHlp.lib winmm.lib "$(OUTDIR)\$(DTCLIB).lib" msvcrt.lib bufferoverflowu.lib /nologo /dll /machine:$(CPU) /def:"$(DEF_FILE)"
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib advapi32.lib odbc32.lib odbccp32.lib wsock32.lib ws2_32.lib XOleHlp.lib winmm.lib "$(OUTDIR)\$(DTCLIB).lib" msvcrt.lib $(BUFOVFLIB) /nologo /dll /machine:$(CPU) /def:"$(DEF_FILE)"
 !IF  "$(ANSI_VERSION)" == "yes"
 DEF_FILE= "psqlodbca.def"
 !ELSE
@@ -354,12 +365,12 @@ LINK32_OBJS= \
 DTCDEF_FILE= "$(DTCLIB).def"
 LIB32_DTCLIBFLAGS=/nologo /machine:$(CPU) /def:"$(DTCDEF_FILE)"
 
-LINK32_DTCFLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib wsock32.lib XOleHlp.lib $(OUTDIR)\$(MAINLIB).lib bufferoverflowu.lib Delayimp.lib /DelayLoad:XOLEHLP.DLL /nologo /dll /incremental:no /machine:$(CPU)
+LINK32_DTCFLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib wsock32.lib XOleHlp.lib $(OUTDIR)\$(MAINLIB).lib $(BUFOVFLIB) Delayimp.lib /DelayLoad:XOLEHLP.DLL /nologo /dll /incremental:no /machine:$(CPU)
 LINK32_DTCOBJS= \
         "$(INTDIR)\msdtc_enlist.obj" "$(INTDIR)\xalibname.obj"
 
 XADEF_FILE= "$(XALIB).def"
-LINK32_XAFLAGS=/nodefaultlib:libcmt.lib kernel32.lib user32.lib gdi32.lib advapi32.lib odbc32.lib odbccp32.lib wsock32.lib XOleHlp.lib winmm.lib msvcrt.lib bufferoverflowu.lib /nologo /dll /incremental:no /machine:$(CPU) /def:"$(XADEF_FILE)"
+LINK32_XAFLAGS=/nodefaultlib:libcmt.lib kernel32.lib user32.lib gdi32.lib advapi32.lib odbc32.lib odbccp32.lib wsock32.lib XOleHlp.lib winmm.lib msvcrt.lib $(BUFOVFLIB) /nologo /dll /incremental:no /machine:$(CPU) /def:"$(XADEF_FILE)"
 LINK32_XAOBJS= \
    "$(INTDIR)\pgxalib.obj" 
 

diff --git a/winbuild/configuration_template.xml b/winbuild/configuration_template.xml
index fed219788fe0e993ddfed86d5a753d3c47d3ab6d..4cc59b1008872597d0a5ae96ea220b8ae98c044e 100644 (file)
--- a/winbuild/configuration_template.xml
+++ b/winbuild/configuration_template.xml
@@ -16,6 +16,7 @@
       <bin></bin>
     </gss>
     <setvcvars></setvcvars>
+    <build_macros></build_macros>
   </x86>
   <x64 use_libpq="yes" use_sspi="yes" use_gss="no">
     <libpq version="">
@@ -33,5 +34,6 @@
       <bin></bin>
     </gss>
     <setvcvars></setvcvars>
+    <build_macros></build_macros>
   </x64>
 </Configuration>