Skip to content

Commit 99edb31

Browse files
authored
PHP-158: Remove static linking of OpenSSL (Windows)
* Updated version of PHP 7.0.x to the latest release (v7.0.19) * Updated version of MPIR to latest release (v3.0.0)
1 parent 0143bff commit 99edb31

File tree

3 files changed

+34
-21
lines changed

3 files changed

+34
-21
lines changed

appveyor.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ environment:
4545
CONFIGURATION_COMPLETE: False
4646
matrix:
4747
- PHP: 7.0
48-
PHP_VERSION: 7.0.16
48+
PHP_VERSION: 7.0.19
4949
THREAD_SAFE: True
5050
CMAKE_GENERATOR: Visual Studio 14 2015
5151
VISUAL_STUDIO_INTERNAL_VERSION: 140
5252
VISUAL_STUDIO_SHORTHAND_VERSION: 14
5353
- PHP: 7.0
54-
PHP_VERSION: 7.0.16
54+
PHP_VERSION: 7.0.19
5555
THREAD_SAFE: False
5656
CMAKE_GENERATOR: Visual Studio 14 2015
5757
VISUAL_STUDIO_INTERNAL_VERSION: 140
@@ -235,7 +235,7 @@ before_build:
235235
Push-Location "$($env:PHP_SOURCE_DIR)"
236236
# Configure PHP and the PHP driver extension
237237
- cmd: buildconf.bat --force --add-modules-dir="%APPVEYOR_BUILD_FOLDER%"
238-
- cmd: configure.bat --with-prefix="%APPVEYOR_BUILD_FOLDER%\%CONFIGURATION%" --disable-all --enable-cli --enable-com-dotnet --enable-session --enable-zlib --with-gmp --with-openssl --enable-cassandra=shared --enable-phar --enable-json --enable-filter --enable-hash --enable-ctype --enable-mbstring --enable-mbregex --enable-mbregex-backtrack --enable-tokenizer --enable-zip --with-libxml --with-dom --with-iconv %ENABLE_DISABLE_THREAD_SAFETY% %ENABLE_DEBUG%
238+
- cmd: configure.bat --with-prefix="%APPVEYOR_BUILD_FOLDER%\%CONFIGURATION%" --disable-all --enable-cli --enable-com-dotnet --enable-session --enable-zlib --with-gmp --with-openssl=static --enable-cassandra=shared --enable-phar --enable-json --enable-filter --enable-hash --enable-ctype --enable-mbstring --enable-mbregex --enable-mbregex-backtrack --enable-tokenizer --enable-zip --with-libxml --with-dom --with-iconv %ENABLE_DISABLE_THREAD_SAFETY% %ENABLE_DEBUG%
239239
- ps: $env:CONFIGURATION_COMPLETE=$TRUE
240240

241241
build_script:

ext/vc_build.bat

Lines changed: 30 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,13 @@ SET OPENSSL_DIRECTORY=openssl
112112
SET ZLIB_DIRECTORY=zlib
113113
SET MPIR_REPOSITORY_URL=https://github.com/wbhart/mpir.git
114114
SET MPIR_DIRECTORY=mpir
115-
REM MPIR updated versions but did not create a release or tag on GitHub for 2.7.2
116-
SET MPIR_BRANCH_TAG_VERSION=2.7.2
117-
SET MPIR_SHA_CHANGESET=67d98ac
115+
REM MPIR updated versions but did not create a release or tag on GitHub for 3.0.0
116+
SET MPIR_BRANCH_TAG_VERSION=3.0.0
117+
SET MPIR_SHA_CHANGESET=a6ad489
118118
SET PHP_REPOSITORY_URL=https://github.com/php/php-src.git
119119
SET PHP_DIRECTORY=php
120120
SET PHP_5_6_BRANCH_TAG_VERSION=php-5.6.30
121-
SET PHP_7_0_BRANCH_TAG_VERSION=php-7.0.16
121+
SET PHP_7_0_BRANCH_TAG_VERSION=php-7.0.19
122122
SET "SUPPORTED_PHP_VERSIONS=5_6 7_0"
123123
SET "SUPPORTED_PHP_DISPLAY_VERSIONS=5.6 7.0"
124124
SET "SUPPORTED_PHP_VISUAL_STUDIO_VERSIONS=2012 2015"
@@ -643,31 +643,43 @@ IF !ENABLE_BUILD_PACKAGES! EQU !FALSE! (
643643
CALL :BUILDDRIVER "!ABSOLUTE_DEPENDENCIES_PHP_SOURCE_DIRECTORY!" "!ABSOLUTE_BATCH_DIRECTORY!" "!ABSOLUTE_DRIVER_LIBRARY_DIRECTORY!" !ENABLE_TEST_CONFIGURATION! !ENABLE_THREAD_SAFETY! !BUILD_TYPE! "!ABSOLUTE_DEPENDENCIES_LIBICONV_LIBRARIES_DIRECTORY!" "!ABSOLUTE_DEPENDENCIES_LIBXML2_LIBRARIES_DIRECTORY!" "!ABSOLUTE_DEPENDENCIES_CPP_DRIVER_LIBRARIES_DIRECTORY!" "!ABSOLUTE_DEPENDENCIES_LIBUV_LIBRARIES_DIRECTORY!" "!ABSOLUTE_DEPENDENCIES_OPENSSL_LIBRARIES_DIRECTORY!" "!ABSOLUTE_DEPENDENCIES_ZLIB_LIBRARIES_DIRECTORY!" "!ABSOLUTE_DEPENDENCIES_MPIR_LIBRARIES_DIRECTORY!" "!LOG_DRIVER_BUILD!"
644644
IF !ERRORLEVEL! NEQ 0 EXIT /B !ERRORLEVEL!
645645
ECHO extension=php_cassandra.dll >> "!ABSOLUTE_DRIVER_LIBRARY_DIRECTORY!\php.ini"
646+
647+
REM Configure PHP for use with OpenSSL runtime libraries
648+
ECHO | SET /P="Copying runtime libraries ... "
649+
XCOPY /Y /E "!ABSOLUTE_DEPENDENCIES_OPENSSL_LIBRARIES_DIRECTORY!\!LIBRARY_RUNTIME_DIRECTORY!\*.dll" "!ABSOLUTE_DRIVER_LIBRARY_DIRECTORY!" >> "!PHP_DRIVER_LOG_FILENAME!" 2>&1
650+
IF NOT !ERRORLEVEL! EQU 0 (
651+
ECHO FAILED!
652+
ECHO See !PHP_DRIVER_LOG_FILENAME! for more details
653+
EXIT /B !EXIT_CODE_BUILD_DRIVER_FAILED!
654+
)
655+
PUSHD "!ABSOLUTE_BATCH_DIRECTORY!\.." > NUL
656+
IF EXIST bin RMDIR /S /Q bin
657+
MKDIR bin
658+
ECHO @ECHO %%PATH%% ^| FIND /C /I ^"!ABSOLUTE_DRIVER_LIBRARY_DIRECTORY!^"^>NUL ^|^| @SET ^"PATH=!ABSOLUTE_DRIVER_LIBRARY_DIRECTORY!;%%PATH%%^" > bin\php.bat
659+
ECHO "!ABSOLUTE_DRIVER_LIBRARY_DIRECTORY!\php.exe" %%* >> bin\php.bat
660+
POPD
661+
ECHO done.
646662
)
647663

648664
REM Configure PHP instance for use with the driver (or keep just driver)
649665
IF !ENABLE_TEST_CONFIGURATION! EQU !TRUE! (
650666
SET "PATH=!ABSOLUTE_DRIVER_LIBRARY_DIRECTORY!;!PATH!"
651667
PUSHD "!ABSOLUTE_BATCH_DIRECTORY!\.." > NUL
652-
IF EXIST bin RMDIR /S /Q bin
653668
IF EXIST vendor RMDIR /S /Q vendor
654669
IF EXIST composer.phar ERASE composer.phar
655-
ECHO | SET /P="Installing composer and driver dependencies ... "
656-
ECHO Installing composer >> "!LOG_DRIVER_BUILD!"
670+
ECHO | SET /P="Installing composer ... "
657671
php -r "readfile('https://getcomposer.org/installer');" | php >> "!LOG_DRIVER_BUILD!" 2>&1
658672
IF NOT !ERRORLEVEL! EQU 0 (
659673
ECHO FAILED!
660674
ECHO See !LOG_DRIVER_BUILD! for more details
661675
EXIT /B !EXIT_CODE_CONFIGURATION_DRIVER_FAILED!
662676
)
663-
ECHO Installing driver dependencies >> "!LOG_DRIVER_BUILD!"
664677
php composer.phar install >> "!LOG_DRIVER_BUILD!" 2>&1
665678
IF NOT !ERRORLEVEL! EQU 0 (
666679
ECHO FAILED!
667680
ECHO See !LOG_DRIVER_BUILD! for more details
668681
EXIT /B !EXIT_CODE_CONFIGURATION_DRIVER_FAILED!
669682
)
670-
ECHO done.
671683
IF EXIST bin\behat.bat (
672684
RENAME bin\behat.bat behat.bak
673685
ECHO @ECHO %%PATH%% ^| FIND /C /I ^"!ABSOLUTE_DRIVER_LIBRARY_DIRECTORY!^"^>NUL ^|^| @SET ^"PATH=!ABSOLUTE_DRIVER_LIBRARY_DIRECTORY!;%%PATH%%^" > bin\behat.bat
@@ -680,6 +692,7 @@ IF !ENABLE_BUILD_PACKAGES! EQU !FALSE! (
680692
TYPE bin\phpunit.bak >> bin\phpunit.bat
681693
ERASE bin\phpunit.bak
682694
)
695+
ECHO done.
683696
POPD
684697
)
685698

@@ -889,9 +902,9 @@ REM Display the help message and exit with error code
889902
ECHO !ARGUMENT_BUILD_TYPE_RELEASE! Enable release build ^(default^)
890903
ECHO !ARGUMENT_DISABLE_CLEAN_BUILD! Disable clean build
891904
ECHO !ARGUMENT_DISABLE_THREAD_SAFETY! Disable thread safety
892-
ECHO !ARGUMENT_ENABLE_BUILD_PACKAGES! [version] Enable package generation ^(5.6, 7.0^) ^(*^)
905+
ECHO !ARGUMENT_ENABLE_BUILD_PACKAGES! [version] Enable package generation ^(5.6 and 7.0^) ^(*^)
893906
ECHO !ARGUMENT_ENABLE_TEST_CONFIGURATION! Enable test configuration build
894-
ECHO !ARGUMENT_PHP_VERSION! [version] PHP version 5.6, 7.0
907+
ECHO !ARGUMENT_PHP_VERSION! [version] PHP version 5.6 and 7.0
895908
IF !SYSTEM_ARCHITECTURE! EQU !ARCHITECTURE_32BIT! (
896909
ECHO !ARGUMENT_TARGET_ARCHITECTURE_32BIT! Target 32-bit build ^(default^)
897910
ECHO !ARGUMENT_TARGET_ARCHITECTURE_64BIT! Target 64-bit build
@@ -1069,7 +1082,7 @@ REM @param log-filename Absolute path and filename for log output
10691082
SET "CPP_DRIVER_INSTALLATION_DIRECTORY=%~1"
10701083
SHIFT
10711084
SET "CPP_DRIVER_BUILD_TYPE=%~1"
1072-
SHIFT
1085+
SHIFT
10731086
SET "CPP_DRIVER_TARGET_ARCHITECTURE=%~1"
10741087
SHIFT
10751088
SET "CPP_DRIVER_USE_BOOST_ATOMIC=%~1"
@@ -1082,7 +1095,7 @@ REM @param log-filename Absolute path and filename for log output
10821095

10831096
REM Build the cpp-driver
10841097
PUSHD "!CPP_DRIVER_SOURCE_DIRECTORY!" > NUL
1085-
SET "CPP_DRIVER_BUILD_COMMAND_LINE=--TARGET-COMPILER !CPP_DRIVER_TARGET_COMPILER! --INSTALL-DIR !CPP_DRIVER_INSTALLATION_DIRECTORY! --STATIC --ENABLE-ZLIB"
1098+
SET "CPP_DRIVER_BUILD_COMMAND_LINE=--TARGET-COMPILER !CPP_DRIVER_TARGET_COMPILER! --INSTALL-DIR !CPP_DRIVER_INSTALLATION_DIRECTORY! --STATIC --ENABLE-SHARED-OPENSSL --ENABLE-ZLIB"
10861099
IF "!CPP_DRIVER_BUILD_TYPE!" == "!BUILD_TYPE_DEBUG!" (
10871100
SET "CPP_DRIVER_BUILD_COMMAND_LINE=!CPP_DRIVER_BUILD_COMMAND_LINE! --DEBUG"
10881101
) ELSE (
@@ -1132,7 +1145,7 @@ REM @param log-filename Absolute path and filename for log output
11321145
SET "MPIR_INSTALLATION_DIRECTORY=%~1"
11331146
SHIFT
11341147
SET "MPIR_BUILD_TYPE=%~1"
1135-
SHIFT
1148+
SHIFT
11361149
SET "MPIR_TARGET_ARCHITECTURE=%~1"
11371150
SHIFT
11381151
SET "MPIR_VISUAL_STUDIO_VERSION=%~1"
@@ -1147,8 +1160,8 @@ REM @param log-filename Absolute path and filename for log output
11471160
ECHO | SET /P="Building MPIR ... "
11481161
SET MPIR_PLATFORM_ARCHITECTURE=Win32
11491162
IF !MPIR_TARGET_ARCHITECTURE! EQU !ARCHITECTURE_64BIT! SET MPIR_PLATFORM_ARCHITECTURE=x64
1150-
ECHO !MSBUILD! !MPIR_VISUAL_STUDIO_SOLUTION_DIRECTORY!\mpir.sln /T:lib_mpir_gc /P:Configuration=!MPIR_BUILD_TYPE! /P:Platform=!MPIR_PLATFORM_ARCHITECTURE! /CLP:NoSummary;NoItemAndPropertyList;Verbosity=minimal /NOLOGO >> "!MPIR_LOG_FILENAME!" 2>&1
1151-
!MSBUILD! !MPIR_VISUAL_STUDIO_SOLUTION_DIRECTORY!\mpir.sln /T:lib_mpir_gc /P:Configuration=!MPIR_BUILD_TYPE! /P:Platform=!MPIR_PLATFORM_ARCHITECTURE! /CLP:NoSummary;NoItemAndPropertyList;Verbosity=minimal /NOLOGO >> "!MPIR_LOG_FILENAME!" 2>&1
1163+
ECHO !MSBUILD! /P:Configuration=!MPIR_BUILD_TYPE! /P:Platform=!MPIR_PLATFORM_ARCHITECTURE! /CLP:NoSummary;NoItemAndPropertyList;Verbosity=minimal /NOLOGO !MPIR_VISUAL_STUDIO_SOLUTION_DIRECTORY!\lib_mpir_gc\lib_mpir_gc.vcxproj >> "!MPIR_LOG_FILENAME!" 2>&1
1164+
!MSBUILD! /P:Configuration=!MPIR_BUILD_TYPE! /P:Platform=!MPIR_PLATFORM_ARCHITECTURE! /CLP:NoSummary;NoItemAndPropertyList;Verbosity=minimal /NOLOGO !MPIR_VISUAL_STUDIO_SOLUTION_DIRECTORY!\lib_mpir_gc\lib_mpir_gc.vcxproj >> "!MPIR_LOG_FILENAME!" 2>&1
11521165
IF NOT !ERRORLEVEL! EQU 0 (
11531166
ECHO FAILED!
11541167
ECHO See !MPIR_LOG_FILENAME! for more details
@@ -1446,7 +1459,7 @@ REM @param log-filename Absolute path and filename for log output
14461459
ECHO done.
14471460
)
14481461
ECHO | SET /P="Configuring PHP and enable driver extension ... "
1449-
SET "DRIVER_CONFIGURE_COMMAND_LINE=--with-prefix=^"!PHP_DRIVER_INSTALLATION_DIRECTORY!^" --disable-all --enable-cli --enable-com-dotnet --enable-session --enable-zlib --with-gmp --with-openssl --enable-cassandra=shared"
1462+
SET "DRIVER_CONFIGURE_COMMAND_LINE=--with-prefix=^"!PHP_DRIVER_INSTALLATION_DIRECTORY!^" --disable-all --enable-cli --enable-com-dotnet --enable-session --enable-zlib --with-gmp --with-openssl=static --enable-cassandra=shared"
14501463
IF "!PHP_DRIVER_ENABLE_THREAD_SAFETY!" == "!TRUE!" (
14511464
SET "DRIVER_CONFIGURE_COMMAND_LINE=!DRIVER_CONFIGURE_COMMAND_LINE! --enable-zts"
14521465
) ELSE (

lib/cpp-driver

0 commit comments

Comments
 (0)