From 94c13e35457bebb9f40a1ca867423f479325ae37 Mon Sep 17 00:00:00 2001 From: Gwynne Raskind Date: Mon, 13 Jul 2009 08:14:46 +0000 Subject: [PATCH] - Redirects from CVS pages to SVN pages - CVS -> SVN in all affected pages Most of this work was done by Shawn Stratton. --- anoncvs.php | 183 ---------------------------- anonsvn.php | 153 +++++++++++++++++++++++ error.php | 4 + include/languages.inc | 2 +- license/contrib-guidelines-code.php | 2 +- mirroring.php | 10 +- search.php | 4 +- sitemap.php | 8 +- sites.php | 16 ++- source.php | 4 +- cvs-php.php => svn-php.php | 142 ++++++++++----------- urlhowto.php | 4 +- 12 files changed, 261 insertions(+), 271 deletions(-) delete mode 100644 anoncvs.php create mode 100644 anonsvn.php rename cvs-php.php => svn-php.php (72%) diff --git a/anoncvs.php b/anoncvs.php deleted file mode 100644 index 68967a1a3..000000000 --- a/anoncvs.php +++ /dev/null @@ -1,183 +0,0 @@ -What is CVS? -

- You can find more information about CVS, and - download clients for most major platforms, at - the CVS Wiki. -

- -

CVS mirroring

-

- You can also mirror the PHP CVS repository using CVSup, see - our CVSup page for more details. -

- -

Contribute

-

- If you would like to join PHP development or would like to - contribute to the PHP documentation, contact the relevant - group. You will need your own CVS account - to contribute. -

- -

Source and binary snapshots

-

- You may also be interested in a PHP snapshot, see - snaps.php.net. - Compiled snapshots for Windows users are also included. -

-'; -site_header("Anonymous CVS Access"); -?> - -

Anonymous CVS Access

- -

- If you wish to get the latest PHP source tree, you can obtain it - through anonymous CVS. You should be warned that the CVS version - is a development version, and as such, is often unstable, and may - not even compile properly. The advantage of using CVS, though, - is that you can get the latest fixes and updates, without having - to wait for the official releases. -

- -

- PHP uses an advanced configuration system that requires you to have - the following tools. Re2c is only necessary for developers and can be found - here. - All other utilities can be obtained from - the GNU FTP site. -

- - - -

- If you're experiencing problems, see also the section on - buildconf failures. -

- -

Steps for using PHP from CVS

-
    -
  1. - It is recommended that you configure CVS by putting this - in your ~/.cvsrc file: -
    -cvs -z3
-update -d -P
-checkout -P
-diff -u
-
    -
    2. - -
  2. - Log in to the PHP CVS server. We'll use the anonymous user cvsread - as the username, and use phpfi as the password:
    - cvs -d :pserver:cvsread@cvs.php.net:/repository login -
    3. - -
  3. - Obtain the latest PHP source from CVS. There is a single php-src - directory that contains all PHP branches. To get PHP from CVS, - use the "cvs checkout -r BRANCH" notation. To checkout the - latest, consider the following CVS commands:

    - PHP 4.4: - cvs -d :pserver:cvsread@cvs.php.net:/repository checkout -r PHP_4_4 php-src -
    - PHP 5.2: - cvs -d :pserver:cvsread@cvs.php.net:/repository checkout -r PHP_5_2 php5 -
    - PHP 5.3: - cvs -d :pserver:cvsread@cvs.php.net:/repository checkout -r PHP_5_3 php5 -
    - PHP 6: - cvs -d :pserver:cvsread@cvs.php.net:/repository checkout php6 -

    - Some tips and notes: -
    -
    -

    You may retrieve a specific release of PHP from CVS by using the - -r flag in your cvs command. Some examples:
    - cvs -d :pserver:cvsread@cvs.php.net:/repository checkout -r php_4_2_1 php-src
    - cvs -d :pserver:cvsread@cvs.php.net:/repository checkout -r php_4_3_2 php-src

    -
    -
      -
    • - The branch names can also be used for cvs diff and merge operations. -
      • -
    • - You can also specify the directory name, for example, to put PHP 6 HEAD into a directory - named php6dev:
      - cvs -d :pserver:cvsread@cvs.php.net:/repository checkout -d php6dev php6 -
      • -
    -
    4. - -
  4. - Make sure you have autoconf 2.13 or newer, automake 1.4 or newer and libtool - 1.4. -
    -

    Note that certain combinations of autoconf, automake and libtool may not - work when used together. See below for - details.
    - Also, certain versions of autoconf may generate warnings of AC_PROG_CPP - called before AC_PROG_CC. These messages can usually be ignored.

    -
    -
    5. - -
  5. - Run ./buildconf. After a while, the configure script should be generated. -
    6. - -
  6. - From this point onwards, installation is similar to the installation of one of - the official packages with one main difference – you must have bison 1.28 or later - and flex 2.5.4 to compile, because the pre-generated scanner and parser - files are not included in CVS. -
    7. -
- -

- There are also other things, like the XML source code - for the documentation, available via anonymous CVS. See - the web-based view of the CVS - server to see what is available. For example, to checkout the - latest english version of the PHP manual:
- cvs -d :pserver:cvsread@cvs.php.net:/repository checkout phpdoc -

- - -

autoconf, automake and libtool information

- -

- There seem to be problems with libtool 1.4.2. It is suggested - that you use libtool 1.4, along with autoconf 2.13 and - automake 1.4. You should also ensure that autoconf, automake - and libtool are installed in the same directory. libtool 1.5 - will not work. -

- -

The following combinations are known to work:

- - - -

Zend/zend_language_scanner.c: No such file or directory

- -

- PHP only supports flex 2.5.4, not later versions as they broke backwards compatibility -

- - diff --git a/anonsvn.php b/anonsvn.php new file mode 100644 index 000000000..c025578ab --- /dev/null +++ b/anonsvn.php @@ -0,0 +1,153 @@ +What is SVN? +

+ You can find more information about SVN, and + download clients for most major platforms, at + the official SVN site. +

+ + +

Contribute

+

+ If you would like to join PHP development or would like to + contribute to the PHP documentation, contact the relevant + group. You will need your own SVN account + to contribute. +

+ +

Source and binary snapshots

+

+ You may also be interested in a PHP snapshot, see + snaps.php.net. + Compiled snapshots for Windows users are also included. +

+'; +site_header("SVN Access"); +?> + +

SVN Access

+ +

+ If you wish to get the latest PHP source tree, you can obtain it + through SVN. You should be warned that the SVN version + is a development version, and as such, is often unstable, and may + not even compile properly. The advantage of using SVN, though, + is that you can get the latest fixes and updates, without having + to wait for the official releases. +

+ +

+ PHP uses an advanced configuration system that requires you to have + the following tools. re2c is only necessary for developers and can be found + here. + All other utilities can be obtained from + the GNU FTP site. +

+ + + +

+ If you're experiencing problems, see also the section on + buildconf failures. +

+ +

Steps for using PHP from SVN

+
    + +
  1. + Obtain the latest PHP source from SVN. There is a single php-src + directory that contains all PHP branches and tags. To get PHP from SVN, + use the "svn checkout http://svn.php.net/repository/php/php-src/branches/BRANCH" notation. To checkout the + latest, consider the following SVN commands:

    + PHP 5.2: + svn checkout http://svn.php.net/repository/php/php-src/branches/PHP_5_2 php-src-5.2 +
    + PHP 5.3: + svn checkout http://svn.php.net/repository/php/php-src/branches/PHP_5_3 php-src-5.3 +
    + PHP 6: + svn checkout http://svn.php.net/repository/php/php-src/trunk php-src +

    + The branch names can also be used for SVN diff and merge operations. +
    2. + +
  2. + Make sure you have autoconf 2.13 or newer, automake 1.4 or newer and libtool + 1.4. +
    +

    Note that certain combinations of autoconf, automake and libtool may not + work when used together. See below for + details.
    + Also, certain versions of autoconf may generate warnings of AC_PROG_CPP + called before AC_PROG_CC. These messages can usually be ignored.

    +
    +
    3. + +
  3. + Run ./buildconf to generate the configure script. This may take several moments. +
    4. + +
  4. + From this point onwards, installation is similar to the installation of one of + the official packages with one main difference – you may need bison 1.28 or later + and flex 2.5.4 (PHP 5.2 and earlier) or re2c 0.13.4+ or later (PHP 5.3 and later) to + compile, because the pre-generated scanner and parser files may not + be included in SVN. +
    5. +
+ +

+ There are many other things, such as the XML source code + for the documentation, available via SVN. See + the web-based view of the SVN + server to see what is available. For example, to checkout the + latest english version of the PHP manual:
+ svn checkout http://svn.php.net/repository/phpdoc/en/trunk ./phpdoc-en +

+ + +

autoconf, automake and libtool information

+ +

+ There seem to be problems with libtool 1.4.2. It is suggested + that you use libtool 1.4, along with autoconf 2.13 and + automake 1.4. You should also ensure that autoconf, automake + and libtool are installed in the same directory. libtool 1.5 + will not work. +

+ +

The following combinations are known to work:

+ + +

+ If you have multiple versions of autoconf installed on your computer, as is + common for many UNIXes, you can set the PHP_AUTOCONF and PHP_AUTOHEADER + variables when running buildconf to indicate which versions it should use + e.g.:
+ PHP_AUTOCONF=autoconf213 PHP_AUTOHEADER=autoheader213 ./buildconf +

+ + +

Zend/zend_language_scanner.c: No such file or directory

+ +

+ PHP only supports flex 2.5.4, not later versions as they broke backwards compatibility. + Please note that PHP 5.3 and later do not require flex at all. +

+ + diff --git a/error.php b/error.php index 482881741..63e686b1b 100644 --- a/error.php +++ b/error.php @@ -386,6 +386,10 @@ $uri_aliases = array ( # external shortcut aliases ;) "dochowto" => "phpdochowto", "projects.php" => "projects", // BC + + # CVS -> SVN + "anoncvs.php" => "anonsvn", + "cvs-php.php" => "svn-php", ); $external_redirects = array( diff --git a/include/languages.inc b/include/languages.inc index 356ddc26b..6e78f76ef 100644 --- a/include/languages.inc +++ b/include/languages.inc @@ -4,7 +4,7 @@ /* This is a list of all manual languages hosted - within PHP CVS modules (phpdoc-{lang}) + within PHP SVN modules (phpdoc-{lang}) Some codes, like "kr", "tw" and "hk" are not in conformance with the official language code standard! diff --git a/license/contrib-guidelines-code.php b/license/contrib-guidelines-code.php index 15dc0de89..f439616a2 100644 --- a/license/contrib-guidelines-code.php +++ b/license/contrib-guidelines-code.php @@ -7,7 +7,7 @@ site_header("License Information");

PHP Contributor Guidelines for Code Developers

- Before you complete the form to request a CVS id, you must understand and accept the principles under which PHP + Before you complete the form to request a SVN account, you must understand and accept the principles under which PHP itself is developed. These are summarised in the next paragraph.

diff --git a/mirroring.php b/mirroring.php index 3fb52cb20..734e563b4 100644 --- a/mirroring.php +++ b/mirroring.php @@ -8,15 +8,17 @@ $SIDEBAR_DATA = ' Properly working mirror sites are listed on our mirrors page.

- -

CVS repository mirroring

+'; +/* +

SVN repository mirroring

If you are interested in using a local copy of our - CVS repository for yourself, we provide - CVSUp instructions + SVN repository for yourself, we provide + svnsync instructions separately.

'; +*/ site_header("Mirroring The PHP Website"); diff --git a/search.php b/search.php index aac8c3a4b..5144ec298 100644 --- a/search.php +++ b/search.php @@ -125,8 +125,8 @@ else { In case you find any bugs, we are interested in a detailed writeup, including JS error messages, operating system and browser information. The source code of this feature is released under the PHP License and - is available from the - PHP CVS server without any support. + is available from the + PHP SVN server without any support.

PHP.net Sites List -

CVS instructions

+

SVN instructions

Mirror sites

diff --git a/sites.php b/sites.php index 3b64e3fb7..5bd1ee4f5 100644 --- a/sites.php +++ b/sites.php @@ -163,16 +163,24 @@ site_header("A Tourist's Guide"); process.

-

cvs.php.net: CVS Repository

+

svn.php.net: SVN Repository

- The PHP project is organized with a CVS server, and this website is the web + The PHP project is organized with a SVN server, and this website is the web interface to it. There you can browse the history (and latest versions) of the source code for all of the PHP projects. For example, the php-src module is the + href="http://svn.php.net/php/php-src/">php-src module is the repository for the source code to the latest version of PHP itself.

+

cvs.php.net: Archived CVS Repository

+ +

+ The PHP project used to be organized under the CVS revision control system, but + migrated to Subversion (see above) in July of 2009. The old CVS repository is + archived here for posterity. +

+

lxr.php.net: Cross Reference

@@ -204,7 +212,7 @@ site_header("A Tourist's Guide");

This site is dedicated to automatic PHP code coverage testing. On a regular - basis current CVS snapshots are being build and tested on this machine. After + basis current SVN snapshots are being build and tested on this machine. After all tests are done the results are visualized along with a code coverage analysis.

diff --git a/source.php b/source.php index 36335221b..ee4f1b619 100644 --- a/source.php +++ b/source.php @@ -28,8 +28,8 @@ $SIDEBAR_DATA = '

Of course, if you want to see the source of this page, we have it available. - You can also browse the CVS repository for this website on - cvs.php.net. + You can also browse the SVN repository for this website on + svn.php.net.

'; site_header("Show Source"); diff --git a/cvs-php.php b/svn-php.php similarity index 72% rename from cvs-php.php rename to svn-php.php index 44198b840..40e10a6ba 100644 --- a/cvs-php.php +++ b/svn-php.php @@ -1,26 +1,26 @@ More about CVS +

More about SVN

- You can find more information about CVS, and + You can find more information about SVN, and download clients for most major platforms, at - the CVS Wiki. + the official SVN site.

-

Anonymous CVS access

+

Anonymous SVN access

If you would like to grab PHP sources or other PHP.net hosted project data from PHP.net, you can also use - anonymous CVS. + anonymous SVN.

'; -site_header("Using CVS for PHP Development"); +site_header("Using SVN for PHP Development"); $groups = array( "php" => "PHP Group", @@ -31,14 +31,14 @@ $groups = array( ?> -

Using CVS for PHP Development

+

Using SVN for PHP Development

$v) { $cleaned[$k] = stripslashes($v); } @@ -52,37 +52,37 @@ if (count($_POST) && (!is_array($_POST['purpose']) || !count($_POST['purpose'])) // Check for errors if (empty($_POST['id'])) { - $error .= "You must supply a desired CVS id. "; + $error .= "You must supply a desired SVN user id.
"; } elseif(!preg_match('!^[a-z]\w+$!', $_POST['id'])) { $error .= "Your user id must be >1 char long, start with ". - "a letter and contain nothing but a-z or 0-9 and _"; + "a letter and contain nothing but a-z, 0-9, and _
"; } if (empty($_POST['fullname'])) { - $error .= "You must supply your real name. "; + $error .= "You must supply your real name.
"; } if (empty($_POST['realpurpose'])) { - $error .= "You must supply a reason for requesting the CVS account. "; + $error .= "You must supply a reason for requesting the SVN account.
"; } if (empty($_POST['password'])) { - $error .= "You must supply a desired password. "; + $error .= "You must supply a desired password.
"; } if (empty($_POST['email']) || !is_emailable_address($cleaned['email'])) { - $error .= "You must supply a proper email address. "; + $error .= "You must supply a proper email address.
"; } if (empty($_POST['yesno']) || $_POST['yesno'] != 'yes') { - $error .= "You did not fill the form out correctly. "; + $error .= "You did not fill the form out correctly.
"; } if (empty($_POST['group']) || !isset($groups[$_POST['group']])) { - $error .= "You did not fill out where to send the request. "; + $error .= "You did not fill out where to send the request.
"; } if (!isset($_POST['guidelines']) || !$_POST['guidelines']) { - $error .= "You did not agree to follow the contribution guidelines. "; + $error .= "You did not agree to follow the contribution guidelines.
"; } // Post the request if there is no error if (!$error) { $error = posttohost( - "http://master.php.net/entry/cvs-account.php", + "http://master.php.net/entry/svn-account.php", array( "username" => $cleaned['id'], "name" => $cleaned['fullname'], @@ -107,7 +107,7 @@ if (count($_POST) && (!is_array($_POST['purpose']) || !count($_POST['purpose'])) ?>

Thank you. Your request has been sent. You should hear something within the - next week or so. If you haven't heard anything by around + next week or so. If you haven't heard anything by around then please send an email to the appropriate mailing list: