svn: /phpdoc/doc-base/branches/gtk-docgen/scripts/docgen/ docgen.php

--6c4f69c1f02180bd0b191815eff8bfe7b1d25d60
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

frozenfire                               Sat, 26 Feb 2011 20:21:41 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=308713

Log:
Added svn:externals to PHP-GTK trunk ext directory, and modified script to use that by default.
Note: Explicitly specifying the sources directory now requires a path to the ext directory, not the PHP-GTK sources top-level directory.

Changed paths:
    _U  phpdoc/doc-base/branches/gtk-docgen/scripts/docgen/
    U   phpdoc/doc-base/branches/gtk-docgen/scripts/docgen/docgen.php


Property changes on: phpdoc/doc-base/branches/gtk-docgen/scripts/docgen
___________________________________________________________________
Added: svn:externals
   + gtk-ext http://svn.php.net/repository/gtk/php-gtk/trunk/ext


Modified: phpdoc/doc-base/branches/gtk-docgen/scripts/docgen/docgen.php
===================================================================
--- phpdoc/doc-base/branches/gtk-docgen/scripts/docgen/docgen.php	2011-02-26 20:10:13 UTC (rev 308712)
+++ phpdoc/doc-base/branches/gtk-docgen/scripts/docgen/docgen.php	2011-02-26 20:21:41 UTC (rev 308713)
@@ -61,6 +61,7 @@
 	-e dom                                (an entire extension)
 	-f preg_replace                       (a single function)
 	-c simplexmlelement -m xpath -m asxml (a couple class methods)
+	-g /path/to/php-gtk/sources/ext/      (PHP-GTK sources extensions directory)

 Notes:
 	Long options are supported with PHP 5.3.0+, and you use $v
@@ -70,7 +71,7 @@
 	-c,--class 	-- class name
 	-e,--extension	-- extension name
 	-f,--function	-- function name
-	-g,--gtk	-- specify the PHP-GTK source directory
+	-g,--gtk	-- enable PHP-GTK source reading, optionally specify extension sources
 	-h,--help	-- show this help
 	-i,--include	-- includes a PHP file
 	(shortcut for: php -dauto_prepend_file=streams.php docgen.php)
@@ -988,7 +989,7 @@
 			if($OPTION['gtk']) {
 				$dirsep = DIRECTORY_SEPARATOR;
 				$initialOutput = $OPTION["output"];
-				$exts = glob("{$OPTION['gtk']}{$dirsep}ext{$dirsep}*", GLOB_ONLYDIR);
+				$exts = glob("{$OPTION['gtk']}{$dirsep}*", GLOB_ONLYDIR);
 				foreach($exts as $ext) {
 					$extname = format_id(basename($ext));
 					if ($OPTION['verbose']) echo "Generating ".$extname." PHP-GTK sub-extension.".PHP_EOL;
@@ -1255,7 +1256,7 @@
 	'class:'  		=> 'c:', /* classname */
 	'extension:' 	=> 'e:', /* extension */
 	'function:' 	=> 'f:', /* function */
-	'gtk:'			=> 'g:',  /* gtk */
+	'gtk::'			=> 'g::',  /* gtk */
 	'method:' 		=> 'm:'  /* method */
 );

@@ -1290,7 +1291,7 @@
 			break;
 		case 'g':
 		case 'gtk':
-			$OPTION['gtk'] = $value;
+			$OPTION['gtk'] = is_dir($value)?$value:'gtk-ext';
 			break;
 		case 'm':
 		case 'method':

--6c4f69c1f02180bd0b191815eff8bfe7b1d25d60--