goba Sat Feb 16 06:14:55 2002 EDT
Modified files:
/phpdoc manual.xml.in configure.in
Log:
Integrate new install.xml pieces to manual.xml.in (=> make xslt
processors happy, as this way, all relative path values are relative
to manual.xml ;)
Make this change fully backward compatible, so if there is an install.xml
file in the built language, then it is used, if there is no, then the
new splitup format is used (either from the current language, or the en
tree, or mixed, depending on chapters.ent entity associations)
Also print out messages about ZendAPI, CHMonly and install.xml part
decisions of configure.
This change makes the move of install parts not that painful, and
generating a html with xslt processors are possible again without
any ugly workarounds...
Index: phpdoc/manual.xml.in
diff -u phpdoc/manual.xml.in:1.112 phpdoc/manual.xml.in:1.113
--- phpdoc/manual.xml.in:1.112 Sat Feb 16 05:49:31 2002
+++ phpdoc/manual.xml.in Sat Feb 16 06:14:55 2002
@@ -26,10 +26,45 @@
<!-- Include CHMonly parts, if we are generating for CHM target -->
<![%chmonly-enabled;[
- <!ENTITY chmonly '<part
id="chmonly"><title>&CHMEdition;</title>&chmonly.aboutchm;</part>'>
+ <!ENTITY chmonly '
+ <part id="chmonly">
+ <title>&CHMEdition;</title>
+ &chmonly.aboutchm;
+ </part>
+ '>
]]>
<!ENTITY chmonly ''>
+<!-- Backwards compatible installation part inclusion -->
+<![%new-install-chapter;[
+ <!ENTITY install-chapter '
+ <chapter id="installation">
+ <title>&Installation;</title>
+ &chapters.install.general;
+ &chapters.install.hpux;
+ &chapters.install.linux;
+ &chapters.install.macosx;
+ &chapters.install.openbsd;
+ &chapters.install.solaris;
+ &chapters.install.unix;
+ &chapters.install.windows;
+ &chapters.install.commandline;
+ &chapters.install.apache;
+ &chapters.install.caudium;
+ &chapters.install.fhttpd;
+ &chapters.install.iis;
+ &chapters.install.iplanet;
+ &chapters.install.omnihttpd;
+ &chapters.install.oreilly;
+ &chapters.install.xitami;
+ &chapters.install.otherhttpd;
+ &chapters.install.problems;
+ &chapters.install.configure;
+ </chapter>
+ '>
+]]>
+<!ENTITY install-chapter '&chapters.install;'>
+
<!-- Autogenerated missing entites and IDs to make build work -->
<!ENTITY % missing-entities SYSTEM "entities/missing-entities.ent">
%missing-entities;
@@ -46,7 +81,7 @@
<part id="getting-started">
<title>&GettingStarted;</title>
&chapters.intro;
- &chapters.install;
+ &install-chapter; <!-- note that this is not always chapters/install.xml -->
&chapters.config;
&chapters.security;
</part>
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.135 phpdoc/configure.in:1.136
--- phpdoc/configure.in:1.135 Sat Feb 16 05:49:31 2002
+++ phpdoc/configure.in Sat Feb 16 06:14:55 2002
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.135 2002/02/16 10:49:31 goba Exp $
+dnl $Id: configure.in,v 1.136 2002/02/16 11:14:55 goba Exp $
dnl autoconf initialisation
AC_INIT()
@@ -741,18 +741,34 @@
echo "%zend.defs;" >> entities/chapters.ent
echo "<!-- end ZendAPI integration -->" >> entities/chapters.ent
echo >> entities/chapters.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 " Zend part not found"
fi
if test "$CHMENABLED" = "yes"; then
- echo >> entities/chapters.ent
echo "<!-- chmonly pages inclusion enabled -->" >> entities/chapters.ent
echo "<!ENTITY % chmonly-enabled \"INCLUDE\">" >> entities/chapters.ent
echo >> entities/chapters.ent
+ echo " CHM inclusion enabled"
else
echo "<!-- chmonly pages inclusion disabled -->" >> entities/chapters.ent
echo "<!ENTITY % chmonly-enabled \"IGNORE\">" >> entities/chapters.ent
+ echo >> entities/chapters.ent
+ echo " CHM inclusion disabled"
+fi
+if test -f "$srcdir/$LANGDIR/chapters/install.xml"; then
+ echo "<!-- old install.xml found in langauge dir -->" >> entities/chapters.ent
+ echo "<!ENTITY % new-install-chapter \"IGNORE\">" >> entities/chapters.ent
+ echo >> entities/chapters.ent
+ echo " Using install.xml"
+else
+ echo "<!-- old install.xml not found in langauge dir -->" >> entities/chapters.ent
+ echo "<!ENTITY % new-install-chapter \"INCLUDE\">" >> entities/chapters.ent
+ echo >> entities/chapters.ent
+ echo " Using the install part from manual.xml"
fi
for file in `find $srcdir/en -name "*.xml" | sed -e"s%^$srcdir\/en\/%%g" | sort`
do
@@ -762,7 +778,7 @@
file=$srcdir/$LANGDIR/$file
else
file=$srcdir/en/$file
- echo " untranslated $file (`wc -l <$file | tr -d ' '` lines)"
+ echo " Untranslated $file (`wc -l <$file | tr -d ' '` lines)"
fi
DEPEND_FILES="$DEPEND_FILES $file"
echo "<!ENTITY $name SYSTEM \"$file\">" >> entities/chapters.ent
@@ -783,7 +799,4 @@
dnl }}}
dnl }}}
-
-
-
