[ci skip] win: Fix package building and update PHP versions

datastax · Jul 19, 2016 · a4ae222 · a4ae222
1 parent 84035aa
commit a4ae222
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/ext/vc_build.bat b/ext/vc_build.bat
@@ -117,9 +117,9 @@ SET MPIR_BRANCH_TAG_VERSION=2.7.2
 SET MPIR_SHA_CHANGESET=67d98ac
 SET PHP_REPOSITORY_URL=https://github.com/php/php-src.git
 SET PHP_DIRECTORY=php
-SET PHP_5_5_BRANCH_TAG_VERSION=php-5.5.36
-SET PHP_5_6_BRANCH_TAG_VERSION=php-5.6.22
-SET PHP_7_0_BRANCH_TAG_VERSION=php-7.0.7
+SET PHP_5_5_BRANCH_TAG_VERSION=php-5.5.37
+SET PHP_5_6_BRANCH_TAG_VERSION=php-5.6.23
+SET PHP_7_0_BRANCH_TAG_VERSION=php-7.0.8
 SET "SUPPORTED_PHP_VERSIONS=5_5 5_6 7_0"
 SET "SUPPORTED_PHP_DISPLAY_VERSIONS=5.5 5.6 7.0"
 SET "SUPPORTED_PHP_VISUAL_STUDIO_VERSIONS=2012 2012 2015"
@@ -785,8 +785,10 @@ IF !ENABLE_BUILD_PACKAGES! EQU !FALSE! (
         CALL :BUILDDRIVER "!ABSOLUTE_DEPENDENCIES_PHP_SOURCE_DIRECTORY!" "!ABSOLUTE_BATCH_DIRECTORY!" "!ABSOLUTE_DRIVER_LIBRARY_DIRECTORY!" !FALSE! !TRUE! !BUILD_TYPE_RELEASE! "" "" "!ABSOLUTE_DRIVER_DEPENDENCY_CPP_DRIVER_PACKAGE_INSTALLATION_DIRECTORY!" "!ABSOLUTE_CPP_DRIVER_DEPENDENCY_LIBUV_PACKAGE_INSTALLATION_DIRECTORY!" "!ABSOLUTE_CPP_DRIVER_DEPENDENCY_OPENSSL_PACKAGE_INSTALLATION_DIRECTORY!" "!ABSOLUTE_CPP_DRIVER_DEPENDENCY_ZLIB_PACKAGE_INSTALLATION_DIRECTORY!" "!ABSOLUTE_DRIVER_DEPENDENCY_MPIR_PACKAGE_INSTALLATION_DIRECTORY!" "!LOG_DRIVER_BUILD!"
         IF !ERRORLEVEL! NEQ 0 EXIT /B !ERRORLEVEL!
         MKDIR "!ABSOLUTE_PACKAGES_DIRECTORY!\!DRIVER_PACKAGE_INSTALLATION_DIRECTORY!\ts\doc"
-        ECHO COPY /Y !ABSOLUTE_DRIVER_LIBRARY_DIRECTORY!\php_cassandra.dll !ABSOLUTE_PACKAGES_DIRECTORY!\!DRIVER_PACKAGE_INSTALLATION_DIRECTORY!\ts >> "!LOG_PACKAGE_BUILD!"
-        COPY /Y "!ABSOLUTE_DRIVER_LIBRARY_DIRECTORY!\php_cassandra.dll" "!ABSOLUTE_PACKAGES_DIRECTORY!\!DRIVER_PACKAGE_INSTALLATION_DIRECTORY!\ts" >> "!LOG_PACKAGE_BUILD!" 2>&1
+        SET "ABSOLUTE_DRIVER_LIBRARY=!ABSOLUTE_DRIVER_LIBRARY_DIRECTORY!\php_cassandra.dll"
+        IF NOT EXIST "!ABSOLUTE_DRIVER_LIBRARY!" SET "ABSOLUTE_DRIVER_LIBRARY=!ABSOLUTE_DRIVER_LIBRARY_DIRECTORY!\ext\php_cassandra.dll"
+        ECHO COPY /Y !ABSOLUTE_DRIVER_LIBRARY! !ABSOLUTE_PACKAGES_DIRECTORY!\!DRIVER_PACKAGE_INSTALLATION_DIRECTORY!\ts >> "!LOG_PACKAGE_BUILD!"
+        COPY /Y "!ABSOLUTE_DRIVER_LIBRARY!" "!ABSOLUTE_PACKAGES_DIRECTORY!\!DRIVER_PACKAGE_INSTALLATION_DIRECTORY!\ts" >> "!LOG_PACKAGE_BUILD!" 2>&1
         ECHO COPY /Y !ABSOLUTE_CHANGELOG_PATH! !ABSOLUTE_PACKAGES_DIRECTORY!\!DRIVER_PACKAGE_INSTALLATION_DIRECTORY!\ts >> "!LOG_PACKAGE_BUILD!"
         COPY /Y "!ABSOLUTE_CHANGELOG_PATH!" "!ABSOLUTE_PACKAGES_DIRECTORY!\!DRIVER_PACKAGE_INSTALLATION_DIRECTORY!\ts" >> "!LOG_PACKAGE_BUILD!" 2>&1
         ECHO COPY /Y !ABSOLUTE_LICENSE_PATH! !ABSOLUTE_PACKAGES_DIRECTORY!\!DRIVER_PACKAGE_INSTALLATION_DIRECTORY!\ts >> "!LOG_PACKAGE_BUILD!"
@@ -797,12 +799,15 @@ IF !ENABLE_BUILD_PACKAGES! EQU !FALSE! (
         XCOPY /E /Y "!ABSOLUTE_EXTENSION_DOCUMENT_DIRECTORY!" "!ABSOLUTE_PACKAGES_DIRECTORY!\!DRIVER_PACKAGE_INSTALLATION_DIRECTORY!\ts\doc" >> "!LOG_PACKAGE_BUILD!" 2>&1
         CALL :CLEANGITSOURCE "!ABSOLUTE_DEPENDENCIES_PHP_SOURCE_DIRECTORY!" "!LOG_DRIVER_BUILD!"
         IF !ERRORLEVEL! NEQ 0 EXIT /B !ERRORLEVEL!
+        CALL :CLEANDIRECTORY "!ABSOLUTE_DRIVER_LIBRARY_DIRECTORY!" "Cleaning library directory"
         ECHO Building PHP driver [NTS]
         CALL :BUILDDRIVER "!ABSOLUTE_DEPENDENCIES_PHP_SOURCE_DIRECTORY!" "!ABSOLUTE_BATCH_DIRECTORY!" "!ABSOLUTE_DRIVER_LIBRARY_DIRECTORY!" !FALSE! !FALSE! !BUILD_TYPE_RELEASE! "" "" "!ABSOLUTE_DRIVER_DEPENDENCY_CPP_DRIVER_PACKAGE_INSTALLATION_DIRECTORY!" "!ABSOLUTE_CPP_DRIVER_DEPENDENCY_LIBUV_PACKAGE_INSTALLATION_DIRECTORY!" "!ABSOLUTE_CPP_DRIVER_DEPENDENCY_OPENSSL_PACKAGE_INSTALLATION_DIRECTORY!" "!ABSOLUTE_CPP_DRIVER_DEPENDENCY_ZLIB_PACKAGE_INSTALLATION_DIRECTORY!" "!ABSOLUTE_DRIVER_DEPENDENCY_MPIR_PACKAGE_INSTALLATION_DIRECTORY!" "!LOG_DRIVER_BUILD!"
         IF !ERRORLEVEL! NEQ 0 EXIT /B !ERRORLEVEL!
         MKDIR "!ABSOLUTE_PACKAGES_DIRECTORY!\!DRIVER_PACKAGE_INSTALLATION_DIRECTORY!\nts\doc"
-        ECHO COPY /Y !ABSOLUTE_DRIVER_LIBRARY_DIRECTORY!\php_cassandra.dll !ABSOLUTE_PACKAGES_DIRECTORY!\!DRIVER_PACKAGE_INSTALLATION_DIRECTORY!\nts >> "!LOG_PACKAGE_BUILD!"
-        COPY /Y "!ABSOLUTE_DRIVER_LIBRARY_DIRECTORY!\php_cassandra.dll" "!ABSOLUTE_PACKAGES_DIRECTORY!\!DRIVER_PACKAGE_INSTALLATION_DIRECTORY!\nts" >> "!LOG_PACKAGE_BUILD!" 2>&1
+        SET "ABSOLUTE_DRIVER_LIBRARY=!ABSOLUTE_DRIVER_LIBRARY_DIRECTORY!\php_cassandra.dll"
+        IF NOT EXIST "!ABSOLUTE_DRIVER_LIBRARY!" SET "ABSOLUTE_DRIVER_LIBRARY=!ABSOLUTE_DRIVER_LIBRARY_DIRECTORY!\ext\php_cassandra.dll"
+        ECHO COPY /Y !ABSOLUTE_DRIVER_LIBRARY! !ABSOLUTE_PACKAGES_DIRECTORY!\!DRIVER_PACKAGE_INSTALLATION_DIRECTORY!\nts >> "!LOG_PACKAGE_BUILD!"
+        COPY /Y "!ABSOLUTE_DRIVER_LIBRARY!" "!ABSOLUTE_PACKAGES_DIRECTORY!\!DRIVER_PACKAGE_INSTALLATION_DIRECTORY!\nts" >> "!LOG_PACKAGE_BUILD!" 2>&1
         ECHO COPY /Y !ABSOLUTE_CHANGELOG_PATH! !ABSOLUTE_PACKAGES_DIRECTORY!\!DRIVER_PACKAGE_INSTALLATION_DIRECTORY!\nts >> "!LOG_PACKAGE_BUILD!"
         COPY /Y "!ABSOLUTE_CHANGELOG_PATH!" "!ABSOLUTE_PACKAGES_DIRECTORY!\!DRIVER_PACKAGE_INSTALLATION_DIRECTORY!\nts" >> "!LOG_PACKAGE_BUILD!" 2>&1
         ECHO COPY /Y !ABSOLUTE_LICENSE_PATH! !ABSOLUTE_PACKAGES_DIRECTORY!\!DRIVER_PACKAGE_INSTALLATION_DIRECTORY!\nts >> "!LOG_PACKAGE_BUILD!"
@@ -813,6 +818,7 @@ IF !ENABLE_BUILD_PACKAGES! EQU !FALSE! (
         XCOPY /E /Y "!ABSOLUTE_EXTENSION_DOCUMENT_DIRECTORY!" "!ABSOLUTE_PACKAGES_DIRECTORY!\!DRIVER_PACKAGE_INSTALLATION_DIRECTORY!\nts\doc" >> "!LOG_PACKAGE_BUILD!" 2>&1
         CALL :CLEANGITSOURCE "!ABSOLUTE_DEPENDENCIES_PHP_SOURCE_DIRECTORY!" "!LOG_DRIVER_BUILD!"
         IF !ERRORLEVEL! NEQ 0 EXIT /B !ERRORLEVEL!
+        CALL :CLEANDIRECTORY "!ABSOLUTE_DRIVER_LIBRARY_DIRECTORY!" "Cleaning library directory"
 
         REM Skip a line on the display
         ECHO.