hholzgra Wed Feb 9 18:46:00 2005 EDT
Modified files:
/phpdoc Makefile.in configure.in manual.xml.in
/phpdoc/scripts file-entities.php.in missing-entities.php.in
Log:
some changes that allow configure to be run in a different directory
so that several different manual builds can be done from just one
source repository
http://cvs.php.net/diff.php/phpdoc/Makefile.in?r1=1.157&r2=1.158&ty=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.157 phpdoc/Makefile.in:1.158
--- phpdoc/Makefile.in:1.157 Mon Nov 15 14:17:56 2004
+++ phpdoc/Makefile.in Wed Feb 9 18:45:58 2005
@@ -16,7 +16,7 @@
#
#
-# $Id: Makefile.in,v 1.157 2004/11/15 19:17:56 techtonik Exp $
+# $Id: Makefile.in,v 1.158 2005/02/09 23:45:58 hholzgra Exp $
#
all: html
@@ -292,20 +292,20 @@
test: manual.xml
@if test ! -e funcindex.xml; then touch funcindex.xml; fi
@if test ! -e entities/missing-entities.ent; then touch
entities/missing-entities.ent; fi
- @if test ! -e @LANGDIR@/missing-ids.xml; then touch
@LANGDIR@/missing-ids.xml; fi
+ @if test ! -e entities/missing-ids.xml; then touch
entities/missing-ids.xml; fi
$(NSGMLS) -i lang-$(LANG) -s $(XMLDCL) manual.xml
# ignore missing IDs and check if the manual can be generated anyway
test_man_gen: manual.xml
@if test ! -e funcindex.xml; then touch funcindex.xml; fi
@if test ! -e entities/missing-entities.ent; then touch
entities/missing-entities.ent; fi
- @if test ! -e @LANGDIR@/missing-ids.xml; then touch
@LANGDIR@/missing-ids.xml; fi
+ @if test ! -e entities/missing-ids.xml; then touch
entities/missing-ids.xml; fi
$(NSGMLS) -wno-idref -i lang-$(LANG) -s $(XMLDCL) manual.xml
test_xml: manual.xml
@if test ! -e funcindex.xml; then touch funcindex.xml; fi
@if test ! -e entities/missing-entities.ent; then touch
entities/missing-entities.ent; fi
- @if test ! -e @LANGDIR@/missing-ids.xml; then touch
@LANGDIR@/missing-ids.xml; fi
+ @if test ! -e entities/missing-ids.xml; then touch
entities/missing-ids.xml; fi
$(XMLLINT) --noent --noout --valid manual.xml
test_howto:
http://cvs.php.net/diff.php/phpdoc/configure.in?r1=1.214&r2=1.215&ty=u
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.214 phpdoc/configure.in:1.215
--- phpdoc/configure.in:1.214 Tue Feb 8 13:22:33 2005
+++ phpdoc/configure.in Wed Feb 9 18:45:59 2005
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.214 2005/02/08 18:22:33 hholzgra Exp $
+dnl $Id: configure.in,v 1.215 2005/02/09 23:45:59 hholzgra Exp $
dnl autoconf initialisation
AC_INIT()
@@ -844,7 +844,7 @@
fi
done
AC_OUTPUT($OUTFILES)
-find . -name "*.sh" | xargs chmod u+x
+find $srcdir -name "*.sh" | tee find.log | xargs chmod u+x
dnl }}}
dnl {{{ create default empty phpweb.ent file
@@ -865,7 +865,7 @@
dnl create missing-entities.ent and missing-ids.xml
rm -f entities/missing*
- rm -f $LANGDIR/missing-ids.xml
+ rm -f entities/missing-ids.xml
$PHP -c $INIPATH -q ./scripts/missing-entities.php
else
http://cvs.php.net/diff.php/phpdoc/manual.xml.in?r1=1.204&r2=1.205&ty=u
Index: phpdoc/manual.xml.in
diff -u phpdoc/manual.xml.in:1.204 phpdoc/manual.xml.in:1.205
--- phpdoc/manual.xml.in:1.204 Wed Feb 9 05:33:53 2005
+++ phpdoc/manual.xml.in Wed Feb 9 18:45:59 2005
@@ -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.204 $ -->
+<!-- $Revision: 1.205 $ -->
<!-- Add translated specific definitions and snippets -->
<!ENTITY % language-defs SYSTEM "@srcdir@/@LANGDIR@/language-defs.ent">
@@ -28,7 +28,7 @@
<!ENTITY % global.entities SYSTEM "@srcdir@/entities/global.ent">
<!-- These are language independent -->
-<!ENTITY % frontpage.entities SYSTEM "en/contributors.ent">
+<!ENTITY % frontpage.entities SYSTEM "@srcdir@/en/contributors.ent">
<!ENTITY % build.version SYSTEM "entities/version.ent">
<!ENTITY % file.entities SYSTEM "entities/file-entities.ent">
http://cvs.php.net/diff.php/phpdoc/scripts/file-entities.php.in?r1=1.30&r2=1.31&ty=u
Index: phpdoc/scripts/file-entities.php.in
diff -u phpdoc/scripts/file-entities.php.in:1.30
phpdoc/scripts/file-entities.php.in:1.31
--- phpdoc/scripts/file-entities.php.in:1.30 Wed Feb 9 18:05:05 2005
+++ phpdoc/scripts/file-entities.php.in Wed Feb 9 18:46:00 2005
@@ -17,7 +17,7 @@
| Gabor Hojtsy <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: file-entities.php.in,v 1.30 2005/02/09 23:05:05 hholzgra Exp $
+ $Id: file-entities.php.in,v 1.31 2005/02/09 23:46:00 hholzgra Exp $
*/
/**
@@ -444,11 +444,11 @@
*/
function create_part_file ($filename, $entities, $id, $title)
{
- global $srcdir, $encoding;
+ global $out_dir, $encoding;
sort($entities);
- $fp = fopen("$srcdir/$filename","w");
+ $fp = fopen("$out_dir/$filename","w");
fputs($fp, "<?xml version='1.0' encoding='$encoding' ?>\n");
fputs($fp, "<!-- FILE AUTOGENERATED BY file-entities.php, DO NOT EDIT
!!! -->\n");
if(count($entities)) {
http://cvs.php.net/diff.php/phpdoc/scripts/missing-entities.php.in?r1=1.16&r2=1.17&ty=u
Index: phpdoc/scripts/missing-entities.php.in
diff -u phpdoc/scripts/missing-entities.php.in:1.16
phpdoc/scripts/missing-entities.php.in:1.17
--- phpdoc/scripts/missing-entities.php.in:1.16 Thu Dec 23 15:58:07 2004
+++ phpdoc/scripts/missing-entities.php.in Wed Feb 9 18:46:00 2005
@@ -17,7 +17,7 @@
| Gabor Hojtsy <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: missing-entities.php.in,v 1.16 2004/12/23 20:58:07 dallas Exp $
+ $Id: missing-entities.php.in,v 1.17 2005/02/09 23:46:00 hholzgra Exp $
*/
set_time_limit(0);
@@ -56,7 +56,7 @@
// Try to open files for rewriting
$ment = fopen("entities/missing-entities.ent", "w");
-$mids = fopen("@LANGDIR@/missing-ids.xml", "w");
+$mids = fopen("entities/missing-ids.xml", "w");
// Exit if we cannot rewrite the files
if (!$ment || !$mids) {
