Commit:    1c9eb963e383c1c9d9891b2afe832514beb82547
Author:    Christoph M. Becker <[email protected]>         Mon, 12 Aug 2019 
11:05:29 +0200
Parents:   fc334e582f99ea0f2162a72802d40b587ae78bdf
Branches:  master

Link:       
http://git.php.net/?p=web/rmtools.git;a=commitdiff;h=1c9eb963e383c1c9d9891b2afe832514beb82547

Log:
Switch PHP 7.4 builds back to VC15

Changed paths:
  M  data/config/branch/x64/php74.ini
  M  data/config/branch/x86/php74.ini
  M  data/config/pecl/pecl74_x64.ini
  M  data/config/pecl/pecl74_x86.ini


Diff:
diff --git a/data/config/branch/x64/php74.ini b/data/config/branch/x64/php74.ini
index 5761494..cb5e1eb 100644
--- a/data/config/branch/x64/php74.ini
+++ b/data/config/branch/x64/php74.ini
@@ -4,30 +4,30 @@ repo_name=phpnet
 repo_module=php-src.git
 repo_branch=refs/heads/PHP-7.4
 build_dir=C:/php-snap-build/obj-x64
-build_location=C:/php-snap-build/snap_7.4/vs16/x64
+build_location=C:/php-snap-build/snap_7.4/vc15/x64
 appver=
 debug=0
 pgo=1
-compiler=vs16
+compiler=vc15
 arch=x64
 
-[build-nts-windows-vs16-x64]
-name=nts-windows-vs16-x64
-compiler=vs16
+[build-nts-windows-vc15-x64]
+name=nts-windows-vc15-x64
+compiler=vc15
 arch=x64
 configure_options=--enable-snapshot-build --disable-zts --enable-debug-pack 
--with-pdo-oci=c:/php-snap-build/deps_aux/oracle/x64/instantclient_12_1/sdk,shared
 
--with-oci8-12c=c:/php-snap-build/deps_aux/oracle/x64/instantclient_12_1/sdk,shared
 --enable-com-dotnet=shared --without-analyzer
 platform=windows
 
-[build-ts-windows-vs16-x64]
-name=ts-windows-vs16-x64
-compiler=vs16
+[build-ts-windows-vc15-x64]
+name=ts-windows-vc15-x64
+compiler=vc15
 arch=x64
 configure_options=--enable-snapshot-build --enable-debug-pack 
--with-pdo-oci=c:/php-snap-build/deps_aux/oracle/x64/instantclient_12_1/sdk,shared
 
--with-oci8-12c=c:/php-snap-build/deps_aux/oracle/x64/instantclient_12_1/sdk,shared
 --enable-com-dotnet=shared --without-analyzer
 platform=windows
 
-[build-nts-windows-vs16-x64-avx]
-name=nts-windows-vs16-x64
-compiler=vs16
+[build-nts-windows-vc15-x64-avx]
+name=nts-windows-vc15-x64
+compiler=vc15
 arch=x64
 configure_options=--enable-snapshot-build --disable-zts --enable-debug-pack 
--with-pdo-oci=c:/php-snap-build/deps_aux/oracle/x64/instantclient_12_1/sdk,shared
 
--with-oci8-12c=c:/php-snap-build/deps_aux/oracle/x64/instantclient_12_1/sdk,shared
 --enable-com-dotnet=shared --without-analyzer --enable-native-intrinsics=avx
 platform=windows
diff --git a/data/config/branch/x86/php74.ini b/data/config/branch/x86/php74.ini
index 5748c70..9714c85 100644
--- a/data/config/branch/x86/php74.ini
+++ b/data/config/branch/x86/php74.ini
@@ -4,23 +4,23 @@ repo_name=phpnet
 repo_module=php-src.git
 repo_branch=refs/heads/PHP-7.4
 build_dir=C:/php-snap-build/obj
-build_location=C:/php-snap-build/snap_7.4/vs16/x86
+build_location=C:/php-snap-build/snap_7.4/vc15/x86
 appver=
 debug=0
 pgo=1
-compiler=vs16
+compiler=vc15
 arch=x86
 
-[build-nts-windows-vs16-x86]
-name=nts-windows-vs16-x86
-compiler=vs16
+[build-nts-windows-vc15-x86]
+name=nts-windows-vc15-x86
+compiler=vc15
 arch=x86
 configure_options=--enable-snapshot-build --disable-zts --enable-debug-pack 
--with-pdo-oci=c:\php-snap-build\deps_aux\oracle\x86\instantclient_12_1\sdk,shared
 
--with-oci8-12c=c:\php-snap-build\deps_aux\oracle\x86\instantclient_12_1\sdk,shared
 --enable-com-dotnet=shared --without-analyzer
 platform=windows
 
-[build-ts-windows-vs16-x86]
-name=ts-windows-vs16-x86
-compiler=vs16
+[build-ts-windows-vc15-x86]
+name=ts-windows-vc15-x86
+compiler=vc15
 arch=x86
 configure_options=--enable-snapshot-build --enable-debug-pack 
--with-pdo-oci=c:\php-snap-build\deps_aux\oracle\x86\instantclient_12_1\sdk,shared
 
--with-oci8-12c=c:\php-snap-build\deps_aux\oracle\x86\instantclient_12_1\sdk,shared
 --enable-com-dotnet=shared --without-analyzer
 platform=windows
diff --git a/data/config/pecl/pecl74_x64.ini b/data/config/pecl/pecl74_x64.ini
index 3f15834..58b4384 100644
--- a/data/config/pecl/pecl74_x64.ini
+++ b/data/config/pecl/pecl74_x64.ini
@@ -6,22 +6,22 @@ build_location=c:\php-snap-build\php-src\php74\x64
 appver=2019
 debug=0
 pgo=0
-compiler=vs16
+compiler=vc15
 arch=x64
-pecl_deps_base=c:/php-snap-build/dep-aux/vs16/x64
+pecl_deps_base=c:/php-snap-build/dep-aux/vc15/x64
 pecl_non_core_ext_deps_base=c:/php-snap-build/ext-aux
 
-[build-nts-windows-vs16-x64]
-name=nts-windows-vs16-x64
-compiler=vs16
+[build-nts-windows-vc15-x64]
+name=nts-windows-vc15-x64
+compiler=vc15
 arch=x64
 thread_safe=0
 configure_options=--enable-snapshot-build --disable-zts --enable-debug-pack 
--without-pdo-mssql --enable-com-dotnet=shared --without-analyzer 
--with-pdo-odbc --disable-phpdbg --disable-phpdbgs
 platform=windows
 
-[build-ts-windows-vs16-x64]
-name=ts-windows-vs16-x64
-compiler=vs16
+[build-ts-windows-vc15-x64]
+name=ts-windows-vc15-x64
+compiler=vc15
 arch=x64
 thread_safe=1
 configure_options=--enable-snapshot-build --enable-debug-pack 
--without-pdo-mssql --enable-com-dotnet=shared --without-analyzer 
--with-pdo-odbc --disable-phpdbg --disable-phpdbgs
diff --git a/data/config/pecl/pecl74_x86.ini b/data/config/pecl/pecl74_x86.ini
index e0c0d6a..7e6de1b 100644
--- a/data/config/pecl/pecl74_x86.ini
+++ b/data/config/pecl/pecl74_x86.ini
@@ -6,22 +6,22 @@ build_location=c:\php-snap-build\php-src\php74\x86
 appver=2019
 debug=0
 pgo=0
-compiler=vs16
+compiler=vc15
 arch=x86
-pecl_deps_base=c:/php-snap-build/dep-aux/vs16/x86
+pecl_deps_base=c:/php-snap-build/dep-aux/vc15/x86
 pecl_non_core_ext_deps_base=c:/php-snap-build/ext-aux
 
-[build-nts-windows-vs16-x86]
-name=nts-windows-vs16-x86
-compiler=vs16
+[build-nts-windows-vc15-x86]
+name=nts-windows-vc15-x86
+compiler=vc15
 arch=x86
 thread_safe=0
 configure_options=--enable-snapshot-build --disable-zts --enable-debug-pack 
--without-pdo-mssql --enable-com-dotnet=shared --without-analyzer 
--with-pdo-odbc --disable-phpdbg --disable-phpdbgs
 platform=windows
 
-[build-ts-windows-vs16-x86]
-name=ts-windows-vs16-x86
-compiler=vs16
+[build-ts-windows-vc15-x86]
+name=ts-windows-vc15-x86
+compiler=vc15
 arch=x86
 thread_safe=1
 configure_options=--enable-snapshot-build --enable-debug-pack 
--without-pdo-mssql --enable-com-dotnet=shared --without-analyzer 
--with-pdo-odbc --disable-phpdbg --disable-phpdbgs


--
PHP Webmaster List Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to