cvs: SVNROOT / run-conversion.php

gwynne		Tue Jul  7 15:39:14 2009 UTC

  Modified files:              
    /SVNROOT	run-conversion.php 
  Log:
  fix bad module avoidance, fix syntax error, ZendEngine -> Zend per Johannes' request
  
http://cvs.php.net/viewvc.cgi/SVNROOT/run-conversion.php?r1=1.68&r2=1.69&diff_format=u
Index: SVNROOT/run-conversion.php
diff -u SVNROOT/run-conversion.php:1.68 SVNROOT/run-conversion.php:1.69
--- SVNROOT/run-conversion.php:1.68	Mon Jul  6 21:40:30 2009
+++ SVNROOT/run-conversion.php	Tue Jul  7 15:39:14 2009
@@ -7,7 +7,7 @@
 
 // -----------------------------------------------------------------------------------------------------------------------------
 // Constants
-$version = substr('$Revision: 1.68 $', strlen('$Revision: '), -2);
+$version = substr('$Revision: 1.69 $', strlen('$Revision: '), -2);
 
 $passes = array(
     'svncreate',        // Create various SVN repositories
@@ -219,7 +219,7 @@
                 // Special case for problematic modules
                 if (!is_dir($cvspath . $module) || 
                         count(scandir($cvspath . $module)) == 2 || $module == 'Attic' ||
-                        ($moduleName == 'php/pecl' && in_array($module, array('libextractor', 'cudpp'))) ||
+                        ($moduleName == 'pecl' && in_array($module, array('libextractor', 'cudpp'))) ||
                         ($moduleName == 'pear/packages' && in_array($module, array('HTML_QuickForm_ComboBox', 'Services_Compete', 'XML_HTMLSax3')))) {
                     continue; // empty dir
                 }
@@ -347,7 +347,7 @@
     mv("{$cvsPath}/doc-base/en", "{$cvsPath}/phpdoc-en");
     mv("{$cvsPath}/pear", "{$cvsPath}/packages");
     mv("{$cvsPath}/TSRM", "{$cvsPath}/php-src/TSRM");
-    mv("{$cvsPath}/ZendEngine2", "{$cvsPath}/php-src/ZendEngine2");
+    mv("{$cvsPath}/ZendEngine2", "{$cvsPath}/php-src/Zend");
     mv("{$cvsPath}/pdo-specs", "{$cvsPath}/pecl/pdo/specs");
     
     // There are several symlinks in php-src to PECL extensions which confuse cvs2svn. As decided on svn-migration@, these extensions will be moved from
@@ -397,7 +397,6 @@
         // PECL is a top-level meta-module (see CVS2SVNConverter::addCVSModule)
         } else if ($cvs_module == 'pecl') {
             $converter->addCVSModule($cvs_module, TRUE);
-        }
         // Modules belonging to PEAR (especially the "packages" directory which contains all PEAR packages) go into cvs/pear/<module>
         //  PEAR/packages is a meta-module. (see CVS2SVNConverter::addCVSModule)
         } else if (in_array($cvs_module, array('packages', 'pearbot', 'pear-core', 'peardoc', 'pearweb'))) {