goba Thu Jul 25 11:58:09 2002 EDT
Modified files:
/phpdoc configure.in
Log:
Moving all the file-entities.ent creation code to a part which
is only executed if there is no PHP available.
Add more parameters to file-entities.php invocation to support
all the features we need to replace the above mentioned part.
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.162 phpdoc/configure.in:1.163
--- phpdoc/configure.in:1.162 Thu Jul 25 07:58:41 2002
+++ phpdoc/configure.in Thu Jul 25 11:58:09 2002
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.162 2002/07/25 11:58:41 goba Exp $
+dnl $Id: configure.in,v 1.163 2002/07/25 15:58:09 goba Exp $
dnl autoconf initialisation
AC_INIT()
@@ -253,10 +253,16 @@
DOCBOOKXSL_BIGHTML=$withval/html/docbook.xsl
DOCBOOKXSL_HTML=$withval/html/chunk.xsl
DOCBOOKXSL_PRINT=$withval/fo/docbook.xsl
+ DOCBOOKXSL_USED=yes
AC_MSG_RESULT(in $withval)
fi
],[
- for dir in \
+ if test "$withval" = "yes"; then
+ DOCBOOKXSL_USED=yes
+ else
+ DOCBOOKXSL_USED=no
+ fi
+ for dir in \
$srcdir/xsl/docbook \
$srcdir/phpdoc-tools/xsl \
$srcdir/phpdoc-tools/xsl/docbook \
@@ -355,7 +361,7 @@
ZENDAPI=$withval
fi
],[
- ZENDAPI="not found"
+ ZENDAPI="notfound"
for dir in \
$srcdir/en/ZendAPI \
$srcdir/ZendAPI \
@@ -647,75 +653,77 @@
dnl {{{ generate entity mapping file for translation support
-dnl check for files and translations, create chapter entities
-echo creating entities/file-entities.ent
-rm -f entities/file-entities.ent
-DEPEND_FILES=""
-echo "<!-- DON'T TOUCH - AUTOGENERATED BY ./configure -->" >
entities/file-entities.ent
-
-dnl {{{ ZendAPI entities
-
-if test -d "$ZENDAPI"; then
- 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/file-entities.ent
- echo "<!ENTITY zendapi.toc \"\">" >> entities/file-entities.ent
- echo >> entities/file-entities.ent
- echo " Zend part not found"
-fi
-
-dnl }}}
-
-dnl {{{ .CHM entities
-
-if test "$CHMENABLED" = "yes"; then
- 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"
+dnl if we have PHP use it for all of these things
+if test $PHP != "no"
+then
+ dnl note that the # signs are all just part of a workaround for the Windows PHP
+invocation which has some problems
+ $PHP -c $srcdir/scripts -q $srcdir/scripts/file-entities.php
+$LANGDIR#$srcdir#`pwd`#$DOCBOOKXSL_USED#$CHMENABLED#$ZENDAPI
else
- 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
-
-dnl }}}
-
-dnl {{{ install already splitted?
-if test -f "$srcdir/$LANGDIR/chapters/install.xml"; then
- 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/file-entities.ent
- echo "<!ENTITY chapters.install SYSTEM 'installpart.xml'>" >>
entities/file-entities.ent
+ echo creating entities/file-entities.ent [in configure]
+ rm -f entities/file-entities.ent
+ DEPEND_FILES=""
+ echo "<!-- DON'T TOUCH - AUTOGENERATED BY ./configure -->" >
+entities/file-entities.ent
+
+ dnl {{{ ZendAPI entities
+
+ if test -d "$ZENDAPI"; then
+ 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/file-entities.ent
+ echo "<!ENTITY zendapi.toc \"\">" >> entities/file-entities.ent
+ echo >> entities/file-entities.ent
+ echo " Zend part not found"
+ fi
+
+ dnl }}}
+
+ dnl {{{ .CHM entities
+
+ if test "$CHMENABLED" = "yes"; then
+ 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/file-entities.ent
+ echo "<!ENTITY chmonly ''>" >> entities/file-entities.ent
+ echo >> entities/file-entities.ent
+ echo " CHM inclusion disabled"
+ fi
+
+ dnl }}}
+
+ dnl {{{ install already splitted?
+
+ if test -f "$srcdir/$LANGDIR/chapters/install.xml"; then
+ 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/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/file-entities.ent
+ echo "<!ENTITY appendices.reserved.constants SYSTEM 'reserved.constants.xml'>" >>
+entities/file-entities.ent
echo >> entities/file-entities.ent
- echo " Using the install part from installpart.xml"
-fi
+
+ dnl {{{ check configured language files against english tree
-dnl }}}
-
-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
`pwd`
-else
for file in `find $srcdir/en -name "*.xml" | sed -e"s%^$srcdir\/en\/%%g" | sort`
do
name=`echo $file | sed -e"s/\//./g" -e"s/.xml$//g" -e "s/_/-/g"`
@@ -729,14 +737,15 @@
DEPEND_FILES="$DEPEND_FILES $file"
echo "<!ENTITY $name SYSTEM \"$file\">" >> entities/file-entities.ent
done
-fi
-dnl }}}
+ dnl }}}
+ echo "<!ENTITY global.function-index SYSTEM \"./funcindex.xml\">" >>
+entities/file-entities.ent
-echo "<!ENTITY global.function-index SYSTEM \"./funcindex.xml\">" >>
entities/file-entities.ent
+ dnl Revoke write permisson from all users
+ chmod a-w entities/file-entities.ent
-chmod a-w entities/file-entities.ent
+fi
dnl }}}
--
PHP Documentation Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
