@@ -112,13 +112,13 @@ SET OPENSSL_DIRECTORY=openssl
112
112
SET ZLIB_DIRECTORY = zlib
113
113
SET MPIR_REPOSITORY_URL = https://github.com/wbhart/mpir.git
114
114
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
118
118
SET PHP_REPOSITORY_URL = https://github.com/php/php-src.git
119
119
SET PHP_DIRECTORY = php
120
120
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
122
122
SET " SUPPORTED_PHP_VERSIONS = 5_6 7_0"
123
123
SET " SUPPORTED_PHP_DISPLAY_VERSIONS = 5.6 7.0"
124
124
SET " SUPPORTED_PHP_VISUAL_STUDIO_VERSIONS = 2012 2015"
@@ -643,31 +643,43 @@ IF !ENABLE_BUILD_PACKAGES! EQU !FALSE! (
643
643
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! "
644
644
IF !ERRORLEVEL! NEQ 0 EXIT /B !ERRORLEVEL!
645
645
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.
646
662
)
647
663
648
664
REM Configure PHP instance for use with the driver (or keep just driver)
649
665
IF !ENABLE_TEST_CONFIGURATION! EQU !TRUE! (
650
666
SET " PATH = !ABSOLUTE_DRIVER_LIBRARY_DIRECTORY! ;!PATH! "
651
667
PUSHD " !ABSOLUTE_BATCH_DIRECTORY! \.." > NUL
652
- IF EXIST bin RMDIR /S /Q bin
653
668
IF EXIST vendor RMDIR /S /Q vendor
654
669
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 ... "
657
671
php -r " readfile('https://getcomposer.org/installer');" | php >> " !LOG_DRIVER_BUILD! " 2 >& 1
658
672
IF NOT !ERRORLEVEL! EQU 0 (
659
673
ECHO FAILED!
660
674
ECHO See !LOG_DRIVER_BUILD! for more details
661
675
EXIT /B !EXIT_CODE_CONFIGURATION_DRIVER_FAILED!
662
676
)
663
- ECHO Installing driver dependencies >> " !LOG_DRIVER_BUILD! "
664
677
php composer.phar install >> " !LOG_DRIVER_BUILD! " 2 >& 1
665
678
IF NOT !ERRORLEVEL! EQU 0 (
666
679
ECHO FAILED!
667
680
ECHO See !LOG_DRIVER_BUILD! for more details
668
681
EXIT /B !EXIT_CODE_CONFIGURATION_DRIVER_FAILED!
669
682
)
670
- ECHO done.
671
683
IF EXIST bin\behat.bat (
672
684
RENAME bin\behat.bat behat.bak
673
685
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! (
680
692
TYPE bin\phpunit.bak >> bin\phpunit.bat
681
693
ERASE bin\phpunit.bak
682
694
)
695
+ ECHO done.
683
696
POPD
684
697
)
685
698
@@ -889,9 +902,9 @@ REM Display the help message and exit with error code
889
902
ECHO !ARGUMENT_BUILD_TYPE_RELEASE! Enable release build ^ (default^ )
890
903
ECHO !ARGUMENT_DISABLE_CLEAN_BUILD! Disable clean build
891
904
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^ ) ^ (*^ )
893
906
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
895
908
IF !SYSTEM_ARCHITECTURE! EQU !ARCHITECTURE_32BIT! (
896
909
ECHO !ARGUMENT_TARGET_ARCHITECTURE_32BIT! Target 32-bit build ^ (default^ )
897
910
ECHO !ARGUMENT_TARGET_ARCHITECTURE_64BIT! Target 64-bit build
@@ -1069,7 +1082,7 @@ REM @param log-filename Absolute path and filename for log output
1069
1082
SET " CPP_DRIVER_INSTALLATION_DIRECTORY = %~1 "
1070
1083
SHIFT
1071
1084
SET " CPP_DRIVER_BUILD_TYPE = %~1 "
1072
- SHIFT
1085
+ SHIFT
1073
1086
SET " CPP_DRIVER_TARGET_ARCHITECTURE = %~1 "
1074
1087
SHIFT
1075
1088
SET " CPP_DRIVER_USE_BOOST_ATOMIC = %~1 "
@@ -1082,7 +1095,7 @@ REM @param log-filename Absolute path and filename for log output
1082
1095
1083
1096
REM Build the cpp-driver
1084
1097
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"
1086
1099
IF " !CPP_DRIVER_BUILD_TYPE! " == " !BUILD_TYPE_DEBUG! " (
1087
1100
SET " CPP_DRIVER_BUILD_COMMAND_LINE = !CPP_DRIVER_BUILD_COMMAND_LINE! --DEBUG"
1088
1101
) ELSE (
@@ -1132,7 +1145,7 @@ REM @param log-filename Absolute path and filename for log output
1132
1145
SET " MPIR_INSTALLATION_DIRECTORY = %~1 "
1133
1146
SHIFT
1134
1147
SET " MPIR_BUILD_TYPE = %~1 "
1135
- SHIFT
1148
+ SHIFT
1136
1149
SET " MPIR_TARGET_ARCHITECTURE = %~1 "
1137
1150
SHIFT
1138
1151
SET " MPIR_VISUAL_STUDIO_VERSION = %~1 "
@@ -1147,8 +1160,8 @@ REM @param log-filename Absolute path and filename for log output
1147
1160
ECHO | SET /P = " Building MPIR ... "
1148
1161
SET MPIR_PLATFORM_ARCHITECTURE = Win32
1149
1162
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
1152
1165
IF NOT !ERRORLEVEL! EQU 0 (
1153
1166
ECHO FAILED!
1154
1167
ECHO See !MPIR_LOG_FILENAME! for more details
@@ -1446,7 +1459,7 @@ REM @param log-filename Absolute path and filename for log output
1446
1459
ECHO done.
1447
1460
)
1448
1461
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"
1450
1463
IF " !PHP_DRIVER_ENABLE_THREAD_SAFETY! " == " !TRUE! " (
1451
1464
SET " DRIVER_CONFIGURE_COMMAND_LINE = !DRIVER_CONFIGURE_COMMAND_LINE! --enable-zts"
1452
1465
) ELSE (
0 commit comments