bjori Wed Apr 18 08:19:30 2007 UTC
Modified files:
/livedocs build-ops.in build.sh configure.in
Log:
Fix configure/build when paths include spaces
http://cvs.php.net/viewvc.cgi/livedocs/build-ops.in?r1=1.13&r2=1.14&diff_format=u
Index: livedocs/build-ops.in
diff -u livedocs/build-ops.in:1.13 livedocs/build-ops.in:1.14
--- livedocs/build-ops.in:1.13 Wed Feb 9 22:15:59 2005
+++ livedocs/build-ops.in Wed Apr 18 08:19:30 2007
@@ -1,12 +1,12 @@
#!/bin/sh
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
+BUILDLOG='@BUILDLOG@'
+PHPDOC='@PHPDOC@'
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
+LIVEDOCS='@LIVEDOCS@'
+OUTPUTDIR='@OUTPUTDIR@'
+GENDIR='@GENDIR@'
XSLTPROC='@XSLTPROC@'
# "en" should be the first!
http://cvs.php.net/viewvc.cgi/livedocs/build.sh?r1=1.31&r2=1.32&diff_format=u
Index: livedocs/build.sh
diff -u livedocs/build.sh:1.31 livedocs/build.sh:1.32
--- livedocs/build.sh:1.31 Mon Aug 14 16:37:19 2006
+++ livedocs/build.sh Wed Apr 18 08:19:30 2007
@@ -2,7 +2,7 @@
. ./build-ops
-exec > ${BUILDLOG} 2>&1
+exec > "${BUILDLOG}" 2>&1
echo "####################"
@@ -10,11 +10,11 @@
echo "Building user notes"
TOKEN=$NOTES_TOKEN
export TOKEN
- ${PHP} ${LIVEDOCS}/mk_notes.php ${OUTPUTDIR} ${GENDIR} ${NOTES_MIRROR}
+ ${PHP} "${LIVEDOCS}/mk_notes.php" "${OUTPUTDIR}" "${GENDIR}"
${NOTES_MIRROR}
#fi
# running ./buildconf
-cd ${PHPDOC}
+cd "${PHPDOC}"
autoconf
# Making indexes for every language
@@ -24,13 +24,13 @@
if test "$CONFIGURE_PHP_DOC" != "no" ; then
echo -n "Configuring ${BUILDTYPE} for $i: "
date
- cd ${PHPDOC}
+ cd "${PHPDOC}"
if ! ./configure --with-lang=$i --with-php="${PHP}"
$PHPDOC_CONFIG_OPTS ; then
continue
fi
fi
- cd ${GENDIR}
+ cd "${GENDIR}"
# Making TOC as SQL insertion script if we're doing the english build
if test "$i" = "en"; then
@@ -43,32 +43,32 @@
XSLTFILE=toc.xsl
fi
- if ! ${XSLTPROC} ${LIVEDOCS}/${XSLTFILE} ${PHPDOC}/manual.xml >
${GENDIR}/toc-ugly.xml ; then
+ if ! ${XSLTPROC} "${LIVEDOCS}/${XSLTFILE}"
"${PHPDOC}/manual.xml" > "${GENDIR}/toc-ugly.xml" ; then
continue
fi
#Just for debuging
#xmllint --format ${GENDIR}/toc-ugly.xml > ${GENDIR}/toc.xml
- ${PHP} ${LIVEDOCS}/mktoc.php ${GENDIR}/toc-ugly.xml >
${GENDIR}/toc-insert.sql
+ ${PHP} "${LIVEDOCS}/mktoc.php" "${GENDIR}/toc-ugly.xml" >
"${GENDIR}/toc-insert.sql"
fi
echo -n "Making index for $i: "
date
- ${PHP} ${LIVEDOCS}/mkindex.php ${PHPDOC} $i ${GENDIR} ${BUILDTYPE}
- mv ${GENDIR}/livedoc-idx.$i.sqlite ${OUTPUTDIR}
+ ${PHP} "${LIVEDOCS}/mkindex.php" "${PHPDOC}" $i "${GENDIR}" ${BUILDTYPE}
+ mv "${GENDIR}/livedoc-idx.$i.sqlite" "${OUTPUTDIR}"
# create output dir
- mkdir -p ${OUTPUTDIR}/$i
- chmod 0777 ${OUTPUTDIR}/$i
+ mkdir -p "${OUTPUTDIR}/$i"
+ chmod 0777 "${OUTPUTDIR}/$i"
# remove cached manual pages
- rm -f ${OUTPUTDIR}/$i/*.html
+ rm -f "${OUTPUTDIR}/$i/*.html"
# make search cache database
- mv ${GENDIR}/livedoc-cache-idx.$i.sqlite ${OUTPUTDIR}/$i/
- chmod 0666 ${OUTPUTDIR}/$i/livedoc-cache-idx.$i.sqlite
+ mv "${GENDIR}/livedoc-cache-idx.$i.sqlite" "${OUTPUTDIR}/$i/"
+ chmod 0666 "${OUTPUTDIR}/$i/livedoc-cache-idx.$i.sqlite"
cd $curpath
done;
echo -n "End: "
date
-rm -f ${GENDIR}/toc-ugly.xml ${GENDIR}/toc-insert.sql
+rm -f "${GENDIR}/toc-ugly.xml" "${GENDIR}/toc-insert.sql"
http://cvs.php.net/viewvc.cgi/livedocs/configure.in?r1=1.33&r2=1.34&diff_format=u
Index: livedocs/configure.in
diff -u livedocs/configure.in:1.33 livedocs/configure.in:1.34
--- livedocs/configure.in:1.33 Thu Feb 10 12:55:20 2005
+++ livedocs/configure.in Wed Apr 18 08:19:30 2007
@@ -1,5 +1,5 @@
## A configure script
-## $Id: configure.in,v 1.33 2005/02/10 12:55:20 edink Exp $
+## $Id: configure.in,v 1.34 2007/04/18 08:19:30 bjori Exp $
AC_PREREQ(2.13)
AC_INIT(livedoc.php)
@@ -133,21 +133,22 @@
AC_MSG_ERROR([HEY!! You should probably mkdir $OUTPUTDIR...])
else
echo "Copying livedoc files to $OUTPUTDIR..."
- cp config.php .htaccess $OUTPUTDIR
+ cp config.php .htaccess "$OUTPUTDIR"
rm -f .htaccess
- $lncmd $LIVEDOCS/common.php $OUTPUTDIR/common.php
- $lncmd $LIVEDOCS/livedoc.php $OUTPUTDIR/index.php
- $lncmd $LIVEDOCS/livedoc_funcs.php $OUTPUTDIR/livedoc_funcs.php
- $lncmd $LIVEDOCS/error.php $OUTPUTDIR/error.php
- $lncmd $LIVEDOCS/style_mapping.php $OUTPUTDIR/style_mapping.php
- $lncmd $LIVEDOCS/xml_classes.php $OUTPUTDIR/xml_classes.php
- $lncmd $LIVEDOCS/xml_classes5.php $OUTPUTDIR/xml_classes5.php
- $lncmd $LIVEDOCS/search.php $OUTPUTDIR/search.php
- $lncmd $LIVEDOCS/handlers.php $OUTPUTDIR/handlers.php
- rm -rf $OUTPUTDIR/themes
- $lncmd $LIVEDOCS/themes $OUTPUTDIR/themes
+ $lncmd "$LIVEDOCS/common.php" "$OUTPUTDIR/common.php"
+ $lncmd "$LIVEDOCS/livedoc.php" "$OUTPUTDIR/index.php"
+ $lncmd "$LIVEDOCS/livedoc_funcs.php" "$OUTPUTDIR/livedoc_funcs.php"
+ $lncmd "$LIVEDOCS/error.php" "$OUTPUTDIR/error.php"
+ $lncmd "$LIVEDOCS/style_mapping.php" "$OUTPUTDIR/style_mapping.php"
+ $lncmd "$LIVEDOCS/xml_classes.php" "$OUTPUTDIR/xml_classes.php"
+ $lncmd "$LIVEDOCS/xml_classes5.php" "$OUTPUTDIR/xml_classes5.php"
+ $lncmd "$LIVEDOCS/search.php" "$OUTPUTDIR/search.php"
+ $lncmd "$LIVEDOCS/handlers.php" "$OUTPUTDIR/handlers.php"
+ rm -rf "$OUTPUTDIR/themes"
+ $lncmd "$LIVEDOCS/themes" "$OUTPUTDIR/themes"
echo ""
echo "You have configured livedocs so that links are relative to
http://yourserver$WEBBASE";
echo "$OUTPUTDIR is assumed to be the dir that is displayed by your
webserver for that URL"
fi
dnl vim:et:sw=2:ts=2
+
