Skip to content

Commit 96da68e

Browse files
committed
Make the git page more useful for current versions of PHP.
This is precipitated mostly by the fact that we no longer have snaps.php.net, so this is likely to be more heavily trafficked than before. This almost certainly requires more work, but at least this gets rid of the most egregious problems.
1 parent f6a1397 commit 96da68e

File tree

1 file changed

+33
-18
lines changed

1 file changed

+33
-18
lines changed

git.php

+33-18
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,17 @@
4444
</p>
4545

4646
<ul>
47-
<li><i>autoconf</i>: 2.13 (2.59+ for PHP 5.4+)</li>
47+
<li><i>autoconf</i>: 2.59+</li>
4848
<li><i>automake</i>: 1.4+</li>
4949
<li><i>libtool</i>: 1.4.x+ (except 1.4.2)</li>
50-
<li><i>bison</i>: 1.28, 1.35, 1.75, 2.0 or higher</li>
51-
<li><i>flex (PHP 5.2 and earlier)</i>: 2.5.4 (<strong>not higher</strong>)</li>
5250
<li><i>re2c</i>: 0.13.4+</li>
51+
<li id="bison"><i>bison</i>:
52+
<ul>
53+
<li><i>PHP 5.4</i>: 1.28, 1.35, 1.75, 2.0 to 2.6.4</li>
54+
<li><i>PHP 5.5 and 5.6</i>: 2.4 to 2.7</li>
55+
<li><i>PHP 7</i>: 2.4+</li>
56+
</ul>
57+
</li>
5358
</ul>
5459

5560
<p>
@@ -73,6 +78,13 @@
7378
<br><br>
7479
<code>git clone http://git.php.net/repository/php-src.git</code>
7580
<br><br>
81+
82+
You can also download a snapshot from GitHub:<br><br>
83+
<ul>
84+
<li>Go to the <a href="https://github.com/php/php-src">php-src project page</a>.</li>
85+
<li>Select the branch you're interested in from the branch dropdown.</li>
86+
<li>Click on the <strong>Download ZIP</strong> button.</li>
87+
</ul>
7688
</li>
7789

7890
<li>
@@ -83,14 +95,17 @@
8395
</li>
8496

8597
<li>
86-
You can then check out the branch you want to build:
98+
You can then check out the branch you want to build, for example:
8799
<br><br>
88-
<strong>PHP 5.3</strong>:
89-
<code>git checkout PHP-5.3</code>
90-
<br>
91100
<strong>PHP 5.4</strong>:
92101
<code>git checkout PHP-5.4</code>
93102
<br>
103+
<strong>PHP 5.5</strong>:
104+
<code>git checkout PHP-5.5</code>
105+
<br>
106+
<strong>PHP 5.6</strong>:
107+
<code>git checkout PHP-5.6</code>
108+
<br>
94109
<strong>PHP HEAD</strong>:
95110
<code>git checkout master</code>
96111
<br><br>
@@ -99,8 +114,8 @@
99114
<li>
100115
<div class="tip" style="margin: 10px 0 10px 20px;">
101116
<p>Note that certain combinations of autoconf, automake and libtool may not
102-
work when used together. See <a href="#buildconf_fail">below</a> for
103-
details.<br>
117+
work when used together, particularly with historical versions of PHP. See
118+
<a href="#buildconf_fail">below</a> for details.<br>
104119
Also, certain versions of autoconf may generate warnings of <code>AC_PROG_CPP
105120
called before AC_PROG_CC</code>. These messages can usually be ignored.</p>
106121
</div>
@@ -112,10 +127,10 @@
112127

113128
<li>
114129
From this point onwards, installation is similar to the installation of one of
115-
the official packages with one main difference &ndash; you may need bison 1.28 or later
116-
and flex 2.5.4 (PHP 5.2 and earlier) or re2c 0.13.4+ or later (PHP 5.3 and later) to
117-
compile, because the pre-generated scanner and parser files may not
118-
be included in Git.
130+
the official packages with one main difference &ndash; you will need
131+
<a href="#bison">a version of bison that is supported for the PHP version you want to build</a>.
132+
You may also require re2c if you intend to change any of the scanner and
133+
parser files PHP uses.
119134
</li>
120135
</ol>
121136

@@ -139,15 +154,16 @@
139154

140155
<p>
141156
The PHP manual is still currently hosted on SVN, although it will be migrated
142-
to Git in the near future. To checkout the latest English version of the PHP
157+
to Git in the future. To checkout the latest English version of the PHP
143158
manual:<br>
144159
<code>svn checkout https://svn.php.net/repository/phpdoc/modules/doc-en ./phpdoc-en</code>
145160
<br><br>
146161
You can also check the <a href="https://wiki.php.net/vcs/svnfaq">SVN FAQ on the wiki</a>.
147162
</p>
148163

149-
<a name="buildconf_fail"></a>
150-
<h2>autoconf, automake and libtool information</h2>
164+
<h2>Historical issues</h2>
165+
166+
<h3 id="buildconf_fail">autoconf, automake and libtool information for PHP 5.3 and below</h3>
151167

152168
<p>
153169
There seem to be problems with libtool 1.4.2. It is suggested
@@ -171,8 +187,7 @@
171187
<code>PHP_AUTOCONF=autoconf213 PHP_AUTOHEADER=autoheader213 ./buildconf</code>
172188
</p>
173189

174-
<a name="flex_fail"></a>
175-
<h2>Zend/zend_language_scanner.c: No such file or directory</h2>
190+
<h3 id="flex_fail">Zend/zend_language_scanner.c: No such file or directory</h3>
176191

177192
<p>
178193
PHP only supports flex 2.5.4, <strong>not</strong> later versions as they broke backwards compatibility.

0 commit comments

Comments
 (0)