- add announce steps, s,cvs,svn, MFH

1 files changed, 28 insertions, 25 deletions

diff --git a/README.RELEASE_PROCESS b/README.RELEASE_PROCESS
index 08c89b3e67..09162c6306 100644
--- a/README.RELEASE_PROCESS
+++ b/README.RELEASE_PROCESS
@@ -20,12 +20,18 @@ php/QA/bug websites try to have someone from the webmaster team (Bjori) on hand.
 
 5. Verify the tags to be extra sure everything was tagged properly.
 
-6. Moving extensions from/to PECL requires root level access to the CVS server.
-Contact systems@php.net to get this taken care of.
+6. Moving extensions from/to PECL requires write acces to the destination.
+Most developers should have this. 
 
 Moving extensions from php-src to PECL
-- Filesystem: cp -r php-src/ext/foo pecl/foo
-- cvs rm php-src/ext/foo
+- Checkout the pecl directory, most likely you want a sparse-root checkout
+  svn co --depth=empty https://svn.php.net/repository/pecl
+- Create an directory for the extension incl. branch and tag structure,
+  no trunk at this point and commit this to svn
+  cd pecl; mkdir foo foo/tags foo/branches; svn add foo; svn commit
+- Move the extension from php-src to the new location
+  svn mv https://svn.php.net/repository/php/php-src/trunk/ext/foo \
+         https://svn.php.net/repository/pecl/foo/trunk
 
 If the extension is still usable or not dead, in cooperation with the extension
 maintainers if any:
@@ -33,26 +39,24 @@ maintainers if any:
 - create the package.xml, commit
 - release the package
 
-Moving extensions from PECL to php-src
-- Filesystem: cp -r pecl/foo php-src/ext/foo
-OR depending on the wishes from the PECL extension maintainer.
-- Filesystem: ln -s pecl/foo php-src/ext/foo
+For Moving extensions from PECL to php-src the svn mv has to be tone the other
+way round.
 
 Rolling a non stable release (alpha/beta/RC)
 --------------------------------------------
 
-1. Check windows snapshot builder logs (http://snaps.php.net/win32/snapshot-STABLE.log f.e.)
+1. Check windows snapshot builder logs (http://windows.php.net/downloads/snaps/ the last revision)
 
-2. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``.
+2. run the "scripts/dev/credits" script in php-src and commit the changes in the
+credits files in ext/standard.
+
+3. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``.
 Do not use abbreviations for alpha and beta.
 
-3. Commit those changes
+4. Commit those changes and note the revision id.
 
-4. run the "scripts/dev/credits" script in php-src and commit the changes in the
-credits files in ext/standard.
-
-5. tag the repository with the version f.e. "``cvs tag php_4_4_1RC1``"
-(of course, you need to change that to the version you're rolling an RC for).
+5. tag the repository with the version. To do the tag in a fast way do a svn copy on the server using full URLs. You should use the revision id from the above commit to prevent mistakes in case there was a commit in between. f.e. "``svn cp https://svn.php.net/repository/php/php-src/branches/PHP_5_3@308399  https://svn.php.net/repository/php/php-src/tags/php_5_3_6RC1``"
+(of course, you need to change that to the version you're rolling an RC for). Mail php-internals to announce the tag so tests/validation/check can be done prior to package it. It is especially important for RCs.
 
 6. Bump up the version numbers in ``main/php_version.h``, ``configure.in``
 and possibly ``NEWS`` again, to the **next** version. F.e. if the release
@@ -65,7 +69,7 @@ correctly work.
 8. Log in onto the snaps box and go into the correct tree (f.e. the PHP_4_4
 branch if you're rolling 4.4.x releases).
 
-9. You do not have to update the tree, but of course you can with "``cvs up -dP``".
+9. You do not have to update the tree, but of course you can with "``svn up``".
 
 10. run: ``./makedist php 4.4.1RC1``, this will export the tree, create configure
 and build two tarballs (one gz and one bz2).
@@ -109,22 +113,21 @@ Derick) run the following commands for you:
 
    Note: Remember to update the MD5 checksum information.
 
-1. Update in ``php-bugs/trunk/include/functions.inc`` the ``show_version_option``
-function to include the new RC and commit.
-
-2. Update ``phpweb/include/version.inc`` (x=major version number)
+4. Update ``web/php/trunk/include/version.inc`` (x=major version number)
 
  a. ``$PHP_x_RC`` = "5.3.0RC1"
 
  b. ``$PHP_x_RC_DATE`` = "06 September 2007"
 
-3. Commit those changes:
+5. Commit those changes:
 
- a. ``cvs commit include/version.inc include/releases.inc``
+ a. ``svn commit web/qa/trunk web/php-bugs/trunk web/php/trunk``
 
-4. For the first RC, write the doc team (phpdoc@lists.php.net) about updating the
+6. For the first RC, write the doc team (phpdoc@lists.php.net) about updating the
 INSTALL and win32/install.txt files which are generated from the PHP manual sources.
 
+7. Publish the announce on www.php.net as well (for all releases, alpha, RCs or other)
+
 Rolling a stable release
 ------------------------
 
@@ -162,7 +165,7 @@ and build two tarballs (one gz and one bz2).
 
 13. Once the release has been tagged, contact the PHP Windows development team
 (internals-win@lists.php.net) so that Windows binaries can be created. Once
-those are made, they should be committed to CVS too.
+those are made, they should be committed to SVN too.
 
 14. Check if the pear files are updated (phar for 5.1+ or run pear/make-pear-bundle.php with 4.4)