From e8f07b31a98e2213f9ae05d92ad04d2d741d6e47 Mon Sep 17 00:00:00 2001 From: AlexNDRmac Date: Mon, 30 Nov 2020 21:10:22 +0200 Subject: [PATCH 1/8] Add php 8 build matrix for window, update readme --- .appveyor.yml | 10 ++++++++++ README.md | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index fa2c7a92..dde4ca08 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -53,6 +53,16 @@ environment: BUILD_TYPE: nts-Win32 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + - PHP_VERSION: 8.0 + VC_VERSION: 15 + BUILD_TYPE: Win32 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + + - PHP_VERSION: 8.0 + VC_VERSION: 15 + BUILD_TYPE: nts-Win32 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + PHP_SDK_VERSION: 2.1.9 PHP_AVM: https://raw.githubusercontent.com/sergeyklay/php-appveyor/master/php-appveyor.psm1 diff --git a/README.md b/README.md index e58e3f8e..a12c44b3 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ The Zephir Parser delivered as a C extension for the PHP language. -Supported PHP versions: **7.0**, **7.1**, **7.2**, **7.3** and **7.4**. +Supported PHP versions: **7.0**, **7.1**, **7.2**, **7.3**, **7.4** and **8.0** **NOTE:** The [`development`][:dev-branch:] branch will always contain the latest **unstable** version. If you wish to From b94b7c1fd267a08506f0ea46b665a24412cafa83 Mon Sep 17 00:00:00 2001 From: AlexNDRmac Date: Wed, 2 Dec 2020 17:21:01 +0200 Subject: [PATCH 2/8] Try to use fixed appveyour ps script for build --- .appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index dde4ca08..f121af6b 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -64,7 +64,8 @@ environment: APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 PHP_SDK_VERSION: 2.1.9 - PHP_AVM: https://raw.githubusercontent.com/sergeyklay/php-appveyor/master/php-appveyor.psm1 + # PHP_AVM: https://raw.githubusercontent.com/sergeyklay/php-appveyor/master/php-appveyor.psm1 + PHP_AVM: https://raw.githubusercontent.com/AlexNDRmac/php-appveyor/fix-for-php8/php-appveyor.psm1 TEST_PHP_EXECUTABLE: C:\php\php.exe NO_INTERACTION: 1 From 6dded5028698828414d9258786d5c089b355fb5c Mon Sep 17 00:00:00 2001 From: AlexNDRmac Date: Wed, 2 Dec 2020 17:26:44 +0200 Subject: [PATCH 3/8] Add current branch to build whitelist --- .appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.appveyor.yml b/.appveyor.yml index f121af6b..1547eb3c 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -88,6 +88,7 @@ branches: only: - master - development + - windows-builds-php8 init: - ps: $DebugPreference = 'SilentlyContinue' # Continue From bedc45c18a35f1d523cfcd4b814580a60512b71a Mon Sep 17 00:00:00 2001 From: AlexNDRmac Date: Wed, 2 Dec 2020 17:55:01 +0200 Subject: [PATCH 4/8] Disable build matrix for debug, add VS2017 workaround --- .appveyor.yml | 112 +++++++++++++++++++++++----------------------- .ci/AppVeyor.psm1 | 10 +++++ 2 files changed, 66 insertions(+), 56 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 1547eb3c..dd78db18 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -3,65 +3,65 @@ version: 1.3.5-{build} environment: matrix: - - PHP_VERSION: 7.0 - VC_VERSION: 14 - BUILD_TYPE: "Win32" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 - - - PHP_VERSION: 7.0 - VC_VERSION: 14 - BUILD_TYPE: "nts-Win32" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 - - - PHP_VERSION: 7.1 - VC_VERSION: 14 - BUILD_TYPE: "Win32" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 - - - PHP_VERSION: 7.1 - VC_VERSION: 14 - BUILD_TYPE: "nts-Win32" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 - - - PHP_VERSION: 7.2 - VC_VERSION: 15 - BUILD_TYPE: "Win32" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - - - PHP_VERSION: 7.2 - VC_VERSION: 15 - BUILD_TYPE: "nts-Win32" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - - - PHP_VERSION: 7.3 - VC_VERSION: 15 - BUILD_TYPE: Win32 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - - - PHP_VERSION: 7.3 - VC_VERSION: 15 - BUILD_TYPE: nts-Win32 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - - - PHP_VERSION: 7.4 - VC_VERSION: 15 - BUILD_TYPE: Win32 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - - - PHP_VERSION: 7.4 - VC_VERSION: 15 - BUILD_TYPE: nts-Win32 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + # - PHP_VERSION: 7.0 + # VC_VERSION: 14 + # BUILD_TYPE: "Win32" + # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 + + # - PHP_VERSION: 7.0 + # VC_VERSION: 14 + # BUILD_TYPE: "nts-Win32" + # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 + + # - PHP_VERSION: 7.1 + # VC_VERSION: 14 + # BUILD_TYPE: "Win32" + # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 + + # - PHP_VERSION: 7.1 + # VC_VERSION: 14 + # BUILD_TYPE: "nts-Win32" + # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 + + # - PHP_VERSION: 7.2 + # VC_VERSION: 15 + # BUILD_TYPE: "Win32" + # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + + # - PHP_VERSION: 7.2 + # VC_VERSION: 15 + # BUILD_TYPE: "nts-Win32" + # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + + # - PHP_VERSION: 7.3 + # VC_VERSION: 15 + # BUILD_TYPE: Win32 + # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + + # - PHP_VERSION: 7.3 + # VC_VERSION: 15 + # BUILD_TYPE: nts-Win32 + # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + + # - PHP_VERSION: 7.4 + # VC_VERSION: 15 + # BUILD_TYPE: Win32 + # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + + # - PHP_VERSION: 7.4 + # VC_VERSION: 15 + # BUILD_TYPE: nts-Win32 + # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - PHP_VERSION: 8.0 - VC_VERSION: 15 + VC_VERSION: 16 BUILD_TYPE: Win32 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - - PHP_VERSION: 8.0 - VC_VERSION: 15 - BUILD_TYPE: nts-Win32 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + # - PHP_VERSION: 8.0 + # VC_VERSION: 16 + # BUILD_TYPE: nts-Win32 + # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 PHP_SDK_VERSION: 2.1.9 # PHP_AVM: https://raw.githubusercontent.com/sergeyklay/php-appveyor/master/php-appveyor.psm1 @@ -107,7 +107,7 @@ install: build_script: - ps: InitializeBuildVars - '"%VSCOMNTOOLS%\VsDevCmd" %PLATFORM%' - - '"%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat" %ARCH%' + - IF EXIST '"%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat" %ARCH%' '"%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat" %ARCH%' - phpsdk_setvars - cmd /c .ci\build-win32.bat - phpize diff --git a/.ci/AppVeyor.psm1 b/.ci/AppVeyor.psm1 index 337311b9..082dc91f 100644 --- a/.ci/AppVeyor.psm1 +++ b/.ci/AppVeyor.psm1 @@ -21,6 +21,16 @@ Function InitializeBuildVars { $Env:VSCOMNTOOLS = $Env:VS140COMNTOOLS break } + '16' { + # By default VS does not set the VS150COMNTOOLS as system-wide variable starting from VS2017 + # So, we need to use built-in tool from VS installer to set all the required vars manually + $VSInstaller = "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" + If (-not (Test-Path $VSInstaller)) { + Throw 'The VSCOMNTOOLS environment variable is not set. Check your MS VS installation' + } + $Env:VSCOMNTOOLS = (& "${VsInstaller}" -latest -products * -property installationPath) + break + } default { Throw 'This script is designed to run with MS VS 14/15. Check your MS VS installation' break From 460e84abfcb53c3d3c4668376fbfea0e023d6d0d Mon Sep 17 00:00:00 2001 From: AlexNDRmac Date: Wed, 2 Dec 2020 20:30:30 +0200 Subject: [PATCH 5/8] Enable all matrix options --- .appveyor.yml | 111 +++++++++++++++++++++++----------------------- .ci/AppVeyor.psm1 | 2 +- 2 files changed, 57 insertions(+), 56 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index dd78db18..f95c8931 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -3,65 +3,65 @@ version: 1.3.5-{build} environment: matrix: - # - PHP_VERSION: 7.0 - # VC_VERSION: 14 - # BUILD_TYPE: "Win32" - # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 - - # - PHP_VERSION: 7.0 - # VC_VERSION: 14 - # BUILD_TYPE: "nts-Win32" - # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 - - # - PHP_VERSION: 7.1 - # VC_VERSION: 14 - # BUILD_TYPE: "Win32" - # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 - - # - PHP_VERSION: 7.1 - # VC_VERSION: 14 - # BUILD_TYPE: "nts-Win32" - # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 - - # - PHP_VERSION: 7.2 - # VC_VERSION: 15 - # BUILD_TYPE: "Win32" - # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - - # - PHP_VERSION: 7.2 - # VC_VERSION: 15 - # BUILD_TYPE: "nts-Win32" - # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - - # - PHP_VERSION: 7.3 - # VC_VERSION: 15 - # BUILD_TYPE: Win32 - # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - - # - PHP_VERSION: 7.3 - # VC_VERSION: 15 - # BUILD_TYPE: nts-Win32 - # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - - # - PHP_VERSION: 7.4 - # VC_VERSION: 15 - # BUILD_TYPE: Win32 - # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - - # - PHP_VERSION: 7.4 - # VC_VERSION: 15 - # BUILD_TYPE: nts-Win32 - # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + - PHP_VERSION: 7.0 + VC_VERSION: 14 + BUILD_TYPE: "Win32" + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 + + - PHP_VERSION: 7.0 + VC_VERSION: 14 + BUILD_TYPE: "nts-Win32" + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 + + - PHP_VERSION: 7.1 + VC_VERSION: 14 + BUILD_TYPE: "Win32" + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 + + - PHP_VERSION: 7.1 + VC_VERSION: 14 + BUILD_TYPE: "nts-Win32" + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 + + - PHP_VERSION: 7.2 + VC_VERSION: 15 + BUILD_TYPE: "Win32" + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + + - PHP_VERSION: 7.2 + VC_VERSION: 15 + BUILD_TYPE: "nts-Win32" + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + + - PHP_VERSION: 7.3 + VC_VERSION: 15 + BUILD_TYPE: Win32 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + + - PHP_VERSION: 7.3 + VC_VERSION: 15 + BUILD_TYPE: nts-Win32 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + + - PHP_VERSION: 7.4 + VC_VERSION: 15 + BUILD_TYPE: Win32 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + + - PHP_VERSION: 7.4 + VC_VERSION: 15 + BUILD_TYPE: nts-Win32 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - PHP_VERSION: 8.0 VC_VERSION: 16 BUILD_TYPE: Win32 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - # - PHP_VERSION: 8.0 - # VC_VERSION: 16 - # BUILD_TYPE: nts-Win32 - # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + - PHP_VERSION: 8.0 + VC_VERSION: 16 + BUILD_TYPE: nts-Win32 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 PHP_SDK_VERSION: 2.1.9 # PHP_AVM: https://raw.githubusercontent.com/sergeyklay/php-appveyor/master/php-appveyor.psm1 @@ -106,8 +106,9 @@ install: build_script: - ps: InitializeBuildVars - - '"%VSCOMNTOOLS%\VsDevCmd" %PLATFORM%' + - IF EXIST '"%VSCOMNTOOLS%\VsDevCmd" %PLATFORM%' '"%VSCOMNTOOLS%\VsDevCmd" %PLATFORM%' - IF EXIST '"%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat" %ARCH%' '"%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat" %ARCH%' + - for /f "tokens=1* delims=" %%i in ('"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -property installationPath') do call "%%i\VC\Auxiliary\Build\vcvarsall.bat" %PLATFORM% - phpsdk_setvars - cmd /c .ci\build-win32.bat - phpize diff --git a/.ci/AppVeyor.psm1 b/.ci/AppVeyor.psm1 index 082dc91f..ecaef8a8 100644 --- a/.ci/AppVeyor.psm1 +++ b/.ci/AppVeyor.psm1 @@ -28,7 +28,7 @@ Function InitializeBuildVars { If (-not (Test-Path $VSInstaller)) { Throw 'The VSCOMNTOOLS environment variable is not set. Check your MS VS installation' } - $Env:VSCOMNTOOLS = (& "${VsInstaller}" -latest -products * -property installationPath) + $Env:VSCOMNTOOLS = (& "${VsInstaller}" -latest -property installationPath) break } default { From cc8127f4f6365ba0c85a3dc4b7a63b3ce63598d6 Mon Sep 17 00:00:00 2001 From: AlexNDRmac Date: Wed, 2 Dec 2020 22:14:49 +0200 Subject: [PATCH 6/8] Use vcvarsall file directly from matrix --- .appveyor.yml | 114 +++++++++++++++++++++++++--------------------- .ci/AppVeyor.psm1 | 31 ------------- 2 files changed, 62 insertions(+), 83 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index f95c8931..6b7404aa 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -6,61 +6,73 @@ environment: - PHP_VERSION: 7.0 VC_VERSION: 14 BUILD_TYPE: "Win32" + VCVARSALL: "%VS120COMNTOOLS%/../../VC/vcvarsall.bat" APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 - - PHP_VERSION: 7.0 - VC_VERSION: 14 - BUILD_TYPE: "nts-Win32" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 - - - PHP_VERSION: 7.1 - VC_VERSION: 14 - BUILD_TYPE: "Win32" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 - - - PHP_VERSION: 7.1 - VC_VERSION: 14 - BUILD_TYPE: "nts-Win32" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 - - - PHP_VERSION: 7.2 - VC_VERSION: 15 - BUILD_TYPE: "Win32" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - - - PHP_VERSION: 7.2 - VC_VERSION: 15 - BUILD_TYPE: "nts-Win32" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - - - PHP_VERSION: 7.3 - VC_VERSION: 15 - BUILD_TYPE: Win32 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - - - PHP_VERSION: 7.3 - VC_VERSION: 15 - BUILD_TYPE: nts-Win32 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - - - PHP_VERSION: 7.4 - VC_VERSION: 15 - BUILD_TYPE: Win32 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - - - PHP_VERSION: 7.4 - VC_VERSION: 15 - BUILD_TYPE: nts-Win32 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - - - PHP_VERSION: 8.0 - VC_VERSION: 16 - BUILD_TYPE: Win32 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + # - PHP_VERSION: 7.0 + # VC_VERSION: 14 + # BUILD_TYPE: "nts-Win32" + # VCVARSALL: "%VS120COMNTOOLS%/../../VC/vcvarsall.bat" + # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 + + # - PHP_VERSION: 7.1 + # VC_VERSION: 14 + # BUILD_TYPE: "Win32" + # VCVARSALL: "%VS120COMNTOOLS%/../../VC/vcvarsall.bat" + # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 + + # - PHP_VERSION: 7.1 + # VC_VERSION: 14 + # BUILD_TYPE: "nts-Win32" + # VCVARSALL: "%VS120COMNTOOLS%/../../VC/vcvarsall.bat" + # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 + + # - PHP_VERSION: 7.2 + # VC_VERSION: 15 + # BUILD_TYPE: "Win32" + # VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat" + # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + + # - PHP_VERSION: 7.2 + # VC_VERSION: 15 + # BUILD_TYPE: "nts-Win32" + # VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat" + # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + + # - PHP_VERSION: 7.3 + # VC_VERSION: 15 + # BUILD_TYPE: Win32 + # VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat" + # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + + # - PHP_VERSION: 7.3 + # VC_VERSION: 15 + # BUILD_TYPE: nts-Win32 + # VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat" + # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + + # - PHP_VERSION: 7.4 + # VC_VERSION: 15 + # BUILD_TYPE: Win32 + # VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat" + # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + + # - PHP_VERSION: 7.4 + # VC_VERSION: 15 + # BUILD_TYPE: nts-Win32 + # VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat" + # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + + # - PHP_VERSION: 8.0 + # VC_VERSION: 16 + # BUILD_TYPE: Win32 + # VCVARSALL: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Auxiliary/Build/vcvarsall.bat" + # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - PHP_VERSION: 8.0 VC_VERSION: 16 BUILD_TYPE: nts-Win32 + VCVARSALL: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Auxiliary/Build/vcvarsall.bat" APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 PHP_SDK_VERSION: 2.1.9 @@ -105,10 +117,8 @@ install: - ps: TuneUpPhp build_script: + - if NOT "%VCVARSALL%" == "" call "%VCVARSALL%" %PLATFORM% - ps: InitializeBuildVars - - IF EXIST '"%VSCOMNTOOLS%\VsDevCmd" %PLATFORM%' '"%VSCOMNTOOLS%\VsDevCmd" %PLATFORM%' - - IF EXIST '"%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat" %ARCH%' '"%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat" %ARCH%' - - for /f "tokens=1* delims=" %%i in ('"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -property installationPath') do call "%%i\VC\Auxiliary\Build\vcvarsall.bat" %PLATFORM% - phpsdk_setvars - cmd /c .ci\build-win32.bat - phpize diff --git a/.ci/AppVeyor.psm1 b/.ci/AppVeyor.psm1 index ecaef8a8..d4887f7b 100644 --- a/.ci/AppVeyor.psm1 +++ b/.ci/AppVeyor.psm1 @@ -6,37 +6,6 @@ # the LICENSE file that was distributed with this source code. Function InitializeBuildVars { - switch ($Env:VC_VERSION) { - '14' { - If (-not (Test-Path $Env:VS120COMNTOOLS)) { - Throw 'The VS120COMNTOOLS environment variable is not set. Check your MS VS installation' - } - $Env:VSCOMNTOOLS = $Env:VS120COMNTOOLS - break - } - '15' { - If (-not (Test-Path $Env:VS140COMNTOOLS)) { - Throw 'The VS140COMNTOOLS environment variable is not set. Check your MS VS installation' - } - $Env:VSCOMNTOOLS = $Env:VS140COMNTOOLS - break - } - '16' { - # By default VS does not set the VS150COMNTOOLS as system-wide variable starting from VS2017 - # So, we need to use built-in tool from VS installer to set all the required vars manually - $VSInstaller = "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" - If (-not (Test-Path $VSInstaller)) { - Throw 'The VSCOMNTOOLS environment variable is not set. Check your MS VS installation' - } - $Env:VSCOMNTOOLS = (& "${VsInstaller}" -latest -property installationPath) - break - } - default { - Throw 'This script is designed to run with MS VS 14/15. Check your MS VS installation' - break - } - } - If ($Env:PLATFORM -eq 'x64') { $Env:ARCH = 'x86_amd64' } Else { From 376cf34ebde888a621c533dcaa430bd55cb5bf51 Mon Sep 17 00:00:00 2001 From: AlexNDRmac Date: Thu, 3 Dec 2020 13:40:18 +0200 Subject: [PATCH 7/8] Enable all matrix builds --- .appveyor.yml | 120 +++++++++++++++++++++++++------------------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 6b7404aa..0b9c3b8c 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -6,74 +6,74 @@ environment: - PHP_VERSION: 7.0 VC_VERSION: 14 BUILD_TYPE: "Win32" + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 VCVARSALL: "%VS120COMNTOOLS%/../../VC/vcvarsall.bat" + + - PHP_VERSION: 7.0 + VC_VERSION: 14 + BUILD_TYPE: "nts-Win32" + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 + VCVARSALL: "%VS120COMNTOOLS%/../../VC/vcvarsall.bat" + + - PHP_VERSION: 7.1 + VC_VERSION: 14 + BUILD_TYPE: "Win32" + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 + VCVARSALL: "%VS120COMNTOOLS%/../../VC/vcvarsall.bat" + + - PHP_VERSION: 7.1 + VC_VERSION: 14 + BUILD_TYPE: "nts-Win32" APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 + VCVARSALL: "%VS120COMNTOOLS%/../../VC/vcvarsall.bat" + + - PHP_VERSION: 7.2 + VC_VERSION: 15 + BUILD_TYPE: "Win32" + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat" + + - PHP_VERSION: 7.2 + VC_VERSION: 15 + BUILD_TYPE: "nts-Win32" + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat" + + - PHP_VERSION: 7.3 + VC_VERSION: 15 + BUILD_TYPE: Win32 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat" + + - PHP_VERSION: 7.3 + VC_VERSION: 15 + BUILD_TYPE: nts-Win32 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat" - # - PHP_VERSION: 7.0 - # VC_VERSION: 14 - # BUILD_TYPE: "nts-Win32" - # VCVARSALL: "%VS120COMNTOOLS%/../../VC/vcvarsall.bat" - # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 - - # - PHP_VERSION: 7.1 - # VC_VERSION: 14 - # BUILD_TYPE: "Win32" - # VCVARSALL: "%VS120COMNTOOLS%/../../VC/vcvarsall.bat" - # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 - - # - PHP_VERSION: 7.1 - # VC_VERSION: 14 - # BUILD_TYPE: "nts-Win32" - # VCVARSALL: "%VS120COMNTOOLS%/../../VC/vcvarsall.bat" - # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 - - # - PHP_VERSION: 7.2 - # VC_VERSION: 15 - # BUILD_TYPE: "Win32" - # VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat" - # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - - # - PHP_VERSION: 7.2 - # VC_VERSION: 15 - # BUILD_TYPE: "nts-Win32" - # VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat" - # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - - # - PHP_VERSION: 7.3 - # VC_VERSION: 15 - # BUILD_TYPE: Win32 - # VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat" - # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - - # - PHP_VERSION: 7.3 - # VC_VERSION: 15 - # BUILD_TYPE: nts-Win32 - # VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat" - # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - - # - PHP_VERSION: 7.4 - # VC_VERSION: 15 - # BUILD_TYPE: Win32 - # VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat" - # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - - # - PHP_VERSION: 7.4 - # VC_VERSION: 15 - # BUILD_TYPE: nts-Win32 - # VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat" - # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - - # - PHP_VERSION: 8.0 - # VC_VERSION: 16 - # BUILD_TYPE: Win32 - # VCVARSALL: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Auxiliary/Build/vcvarsall.bat" - # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + - PHP_VERSION: 7.4 + VC_VERSION: 15 + BUILD_TYPE: Win32 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat" + + - PHP_VERSION: 7.4 + VC_VERSION: 15 + BUILD_TYPE: nts-Win32 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat" - PHP_VERSION: 8.0 VC_VERSION: 16 - BUILD_TYPE: nts-Win32 + BUILD_TYPE: Win32 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 VCVARSALL: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Auxiliary/Build/vcvarsall.bat" + + - PHP_VERSION: 8.0 + VC_VERSION: 16 + BUILD_TYPE: nts-Win32 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + VCVARSALL: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Auxiliary/Build/vcvarsall.bat" PHP_SDK_VERSION: 2.1.9 # PHP_AVM: https://raw.githubusercontent.com/sergeyklay/php-appveyor/master/php-appveyor.psm1 From 47ae7eef0c36fb11c7c315abfba78516c6e7d346 Mon Sep 17 00:00:00 2001 From: AlexNDRmac Date: Thu, 3 Dec 2020 16:04:23 +0200 Subject: [PATCH 8/8] Use fixed powershell module from origin --- .appveyor.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 0b9c3b8c..2075ac23 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -76,8 +76,7 @@ environment: VCVARSALL: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Auxiliary/Build/vcvarsall.bat" PHP_SDK_VERSION: 2.1.9 - # PHP_AVM: https://raw.githubusercontent.com/sergeyklay/php-appveyor/master/php-appveyor.psm1 - PHP_AVM: https://raw.githubusercontent.com/AlexNDRmac/php-appveyor/fix-for-php8/php-appveyor.psm1 + PHP_AVM: https://raw.githubusercontent.com/sergeyklay/php-appveyor/master/php-appveyor.psm1 TEST_PHP_EXECUTABLE: C:\php\php.exe NO_INTERACTION: 1