Fix issue 955 - errors building sqlsrv alone (#956)
This commit is contained in:
parent
df8d7da328
commit
15f61bd0b4
|
@ -261,12 +261,14 @@ jobs:
|
||||||
$env:VERSION=type sha256sum.txt | where { $_ -match "php-($(phpVersion)\.\d+)-src" } | foreach { $matches[1] }
|
$env:VERSION=type sha256sum.txt | where { $_ -match "php-($(phpVersion)\.\d+)-src" } | foreach { $matches[1] }
|
||||||
Write-Host "Latest PHP $(phpVersion) is ${env:VERSION}"
|
Write-Host "Latest PHP $(phpVersion) is ${env:VERSION}"
|
||||||
cd $(Build.SourcesDirectory)/buildscripts/
|
cd $(Build.SourcesDirectory)/buildscripts/
|
||||||
python builddrivers.py --PHPVER=${env:VERSION} --ARCH=x64 --THREAD=nts --SOURCE=$(Build.SourcesDirectory)/source --TESTING --NO_RENAME
|
python builddrivers.py --PHPVER=${env:VERSION} --DRIVER=sqlsrv --ARCH=x64 --THREAD=nts --SOURCE=$(Build.SourcesDirectory)/source --TESTING --NO_RENAME
|
||||||
|
dir *sqlsrv*.dll
|
||||||
|
python builddrivers.py --PHPVER=${env:VERSION} --DRIVER=pdo_sqlsrv --ARCH=x64 --THREAD=nts --SOURCE=$(Build.SourcesDirectory)/source --TESTING --NO_RENAME
|
||||||
cp php-sdk\phpdev\vc15\x64\php-${env:VERSION}-src\run-tests.php $(Build.SourcesDirectory)\test\functional\sqlsrv
|
cp php-sdk\phpdev\vc15\x64\php-${env:VERSION}-src\run-tests.php $(Build.SourcesDirectory)\test\functional\sqlsrv
|
||||||
cp php-sdk\phpdev\vc15\x64\php-${env:VERSION}-src\run-tests.php $(Build.SourcesDirectory)\test\functional\pdo_sqlsrv
|
cp php-sdk\phpdev\vc15\x64\php-${env:VERSION}-src\run-tests.php $(Build.SourcesDirectory)\test\functional\pdo_sqlsrv
|
||||||
dir *sqlsrv*.dll
|
dir *sqlsrv*.dll
|
||||||
cp *sqlsrv*.dll C:\tools\php\ext\
|
cp *sqlsrv*.dll C:\tools\php\ext\
|
||||||
displayName: 'Build drivers for the latest version of PHP $(phpVersion)'
|
displayName: 'Build drivers (separately) for the latest version of PHP $(phpVersion)'
|
||||||
|
|
||||||
- script: |
|
- script: |
|
||||||
echo extension=php_sqlsrv.dll >> C:\tools\php\php.ini
|
echo extension=php_sqlsrv.dll >> C:\tools\php\php.ini
|
||||||
|
|
|
@ -27,7 +27,7 @@ if( PHP_SQLSRV != "no" ) {
|
||||||
if (CHECK_LIB("odbc32.lib", "sqlsrv") && CHECK_LIB("odbccp32.lib", "sqlsrv") &&
|
if (CHECK_LIB("odbc32.lib", "sqlsrv") && CHECK_LIB("odbccp32.lib", "sqlsrv") &&
|
||||||
CHECK_LIB("version.lib", "sqlsrv") && CHECK_LIB("psapi.lib", "sqlsrv")&&
|
CHECK_LIB("version.lib", "sqlsrv") && CHECK_LIB("psapi.lib", "sqlsrv")&&
|
||||||
CHECK_HEADER_ADD_INCLUDE( "core_sqlsrv.h", "CFLAGS_SQLSRV", configure_module_dirname + "\\shared")) {
|
CHECK_HEADER_ADD_INCLUDE( "core_sqlsrv.h", "CFLAGS_SQLSRV", configure_module_dirname + "\\shared")) {
|
||||||
if (PHP_PDO_SQLSRV == "no" || PHP_SQLSRV_SHARED) {
|
if (PHP_SQLSRV_SHARED || PHP_PDO_SQLSRV == "no") {
|
||||||
ADD_SOURCES( configure_module_dirname + "\\shared", shared_src_class, "sqlsrv" );
|
ADD_SOURCES( configure_module_dirname + "\\shared", shared_src_class, "sqlsrv" );
|
||||||
}
|
}
|
||||||
CHECK_HEADER_ADD_INCLUDE("sql.h", "CFLAGS_SQLSRV_ODBC");
|
CHECK_HEADER_ADD_INCLUDE("sql.h", "CFLAGS_SQLSRV_ODBC");
|
||||||
|
|
Loading…
Reference in a new issue