Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:2666 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 58359 invoked from network); 23 Jun 2003 21:52:09 -0000 Received: from unknown (HELO gamma) (62.242.117.189) by pb1.pair.com with SMTP; 23 Jun 2003 21:52:09 -0000 Received: from adam by gamma with local (Exim 3.35 #1 (Debian)) id 19UZEO-0001Hq-00 for ; Mon, 23 Jun 2003 23:52:08 +0200 Date: Mon, 23 Jun 2003 23:52:08 +0200 To: internals@lists.php.net Message-ID: <20030623215207.GA4929@indexdata.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.3.28i Subject: Re: [PHP-DEV] HEADS UP: CVS changes From: adam@indexdata.dk (Adam Dickmeiss) On Mon, Jun 23, 2003 at 11:37:56PM +0200, Sascha Schumann wrote: > The great unification has commenced. > > There is now a single module php-src which contains all PHP 4 > and PHP 5 branches. > > BRANCH INFORMATION > > Please make yourself familiar with the "cvs checkout -r > BRANCH" notation. It will be necessary from now on for a > checkout. > > Some examples: > > PHP 5: cvs co -r PHP_5 php-src-ze2 Can't this one to work. adam@gamma:~/proj/php-src$ ./buildconf using default Zend directory buildconf: checking installation... buildconf: autoconf version 2.13 (ok) buildconf: automake version 1.5 (ok) buildconf: libtool version 1.4.3 (ok) make[1]: *** No rule to make target `Zend/Zend.m4', needed by `configure'. Stop. make: *** [all] Error 2 adam@gamma:~/proj/php-src$ Zend missing? -- Adam > PHP 4: cvs co -r PHP_4 php-src-ze1 > PHP 4.3: cvs co -r PHP_4_3 php-src-ze1 > > The branch names can also be used for cvs diff and merge > operations. Note that all of the above commands create a > local directory named "php-src". > > I hope that we can eliminate the ze1/ze2 suffixes soon, but > that is another topic. > > UPGRADE PROCEDURE > > The php4/php5 modules have been disabled so that you cannot > accidentially commit code into the wrong branch. A "cvs > update" will also fail. Please use the following syntax to > upgrade your existing checkout: > > $ cd phpX > $ find . -name Repository|xargs perl -pi -e 's/php./php-src/' > $ cvs upd -r PHP_5 > > Replace PHP_5 with the name of the branch you are working on. > > - Sascha > > -- > PHP Internals - PHP Runtime Development Mailing List > To unsubscribe, visit: http://www.php.net/unsub.php -- Adam Dickmeiss mailto:adam@indexdata.dk http://www.indexdata.dk Index Data T: +45 33410100 Mob.: 212 212 66