diff --git a/BuildAll.bat b/BuildAll.bat deleted file mode 100755 index 8ee7739..0000000 --- a/BuildAll.bat +++ /dev/null @@ -1,11 +0,0 @@ -:: -:: Build all dlls of psqlodbc project -:: -@echo off -if "%1" == "/?" ( - powershell Get-Help %~dp0\winbuild\BuildAll.ps1 -detailed -) else if "%1" == "-?" ( - powershell Get-Help %~dp0\winbuild\BuildAll.ps1 %2 %3 %4 %5 %6 %7 %8 %9 -) else ( - powershell %~dp0\winbuild\BuildAll.ps1 %* -) diff --git a/docs/win32-compilation.html b/docs/win32-compilation.html index f6aa30a..b9bd2b8 100644 --- a/docs/win32-compilation.html +++ b/docs/win32-compilation.html @@ -10,8 +10,8 @@

Compiling psqlODBC on Windows

-This page describes how to build the PostgreSQL ODBC Driver on Windows. There -are three methods to build: from command line using nmake makefiles, from +This page describes how to build the PostgreSQL ODBC Driver on Windows. There +are two methods to build: from command line using nmake makefiles, from command line using MSBuild files, and from Visual Studio IDE.

@@ -38,155 +38,38 @@ The following 3rd party software are required for the build:

-

-For the MSBuild method, you will also need PowerShell. -

-

It's also possible to build without libpq and OpenSSL, but some authentication methods will be disabled.

-

Building with nmake.exe

- -Use NMAKE.exe to build the driver for the currently active target:

- - C:\psqlodbc\> nmake /f win64.mak <options>

- -

-Despite the name, win64.mak is used to build both 32-bit and 64-bit binaries. -With the Microsoft SDK scripts, you can switch between 32-bit and 64-bit -target architectures with "setenv /x86" and "setenv /x64" commands. -

- -

-To build the .msi installer file:

- - C:\psqlodbc\> nmake /f win64.mak installer

- -The resulting installer file goes to installer/x64 or installer/x86 directory. -

- -

-To build both 32-bit and 64-bit versions in one command:

- - C:\psqlodbc\> nmake /f win64.mak world

-

- - -

-The following build options may be used, either on the command line, or -by creating a file called "windows-local.mak". -

- - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ValiableValues
CFGRelease(default), or Debug
PG_INC$(PROGRAMFILES)\PostgreSQL\9.3\include
PG_LIB$(PROGRAMFILES)\PostgreSQL\9.3\lib
SSL_INCC:\OpenSSL-Win32\include
SSL_LIBC:\OpenSSL-Win32\lib
LINKMTMT
ANSI_VERSIONno (If set to "yes", output dll name to psqlodbc30a.dll)
MSDTCyes
USE_LIBPQyes (libpq is required)
USE_SSPIyes (secur32 and crypt32 libraries are required)
USE_GSSno (gssapi library is required)

- -
    -
  1. UNICODE is the default (psqlodbc35w.dll), unless ANSI_VERSION is selected (psqlodbc30a.dll)
    2. -
  2. libpq.dll is used supported.
    3. -
  3. SSL and Kerberos are original equipment.
    4. -
  4. ODBCVER becomes 0x351 when UNICODE is selected, or becomes 0x0300 with ANSI_VERSION == Yes.
    5. -
  5. If MSDTC == Yes, "pgxalib.dll" is created.
    6. -
  6. If MSDTC is enabled, ANSI_VERSION also creates "pgenlista.dll", or UNICODE creates "pgenlist.dll".
    7. -
-

Building with MSBuild

-See winbuild/readme.txt in the source directory for details. - -

IDE Method

+Use MSBuild.exe to build the driver for the currently active target:

-

A Microsoft Visual Studio project file (and workspace) is included in the source tree. -

- -

psqlodbc.dsp - can be used with Microsoft Visual C++ 6.0. -

- -

psqlodbc.proj and -psqlodbc.sln -can be used with Microsoft Visual C++ 2005 Edition (including the Express edition which can be downloaded free of charge from http://msdn.microsoft.com/vstudio/express/visualc/usingpsdk/default.aspx) -

+ C:\psqlodbc\> MSBuild

- Preparation before the build: +The default target performs a full build, which includes ANSI and Unicode +drivers, both 32-bit and 64-bit versions, and also builds the installers. +The resulting drivers can be found in the x86_ANSI_Release and +x64_Unicode_Release directories, and the installers in x86_Release and +x64_Release directories (or *_Debug instead of *_Release, when building in Debug configuration).

-
    -
  1. The Windows distribution of PostgreSQL will install the required headers and libraries into C:\Program Files\PostgreSQL\9.2 -
  2. OpenSSL should be installed into C:\OpenSSL (OpenSSL binaries can be downloaded from http://www.slproweb.com/products/Win32OpenSSL.html) -

- If you want to change the installation arrangement, it -is necessary to edit the project settings. +Other targets are available for more fine-grained builds: BuildDriver, +BuildDriverBoth, BuildInstaller. See winbuild.proj for details.

- Note: +By default, the drivers are built with libpq and SSPI support, and without +GSSAPI support. This is also the configuration used for the official binaries. +To build with other options, copy winbuild\configuration-defaults.props file +into winbuild\configuration-local.props, and edit the settings. The +configuration-local.props file can also be used to specify non-standard +locations for PostgreSQL and OpenSSL headers and libraries.

-

-The default build settings will create the following driver: -

- -
    -
  1. UNICODE support. -
  2. libpq and SSL equipped are supported. -
  3. Kerberos are supported peculiar by psqlODBC. -
  4. ODBCVER is 0x0351. -
  5. The driver filename is "psqlodbc35w.dll".
- diff --git a/editConfiguration.bat b/editConfiguration.bat deleted file mode 100755 index 1ec9013..0000000 --- a/editConfiguration.bat +++ /dev/null @@ -1,4 +0,0 @@ -:: -:: Start editConfiguration with a mimimized console window -:: -powershell -Sta -WindowStyle Minimized %~dp0\winbuild\editConfiguration.ps1 %* diff --git a/installer/Make.bat b/installer/Make.bat deleted file mode 100755 index 0bb5366..0000000 --- a/installer/Make.bat +++ /dev/null @@ -1,87 +0,0 @@ -@echo off - -:: Values to change include VERSION and SUBLOC, both below. - -setlocal -SET X86PROGRAMFILES=%ProgramFiles% - -if "%PROCESSOR_ARCHITECTURE%" == "x86" GOTO SET_LINKFILES -SET X86PROGRAMFILES=%ProgramFiles(x86)% - -:SET_LINKFILES -:: echo X86PROGRAMFILES=%X86PROGRAMFILES% -:: -:: When you reference PG server's libpq related dlls, set the -:: version to the variable PGVERSION (default 9.3) and call -:: this batch file. -:: -if "%PGVERSION%" == "" SET PGVERSION=9.3 -:: -:: When you placed libpq related dlls in the folder other than -:: the default one, set the folder name to the variable LIBPQBINDIR -:: and call this batch file. -:: -if "%LIBPQBINDIR%" == "" ( - SET LINKFILES="%X86PROGRAMFILES%\PostgreSQL\%PGVERSION%\bin" - ) else ( - SET LINKFILES="%LIBPQBINDIR%" - ) - -if NOT "%1"=="" ( - SET VERSION="%1" - GOTO GOT_VERSION -) - -:: -:: The ProductCode History -:: ProductCode must be changed in case of major upgrade -:: -SET PRODUCTID["09.02.0100"]="838E187D-8B7A-473d-B93C-C8E970B15D2B" -SET PRODUCTID["09.03.0100"]="D3527FA5-9C2B-4550-A59B-9534A78950F4" -SET PRODUCTID["09.03.0200"]="D3527FA5-9C2B-4550-A59B-9534A78950F4" -SET PRODUCTID["09.03.0210"]="D3527FA5-9C2B-4550-A59B-9534A78950F4" -SET PRODUCTID["09.03.0300"]="D3527FA5-9C2B-4550-A59B-9534A78950F4" - -:: The full version number of the build in XXXX.XX.XX format -SET VERSION="09.03.0300" -echo. -echo Version not specified - defaulting to %VERSION% -echo. - -:GOT_VERSION - -:: The subdirectory to install into -SET SUBLOC=%VERSION:~1,2%%VERSION:~4,2% - -CALL SET PRODUCTCODE=%%PRODUCTID[%VERSION%]%% -echo PRODUCTCODE=%PRODUCTCODE% - -echo. -echo Building psqlODBC/%SUBLOC% merge module... - -candle -nologo -dPlatform="x86" -dVERSION=%VERSION% -dSUBLOC=%SUBLOC% -dLIBPQBINDIR=%LINKFILES% -o psqlodbcm.wixobj psqlodbcm_cpu.wxs -IF ERRORLEVEL 1 GOTO ERR_HANDLER - -light -nologo -out psqlodbc.msm psqlodbcm.wixobj -IF ERRORLEVEL 1 GOTO ERR_HANDLER - -echo. -echo Building psqlODBC installer database... - -candle -nologo -dPlatform="x86" -dVERSION=%VERSION% -dSUBLOC=%SUBLOC% -dPRODUCTCODE="%PRODUCTCODE%" -o psqlodbc.wixobj psqlodbc_cpu.wxs -IF ERRORLEVEL 1 GOTO ERR_HANDLER - -light -nologo -ext WixUIExtension -cultures:en-us psqlodbc.wixobj -IF ERRORLEVEL 1 GOTO ERR_HANDLER - -echo. -echo Done! -GOTO EXIT - -:ERR_HANDLER -echo. -echo Aborting build! -GOTO EXIT - -:EXIT -endlocal diff --git a/installer/MakeX64.bat b/installer/MakeX64.bat deleted file mode 100755 index 960b13d..0000000 --- a/installer/MakeX64.bat +++ /dev/null @@ -1,174 +0,0 @@ -@echo off -setlocal - -rem -rem The 64bit installer -rem -set CPUTYPE=x64 - -rem -rem Set yes when clean operations are needed -rem -set CLEANUP=no -rem -rem Set yes so as to build dlls before making the installer -rem -set DLLBUILD=no - -:getparam -set para=%1 -echo para="%para%" -if /i "%para:~1%" == "Drivers" ( - if "%para:~0,1%" == "+" set DLLBUILD=yes - shift - goto getparam -) else if /i "%para%" == "clean" ( - set CLEANUP=yes - shift - goto getparam -) - -if "%CLEANUP%" == "yes" GOTO CLEAN - -rem -rem psqlodbc dlls build options -rem -if "%USE_LIBPQ%" == "" ( - SET USE_LIBPQ=yes -) -if "%USE_GSS%" == "" ( - SET USE_GSS=no -) -if "%USE_SSPI%" == "" ( - SET USE_SSPI=yes -) - -:: -:: Please specify the foler name where you placed libpq related dlls. -:: Currently not used. -:: -if "%PGVERSION%" == "" SET PGVERSION=9.3 -if "%USE_LIBPQ%" == "yes" ( - if "%LIBPQBINDIR%" == "" ( - if "%PROCESSOR_ARCHITECTURE%" == "AMD64" ( - SET LIBPQBINDIR="%ProgramFiles%\PostgreSQL\%PGVERSION%\bin" - ) else ( - echo You are setting USE_LIBPQ=%USE_LIBPQ% - echo Please specify LIBPQBINDIR variable - echo Press any key to exit ... - pause > nul - exit - ) - ) - echo LIBPQBINDIR=%LIBPQBINDIR% -) - -rem -rem Please specify the foler name where you placed GSSAPI related dlls. -rem -if "%USE_GSS%" == "yes" ( - if "%GSSBINDIR%" == "" ( - echo You are setting USE_GSS=%USE_GSS% - echo Please specify GSSBINDIR variable - echo Press any key to exit ... - pause > nul - exit - ) - echo GSSBINDIR=%GSSBINDIR% -) - -rem -rem Build binaries if necessary -rem -set origdir=%CD% -if "%DLLBUILD%" == "yes" ( -cd .. -nmake /f win64.mak USE_LIBPQ=%USE_LIBPQ% USE_SSPI=%USE_SSPI% USE_GSS=%USE_GSS% -nmake /f win64.mak ANSI_VERSION=yes USE_LIBPQ=%USE_LIBPQ% USE_SSPI=%USE_SSPI% USE_GSS=%USE_GSS% -) -cd %origdir% - -set wix_dir="%WIX%bin" -echo wix_dir=%wix_dir% - -rem Values to change include VERSION and SUBLOC, both below. - -if NOT "%1"=="" SET VERSION="%1" -if NOT "%1"=="" GOTO GOT_VERSION -GOTO NORMAL_EXEC - -:CLEAN -echo. -echo cleaning derived files -echo. -del %CPUTYPE%\psqlodbc*.wix* %CPUTYPE%\psqlodbc*.ms* -if "%DLLBUILD%" == "yes" ( -cd .. -nmake /f win64.mak clean -nmake /f win64.mak ANSI_VERSION=yes clean -) -GOTO EXIT - -:NORMAL_EXEC -REM The full version number of the build in XXXX.XX.XX format -SET VERSION="09.03.0300" - -echo. -echo Version not specified - defaulting to %VERSION% -echo. - -:GOT_VERSION - -if not exist %CPUTYPE%\ mkdir %CPUTYPE% - -:: The subdirectory to install into -SET SUBLOC=%VERSION:~1,2%%VERSION:~4,2% - -:: -:: ProductCode History -:: ProductCode must be changed in case of major upgrade -:: -SET PRODUCTID["09.02.0100"]="3E42F836-9204-4c42-B3C3-8680A0434875" -SET PRODUCTID["09.03.0100"]="1F896F2F-5756-4d22-B5A3-040796C9B485" -SET PRODUCTID["09.03.0200"]="1F896F2F-5756-4d22-B5A3-040796C9B485" -SET PRODUCTID["09.03.0210"]="1F896F2F-5756-4d22-B5A3-040796C9B485" -SET PRODUCTID["09.03.0300"]="1F896F2F-5756-4d22-B5A3-040796C9B485" - -CALL SET PRODUCTCODE=%%PRODUCTID[%VERSION%]%% - -echo. -echo Building psqlODBC/%SUBLOC% merge module... - -%wix_dir%\candle.exe -nologo -dPlatform="%CPUTYPE%" -dVERSION=%VERSION% -dSUBLOC=%SUBLOC% -dLIBPQBINDIR=%LIBPQBINDIR% -dGSSBINDIR=%GSSBINDIR% -o %CPUTYPE%\psqlodbcm.wixobj psqlodbcm_cpu.wxs -IF ERRORLEVEL 1 GOTO ERR_HANDLER - -echo Linking psqlODBC merge module... -%wix_dir%\light -nologo -o %CPUTYPE%\psqlodbc_%CPUTYPE%.msm %CPUTYPE%\psqlodbcm.wixobj -IF ERRORLEVEL 1 GOTO ERR_HANDLER - -echo. -echo Building psqlODBC installer database... - -%wix_dir%\candle.exe -nologo -dPlatform="%CPUTYPE%" -dVERSION=%VERSION% -dSUBLOC=%SUBLOC% -dPRODUCTCODE=%PRODUCTCODE% -o %CPUTYPE%\psqlodbc.wixobj psqlodbc_cpu.wxs -IF ERRORLEVEL 1 GOTO ERR_HANDLER - -echo Linking psqlODBC installer database... -%wix_dir%\light -nologo -ext WixUIExtension -cultures:en-us -o %CPUTYPE%\psqlodbc_%CPUTYPE%.msi %CPUTYPE%\psqlodbc.wixobj -IF ERRORLEVEL 1 GOTO ERR_HANDLER - -echo. -echo Modifying psqlODBC installer database... -cscript modify_msi.vbs %CPUTYPE%\psqlodbc_%CPUTYPE%.msi -IF ERRORLEVEL 1 GOTO ERR_HANDLER - -echo. -echo Done! -GOTO EXIT - -:ERR_HANDLER -echo. -echo Aborting build! -GOTO EXIT - -:EXIT -endlocal diff --git a/installer/buildX64-installer.ps1 b/installer/buildX64-installer.ps1 deleted file mode 100755 index 1a325c1..0000000 --- a/installer/buildX64-installer.ps1 +++ /dev/null @@ -1,100 +0,0 @@ -# build 64bit installer -Param( -[string]$configPath -) -$scriptPath = (Split-Path $MyInvocation.MyCommand.Path) -$configInfo = & "$scriptPath\..\winbuild\configuration.ps1" "$configPath" -$VERSION = $configInfo.Configuration.version -$x64info = $configInfo.Configuration.x64 -$USE_LIBPQ=$x64info.use_libpq -$USE_GSS=$x64info.use_gss -$USE_SSPI=$x64info.use_sspi -$LIBPQVER=$x64info.libpq.version -if ($LIBPQVER -eq "") { - $LIBPQVER=$LIBPQ_VERSION -} -if ($USE_LIBPQ -eq "yes") -{ - $LIBPQBINDIR=$x64info.libpq.bin - if ($LIBPQBINDIR -eq "default") { - if ($env:PROCESSOR_ARCHITECTURE -ne "x86") { - $pgmfs = "$env:ProgramFiles" - $LIBPQBINDIR = "$pgmfs\PostgreSQL\$LIBPQVER\bin" - } - elseif ("${env:ProgramW6432}" -ne "") { - $pgmfs = "$env:ProgramW6432" - $LIBPQBINDIR = "$pgmfs\PostgreSQL\$LIBPQVER\bin" - } - } -} -if ($USE_GSS -eq "yes") -{ - $GSSBINDIR=$x64info.gss.bin -} - -Write-Host "VERSION : $VERSION" -Write-Host "USE LIBPQ : $USE_LIBPQ ($LIBPQBINDIR)" -Write-Host "USE GSS : $USE_GSS ($GSSBINDIR)" -Write-Host "USE SSPI : $USE_SSPI" - -$CPUTYPE="x64" - -if ($env:WIX -ne "") -{ - $wix = "$env:WIX" - $env:Path += ";$WIX/bin" -} -# The subdirectory to install into -$SUBLOC=$VERSION.substring(0, 2) + $VERSION.substring(3, 2) - -if (!(Test-Path -Path $CPUTYPE)) { - New-Item -ItemType directory -Path $CPUTYPE -} - -<# - ProductCode History - ProductCode must be changed in case of major upgrade -#> -$PRODUCTID = @{} -$PRODUCTID["09.02.0100"]="3E42F836-9204-4c42-B3C3-8680A0434875" -$PRODUCTID["09.03.0100"]="1F896F2F-5756-4d22-B5A3-040796C9B485" -$PRODUCTID["09.03.0200"]="1F896F2F-5756-4d22-B5A3-040796C9B485" -$PRODUCTID["09.03.0210"]="1F896F2F-5756-4d22-B5A3-040796C9B485" -$PRODUCTID["09.03.0300"]="1F896F2F-5756-4d22-B5A3-040796C9B485" - -$PRODUCTCODE=$PRODUCTID[$VERSION] -if ("$PRODUCTCODE" -eq "") { - Write-Host "`nSpecify the ProductCode for the VERSION $VERSION" - return -} -Write-Host "PRODUCTCODE: $PRODUCTCODE" - -try { - pushd $scriptPath - - Write-Host ".`nBuilding psqlODBC/$SUBLOC merge module..." - - invoke-expression "candle -nologo -dPlatform=$CPUTYPE `"-dVERSION=$VERSION`" -dSUBLOC=$SUBLOC `"-dLIBPQBINDIR=$LIBPQBINDIR`" `"-dGSSBINDIR=$GSSBINDIR`" -o $CPUTYPE\psqlodbcm.wixobj psqlodbcm_cpu.wxs" - - Write-Host ".`nLinking psqlODBC merge module..." - invoke-expression "light -nologo -o $CPUTYPE\psqlodbc_$CPUTYPE.msm $CPUTYPE\psqlodbcm.wixobj" - - Write-Host ".`nBuilding psqlODBC installer database..." - - invoke-expression "candle -nologo -dPlatform=$CPUTYPE `"-dVERSION=$VERSION`" -dSUBLOC=$SUBLOC `"-dPRODUCTCODE=$PRODUCTCODE`" -o $CPUTYPE\psqlodbc.wixobj psqlodbc_cpu.wxs" - - Write-Host ".`nLinking psqlODBC installer database..." - invoke-expression "light -nologo -ext WixUIExtension -cultures:en-us -o $CPUTYPE\psqlodbc_$CPUTYPE.msi $CPUTYPE\psqlodbc.wixobj" - - Write-Host ".`nModifying psqlODBC installer database..." - invoke-expression "cscript modify_msi.vbs $CPUTYPE\psqlodbc_$CPUTYPE.msi" - - Write-Host ".`nDone!" -} -catch { - Write-Host ".`Aborting build!" - throw $error[0] -} -finally { - popd -} diff --git a/installer/buildX86-installer.ps1 b/installer/buildX86-installer.ps1 deleted file mode 100755 index 727c5e4..0000000 --- a/installer/buildX86-installer.ps1 +++ /dev/null @@ -1,83 +0,0 @@ -# build 32bit installer -Param( -[string]$configPath -) -$scriptPath = (Split-Path $MyInvocation.MyCommand.Path) -$configInfo = & "$scriptPath\..\winbuild\configuration.ps1" "$configPath" -$VERSION = $configInfo.Configuration.version -$x86info = $configInfo.Configuration.x86 -$USE_LIBPQ=$x86info.use_libpq -$USE_GSS=$x86info.use_gss -$USE_SSPI=$x86info.use_sspi -$LIBPQVER=$x86info.libpq.version -if ($LIBPQVER -eq "") { - $LIBPQVER=$LIBPQ_VERSION -} -if ($USE_LIBPQ -eq "yes") -{ - $LIBPQBINDIR=$x86info.libpq.bin - if ($env:PROCESSOR_ARCHITECTURE -eq "x86") { - $pgmfs = "$env:ProgramFiles" - } else { - $pgmfs = "${env:ProgramFiles(x86)}" - } - if ($LIBPQBINDIR -eq "default") { - $LIBPQBINDIR = "$pgmfs\PostgreSQL\$LIBPQVER\bin" - } -} - -Write-Host "VERSION : $VERSION" -Write-Host "USE LIBPQ : $USE_LIBPQ ($LIBPQBINDIR)" -Write-Host "USE GSS : $USE_GSS ($GSSBINDIR)" -Write-Host "USE SSPI : $USE_SSPI" - -if ($env:WIX -ne "") -{ - $wix = "$env:WIX" - $env:Path += ";$WIX/bin" -} - -<# - The ProductCode History - ProductCode must be changed in case of major upgrade -#> -$PRODUCTID = @{} -$PRODUCTID["09.02.0100"]="838E187D-8B7A-473d-B93C-C8E970B15D2B" -$PRODUCTID["09.03.0100"]="D3527FA5-9C2B-4550-A59B-9534A78950F4" -$PRODUCTID["09.03.0200"]="D3527FA5-9C2B-4550-A59B-9534A78950F4" -$PRODUCTID["09.03.0210"]="D3527FA5-9C2B-4550-A59B-9534A78950F4" - -# The subdirectory to install into -$SUBLOC=$VERSION.substring(0, 2) + $VERSION.substring(3, 2) - -$PRODUCTCODE=$PRODUCTID[$VERSION] -if ("$PRODUCTCODE" -eq "") { - Write-Host ".`nSpecify the ProductCode for the VERSION $VERSION" - return -} -Write-Host "PRODUCTCODE: $PRODUCTCODE" - -try { - pushd $scroptPath - - Write-Host ".`nBuilding psqlODBC/$SUBLOC merge module..." - - invoke-expression "candle -nologo `"-dVERSION=$VERSION`" -dSUBLOC=$SUBLOC `"-dLINKFILES=$LIBPQBINDIR`" psqlodbcm.wxs" - - invoke-expression "light -nologo -out psqlodbc.msm psqlodbcm.wixobj" - - Write-Host ".`nBuilding psqlODBC installer database..." - - invoke-expression "candle -nologo -dPlatform=`"x86`" `"-dVERSION=$VERSION`" -dSUBLOC=$SUBLOC `"-dPRODUCTCODE=$PRODUCTCODE`" -o psqlodbc.wixobj psqlodbc_cpu.wxs" - - invoke-expression "light -nologo -ext WixUIExtension -cultures:en-us psqlodbc.wixobj" - - Write-Host ".`nDone!" -} -catch { - Write-Host ".`nAborting build!" - throw $error[0] -} -finally { - popd -} diff --git a/installer/installer.mak b/installer/installer.mak deleted file mode 100644 index d393130..0000000 --- a/installer/installer.mak +++ /dev/null @@ -1,46 +0,0 @@ - - -# All the driver files that will be included in the installer -DRIVER_FILES = ../$(TARGET_CPU)_Unicode_$(CFG)/psqlodbc35w.dll \ - ../$(TARGET_CPU)_Unicode_$(CFG)/pgxalib.dll \ - ../$(TARGET_CPU)_Unicode_$(CFG)/pgenlist.dll \ - ../$(TARGET_CPU)_ANSI_$(CFG)/psqlodbc30a.dll \ - ../$(TARGET_CPU)_ANSI_$(CFG)/pgxalib.dll \ - ../$(TARGET_CPU)_ANSI_$(CFG)/pgenlista.dll - -ALL: $(TARGET_CPU)\psqlodbc_$(TARGET_CPU).msm $(TARGET_CPU)\psqlodbc_$(TARGET_CPU).msi - -CANDLE="$(WIX)bin\candle.exe" -LIGHT="$(WIX)bin\light" - -!INCLUDE ..\windows-defaults.mak -!IF EXISTS(..\windows-local.mak) -!INCLUDE ..\windows-local.mak -!ENDIF - -!MESSAGE determining product code - -!INCLUDE productcodes.mak - -!MESSAGE Got product code $(PRODUCTCODE) - -MSM_OPTS = -dLIBPQBINDIR="$(LIBPQ_BIN)" -!IF "$(USE_GSS)" == "yes" -MSM_OPTS = $(MSM_OPTS) -dGSSBINDIR="$(GSSBINDIR)" -!ENDIF - - -# Merge module -$(TARGET_CPU)\psqlodbc_$(TARGET_CPU).msm: psqlodbcm_cpu.wxs $(DRIVER_FILES) - echo Building Installer Merge Module - $(CANDLE) -nologo -dPlatform="$(TARGET_CPU)" -dVERSION=$(POSTGRESDRIVERVERSION) -dSUBLOC=$(SUBLOC) $(MSM_OPTS) -o $(TARGET_CPU)\psqlodbcm.wixobj psqlodbcm_cpu.wxs - $(LIGHT) -nologo -o $(TARGET_CPU)\psqlodbc_$(TARGET_CPU).msm $(TARGET_CPU)\psqlodbcm.wixobj - -$(TARGET_CPU)\psqlodbc_$(TARGET_CPU).msi: psqlodbc_cpu.wxs $(DRIVER_FILES) - echo Building Installer - $(CANDLE) -nologo -dPlatform="$(TARGET_CPU)" -dVERSION=$(POSTGRESDRIVERVERSION) -dSUBLOC=$(SUBLOC) -dPRODUCTCODE=$(PRODUCTCODE) -o $(TARGET_CPU)\psqlodbc.wixobj psqlodbc_cpu.wxs - $(LIGHT) -nologo -ext WixUIExtension -cultures:en-us -o $(TARGET_CPU)\psqlodbc_$(TARGET_CPU).msi $(TARGET_CPU)\psqlodbc.wixobj - cscript modify_msi.vbs $(TARGET_CPU)\psqlodbc_$(TARGET_CPU).msi - -clean: - -rd /Q /S x64 x86 diff --git a/installer/installer.proj b/installer/installer.proj new file mode 100644 index 0000000..4c32c69 --- /dev/null +++ b/installer/installer.proj @@ -0,0 +1,53 @@ + + + + + + + + ..\$(TARGET_CPU)_$(Configuration)\ + + + + "$(WIX)bin\candle" -nologo + "$(WIX)bin\light" -nologo + + + + + + + + + 1F896F2F-5756-4d22-B5A3-040796C9B485 + 0903 + + + + -dLIBPQBINDIR="$(PG_BIN)" + $(CANDLE_MSM_OPTS) -dGSSBINDIR="$(GSSBINDIR)" + -dPlatform="$(TARGET_CPU)" -dConfiguration=$(Configuration) -dVERSION=$(POSTGRESDRIVERVERSION) -dSUBLOC=$(SUBLOC) -dPRODUCTCODE=$(PRODUCTCODE) + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/installer/productcodes.mak b/installer/productcodes.mak deleted file mode 100644 index b343071..0000000 --- a/installer/productcodes.mak +++ /dev/null @@ -1,19 +0,0 @@ -!IF "$(POSTGRESDRIVERVERSION)" == "09.02.0100" -PRODUCTCODE="3E42F836-9204-4c42-B3C3-8680A0434875" -SUBLOC=0902 -!ELSE IF "$(POSTGRESDRIVERVERSION)" == "09.03.0100" -PRODUCTCODE="1F896F2F-5756-4d22-B5A3-040796C9B485" -SUBLOC=0903 -!ELSE IF "$(POSTGRESDRIVERVERSION)" == "09.03.0200" -PRODUCTCODE="1F896F2F-5756-4d22-B5A3-040796C9B485" -SUBLOC=0903 -!ELSE IF "$(POSTGRESDRIVERVERSION)" == "09.03.0210" -PRODUCTCODE="1F896F2F-5756-4d22-B5A3-040796C9B485" -SUBLOC=0903 -!ELSE IF "$(POSTGRESDRIVERVERSION)" == "09.03.0300" -PRODUCTCODE="1F896F2F-5756-4d22-B5A3-040796C9B485" -SUBLOC=0903 -!ELSE -!MESSAGE Driver version $(POSTGRESDRIVERVERSION) is not listed in productcodes.mak -EXIT -!ENDIF diff --git a/installer/psqlodbc-setup/Bundle.wxs b/installer/psqlodbc-setup/Bundle.wxs deleted file mode 100755 index 1b63cdd..0000000 --- a/installer/psqlodbc-setup/Bundle.wxs +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/installer/psqlodbc-setup/Make.bat b/installer/psqlodbc-setup/Make.bat deleted file mode 100755 index 616698b..0000000 --- a/installer/psqlodbc-setup/Make.bat +++ /dev/null @@ -1,32 +0,0 @@ -setlocal -set wix_dir=%WIX%bin -set pgmname=psqlodbc -set build_config=Release -set objdir=obj\%build_config% -set bindir=bin\%build_config% - -"%wix_dir%\candle.exe" -v ^ --dConfiguration=%build_config% ^ --dOutDir=%bindir%\ -dPlatform=x86 ^ --d"ProjectDir=\\" -dProjectExt=.wixproj ^ --dProjectFileName=%pgmname%.wixproj -dProjectName=%pgmname% ^ --d"ProjectPath=%pgmname%.wixproj" ^ --d"TargetDir=%bindir%\\" -dTargetExt=.exe ^ --dTargetFileName=%pgmname%.exe -dTargetName=%pgmname% ^ --d"TargetPath=%bindir%\%pgmname%.exe" ^ --out %objdir%\ -arch x86 ^ --ext "%wix_dir%\WixUtilExtension.dll" ^ --ext "%wix_dir%\WixBalExtension.dll" ^ -Bundle.wxs vcredist.wxs - -"%wix_dir%\Light.exe" -out %bindir%\%pgmname%.exe ^ --pdbout %bindir%\%pgmname%.wixpdb ^ --ext "%wix_dir%\\WixUtilExtension.dll" ^ --ext "%wix_dir%\\WixBalExtension.dll" ^ --contentsfile %objdir%\%pgmname%.wixproj.BindContentsFileList.txt ^ --outputsfile %objdir%\%pgmname%.wixproj.BindOutputsFileList.txt ^ --builtoutputsfile %objdir%\%pgmname%.wixproj.BindBuiltOutputsFileList.txt ^ --wixprojectfile %pgmname%.wixproj ^ -%objdir%\Bundle.wixobj %objdir%\vcredist.wixobj - -endlocal diff --git a/installer/psqlodbc-setup/psqlodbc-setup.wixproj b/installer/psqlodbc-setup/psqlodbc-setup.wixproj deleted file mode 100755 index 38d2899..0000000 --- a/installer/psqlodbc-setup/psqlodbc-setup.wixproj +++ /dev/null @@ -1,46 +0,0 @@ - - - - Debug - x86 - 3.6 - {748caa18-f40d-4308-bc52-2605d09c38b1} - 2.0 - psqlodbc-setup - Bundle - $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets - $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets - - - bin\$(Configuration)\ - obj\$(Configuration)\ - Debug - - - bin\$(Configuration)\ - obj\$(Configuration)\ - - - - - - - - $(WixExtDir)\WixUtilExtension.dll - WixUtilExtension - - - $(WixExtDir)\WixBalExtension.dll - WixBalExtension - - - - - diff --git a/installer/psqlodbc-setup/vcredist.wxs b/installer/psqlodbc-setup/vcredist.wxs deleted file mode 100755 index 7342729..0000000 --- a/installer/psqlodbc-setup/vcredist.wxs +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/installer/psqlodbc_cpu.wxs b/installer/psqlodbc_cpu.wxs index 9c33838..2bf80f0 100644 --- a/installer/psqlodbc_cpu.wxs +++ b/installer/psqlodbc_cpu.wxs @@ -32,7 +32,9 @@ + + diff --git a/installer/psqlodbcm_cpu.wxs b/installer/psqlodbcm_cpu.wxs index aed8508..d546da8 100644 --- a/installer/psqlodbcm_cpu.wxs +++ b/installer/psqlodbcm_cpu.wxs @@ -1,7 +1,7 @@ - + @@ -10,24 +10,33 @@ + + + + + + + + - + - - + + - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/win64.mak b/win64.mak deleted file mode 100755 index b8f1342..0000000 --- a/win64.mak +++ /dev/null @@ -1,399 +0,0 @@ -# -# File: win64.mak -# -# Description: psqlodbc35w Unicode 64bit version Makefile. -# (can be built using platform SDK's buildfarm) -# -# Configurations: Debug, Release -# Build Types: ALL, CLEAN -# Usage: NMAKE /f win64.mak CFG=[Release | Debug] [ALL | CLEAN] -# -# Comments: Created by Hiroshi Inoue, 2006-10-31 -# - -# Include default configuration options, followed by any local overrides -!INCLUDE windows-defaults.mak -!IF EXISTS(windows-local.mak) -!INCLUDE windows-local.mak -!ENDIF - -!IF "$(ANSI_VERSION)" == "yes" -!MESSAGE Building the PostgreSQL ANSI 3.0 Driver for $(TARGET_CPU)... -!ELSE -!MESSAGE Building the PostgreSQL Unicode 3.5 Driver for $(TARGET_CPU)... -!ENDIF -!MESSAGE -!IF "$(CFG)" == "" -CFG=Release -!MESSAGE No configuration specified. Defaulting to Release. -!MESSAGE -!ENDIF - -!IF "$(CFG)" != "Release" && "$(CFG)" != "Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f win64.mak CFG=[Release | Debug] [ALL | CLEAN] -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Release" ($(TARGET_CPU) Release DLL) -!MESSAGE "Debug" ($(TARGET_CPU) Debug DLL) -!MESSAGE -!ERROR An invalid configuration was specified. -!ENDIF - -# -# Please replace the default options from the commandline if necessary -# -!IFNDEF CUSTOMCLOPT -CUSTOMCLOPT=/nologo /W3 /wd4018 /EHsc -!IF "$(CFG)" == "Release" -CUSTOMCLOPT=$(CUSTOMCLOPT) /MD -!ELSE -CUSTOMCLOPT=$(CUSTOMCLOPT) /MDd -!ENDIF -!ELSE -!MESSAGE CL option $(CUSTOMCLOPT) specified -!ENDIF - -# -# Please specify additional libraries to link from the command line. -# For example specify -# CUSTOMLINKLIBS=bufferoverflowu.lib -# when bufferoverflowu.lib is needed in old VC environment. -# -CUSTOMLINKLIBS= - -# Print the paths that will be used in the build -!MESSAGE Using PostgreSQL Include directory: $(PG_INC) -!MESSAGE Using PostgreSQL Library directory: $(PG_LIB) - -!IF "$(USE_LIBPQ)" != "no" -!MESSAGE Using OpenSSL Include directory: $(SSL_INC) -!MESSAGE Using OpenSSL Library directory: $(SSL_LIB) -!ENDIF - -!IF "$(USE_LIBPQ)" != "no" -SSL_DLL = "SSLEAY32.dll" -RESET_CRYPTO = yes -ADD_DEFINES = $(ADD_DEFINES) /D USE_LIBPQ /D "SSL_DLL=\"$(SSL_DLL)\"" /D USE_SSL -!ENDIF - -!IF "$(USE_SSPI)" == "yes" -ADD_DEFINES = $(ADD_DEFINES) /D USE_SSPI -!ENDIF -!IF "$(USE_GSS)" == "yes" -ADD_DEFINES = $(ADD_DEFINES) /D USE_GSS -!ENDIF - -!IF "$(ANSI_VERSION)" == "yes" -DTCLIB = pgenlista -!ELSE -DTCLIB = pgenlist -!ENDIF -DTCDLL = $(DTCLIB).dll - -!IF "$(TARGET_CPU)" == "x64" -ADD_DEFINES=$(ADD_DEFINES) /D _WIN64 -!ENDIF - -!IF "$(USE_LIBPQ)" != "no" -VC07_DELAY_LOAD=/DelayLoad:libpq.dll /DelayLoad:$(SSL_DLL) -!IF "$(RESET_CRYPTO)" == "yes" -VC07_DELAY_LOAD=$(VC07_DELAY_LOAD) /DelayLoad:libeay32.dll -ADD_DEFINES=$(ADD_DEFINES) /D RESET_CRYPTO_CALLBACKS -!ENDIF -!ENDIF -!IF "$(USE_SSPI)" == "yes" -VC07_DELAY_LOAD=$(VC07_DELAY_LOAD) /DelayLoad:secur32.dll /DelayLoad:crypt32.dll -!ENDIF -!IF "$(USE_GSS)" == "yes" -VC07_DELAY_LOAD=$(VC07_DELAY_LOAD) /DelayLoad:gssapi64.dll -!ENDIF -!IF "$(MSDTC)" != "no" -VC07_DELAY_LOAD=$(VC07_DELAY_LOAD) /DelayLoad:$(DTCDLL) -!ENDIF -VC07_DELAY_LOAD=$(VC07_DELAY_LOAD) /DELAY:UNLOAD - -ADD_DEFINES = $(ADD_DEFINES) /D "DYNAMIC_LOAD" -!IF "$(MSDTC)" != "no" -ADD_DEFINES = $(ADD_DEFINES) /D "_HANDLE_ENLIST_IN_DTC_" -!ENDIF -!IF "$(MEMORY_DEBUG)" == "yes" -ADD_DEFINES = $(ADD_DEFINES) /D "_MEMORY_DEBUG_" /GS -!ENDIF -!IF "$(ANSI_VERSION)" == "yes" -ADD_DEFINES = $(ADD_DEFINES) /D "DBMS_NAME=\"PostgreSQL ANSI($(TARGET_CPU))\"" /D "ODBCVER=0x0350" -!ELSE -ADD_DEFINES = $(ADD_DEFINES) /D "DBMS_NAME=\"PostgreSQL Unicode($(TARGET_CPU))\"" /D "ODBCVER=0x0351" /D "UNICODE_SUPPORT" -RSC_DEFINES = $(RSC_DEFINES) /D "UNICODE_SUPPORT" -!ENDIF - -!IF "$(PORT_CHECK)" == "yes" -ADD_DEFINES = $(ADD_DEFINES) /Wp64 -!ENDIF - -!IF "$(PG_INC)" != "" -INC_OPT = $(INC_OPT) /I "$(PG_INC)" -!ENDIF -!IF "$(SSL_INC)" != "" -INC_OPT = $(INC_OPT) /I "$(SSL_INC)" -!ENDIF -!IF "$(GSS_INC)" != "" -INC_OPT = $(INC_OPT) /I "$(GSS_INC)" -!ENDIF -!IF "$(ADDL_INC)" != "" -INC_OPT = $(INC_OPT) /I "$(ADD_INC)" -!ENDIF - -!IF "$(ANSI_VERSION)" == "yes" -MAINLIB = psqlodbc30a -!ELSE -MAINLIB = psqlodbc35w -!ENDIF -MAINDLL = $(MAINLIB).dll -XALIB = pgxalib -XADLL = $(XALIB).dll - -# Construct output directory name. The name consists of three parts, -# target CPU, ANSI/Unicode, and Debug/Release. For example,the output -# directory debug-enabled 32-bit ANSI-version is: -# -# .\x86_ANSI_Debug -# -OUTDIR=.\$(TARGET_CPU) -!IF "$(ANSI_VERSION)" == "yes" -OUTDIR=$(OUTDIR)_ANSI -!ELSE -OUTDIR=$(OUTDIR)_Unicode -!ENDIF -!IF "$(CFG)" == "Debug" -OUTDIR=$(OUTDIR)_Debug -!ELSE -OUTDIR=$(OUTDIR)_Release -!ENDIF - -# Location for intermediary build targets (e.g. *.obj files). -INTDIR=$(OUTDIR) - -ALLDLL = "$(INTDIR)" -!IF "$(OUTDIR)" != "$(INTDIR)" -ALLDLL = $(ALLDLL) "$(INTDIR)" -!ENDIF -ALLDLL = $(ALLDLL) "$(OUTDIR)\$(MAINDLL)" - -!IF "$(MSDTC)" != "no" -ALLDLL = $(ALLDLL) "$(OUTDIR)\$(XADLL)" "$(OUTDIR)\$(DTCDLL)" -!ENDIF - -ALL : $(ALLDLL) - -CLEAN : - -@erase "$(INTDIR)\*.obj" - -@erase "$(INTDIR)\*.res" - -@erase "$(OUTDIR)\*.lib" - -@erase "$(OUTDIR)\*.exp" - -@erase "$(INTDIR)\*.pch" - -@erase "$(OUTDIR)\$(MAINDLL)" -!IF "$(MSDTC)" != "no" - -@erase "$(OUTDIR)\$(DTCDLL)" - -@erase "$(OUTDIR)\$(XADLL)" -!ENDIF - -"$(INTDIR)" : -!IF !EXISTS($(INTDIR)) - mkdir "$(INTDIR)" -!ENDIF -!IF !EXISTS($(OUTDIR)) && "$(OUTDIR)" != "$(INTDIR)" - mkdir "$(OUTDIR)" -!ENDIF - -!IF "$(MSDTC)" != "no" -"$(OUTDIR)\$(MAINDLL)": "$(OUTDIR)\$(DTCLIB).lib" -!ENDIF - -CPP=cl.exe -CPP_PROJ=$(CUSTOMCLOPT) $(INC_OPT) /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbc.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD -!IF "$(CFG)" == "Release" -CPP_PROJ=$(CPP_PROJ) /O2 -!ELSEIF "$(CFG)" == "Debug" -CPP_PROJ=$(CPP_PROJ) /Gm /ZI /Od /D "_DEBUG" /RTC1 -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) /c $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) /c $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) /c $< -<< - -RSC=rc.exe -RSC_PROJ=/l 0x809 /fo"$(INTDIR)\psqlodbc.res" -!IF "$(CFG)" == "Debug" -RSC_PROJ=$(RSC_PROJ) /d "_DEBUG" -!ENDIF - -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 msvcrt.lib $(CUSTOMLINKLIBS) /nologo /dll /def:"$(DEF_FILE)" -!IF "$(MSDTC)" != "no" -LINK32_FLAGS=$(LINK32_FLAGS) "$(OUTDIR)\$(DTCLIB).lib" -!ENDIF - - -!IF "$(ANSI_VERSION)" == "yes" -DEF_FILE= "psqlodbca.def" -!ELSE -DEF_FILE= "psqlodbc.def" -!ENDIF -!IF "$(CFG)" == "Release" -LINK32_FLAGS=$(LINK32_FLAGS) -!ELSE -LINK32_FLAGS=$(LINK32_FLAGS) /debug /pdbtype:sept -!ENDIF -LINK32_FLAGS=$(LINK32_FLAGS) $(VC07_DELAY_LOAD) -!IF "$(PG_LIB)" != "" -LINK32_FLAGS=$(LINK32_FLAGS) /libpath:"$(PG_LIB)" -!ENDIF -!IF "$(GSS_LIB)" != "" -LINK32_FLAGS=$(LINK32_FLAGS) /libpath:"$(GSS_LIB)" -!ENDIF -!IF "$(SSL_LIB)" != "" -LINK32_FLAGS=$(LINK32_FLAGS) /libpath:"$(SSL_LIB)" -!ENDIF - -LINK32_OBJS= \ - "$(INTDIR)\bind.obj" \ - "$(INTDIR)\columninfo.obj" \ - "$(INTDIR)\connection.obj" \ - "$(INTDIR)\convert.obj" \ - "$(INTDIR)\dlg_specific.obj" \ - "$(INTDIR)\dlg_wingui.obj" \ - "$(INTDIR)\drvconn.obj" \ - "$(INTDIR)\environ.obj" \ - "$(INTDIR)\execute.obj" \ - "$(INTDIR)\info.obj" \ - "$(INTDIR)\info30.obj" \ - "$(INTDIR)\lobj.obj" \ - "$(INTDIR)\md5.obj" \ - "$(INTDIR)\misc.obj" \ - "$(INTDIR)\mylog.obj" \ - "$(INTDIR)\pgapi30.obj" \ - "$(INTDIR)\multibyte.obj" \ - "$(INTDIR)\options.obj" \ - "$(INTDIR)\parse.obj" \ - "$(INTDIR)\pgtypes.obj" \ - "$(INTDIR)\psqlodbc.obj" \ - "$(INTDIR)\qresult.obj" \ - "$(INTDIR)\results.obj" \ - "$(INTDIR)\setup.obj" \ -!IF "$(USE_SSPI)" == "yes" - "$(INTDIR)\sspisvcs.obj" \ -!ENDIF -!IF "$(USE_GSS)" == "yes" - "$(INTDIR)\gsssvcs.obj" \ -!ENDIF - "$(INTDIR)\socket.obj" \ - "$(INTDIR)\statement.obj" \ - "$(INTDIR)\tuple.obj" \ - "$(INTDIR)\odbcapi.obj" \ - "$(INTDIR)\odbcapi30.obj" \ - "$(INTDIR)\descriptor.obj" \ - "$(INTDIR)\loadlib.obj" \ -!IF "$(ANSI_VERSION)" != "yes" - "$(INTDIR)\win_unicode.obj" \ - "$(INTDIR)\odbcapiw.obj" \ - "$(INTDIR)\odbcapi30w.obj" \ -!ENDIF -!IF "$(MSDTC)" != "no" - "$(INTDIR)\xalibname.obj" \ -!ENDIF -!IF "$(MEMORY_DEBUG)" == "yes" - "$(INTDIR)\inouealc.obj" \ -!ENDIF - "$(INTDIR)\psqlodbc.res" - -DTCDEF_FILE= "$(DTCLIB).def" -LIB32_DTCLIBFLAGS=/nologo /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 $(CUSTOMLINKLIBS) Delayimp.lib /DelayLoad:XOLEHLP.DLL /nologo /dll -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 $(CUSTOMLINKLIBS) /nologo /dll /def:"$(XADEF_FILE)" -LINK32_XAOBJS= \ - "$(INTDIR)\pgxalib.obj" - -"$(OUTDIR)\$(MAINDLL)" : $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) /pdb:$*.pdb /implib:$*.lib /out:$@ -<< - -"$(OUTDIR)\$(DTCLIB).lib" : $(DTCDEF_FILE) $(LINK32_DTCOBJS) - $(LIB32) @<< - $(LIB32_DTCLIBFLAGS) $(LINK32_DTCOBJS) /out:$@ -<< - -"$(OUTDIR)\$(DTCDLL)" : $(DTCDEF_FILE) $(LINK32_DTCOBJS) - $(LINK32) @<< - $(LINK32_DTCFLAGS) $(LINK32_DTCOBJS) $*.exp /pdb:$*.pdb /out:$@ -<< - -"$(OUTDIR)\$(XADLL)" : $(XADEF_FILE) $(LINK32_XAOBJS) - $(LINK32) @<< - $(LINK32_XAFLAGS) $(LINK32_XAOBJS) /pdb:$*.pdb /implib:$*.lib /out:$@ -<< - - -SOURCE=psqlodbc.rc - -"$(INTDIR)\psqlodbc.res" : $(SOURCE) - $(RSC) $(RSC_PROJ) $(RSC_DEFINES) $(SOURCE) - - - -#### -# Umbrella targets, for building the driver in multiple configurations - -unicode-driver: - $(MAKE) -f win64.mak ANSI_VERSION=no -ansi-driver: - $(MAKE) -f win64.mak ANSI_VERSION=yes - -installer: unicode-driver ansi-driver - cd installer && $(MAKE) -f installer.mak CFG=$(CFG) - -# world target builds both 32-bit and 64-bit installers in one command. -# -# The "setenv" command, from Microsoft SDK, is used to switch the build -# target. However, it only changes the environment for the current shell; -# it is reset for the next command. So we cannot just call "setenv /x64" -# here one one line and nmake one the next one. I also tried creating a .bat -# file with the commands, but setenv contains a "EXIT /B" which stops the -# script from executing. But we can launch a new cmd.exe and pass the -# commands to it in stdin. -world: - cmd < << -setenv /x64 -$(MAKE) -f win64.mak installer CFG=$(CFG) -setenv /x86 -$(MAKE) -f win64.mak installer CFG=$(CFG) -<< - -clean-world: - -rd /Q /S x64_ANSI_Release x64_ANSI_Debug - -rd /Q /S x64_Unicode_Release x64_Unicode_Debug - -rd /Q /S x86_ANSI_Release x86_ANSI_Debug - -rd /Q /S x86_Unicode_Release x86_Unicode_Debug - cd installer && $(MAKE) /f installer.mak CFG=$(CFG) clean diff --git a/winbuild.proj b/winbuild.proj new file mode 100755 index 0000000..9546191 --- /dev/null +++ b/winbuild.proj @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + ANSI_VERSION=false + + + ANSI_VERSION=true + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/winbuild/BuildAll.ps1 b/winbuild/BuildAll.ps1 deleted file mode 100755 index 6b68e04..0000000 --- a/winbuild/BuildAll.ps1 +++ /dev/null @@ -1,300 +0,0 @@ -<# -.SYNOPSIS - Build all dlls of psqlodbc project using MSbuild. -.DESCRIPTION - Build psqlodbc35w.dll, psqlodbc30a.dll, pgenlist.dll, pgenlista.dll - and pgxalib.dll for both x86 and x64 platforms. -.PARAMETER Target - Specify the target of MSBuild. "Build"(default), "Rebuild" or - "Clean" is available. -.PARAMETER VCVersion - Visual Studio version is determined automatically unless this - option is specified. -.PARAMETER Platform - Specify build platforms, "both"(default), "Win32" or "x64" is - available. -.PARAMETER Toolset - MSBuild PlatformToolset is determined automatically unless this - option is specified. Currently "v100", "Windows7.1SDK", "v110", - "v110_xp", "v120" or "v120_xp" is available. -.PARAMETER MSToolsVersion - MSBuild ToolsVersion is detemrined automatically unless this - option is specified. Currently "4.0" or "12.0" is available. -.PARAMETER Configuration - Specify "Release"(default) or "Debug". -.PARAMETER BuildConfigPath - Specify the configuration xml file name if you want to use - the configuration file other than standard one. - The relative path is relative to the current directory. -.EXAMPLE - > .\BuildAll - Build with default or automatically selected parameters. -.EXAMPLE - > .\BuildAll Clean - Clean all generated files. -.EXAMPLE - > .\BuildAll -V(CVersion) 11.0 - Build using Visual Studio 11.0 environment. -.EXAMPLE - > .\BuildAll -P(latform) x64 - Build only 64bit dlls. -.NOTES - Author: Hiroshi Inoue - Date: Febrary 1, 2014 -#> - -# -# build 32bit & 64bit dlls for VC10 or later -# -Param( -[ValidateSet("Build", "Rebuild", "Clean", "info")] -[string]$Target="Build", -[string]$VCVersion, -[ValidateSet("Win32", "x64", "both")] -[string]$Platform="both", -[string]$Toolset, -[ValidateSet("", "4.0", "12.0")] -[string]$MSToolsVersion, -[ValidateSet("Debug", "Release")] -[String]$Configuration="Release", -[string]$BuildConfigPath -) - -function buildPlatform($platinfo, $Platform) -{ - $USE_LIBPQ=$platinfo.use_libpq - $LIBPQVER=$platinfo.libpq.version - if ($LIBPQVER -eq "") { - $LIBPQVER = $LIBPQ_VERSION - } - $USE_SSPI=$platinfo.use_sspi - $USE_GSS=$platinfo.use_gss - $PG_INC=$platinfo.libpq.include - $PG_LIB=$platinfo.libpq.lib - $SSL_INC=$platinfo.ssl.include - $SSL_LIB=$platinfo.ssl.lib - $GSS_INC=$platinfo.gss.include - $GSS_LIB=$platinfo.gss.lib - $BUILD_MACROS=$platinfo.build_macros - if ($USE_LIBPQ -eq "yes") - { - if ($Platform -eq "x64") { - if ($env:PROCESSOR_ARCHITECTURE -eq "x86") { - $pgmfs = "$env:ProgramW6432" - } else { - $pgmfs = "$env:ProgramFiles" - } - } else { - if ($env:PROCESSOR_ARCHITECTURE -eq "x86") { - $pgmfs = "$env:ProgramFiles" - } else { - $pgmfs = "${env:ProgramFiles(x86)}" - } - } - if ($PG_INC -eq "default") { - if ($pgmfs -eq "") { - PG_INC="" - } else { - $PG_INC = "$pgmfs\PostgreSQL\$LIBPQVER\include" - } - } - if ($PG_LIB -eq "default") { - if ($pgmfs -eq "") { - PG_LIB="" - } else { - $PG_LIB = "$pgmfs\PostgreSQL\$LIBPQVER\lib" - } - } - } - - Write-Host "USE LIBPQ : $USE_LIBPQ ($PG_INC $PG_LIB)" - 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=@" -/p: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" -"@ - if ($BUILD_MACROS -ne "") { - $BUILD_MACROS = $BUILD_MACROS -replace ';', '`;' - $BUILD_MACROS = $BUILD_MACROS -replace '"', '`"' - $MACROS="$MACROS $BUILD_MACROS" - } - Write-Debug "MACROS in function = $MACROS" - - invoke-expression -Command "& `"${msbuildexe}`" ./platformbuild.vcxproj /tv:$MSToolsVersion /p:Platform=$Platform``;Configuration=$Configuration``;PlatformToolset=${Toolset} /t:$target /p:VisualStudioVersion=${VisualStudioVersion} /p:DRIVERVERSION=$DRIVERVERSION ${MACROS}" -} - -$scriptPath = (Split-Path $MyInvocation.MyCommand.Path) -$configInfo = & "$scriptPath\configuration.ps1" "$BuildConfigPath" -$DRIVERVERSION=$configInfo.Configuration.version -pushd $scriptPath -$path_save = ${env:PATH} - -$WSDK71Set="Windows7.1SDK" -$refnum="" -Write-Debug "VCVersion=$VCVersion $env:VisualStudioVersion" -# -# Determine VisualStudioVersion -# -if ("$VCVersion" -eq "") { - $VCVersion=$configInfo.Configuration.vcversion -} -$VisualStudioVersion=$VCVersion -if ("$VisualStudioVersion" -eq "") { - $VisualStudioVersion = $env:VisualStudioVersion # VC11 or later version of C++ command prompt sets this variable -} -if ("$VisualStudioVersion" -eq "") { - if ("${env:WindowsSDKVersionOverride}" -eq "v7.1") { # SDK7.1+ command prompt - $VisualStudioVersion = "10.0" - } elseif ("${env:VCInstallDir}" -ne "") { # C++ command prompt - if ("${env:VCInstallDir}" -match "Visual Studio\s*(\S+)\\VC\\$") { - $VisualStudioVersion = $matches[1] - } - } -} -# neither C++ nor SDK prompt -if ("$VisualStudioVersion" -eq "") { - if ("${env:VS100COMNTOOLS}" -ne "") { # VC10 or SDK 7.1 is installed (current official) - $VisualStudioVersion = "10.0" - } elseif ("${env:VS120COMNTOOLS}" -ne "") { # VC12 is installed - $VisualStudioVersion = "12.0" - } elseif ("${env:VS110COMNTOOLS}" -ne "") { # VC11 is installed - $VisualStudioVersion = "11.0" - } else { - Write-Error "Visual Studio >= 10.0 not found" -Category InvalidArgument;return - } -} elseif ([int]::TryParse($VisualStudioVersion, [ref]$refnum)) { - $VisualStudioVersion="${refnum}.0" -} -# Check VisualStudioVersion and prepare for ToolsVersion -switch ($VisualStudioVersion) { - "10.0" { $tv = "4.0" } - "11.0" { $tv = "4.0" } - "12.0" { $tv = "12.0" } - default { Write-Error "Selected Visual Stuidio is Version ${VisualStudioVersion}. Please use VC10 or later" -Category InvalidArgument; return } -} -# -# Determine ToolsVersion -# -if ("$MSToolsVersion" -eq "") { - $MSToolsVersion=$env:ToolsVersion -} -if ("$MSToolsVersion" -eq "") { - $MSToolsVersion = $tv -} elseif ([int]::TryParse($MSToolsVersion, [ref]$refnum)) { - $MSToolsVersion="${refnum}.0" -} -# -# Determine MSBuild executable -# -Write-Debug "ToolsVersion=$MSToolsVersion VisualStudioVersion=$VisualStudioVersion" -try { - $msbver = invoke-expression "msbuild /ver /nologo" - if ("$msbver" -match "^(\d+)\.(\d+)") { - $major1 = [int] $matches[1] - $minor1 = [int] $matches[2] - if ($MSToolsVersion -match "^(\d+)\.(\d+)") { - $bavail = $false - $major2 = [int] $matches[1] - $minor2 = [int] $matches[2] - if ($major1 -gt $major2) { - Write-Debug "$major1 > $major2" - $bavail = $true - } - elseif ($major1 -eq $major2 -And $minor1 -ge $minor2) { - Write-Debug "($major1, $minor1) >= ($major2, $minor2)" - $bavail = $true - } - if ($bavail) { - $msbuildexe = "MSBuild" - } - } - } -} catch {} -if ("$msbuildexe" -eq "") { - $msbindir="" - $regKey="HKLM:\Software\Wow6432Node\Microsoft\MSBuild\ToolsVersions\${MSToolsVersion}" - if (Test-Path -path $regkey) { - $msbitem=Get-ItemProperty $regKey - if ($msbitem -ne $null) { - $msbindir=$msbitem.MSBuildToolsPath - } - } else { - $regKey="HKLM:\Software\Microsoft\MSBuild\ToolsVersions\${MSToolsVersion}" - if (Test-Path -path $regkey) { - $msbitem=Get-ItemProperty $regKey - if ($msbitem -ne $null) { - $msbindir=$msbitem.MSBuildToolsPath - } - } else { - Write-Error "MSBuild ToolsVersion $MSToolsVersion not Found" -Category NotInstalled; return - } - } - $msbuildexe = "$msbindir\msbuild" -} -# -# Determine PlatformToolset -# -if ("$Toolset" -eq "") { - $Toolset=$configInfo.Configuration.toolset -} -if ("$Toolset" -eq "") { - $Toolset=$env:PlatformToolset -} -if ("$Toolset" -eq "") { - switch ($VisualStudioVersion) { - "10.0" { - if (Test-path "HKLM:\Software\Microsoft\Microsoft SDKs\Windows\v7.1") { - $Toolset=$WSDK71Set - } else { - $Toolset="v100" - } - } - "11.0" {$Toolset="v110_xp"} - "12.0" {$Toolset="v120_xp"} - } -} -# avoid a bug of Windows7.1SDK PlatformToolset -if ($Toolset -eq $WSDK71Set) { - $env:TARGET_CPU="" -} - -$recordResult = $true -try { -# -# build 32bit dlls -# - if ($Platform -ieq "Win32" -or $Platform -ieq "both") { - buildPlatform $configInfo.Configuration.x86 "Win32" - if ($LastExitCode -ne 0) { - $recordResult = $false - } - } -# -# build 64bit dlls -# - if ($Platform -ieq "x64" -or $Platform -ieq "both") { - buildPlatform $configInfo.Configuration.x64 "x64" - if ($LastExitCode -ne 0) { - $recordResult = $false - } - } -# -# Write the result to configuration xml -# - if ($recordResult) { - $configInfo.Configuration.BuildResult.Date=[string](Get-Date) - $configInfo.Configuration.BuildResult.VisualStudioVersion=$VisualStudioVersion - $configInfo.Configuration.BuildResult.PlatformToolset=$Toolset - $configInfo.Configuration.BuildResult.ToolsVersion=$MSToolsVersion - $configInfo.Configuration.BuildResult.Platform=$Platform - SaveConfiguration $configInfo - } -} catch { - $error[0] | Format-List -Force -} - -Write-Host "ToolsVersion=$MSToolsVersion VisualStudioVersion=$VisualStudioVersion PlatformToolset=$Toolset" -$env:PATH = $path_save -popd diff --git a/winbuild/configuration-defaults.props b/winbuild/configuration-defaults.props new file mode 100644 index 0000000..7edd4a6 --- /dev/null +++ b/winbuild/configuration-defaults.props @@ -0,0 +1,62 @@ + + + + + + + true + + + true + + true + + + false + + + false + + + + + + + + C:\Program Files (x86)\PostgreSQL\9.3\include + C:\Program Files (x86)\PostgreSQL\9.3\lib + + C:\Program Files (x86)\PostgreSQL\9.3\bin + + + C:\OpenSSL-Win32\include + C:\OpenSSL-Win32\lib + + + + + + + C:\Program Files\PostgreSQL\9.3\include + C:\Program Files\PostgreSQL\9.3\lib + C:\Program Files\PostgreSQL\9.3\bin + C:\OpenSSL-Win64\include + C:\OpenSSL-Win64\lib + + + + + + \ No newline at end of file diff --git a/winbuild/configuration.ps1 b/winbuild/configuration.ps1 deleted file mode 100755 index 318a147..0000000 --- a/winbuild/configuration.ps1 +++ /dev/null @@ -1,96 +0,0 @@ -Param( -[string]$configPath -) -function InitConfiguration($savePath = $configurationXmlPath) -{ - $configInfo = [xml](Get-Content "$configurationTemplatePath") - if ($env:PROCESSOR_ARCHITECTURE -eq "x86") - { - $x64info = $configInfo.Configuration.x64 - $x64info.libpq.include = "" - $x64info.libpq.lib = "" - $x64info.libpq.bin = "" - } - $configInfo.save("$savePath") - - return $configInfo -} - -function global:GetConfiguration($loadPath = $configurationXmlPath) -{ - $configInfo = [xml] (Get-Content "$loadPath") - set-variable -name xmlFormatVersion -value "0.3" -option constant - if ($configInfo.Configuration.formatVersion -ne $xmlFormatVersion) - { - $xmlDoc2 = [xml](Get-Content "$configurationTemplatePath") - $root2 = $XmlDoc2.get_DocumentElement() - $root1 = $configInfo.get_DocumentElement() - unifyNodes $root1 $root2 - - $root1.formatVersion = $xmlFormatVersion - $configInfo.save("$loadPath") - } - - return $configInfo -} - -function global:SaveConfiguration($configInfo, $savePath = $configurationXmlPath) -{ - $configInfo.save("$savePath") -} - -function global:unifyNodes($node1, $node2) -{ - $attributes2 = $node2.get_Attributes() - if ($attributes2.Count -gt 0) - { - $attributes1 = $node1.get_Attributes() - foreach ($attrib in $attributes2) - { - $attribname = $attrib.name - if (($attributes1.Count -eq 0) -or ($attributes1.GetNamedItem($attribname) -eq $null)) - { - Write-Debug " Adding attribute=$attribname" - $addattr = $node1.OwnerDocument.ImportNode($attrib, $true) - $added = $attributes1.Append($addattr) - } - } - } - if (!$node2.get_HasChildNodes()) { - return; - } - foreach ($child2 in $node2.get_ChildNodes()) - { - $nodename = $child2.get_Name() - if ($nodename -eq "#text"){ - continue - } - $matchnode = $node1.SelectSingleNode($nodename) - if ($matchnode -eq $null) - { - Write-Debug "Adding node=$nodename" - $addnode = $node1.OwnerDocument.ImportNode($child2, $true) - $added = $node1.AppendChild($addnode) - continue - } - unifyNodes $matchnode $child2 - } -} - -Write-Debug "configPath=$configPath" -$global:LIBPQ_VERSION="9.3" -$scriptPath = [System.IO.Path]::GetDirectoryName($myInvocation.MyCommand.Definition) -$global:configurationTemplatePath = "$scriptPath\configuration_template.xml" -$global:configurationXmlPath = $configPath -if ($configurationXmlPath -eq "") { - $global:configurationXmlPath = "$scriptPath\configuration.xml" -} -if (!(Test-Path -path $configurationXmlPath)) -{ - InitConfiguration -} -else -{ - GetConfiguration -} -Return diff --git a/winbuild/configuration_template.xml b/winbuild/configuration_template.xml deleted file mode 100755 index 2d53a89..0000000 --- a/winbuild/configuration_template.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - default - default - default - - - - - - - - - - - - - - - - default - default - default - - - - - - - - - - - - - - - - - - - - - diff --git a/winbuild/editConfiguration.ps1 b/winbuild/editConfiguration.ps1 deleted file mode 100755 index 4cbc2ab..0000000 --- a/winbuild/editConfiguration.ps1 +++ /dev/null @@ -1,306 +0,0 @@ -# Powershell needs to run in STA mode to display WPF windows -Param( -[string]$configPath -) -if ([Threading.Thread]::CurrentThread.GetApartmentState() -eq "MTA"){ - PowerShell -Sta -File $MyInvocation.MyCommand.Path - return -} - -<# - Edit the configuration xnl file with WPF -#> - -Add-Type -AssemblyName presentationframework - -[xml]$XAML = @' - - - - -