gwynne Mon Nov 10 02:00:01 2008 UTC
Modified files:
/SVNROOT run-conversion.php
Log:
do it right
http://cvs.php.net/viewvc.cgi/SVNROOT/run-conversion.php?r1=1.33&r2=1.34&diff_format=u
Index: SVNROOT/run-conversion.php
diff -u SVNROOT/run-conversion.php:1.33 SVNROOT/run-conversion.php:1.34
--- SVNROOT/run-conversion.php:1.33 Mon Nov 10 01:56:27 2008
+++ SVNROOT/run-conversion.php Mon Nov 10 02:00:00 2008
@@ -7,7 +7,7 @@
//
-----------------------------------------------------------------------------------------------------------------------------
// Constants
-$version = substr('$Revision: 1.33 $', strlen('$Revision: '), -2);
+$version = substr('$Revision: 1.34 $', strlen('$Revision: '), -2);
$passes = array(
'processcvs', // Process CVS modules
@@ -537,6 +537,14 @@
$rawTagList = run_command('exec svn ls file:///' .
escapeshellarg($GLOBALS['options']['svnroot'] . '/php-src/php-src/tags'));
$rawBranchList = run_command('exec svn ls file:///' .
escapeshellarg($GLOBALS['options']['svnroot'] . '/php-src/php-src/branches'));
+ if (!file_exists($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR .
'php-src-co')) {
+ run_command('exec svn checkout file:///' .
escapeshellarg($GLOBALS['options']['svnroot'] . '/php-src/php-src') . ' ' .
+ escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR .
'php-src-co') . ' 2>&1 > ' .
+ escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR .
'co-output'));
+ }
+ $oldcwd = getcwd();
+ chdir($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'php-src-co');
+
$tagList = array();
$branchList = array();
foreach ($rawTagList as $tag) {
@@ -544,21 +552,16 @@
$xml = run_command('exec svn info --xml file:///' .
escapeshellarg($GLOBALS['options']['svnroot'] . '/php-src/php-src/tags/' .
$realTag));
$xml = implode("\n", $xml);
$tagList[$realTag] = strtotime(substr($xml, strpos($xml, '<date>') +
6, strpos($xml, '</date>')));
+ run_command('exec svn propdel svn:externals ' . escapeshellarg('tags'
. DIRECTORY_SEPARATOR . $realTag . DIRECTORY_SEPARATOR . 'ext'));
}
foreach ($rawBranchList as $branch) {
$realBranch = substr($branch, 0, -1);
$xml = run_command('exec svn info --xml file:///' .
escapeshellarg($GLOBALS['options']['svnroot'] . '/php-src/php-src/branches/' .
$realBranch));
$xml = implode("\n", $xml);
$branchList[$realBranch] = strtotime(substr($xml, strpos($xml,
'<date>') + 6, strpos($xml, '</date>')));
+ run_command('exec svn propdel svn:externals ' .
escapeshellarg('branches' . DIRECTORY_SEPARATOR . $realBranch .
DIRECTORY_SEPARATOR . 'ext'));
}
-
- if (!file_exists($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR .
'php-src-co')) {
- run_command('exec svn checkout file:///' .
escapeshellarg($GLOBALS['options']['svnroot'] . '/php-src/php-src') . ' ' .
- escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR .
'php-src-co') . ' 2>&1 > ' .
- escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR .
'co-output'));
- }
- $oldcwd = getcwd();
- chdir($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'php-src-co');
+ run_command('exec svn propdel svn:externals ' . escapeshellarg('trunk' .
DIRECTORY_SEPARATOR . 'ext'));
$links = array('bz2', 'hash', 'oci8', 'pdo', 'pdo_dblib', 'pdo_firebird',
'spl', 'soap', 'sqlite', 'tidy', 'xmlreader', 'xmlwriter', 'filter', 'json',
'ircg', 'pdo_mysql', 'pdo_oci', 'pdo_odbc', 'pdo_pgsql', 'pdo_sqlite',
'simplexml', 'fileinfo');
@@ -567,9 +570,6 @@
foreach ($links as $link) {
$info = lstat($GLOBALS['options']['cvsroot'] . DIRECTORY_SEPARATOR .
'php-src' . DIRECTORY_SEPARATOR . 'ext' . DIRECTORY_SEPARATOR . $link);
- run_command('exec svn propdel svn:externals ' . escapeshellarg('tags'
. DIRECTORY_SEPARATOR . $tag . DIRECTORY_SEPARATOR . 'ext'));
- run_command('exec svn propdel svn:externals ' .
escapeshellarg('branches' . DIRECTORY_SEPARATOR . $tag . DIRECTORY_SEPARATOR .
'ext'));
- run_command('exec svn propdel svn:externals ' . escapeshellarg('trunk'
. DIRECTORY_SEPARATOR . 'ext'));
$createDate = $info['ctime'];
foreach ($tagList as $tag => $tagDate) {
if ($createDate <= $tagDate) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
