cvs: phd(RESTRUCTURE) / compile.php render.php /include PhDCommonOptions.class.php PhDCompileOptions.class.php
| From: | Gwynne Raskind | Date: | Thu, 10 Jul 2008 12:35:59 +0000 |
| Subject: | cvs: phd(RESTRUCTURE) / compile.php render.php /include PhDCommonOptions.class.php PhDCompileOptions.class.php | ||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-1856@lists.php.net to get a copy of this message | ||
gwynne Thu Jul 10 12:35:59 2008 UTC
Modified files: (Branch: RESTRUCTURE)
/phd compile.php render.php
/phd/include PhDCommonOptions.class.php PhDCompileOptions.class.php
Log:
added Rev tags to the program scripts, colorized version output, added Revision to version output,
added compile options
http://cvs.php.net/viewvc.cgi/phd/compile.php?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: phd/compile.php
diff -u phd/compile.php:1.1.2.1 phd/compile.php:1.1.2.2
--- phd/compile.php:1.1.2.1 Wed Jul 9 12:14:11 2008
+++ phd/compile.php Thu Jul 10 12:35:59 2008
@@ -1,6 +1,7 @@
#!@php_bin@
<?php
-/* $Id: compile.php,v 1.1.2.1 2008/07/09 12:14:11 gwynne Exp $ */
+/* $Id: compile.php,v 1.1.2.2 2008/07/10 12:35:59 gwynne Exp $ */
+$base_revision = '$Rev$';
/* {{{ Find the $ROOT directory of PhD. @php_dir@ will be replaced by the PEAR
package manager. If for some reaosn this hasn't happened, fallback to the
http://cvs.php.net/viewvc.cgi/phd/render.php?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: phd/render.php
diff -u phd/render.php:1.1.2.1 phd/render.php:1.1.2.2
--- phd/render.php:1.1.2.1 Wed Jul 9 12:14:11 2008
+++ phd/render.php Thu Jul 10 12:35:59 2008
@@ -1,6 +1,7 @@
#!@php_bin@
<?php
-/* $Id: render.php,v 1.1.2.1 2008/07/09 12:14:11 gwynne Exp $ */
+/* $Id: render.php,v 1.1.2.2 2008/07/10 12:35:59 gwynne Exp $ */
+$base_revision = '$Rev$';
/* {{{ Find the $ROOT directory of PhD
@php_dir@ will be replaced by the pear package manager
http://cvs.php.net/viewvc.cgi/phd/include/PhDCommonOptions.class.php?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: phd/include/PhDCommonOptions.class.php
diff -u phd/include/PhDCommonOptions.class.php:1.1.2.1
phd/include/PhDCommonOptions.class.php:1.1.2.2
--- phd/include/PhDCommonOptions.class.php:1.1.2.1 Wed Jul 9 12:14:11 2008
+++ phd/include/PhDCommonOptions.class.php Thu Jul 10 12:35:59 2008
@@ -1,5 +1,5 @@
<?php
-/* $Id: PhDCommonOptions.class.php,v 1.1.2.1 2008/07/09 12:14:11 gwynne Exp $ */
+/* $Id: PhDCommonOptions.class.php,v 1.1.2.2 2008/07/10 12:35:59 gwynne Exp $ */
abstract class PhDCommonOptionsParser extends PhDOptionParser
{
@@ -80,9 +80,12 @@
public function option_version($k, $v)
{
- printf("%s\n", $this->getTitleText());
- printf("PhD version: %s\n", PHD_VERSION);
- printf("Copyright (c) 2008 The PHP Documentation Group\n");
+ $color = PhDConfig::phd_info_color();
+ $output = PhDConfig::phd_info_output();
+ $rev = preg_replace('/\$Re[v](: ([\d.]+) ?)?\$$/e', "'\\1' ==
'' ? '??' : '\\2'", $GLOBALS['base_revision']);
+ fprintf($output, "%s\n", term_color($this->getTitleText(), $color));
+ fprintf($output, "%s\n", term_color("PhD Version: " . PHD_VERSION .
" (" . $rev . ")", $color));
+ fprintf($output, "%s\n", term_color("Copyright(c) 2008 The PHP Documentation
Group", $color));
exit(0);
}
http://cvs.php.net/viewvc.cgi/phd/include/PhDCompileOptions.class.php?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: phd/include/PhDCompileOptions.class.php
diff -u phd/include/PhDCompileOptions.class.php:1.1.2.1
phd/include/PhDCompileOptions.class.php:1.1.2.2
--- phd/include/PhDCompileOptions.class.php:1.1.2.1 Wed Jul 9 12:14:11 2008
+++ phd/include/PhDCompileOptions.class.php Thu Jul 10 12:35:59 2008
@@ -1,5 +1,5 @@
<?php
-/* $Id: PhDCompileOptions.class.php,v 1.1.2.1 2008/07/09 12:14:11 gwynne Exp $ */
+/* $Id: PhDCompileOptions.class.php,v 1.1.2.2 2008/07/10 12:35:59 gwynne Exp $ */
require 'PhDCommonOptions.class.php';
@@ -8,7 +8,10 @@
public function getOptionList()
{
return array_merge(parent::getOptionList(), array(
-// "??????:" => "?:", // ?????
+ 'output:' => 'o:', // Output directory or file
+ 'source:' => 's:', // Input phpdoc checkout
+ 'force:' => 'f:', // Force DOM save on validation fail
+ 'partial:' => 'p:', // Root ID
));
}
@@ -22,6 +25,12 @@
return <<<'ENDBLOB'
-o <file/directory>
--output <file/directory> The output directory or file (default: ./.manual.xml)
+ -s <directory>
+ --source <directory> The source documentation checkout (default: .)
+ -f <bool>
+ --force <bool> Save (true) invalid XML with errors or discard (default).
+ -p <id>
+ --partial <id> The root ID to render (default all).
ENDBLOB;
}
}