com web/rmtools: Rename VC to VS: include/BuildVC.php include/PeclBranch.php include/PeclBuildVC.php

Commit: d1f9fe6d80e9a5e6d264c58c88b95efa31d3fd87 Author: Christoph M. Becker <cmbecker69@gmx.de> Thu, 4 Apr 2019 19:08:38 +0200 Parents: 7780e97d8a67a4d8cebb808238a0b605063f9572 Branches: master Link: http://git.php.net/?p=web/rmtools.git;a=commitdiff;h=d1f9fe6d80e9a5e6d264c58c88b95efa31d3fd87 Log: Rename VC to VS We're skipping the Pickle stuff for now, since it's not even up-to-date for VC15.. We also keep the VC prefix for some classes, such as BuildVC. Changed paths: M include/BuildVC.php M include/PeclBranch.php M include/PeclBuildVC.php Diff: diff --git a/include/BuildVC.php b/include/BuildVC.php index 6e46290..21af5ce 100644 --- a/include/BuildVC.php +++ b/include/BuildVC.php @@ -48,9 +48,9 @@ class BuildVC { throw new \Exception("Arch mismatch. PHP SDK is configured for '$sdk_arch', while the current RMTOOLS config targets '{$this->architecture}'"); } - $sdk_vc = getenv("PHP_SDK_VC"); - if (strtolower($this->compiler) != strtolower($sdk_vc)) { - throw new \Exception("Compiler mismatch. PHP SDK is configured for '$sdk_vc', while the current RMTOOLS config targets '{$this->compiler}'"); + $sdk_vs = getenv("PHP_SDK_VS"); + if (strtolower($this->compiler) != strtolower($sdk_vs)) { + throw new \Exception("Compiler mismatch. PHP SDK is configured for '$sdk_vs', while the current RMTOOLS config targets '{$this->compiler}'"); } $env = getenv(); diff --git a/include/PeclBranch.php b/include/PeclBranch.php index c3b6e7c..d581743 100644 --- a/include/PeclBranch.php +++ b/include/PeclBranch.php @@ -94,6 +94,7 @@ class PeclBranch { $compiler = strtolower($build_config['compiler']); switch ($compiler) { + case 'vs16': case 'vc15': case 'vc14': case 'vc12': diff --git a/include/PeclBuildVC.php b/include/PeclBuildVC.php index be2a085..ef657c1 100644 --- a/include/PeclBuildVC.php +++ b/include/PeclBuildVC.php @@ -48,9 +48,9 @@ class PeclBuildVC { throw new \Exception("Arch mismatch. PHP SDK is configured for '$sdk_arch', while the current RMTOOLS config targets '{$this->architecture}'"); } - $sdk_vc = getenv("PHP_SDK_VC"); - if (strtolower($this->compiler) != strtolower($sdk_vc)) { - throw new \Exception("Compiler mismatch. PHP SDK is configured for '$sdk_vc', while the current RMTOOLS config targets '{$this->compiler}'"); + $sdk_vs = getenv("PHP_SDK_VS"); + if (strtolower($this->compiler) != strtolower($sdk_vs)) { + throw new \Exception("Compiler mismatch. PHP SDK is configured for '$sdk_vs', while the current RMTOOLS config targets '{$this->compiler}'"); } $env = getenv();