Commit: 7bd81f4a654048ce8a561e4554a5b905b45d0a33 Author: Christoph M. Becker <cmbecke...@gmx.de> Wed, 11 Dec 2019 12:41:21 +0100 Parents: 6a0ffc18633e929a1bc55a120c07367eca87d01f Branches: master
Link: http://git.php.net/?p=web/windows.git;a=commitdiff;h=7bd81f4a654048ce8a561e4554a5b905b45d0a33 Log: PHP 7.1 is EOL So we can also remove the VC14 stuff. Changed paths: M docroot/listing.php M script/generate_snap_page.php M templates/left_column.php M templates/snaps.php Diff: diff --git a/docroot/listing.php b/docroot/listing.php index 23bdbc0..1e1a266 100644 --- a/docroot/listing.php +++ b/docroot/listing.php @@ -36,14 +36,8 @@ include __DIR__ . '/../include/listing.php'; $baseurl = '/' . $dir_to_parse . '/'; $versions = generate_listing($dir_to_parse, $nmode); -$major_order = array('7.4', '7.3', '7.2', '7.1'); +$major_order = array('7.4', '7.3', '7.2'); $minor_order = array( - '7.1' => array( - 'nts-VC14-x64', - 'ts-VC14-x64', - 'nts-VC14-x86', - 'ts-VC14-x86' - ), '7.2' => array( 'nts-VC15-x64', 'ts-VC15-x64', @@ -65,10 +59,6 @@ $minor_order = array( ); $labels = array( - 'nts-VC14-x86' => 'VC14 x86 Non Thread Safe', - 'ts-VC14-x86' => 'VC14 x86 Thread Safe', - 'nts-VC14-x64' => 'VC14 x64 Non Thread Safe', - 'ts-VC14-x64' => 'VC14 x64 Thread Safe', 'nts-VC15-x86' => 'VC15 x86 Non Thread Safe', 'ts-VC15-x86' => 'VC15 x86 Thread Safe', 'nts-VC15-x64' => 'VC15 x64 Non Thread Safe', diff --git a/script/generate_snap_page.php b/script/generate_snap_page.php index 59707ce..3b33d28 100644 --- a/script/generate_snap_page.php +++ b/script/generate_snap_page.php @@ -3,7 +3,7 @@ include __DIR__ . '/../include/config.php'; /* TODO: use exported branches list when available instead */ -$active_branches = array('master', '7.4', '7.3', '7.2', '7.1'); +$active_branches = array('master', '7.4', '7.3', '7.2'); $builds = array( 'master' => array( @@ -36,12 +36,6 @@ $builds = array( 'nts-windows-vc15-x86', 'ts-windows-vc15-x86' ), - '7.1' => array( - 'nts-windows-vc14-x64', - 'ts-windows-vc14-x64', - 'nts-windows-vc14-x86', - 'ts-windows-vc14-x86' - ), ); function parse_meta($path) diff --git a/templates/left_column.php b/templates/left_column.php index fd5dd79..6e3f3ab 100644 --- a/templates/left_column.php +++ b/templates/left_column.php @@ -64,16 +64,16 @@ if ((isset($mode) && ($mode == 'snapshots' || $mode == 'qa')) <h4><u>Apache</u></h4> <p>Please use the Apache builds provided by <a href="http://apachelounge.com">Apache Lounge</a>. - They provide VC14, VC15 and VS16 builds of Apache for x86 and x64. + They provide VC15 and VS16 builds of Apache for x86 and x64. We use their binaries to build the Apache SAPIs.</p> <p>With Apache you have to use the Thread Safe (TS) versions of PHP.</p> - <h4><u>VC14, VC15 & VS16</u></h4> - <p>More recent versions of PHP are built with VC14, VC15 or VS16 (Visual Studio 2015, 2017 or 2019 compiler respectively) and + <h4><u>VC15 & VS16</u></h4> + <p>More recent versions of PHP are built with VC15 or VS16 (Visual Studio 2015, 2017 or 2019 compiler respectively) and include improvements in performance and stability.</p> - <p> - The VC14, VC15 and VS16 builds require to have the <i>Visual C++ Redistributable for Visual Studio 2015-2019</i> <a href="https://aka.ms/vs/16/release/VC_redist.x64.exe">x64</a> or <a href="https://aka.ms/vs/16/release/VC_redist.x86.exe">x86</a> installed</p> + <p> - The VC15 and VS16 builds require to have the <i>Visual C++ Redistributable for Visual Studio 2015-2019</i> <a href="https://aka.ms/vs/16/release/VC_redist.x64.exe">x64</a> or <a href="https://aka.ms/vs/16/release/VC_redist.x86.exe">x86</a> installed</p> <h4><u>TS and NTS</u></h4> <p><strong>TS</strong> refers to multithread capable builds. <strong>NTS</strong> refers to single thread only builds. Use case for <strong>TS</strong> binaries involves interaction with diff --git a/templates/snaps.php b/templates/snaps.php index 33da01d..3b94b37 100644 --- a/templates/snaps.php +++ b/templates/snaps.php @@ -1,7 +1,7 @@ <?php include __DIR__ . '/../include/tools.php'; -$major_order = array('7.4', '7.3', '7.2', '7.1', 'master'); +$major_order = array('7.4', '7.3', '7.2', 'master'); $minor_order = array( 'master' => array( 'nts-windows-vs16-x64', @@ -33,19 +33,9 @@ $minor_order = array( 'nts-windows-vc15-x86', 'ts-windows-vc15-x86' ), - '7.1' => array( - 'nts-windows-vc14-x64', - 'ts-windows-vc14-x64', - 'nts-windows-vc14-x86', - 'ts-windows-vc14-x86' - ), ); $labels = array( - 'nts-windows-vc14-x86' => 'VC14 x86 Non Thread Safe', - 'ts-windows-vc14-x86' => 'VC14 x86 Thread Safe', - 'nts-windows-vc14-x64' => 'VC14 x64 Non Thread Safe', - 'ts-windows-vc14-x64' => 'VC14 x64 Thread Safe', 'nts-windows-vc15-x86' => 'VC15 x86 Non Thread Safe', 'ts-windows-vc15-x86' => 'VC15 x86 Thread Safe', 'nts-windows-vc15-x64' => 'VC15 x64 Non Thread Safe', -- PHP Webmaster List Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php