goba Thu Sep 2 18:28:30 2004 EDT
Modified files:
/phpdoc manual.xml.in
/phpdoc/en .cvsignore
/phpdoc/entities .cvsignore
/phpdoc/scripts file-entities.php.in missing-entities.php.in
Log:
move missing-ids.xml file to the language folder
- this makes livedocs happier, so this item will not be missing in the TOC
- this cleans up the entities folder, so it only contains entities
- now all content XML files are in the language folders (hopefully)
http://cvs.php.net/diff.php/phpdoc/manual.xml.in?r1=1.189&r2=1.190&ty=u
Index: phpdoc/manual.xml.in
diff -u phpdoc/manual.xml.in:1.189 phpdoc/manual.xml.in:1.190
--- phpdoc/manual.xml.in:1.189 Thu Sep 2 05:54:03 2004
+++ phpdoc/manual.xml.in Thu Sep 2 18:28:30 2004
@@ -2,7 +2,7 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
"@srcdir@/dtds/dbxml-4.1.2/docbookx.dtd" [
-<!-- $Revision: 1.189 $ -->
+<!-- $Revision: 1.190 $ -->
<!-- Add translated specific definitions and snippets -->
<!ENTITY % language-defs SYSTEM "@srcdir@/@LANGDIR@/language-defs.ent">
@@ -41,8 +41,6 @@
<!-- Autogenerated missing entites and IDs to make build work -->
<!ENTITY % missing-entities SYSTEM "entities/missing-entities.ent">
%missing-entities;
-
-<!ENTITY missing-ids SYSTEM "entities/missing-ids.xml">
]>
<book id="manual" lang="@LANG@">
http://cvs.php.net/diff.php/phpdoc/en/.cvsignore?r1=1.4&r2=1.5&ty=u
Index: phpdoc/en/.cvsignore
diff -u /dev/null phpdoc/en/.cvsignore:1.5
--- /dev/null Thu Sep 2 18:28:30 2004
+++ phpdoc/en/.cvsignore Thu Sep 2 18:28:30 2004
@@ -0,0 +1 @@
+missing-ids.xml
\ No newline at end of file
http://cvs.php.net/diff.php/phpdoc/entities/.cvsignore?r1=1.4&r2=1.5&ty=u
Index: phpdoc/entities/.cvsignore
diff -u phpdoc/entities/.cvsignore:1.4 phpdoc/entities/.cvsignore:1.5
--- phpdoc/entities/.cvsignore:1.4 Thu May 8 13:02:32 2003
+++ phpdoc/entities/.cvsignore Thu Sep 2 18:28:30 2004
@@ -1,5 +1,4 @@
file-entities.ent
version.ent
missing-entities.ent
-missing-ids.xml
phpweb.ent
http://cvs.php.net/diff.php/phpdoc/scripts/file-entities.php.in?r1=1.21&r2=1.22&ty=u
Index: phpdoc/scripts/file-entities.php.in
diff -u phpdoc/scripts/file-entities.php.in:1.21
phpdoc/scripts/file-entities.php.in:1.22
--- phpdoc/scripts/file-entities.php.in:1.21 Thu Sep 2 18:12:59 2004
+++ phpdoc/scripts/file-entities.php.in Thu Sep 2 18:28:30 2004
@@ -17,7 +17,7 @@
| Gabor Hojtsy <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: file-entities.php.in,v 1.21 2004/09/02 22:12:59 goba Exp $
+ $Id: file-entities.php.in,v 1.22 2004/09/02 22:28:30 goba Exp $
*/
/**
@@ -114,7 +114,14 @@
fputs(
$fp,
"<!-- global function index file -->\n" .
- entstr("global.function-index", "$out_dir/funcindex.xml") . "\n" .
+ entstr("global.function-index", "$out_dir/funcindex.xml") . "\n"
+);
+
+// The missing id file is generated after this pass
+fputs(
+ $fp,
+ "<!-- generated file with missing ids -->\n" .
+ entstr("missing-ids", "$trans_dir/missing-ids.xml") . "\n" .
"<!-- all other files -->\n"
);
http://cvs.php.net/diff.php/phpdoc/scripts/missing-entities.php.in?r1=1.13&r2=1.14&ty=u
Index: phpdoc/scripts/missing-entities.php.in
diff -u phpdoc/scripts/missing-entities.php.in:1.13
phpdoc/scripts/missing-entities.php.in:1.14
--- phpdoc/scripts/missing-entities.php.in:1.13 Wed Aug 18 18:00:49 2004
+++ phpdoc/scripts/missing-entities.php.in Thu Sep 2 18:28:30 2004
@@ -17,7 +17,7 @@
| Gabor Hojtsy <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: missing-entities.php.in,v 1.13 2004/08/18 22:00:49 philip Exp $
+ $Id: missing-entities.php.in,v 1.14 2004/09/02 22:28:30 goba Exp $
*/
set_time_limit(0);
@@ -56,7 +56,7 @@
// Try to open files for rewriting
$ment = fopen("entities/missing-entities.ent", "w");
-$mids = fopen("entities/missing-ids.xml", "w");
+$mids = fopen("@LANG@/missing-ids.xml", "w");
// Exit if we cannot rewrite the files
if (!$ment || !$mids) {
@@ -131,7 +131,7 @@
echo "* No missing entities were found\n";
}
-echo "\nCreated file: entities/missing-ids.xml\n";
+echo "\nCreated file: @LANG@/missing-ids.xml\n";
if (!empty($missing_ids)) {
foreach ($missing_ids as $k => $v) {
if (false !== strpos('<para id="zend"', $v)) {
