goba Sat Aug 3 08:28:39 2002 EDT
Modified files:
/phpdoc configure.in
Log:
OK, as the manual was built successfully yesterday,
I can go on with converting things to PHP.
- removed the whole shell script stuff to create file-entities.ent
- commented out the missing entities' and IDs' shell script based
creation, and added the PHP script call
Now we'll see if this works in the build system (worked for me locally)
This also speeds up the configure run, because nsgmls only runs once...
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.167 phpdoc/configure.in:1.168
--- phpdoc/configure.in:1.167 Sat Jul 27 09:01:17 2002
+++ phpdoc/configure.in Sat Aug 3 08:28:39 2002
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.167 2002/07/27 13:01:17 goba Exp $
+dnl $Id: configure.in,v 1.168 2002/08/03 12:28:39 goba Exp $
dnl autoconf initialisation
AC_INIT()
@@ -666,83 +666,22 @@
find . -name "*.sh" | xargs chmod u+x
dnl }}}
-dnl {{{ generate entity mapping file for translation support
+dnl {{{ generate entity mapping file, missing entities and IDs
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#$ZENDAPI
+
+ dnl create missing-entities.ent and missing-ids.xml
+ rm -f entities/missing*
+ $PHP -c ./scripts -q ./scripts/missing-entities.php
+
else
- 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 {{{ 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
-
- dnl {{{ check configured language files against english tree
-
- 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"`
- if test -f $srcdir/$LANGDIR/$file
- then
- file=$srcdir/$LANGDIR/$file
- else
- file=$srcdir/en/$file
- echo " Untranslated $file (`wc -l <$file | tr -d ' '` lines)"
- fi
- DEPEND_FILES="$DEPEND_FILES $file"
- echo "<!ENTITY $name SYSTEM \"$file\">" >> entities/file-entities.ent
- done
-
- dnl }}}
-
- 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
+ echo ERROR: configure process cannot continue, php is not found
fi
@@ -750,10 +689,10 @@
dnl {{{ check for missing IDs and ENTITYs in translation
-echo creating entities/missing-entities.ent and entities/missing-ids.xml
-rm -f entities/missing*
-chmod u+x scripts/missing-entities.sh
-scripts/missing-entities.sh
+dnl echo creating entities/missing-entities.ent and entities/missing-ids.xml
+dnl rm -f entities/missing*
+dnl chmod u+x scripts/missing-entities.sh
+dnl scripts/missing-entities.sh
dnl }}}
--
PHP Documentation Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
