hholzgra Tue Jun 11 06:54:25 2002 EDT
Removed files:
/phpdoc/en/reference/apache functions.xml
/phpdoc/en/reference/array functions.xml
/phpdoc/en/reference/aspell functions.xml
/phpdoc/en/reference/bc functions.xml
/phpdoc/en/reference/bzip2 functions.xml
/phpdoc/en/reference/calendar functions.xml
/phpdoc/en/reference/ccvs functions.xml
/phpdoc/en/reference/classobj functions.xml
/phpdoc/en/reference/com functions.xml
/phpdoc/en/reference/cpdf functions.xml
/phpdoc/en/reference/crack functions.xml
/phpdoc/en/reference/ctype functions.xml
/phpdoc/en/reference/curl functions.xml
/phpdoc/en/reference/cybercash functions.xml
/phpdoc/en/reference/cybermut functions.xml
/phpdoc/en/reference/cyrus functions.xml
/phpdoc/en/reference/datetime functions.xml
/phpdoc/en/reference/dba functions.xml
/phpdoc/en/reference/dbase functions.xml
/phpdoc/en/reference/dbm functions.xml
/phpdoc/en/reference/dbplus functions.xml
/phpdoc/en/reference/dbx functions.xml
/phpdoc/en/reference/dio functions.xml
/phpdoc/en/reference/dir functions.xml
/phpdoc/en/reference/domxml functions.xml
/phpdoc/en/reference/dotnet functions.xml
/phpdoc/en/reference/errorfunc functions.xml
/phpdoc/en/reference/exec functions.xml
/phpdoc/en/reference/fbsql functions.xml
/phpdoc/en/reference/fdf functions.xml
/phpdoc/en/reference/filepro functions.xml
/phpdoc/en/reference/filesystem functions.xml
/phpdoc/en/reference/fribidi functions.xml
/phpdoc/en/reference/ftp functions.xml
/phpdoc/en/reference/funchand functions.xml
/phpdoc/en/reference/gettext functions.xml
/phpdoc/en/reference/gmp functions.xml
/phpdoc/en/reference/http functions.xml
/phpdoc/en/reference/hw functions.xml
/phpdoc/en/reference/hwapi functions.xml
/phpdoc/en/reference/ibase functions.xml
/phpdoc/en/reference/icap functions.xml
/phpdoc/en/reference/iconv functions.xml
/phpdoc/en/reference/ifx functions.xml
/phpdoc/en/reference/iisfunc functions.xml
/phpdoc/en/reference/image functions.xml
/phpdoc/en/reference/imap functions.xml
/phpdoc/en/reference/info functions.xml
/phpdoc/en/reference/ingres-ii functions.xml
/phpdoc/en/reference/ircg functions.xml
/phpdoc/en/reference/java functions.xml
/phpdoc/en/reference/ldap functions.xml
/phpdoc/en/reference/mail functions.xml
/phpdoc/en/reference/mailparse functions.xml
/phpdoc/en/reference/math functions.xml
/phpdoc/en/reference/mbstring functions.xml
/phpdoc/en/reference/mcal functions.xml
/phpdoc/en/reference/mcrypt functions.xml
/phpdoc/en/reference/mcve functions.xml
/phpdoc/en/reference/mhash functions.xml
/phpdoc/en/reference/mime_magic functions.xml
/phpdoc/en/reference/ming functions.xml
/phpdoc/en/reference/misc functions.xml
/phpdoc/en/reference/mnogosearch functions.xml
/phpdoc/en/reference/msession functions.xml
/phpdoc/en/reference/msql functions.xml
/phpdoc/en/reference/mssql functions.xml
/phpdoc/en/reference/muscat functions.xml
/phpdoc/en/reference/mysql functions.xml
/phpdoc/en/reference/ncurses functions.xml
/phpdoc/en/reference/network functions.xml
/phpdoc/en/reference/nis functions.xml
/phpdoc/en/reference/notes functions.xml
/phpdoc/en/reference/objaggregation functions.xml
/phpdoc/en/reference/oci8 functions.xml
/phpdoc/en/reference/openssl functions.xml
/phpdoc/en/reference/oracle functions.xml
/phpdoc/en/reference/outcontrol functions.xml
/phpdoc/en/reference/overload functions.xml
/phpdoc/en/reference/ovrimos functions.xml
/phpdoc/en/reference/pcntl functions.xml
/phpdoc/en/reference/pcre functions.xml
/phpdoc/en/reference/pdf functions.xml
/phpdoc/en/reference/pfpro functions.xml
/phpdoc/en/reference/pgsql functions.xml
/phpdoc/en/reference/posix functions.xml
/phpdoc/en/reference/printer functions.xml
/phpdoc/en/reference/pspell functions.xml
/phpdoc/en/reference/qtdom functions.xml
/phpdoc/en/reference/readline functions.xml
/phpdoc/en/reference/recode functions.xml
/phpdoc/en/reference/regex functions.xml
/phpdoc/en/reference/sem functions.xml
/phpdoc/en/reference/sesam functions.xml
/phpdoc/en/reference/session functions.xml
/phpdoc/en/reference/shmop functions.xml
/phpdoc/en/reference/snmp functions.xml
/phpdoc/en/reference/sockets functions.xml
/phpdoc/en/reference/strings functions.xml
/phpdoc/en/reference/swf functions.xml
/phpdoc/en/reference/sybase functions.xml
/phpdoc/en/reference/tokenizer functions.xml
/phpdoc/en/reference/uodbc functions.xml
/phpdoc/en/reference/url functions.xml
/phpdoc/en/reference/var functions.xml
/phpdoc/en/reference/vpopmail functions.xml
/phpdoc/en/reference/w32api functions.xml
/phpdoc/en/reference/wddx functions.xml
/phpdoc/en/reference/xml functions.xml
/phpdoc/en/reference/xmlrpc functions.xml
/phpdoc/en/reference/xslt functions.xml
/phpdoc/en/reference/yaz functions.xml
/phpdoc/en/reference/zip functions.xml
/phpdoc/en/reference/zlib functions.xml
Modified files:
/phpdoc Makefile.in configure.in install.xml
/phpdoc/RFC manual.xml.in
/phpdoc/scripts file-entities.php
Log:
the en/reference/*/functions.xml files are now auto-generated
(should have been from the start, but somehow i forgot to
move the generation code from the split to the configure script)
entities/chapters.ent is now called entities/file-entities.ent
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.118 phpdoc/Makefile.in:1.119
--- phpdoc/Makefile.in:1.118 Fri May 31 17:05:28 2002
+++ phpdoc/Makefile.in Tue Jun 11 06:52:30 2002
@@ -13,7 +13,7 @@
#
#
-# $Id: Makefile.in,v 1.118 2002/05/31 21:05:28 tom Exp $
+# $Id: Makefile.in,v 1.119 2002/06/11 10:52:30 hholzgra Exp $
#
all: html
@@ -259,7 +259,7 @@
rm -f manual_*.pdb @srcdir@/scripts/makedoc *.manifest
rm -f *.aux *.tex *.log *.dvi *.toc *.ps *.gz
rm -f status.txt missing.txt
- rm -f entities/chapters.ent
+ rm -f entities/file-entities.ent
rm -f entities/missing*
distclean: clean
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.151 phpdoc/configure.in:1.152
--- phpdoc/configure.in:1.151 Fri May 31 17:04:14 2002
+++ phpdoc/configure.in Tue Jun 11 06:52:30 2002
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.151 2002/05/31 21:04:14 tom Exp $
+dnl $Id: configure.in,v 1.152 2002/06/11 10:52:30 hholzgra Exp $
dnl autoconf initialisation
AC_INIT()
@@ -751,27 +751,27 @@
dnl {{{ generate entity mapping file for translation support
dnl check for files and translations, create chapter entities
-echo creating entities/chapters.ent
-rm -f entities/chapters.ent
+echo creating entities/file-entities.ent
+rm -f entities/file-entities.ent
DEPEND_FILES=""
-echo "<!-- DON'T TOUCH - AUTOGENERATED BY ./configure -->" > entities/chapters.ent
+echo "<!-- DON'T TOUCH - AUTOGENERATED BY ./configure -->" >
+entities/file-entities.ent
dnl {{{ ZendAPI entities
if test -d "$ZENDAPI"; then
- echo >> entities/chapters.ent
- echo "<!-- begin ZendAPI integration -->" >> entities/chapters.ent
- echo "<!ENTITY % zend.defs SYSTEM \"$ZENDAPI/Extending_Zend.ent\">" >>
entities/chapters.ent
- echo "<!ENTITY zendapi.toc SYSTEM \"$ZENDAPI/Extending_Zend.xml\">" >>
entities/chapters.ent
- echo >> entities/chapters.ent
- echo "%zend.defs;" >> entities/chapters.ent
- echo "<!-- end ZendAPI integration -->" >> entities/chapters.ent
- echo >> entities/chapters.ent
+ echo >> entities/file-entities.ent
+ echo "<!-- begin ZendAPI integration -->" >> entities/file-entities.ent
+ echo "<!ENTITY % zend.defs SYSTEM \"$ZENDAPI/Extending_Zend.ent\">" >>
+entities/file-entities.ent
+ echo "<!ENTITY zendapi.toc SYSTEM \"$ZENDAPI/Extending_Zend.xml\">" >>
+entities/file-entities.ent
+ echo >> entities/file-entities.ent
+ echo "%zend.defs;" >> entities/file-entities.ent
+ echo "<!-- end ZendAPI integration -->" >> entities/file-entities.ent
+ echo >> entities/file-entities.ent
echo " Zend part included"
else
- echo "<!-- ZendAPI not found -->" >> entities/chapters.ent
- echo "<!ENTITY zendapi.toc \"\">" >> entities/chapters.ent
- echo >> entities/chapters.ent
+ echo "<!-- ZendAPI not found -->" >> entities/file-entities.ent
+ echo "<!ENTITY zendapi.toc \"\">" >> entities/file-entities.ent
+ echo >> entities/file-entities.ent
echo " Zend part not found"
fi
@@ -780,14 +780,14 @@
dnl {{{ .CHM entities
if test "$CHMENABLED" = "yes"; then
- echo "<!-- chmonly pages inclusion enabled -->" >> entities/chapters.ent
- echo "<!ENTITY chmonly SYSTEM 'chmonly.xml'>" >> entities/chapters.ent
- echo >> entities/chapters.ent
+ echo "<!-- chmonly pages inclusion enabled -->" >> entities/file-entities.ent
+ echo "<!ENTITY chmonly SYSTEM 'chmonly.xml'>" >> entities/file-entities.ent
+ echo >> entities/file-entities.ent
echo " CHM inclusion enabled"
else
- echo "<!-- chmonly pages inclusion disabled -->" >> entities/chapters.ent
- echo "<!ENTITY chmonly ''>" >> entities/chapters.ent
- echo >> entities/chapters.ent
+ echo "<!-- chmonly pages inclusion disabled -->" >> entities/file-entities.ent
+ echo "<!ENTITY chmonly ''>" >> entities/file-entities.ent
+ echo >> entities/file-entities.ent
echo " CHM inclusion disabled"
fi
@@ -796,28 +796,28 @@
dnl {{{ install already splitted?
if test -f "$srcdir/$LANGDIR/chapters/install.xml"; then
- echo "<!-- old install.xml found in language dir -->" >> entities/chapters.ent
- echo "<!ENTITY chapters.install SYSTEM '$srcdir/$LANGDIR/chapters/install.xml'>" >>
entities/chapters.ent
- echo >> entities/chapters.ent
+ echo "<!-- old install.xml found in language dir -->" >> entities/file-entities.ent
+ echo "<!ENTITY chapters.install SYSTEM '$srcdir/$LANGDIR/chapters/install.xml'>" >>
+entities/file-entities.ent
+ echo >> entities/file-entities.ent
echo " Using install.xml in language dir"
else
- echo "<!-- old install.xml not found in language dir -->" >> entities/chapters.ent
- echo "<!ENTITY chapters.install SYSTEM 'installpart.xml'>" >> entities/chapters.ent
- echo >> entities/chapters.ent
+ echo "<!-- old install.xml not found in language dir -->" >>
+entities/file-entities.ent
+ echo "<!ENTITY chapters.install SYSTEM 'installpart.xml'>" >>
+entities/file-entities.ent
+ echo >> entities/file-entities.ent
echo " Using the install part from installpart.xml"
fi
dnl }}}
-echo "<!-- Separated list of predefined constants. -->" >> entities/chapters.ent
-echo "<!ENTITY appendices.reserved.constants SYSTEM 'reserved.constants.xml'>" >>
entities/chapters.ent
-echo >> entities/chapters.ent
+echo "<!-- Separated list of predefined constants. -->" >> entities/file-entities.ent
+echo "<!ENTITY appendices.reserved.constants SYSTEM 'reserved.constants.xml'>" >>
+entities/file-entities.ent
+echo >> entities/file-entities.ent
dnl {{{ check configured language files against english tree
if test $PHP != "no"
then
- $PHP -c $srcdir/scripts -q $srcdir/scripts/file-entities.php $srcdir $LANGDIR
>> entities/chapters.ent
+ $PHP -c $srcdir/scripts -q $srcdir/scripts/file-entities.php $srcdir $LANGDIR
else
for file in `find $srcdir/en -name "*.xml" | sed -e"s%^$srcdir\/en\/%%g" | sort`
do
@@ -830,16 +830,16 @@
echo " Untranslated $file (`wc -l <$file | tr -d ' '` lines)"
fi
DEPEND_FILES="$DEPEND_FILES $file"
- echo "<!ENTITY $name SYSTEM \"$file\">" >> entities/chapters.ent
+ echo "<!ENTITY $name SYSTEM \"$file\">" >> entities/file-entities.ent
done
fi
dnl }}}
-echo "<!ENTITY global.function-index SYSTEM \"./funcindex.xml\">" >>
entities/chapters.ent
+echo "<!ENTITY global.function-index SYSTEM \"./funcindex.xml\">" >>
+entities/file-entities.ent
-chmod a-w entities/chapters.ent
+chmod a-w entities/file-entities.ent
dnl }}}
Index: phpdoc/install.xml
diff -u phpdoc/install.xml:1.4 phpdoc/install.xml:1.5
--- phpdoc/install.xml:1.4 Mon Jan 7 17:30:34 2002
+++ phpdoc/install.xml Tue Jun 11 06:52:30 2002
@@ -16,11 +16,11 @@
<!-- These are language independent -->
<!ENTITY % build.version SYSTEM "./entities/version.ent">
-<!ENTITY % global.chapters SYSTEM "./entities/chapters.ent">
+<!ENTITY % global.file-entities SYSTEM "./entities/file-entities.ent">
%global.entities;
%faqonly.entities;
-%global.chapters;
+%global.file-entities;
%build.version;
]>
Index: phpdoc/RFC/manual.xml.in
diff -u phpdoc/RFC/manual.xml.in:1.1 phpdoc/RFC/manual.xml.in:1.2
--- phpdoc/RFC/manual.xml.in:1.1 Fri Apr 19 06:34:17 2002
+++ phpdoc/RFC/manual.xml.in Tue Jun 11 06:52:31 2002
@@ -16,12 +16,12 @@
<!-- These are language independent -->
<!ENTITY % build.version SYSTEM "entities/version.ent">
-<!ENTITY % global.chapters SYSTEM "entities/chapters.ent">
+<!ENTITY % global.file-entities SYSTEM "entities/file-entities.ent">
<!-- Include all external DTD parts defined previously -->
%global.entities;
%faqonly.entities;
-%global.chapters;
+%global.file-entities;
%build.version;
<!-- Autogenerated missing entites and IDs to make build work -->
Index: phpdoc/scripts/file-entities.php
diff -u phpdoc/scripts/file-entities.php:1.7 phpdoc/scripts/file-entities.php:1.8
--- phpdoc/scripts/file-entities.php:1.7 Mon Apr 8 14:32:26 2002
+++ phpdoc/scripts/file-entities.php Tue Jun 11 06:54:23 2002
@@ -11,13 +11,23 @@
set_time_limit(0);
$base_dir = str_replace("\\","/",abs_path($argv[$argc-2]));
-# if(php_sapi_name()!="cli")
- $base_dir=ereg_replace("/scripts$","",$base_dir);
+$base_dir=ereg_replace("/scripts$","",$base_dir);
$orig_dir = $base_dir."/en";
$trans_dir = $base_dir."/".$argv[$argc-1];
-process($orig_dir,$trans_dir,$orig_dir);
+$entities = array();
+process($orig_dir, $trans_dir, $orig_dir, $entities);
+
+$fp = fopen("$base_dir/entities/file-entities.ent", "a");
+foreach($entities as $entity) {
+ fputs($fp, "$entity\n");
+}
+fclose($fp);
+
+exit;
+
+
function abs_path($path) {
if($path{0} == '/') return $path;
@@ -34,29 +44,53 @@
return join("/",$absdirs);
}
-function process($work_dir, $trans_dir, $orig_dir) {
+function process($work_dir, $trans_dir, $orig_dir, &$entities) {
+
$trans_path = str_replace($orig_dir,$trans_dir,$work_dir);
$dh = opendir($work_dir);
if(!$dh) return false;
+
+ if(ereg("/reference/.*/functions$", $work_dir)) {
+ $function_entities = array();
+ $functions_file = "$work_dir.xml";
+
+ $functions_file_entity = str_replace("$orig_dir/","",$work_dir);
+ $functions_file_entity = str_replace("/",".",$functions_file_entity);
+ $functions_file_entity = str_replace("_","-",$functions_file_entity);
+
+ $entities[] = sprintf("<!ENTITY %-40s SYSTEM
+'%s'>\n",$functions_file_entity,$functions_file);
+ }
+
while(false !== ($file = readdir($dh))) {
- if($file=="."||$file==".."||$file=="CVS") continue;
- if(is_dir($work_dir."/".$file)) process($work_dir."/".$file,
$trans_dir, $orig_dir);
+
+ if($file{0} == ".")
+ continue;
+
+ if(is_dir($work_dir."/".$file)) {
+ if($file == "CVS") continue;
+ process($work_dir."/".$file, $trans_dir, $orig_dir, $entities);
+ }
+
if(ereg("\\.xml$",$file)) {
$name =
str_replace("$orig_dir/","",$work_dir."/".ereg_replace("\\.xml$","",$file));
$name = str_replace("/",".",$name);
$name = str_replace("_","-",$name);
+ if(isset($function_entities)) {
+ $function_entities[] = "&$name;";
+ }
+
// new: special treatment for function reference entities if splitted version
available
if(strstr($work_dir,"/functions")) {
$splitfile = str_replace(".xml","/reference.xml",$file);
$splitpath = str_replace("/functions","/reference",$trans_path) . "/" .
$splitfile;
if(file_exists($splitpath)) {
- echo sprintf("<!ENTITY %-40s SYSTEM '%s'>\n",$name,$splitpath);
+ $entities[] = sprintf("<!ENTITY %-40s SYSTEM '%s'>\n",$name,$splitpath);
continue;
}
$splitpath = str_replace("/functions","/reference",$trans_path) . "/" .
$splitfile;
if(file_exists($splitpath)) {
- echo sprintf("<!ENTITY %-40s SYSTEM '%s'>\n",$name,$splitpath);
+ $entities[] = sprintf("<!ENTITY %-40s SYSTEM '%s'>\n",$name,$splitpath);
continue;
}
}
@@ -66,17 +100,26 @@
} else {
$path= "$work_dir/$file";
}
- echo sprintf("<!ENTITY %-40s SYSTEM '$path'>\n",$name);
+ $entities[] = sprintf("<!ENTITY %-40s SYSTEM
+'$path'>\n",$name);
}
}
closedir($dh);
+ if(isset($function_entities)) {
+ sort($function_entities);
+ $fp = fopen($functions_file, "w");
+ foreach($function_entities as $entity) {
+ fputs($fp, "$entity\n");
+ }
+ fclose($fp);
+ }
+
// now find all files available in the translation but not the original
- if(file_exists($trans_path) && is_dir($trans_path)) {
+ if($orig_dir != $trans_dir && file_exists($trans_path) && is_dir($trans_path)) {
$dh = @opendir($trans_path);
if($dh) {
while(false !== ($file = readdir($dh))) {
- if($file=="."||$file==".."||$file=="CVS") continue;
+ if($file{0}=="." || $file=="CVS") continue;
if(is_dir($trans_path."/".$file)) continue;
if(ereg("\\.xml$",$file)) {
$name =
str_replace("$orig_dir/","",$work_dir."/".ereg_replace("\\.xml$","",$file));
@@ -85,7 +128,7 @@
if(!file_exists("$work_dir/$file")) {
$path= "$trans_path/$file";
- echo sprintf("<!ENTITY %-40s SYSTEM '$path'>\n",$name);
+ $entities[] = sprintf("<!ENTITY %-40s SYSTEM '$path'>\n",$name);
}
}
}
