cvs: phpdoc(REF_STRUCT_DEV) / configure.php
| From: | Hannes Magnusson | Date: | Tue, 27 Nov 2007 12:04:18 +0000 |
| Subject: | cvs: phpdoc(REF_STRUCT_DEV) / configure.php | ||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-467@lists.php.net to get a copy of this message | ||
bjori Tue Nov 27 12:04:18 2007 UTC
Modified files: (Branch: REF_STRUCT_DEV)
/phpdoc configure.php
Log:
Fix messages
http://cvs.php.net/viewvc.cgi/phpdoc/configure.php?r1=1.6.2.4&r2=1.6.2.5&diff_format=u
Index: phpdoc/configure.php
diff -u phpdoc/configure.php:1.6.2.4 phpdoc/configure.php:1.6.2.5
--- phpdoc/configure.php:1.6.2.4 Sun Nov 11 02:41:50 2007
+++ phpdoc/configure.php Tue Nov 27 12:04:18 2007
@@ -17,10 +17,10 @@
| Authors: Dave Barr <dave@php.net> |
+----------------------------------------------------------------------+
- $Id: configure.php,v 1.6.2.4 2007/11/11 02:41:50 ezyang Exp $
+ $Id: configure.php,v 1.6.2.5 2007/11/27 12:04:18 bjori Exp $
*/
-$cvs_id = '$Id: configure.php,v 1.6.2.4 2007/11/11 02:41:50 ezyang Exp $';
+$cvs_id = '$Id: configure.php,v 1.6.2.5 2007/11/27 12:04:18 bjori Exp $';
$srcdir = "./";
echo "configure.php: $cvs_id\n";
@@ -902,7 +902,7 @@
if ($ac['PARTIAL']) {
$node = $dom->getElementById($ac['PARTIAL']);
- if (!$node) exit("Failed to find partial ID in source XML");
+ if (!$node) exit("Failed to find partial ID in source XML: " .
$ac['PARTIAL']);
if ($node->tagName !== 'book' && $node->tagName !== 'set') {
// this node is not normally allowed here, attempt to wrap it
// in something else
@@ -927,19 +927,24 @@
$dom->validate(); // we don't care if the validation works or not
$filename = '.manual.' . $ac['PARTIAL'] . '.xml';
$dom->save($filename);
- echo "Partial manual saved to $filename, run php build.php on this file\n";
+ echo "Partial manual saved to $filename, to build it run 'phd -d" .
realpath($filename). "'\n";
exit(0);
}
if ($dom->validate()) {
echo "All good.\n";
$dom->save(".manual.xml");
- echo "All you have to do now is run 'php build.php' in your phd checkout
folder\n";
+ echo "All you have to do now is run 'phd -d " . realpath(".manual.xml")
. "'\n";
exit(0); // Tell the shell that this script finished successfully.
} else {
echo "eyh man. No worries. Happ shittens. Try again after fixing the errors above\n";
- if ($ac['FORCE_DOM_SAVE']) // Allow the .manual.xml file to be created, even if it is
not valid.
+
+ if ($ac['FORCE_DOM_SAVE']) {
+ // Allow the .manual.xml file to be created, even if it is not valid.
+ echo "Writing .manual.xml anyway\n";
$dom->save(".manual.xml");
+ }
+
exit(1); // Tell the shell that this script finished with an error.
}