wez Wed Jul 27 07:53:00 2005 EDT
Added files:
/php-src/ext/pdo_sqlite post-bundle.sh
Modified files:
/php-src/ext/pdo_sqlite config.m4
Log:
fixup the build in HEAD again... moved the maintainer only stuff out of the
config.m4 and into a separate script to make it cleaner
http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/config.m4?r1=1.23&r2=1.24&ty=u
Index: php-src/ext/pdo_sqlite/config.m4
diff -u php-src/ext/pdo_sqlite/config.m4:1.23
php-src/ext/pdo_sqlite/config.m4:1.24
--- php-src/ext/pdo_sqlite/config.m4:1.23 Wed Jul 27 00:07:11 2005
+++ php-src/ext/pdo_sqlite/config.m4 Wed Jul 27 07:53:00 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.23 2005/07/27 04:07:11 wez Exp $
+dnl $Id: config.m4,v 1.24 2005/07/27 11:53:00 wez Exp $
dnl config.m4 for extension pdo_sqlite
dnl vim:et:sw=2:ts=2:
@@ -91,19 +91,8 @@
PDO_SQLITE_VERSION=`cat $ext_srcdir/sqlite/VERSION`
PDO_SQLITE_VERSION_NUMBER=`echo $PDO_SQLITE_VERSION | $AWK -F.
'{printf("%d%03d%03d", $1, $2, $3)}'`
sed -e s/--VERS--/$PDO_SQLITE_VERSION/ -e
s/--VERSION-NUMBER--/$PDO_SQLITE_VERSION_NUMBER/
$abs_srcdir/sqlite/src/sqlite.h.in > $abs_srcdir/sqlite/src/sqlite3.h
- if ! test -f $abs_srcdir/sqlite/src/parse.h ; then
- dnl maintainer can comment this line out when upgrading the bundled
library
- dnl and reinstate it when done
- AC_MSG_ERROR([this package is broken])
- $CC -o $abs_srcdir/sqlite/tool/lemon $abs_srcdir/sqlite/tool/lemon.c
- $abs_srcdir/sqlite/tool/lemon $abs_srcdir/sqlite/src/parse.y
- cat $abs_srcdir/sqlite/src/parse.h $abs_srcdir/sqlite/src/vdbe.c |
$AWK -f $abs_srcdir/sqlite/mkopcodeh.awk > $abs_srcdir/sqlite/src/opcodes.h
- sort -n +2 $abs_srcdir/sqlite/src/opcodes.h | $AWK -f
$abs_srcdir/sqlite/mkopcodec.awk > $abs_srcdir/sqlite/src/opcodes.c
- $CC -o $abs_srcdir/sqlite/tool/mkkeywordhash
$abs_srcdir/sqlite/tool/mkkeywordhash.c
- $abs_srcdir/sqlite/tool/mkkeywordhash >
$abs_srcdir/sqlite/src/keywordhash.h
- else
- touch $abs_srcdir/sqlite/src/parse.c $abs_srcdir/sqlite/src/parse.h
- fi
+
+ touch $ext_srcdir/sqlite/src/parse.c $ext_srcdir/sqlite/src/parse.h
if test "$ext_shared" = "no" -o "$ext_srcdir" != "$abs_srcdir"; then
echo '#include <php_config.h>' > $ext_srcdir/sqlite/src/config.h
http://cvs.php.net/co.php/php-src/ext/pdo_sqlite/post-bundle.sh?r=1.1&p=1
Index: php-src/ext/pdo_sqlite/post-bundle.sh
+++ php-src/ext/pdo_sqlite/post-bundle.sh
#!/bin/sh
# Run this script after updating the bundled sqlite library
cc -o sqlite/tool/lemon sqlite/tool/lemon.c../sqlite/tool/lemon
sqlite/src/parse.y
cat sqlite/src/parse.h sqlite/src/vdbe.c | awk -f sqlite/mkopcodeh.awk >
sqlite/src/opcodes.h
sort -n +2 sqlite/src/opcodes.h | awk -f sqlite/mkopcodec.awk >
sqlite/src/opcodes.c
cc -o sqlite/tool/mkkeywordhash
sqlite/tool/mkkeywordhash.c../sqlite/tool/mkkeywordhash >
sqlite/src/keywordhash.h
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
