scottmac Thu Jul 24 00:24:04 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/pdo_sqlite/libsqlite sqlite3.c sqlite3.h sqlite3ext.h
Removed files:
/php-src/ext/pdo_sqlite post-bundle.sh
Modified files:
/php-src/ext/pdo_sqlite config.m4 pdo_sqlite.c
Log:
Update pdo_sqlite to use the amalgamation, much easier to upgrade / maintain.
Also kill useless PECL version tag in MINFO.
Will probably be chastised by Jani for doing branch first...
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.m4?r1=1.26.2.9.2.7.2.1&r2=1.26.2.9.2.7.2.2&diff_format=u
Index: php-src/ext/pdo_sqlite/config.m4
diff -u php-src/ext/pdo_sqlite/config.m4:1.26.2.9.2.7.2.1
php-src/ext/pdo_sqlite/config.m4:1.26.2.9.2.7.2.2
--- php-src/ext/pdo_sqlite/config.m4:1.26.2.9.2.7.2.1 Fri Mar 7 10:47:23 2008
+++ php-src/ext/pdo_sqlite/config.m4 Thu Jul 24 00:24:03 2008
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.26.2.9.2.7.2.1 2008/03/07 10:47:23 scottmac Exp $
+dnl $Id: config.m4,v 1.26.2.9.2.7.2.2 2008/07/24 00:24:03 scottmac Exp $
dnl config.m4 for extension pdo_sqlite
dnl vim:et:sw=2:ts=2:
@@ -71,20 +71,7 @@
PHP_NEW_EXTENSION(pdo_sqlite, $php_pdo_sqlite_sources_core,
$ext_shared,,-I$pdo_inc_path)
else
# use bundled libs
- pdo_sqlite_sources="sqlite/src/attach.c sqlite/src/auth.c
sqlite/src/btree.c \
- sqlite/src/build.c sqlite/src/callback.c sqlite/src/date.c
sqlite/src/delete.c sqlite/src/expr.c \
- sqlite/src/func.c sqlite/src/hash.c sqlite/src/insert.c
sqlite/src/legacy.c \
- sqlite/src/main.c sqlite/src/os_unix.c sqlite/src/os_win.c
sqlite/src/os.c \
- sqlite/src/pager.c sqlite/src/pragma.c sqlite/src/prepare.c \
- sqlite/src/printf.c sqlite/src/random.c sqlite/src/select.c \
- sqlite/src/table.c sqlite/src/tokenize.c sqlite/src/analyze.c
sqlite/src/complete.c \
- sqlite/src/trigger.c sqlite/src/update.c sqlite/src/utf.c
sqlite/src/util.c \
- sqlite/src/vacuum.c sqlite/src/vdbeapi.c sqlite/src/vdbeaux.c
sqlite/src/vdbe.c \
- sqlite/src/vdbemem.c sqlite/src/where.c sqlite/src/parse.c
sqlite/src/opcodes.c \
- sqlite/src/alter.c sqlite/src/vdbefifo.c sqlite/src/vtab.c
sqlite/src/loadext.c \
- sqlite/src/btmutex.c sqlite/src/fault.c sqlite/src/journal.c \
- sqlite/src/malloc.c sqlite/src/mem1.c sqlite/src/mutex.c
sqlite/src/mutex_unix.c \
- sqlite/src/mutex_w32.c sqlite/src/vdbeblob.c"
+ pdo_sqlite_sources="libsqlite/sqlite3.c"
if test "$enable_maintainer_zts" = "yes"; then
threadsafe_flag="-DTHREADSAFE=1"
@@ -94,33 +81,11 @@
PHP_NEW_EXTENSION(pdo_sqlite,
$php_pdo_sqlite_sources_core $pdo_sqlite_sources,
- $ext_shared,,-I$ext_srcdir/sqlite/src -DPDO_SQLITE_BUNDLED=1
-DSQLITE_OMIT_CURSOR $threadsafe_flag -I$pdo_inc_path)
+ $ext_shared,,-I$ext_srcdir/libsqlite -DPDO_SQLITE_BUNDLED=1
-DSQLITE_OMIT_CURSOR $threadsafe_flag -I$pdo_inc_path)
PHP_SUBST(PDO_SQLITE_SHARED_LIBADD)
- PHP_ADD_BUILD_DIR($ext_builddir/sqlite/src, 1)
- AC_CHECK_SIZEOF(char *,4)
- AC_DEFINE(SQLITE_PTR_SZ, SIZEOF_CHAR_P, [Size of a pointer])
- PDO_SQLITE_VERSION=`cat $ext_srcdir/sqlite/VERSION | sed 's/[^0-9.]//g'`
- 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/
$ext_srcdir/sqlite/src/sqlite.h.in > $ext_srcdir/sqlite/src/sqlite3.h
+ PHP_ADD_BUILD_DIR($ext_builddir/libsqlite, 1)
- touch $ext_srcdir/sqlite/src/parse.c $ext_srcdir/sqlite/src/parse.h
-
- if test "$ext_shared" = "no" || test "$ext_srcdir" != "$abs_srcdir"; then
- echo '#include <php_config.h>' > $ext_srcdir/sqlite/src/config.h
- else
- echo "#include \"$abs_builddir/config.h\"" >
$ext_srcdir/sqlite/src/config.h
- fi
- cat >> $ext_srcdir/sqlite/src/config.h <<EOF
-#if ZTS
-# define THREADSAFE 1
-#endif
-#if !ZEND_DEBUG
-# define NDEBUG
-#endif
-/* discourage foolishness */
-#define sqlite3_temp_directory sqlite3_temp_directory_unsafe_except_in_minit
-EOF
AC_CHECK_FUNCS(usleep nanosleep)
AC_CHECK_HEADERS(time.h)
fi
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/pdo_sqlite.c?r1=1.10.2.6.2.2.2.2&r2=1.10.2.6.2.2.2.3&diff_format=u
Index: php-src/ext/pdo_sqlite/pdo_sqlite.c
diff -u php-src/ext/pdo_sqlite/pdo_sqlite.c:1.10.2.6.2.2.2.2
php-src/ext/pdo_sqlite/pdo_sqlite.c:1.10.2.6.2.2.2.3
--- php-src/ext/pdo_sqlite/pdo_sqlite.c:1.10.2.6.2.2.2.2 Mon Dec 31
07:17:12 2007
+++ php-src/ext/pdo_sqlite/pdo_sqlite.c Thu Jul 24 00:24:03 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_sqlite.c,v 1.10.2.6.2.2.2.2 2007/12/31 07:17:12 sebastian Exp $ */
+/* $Id: pdo_sqlite.c,v 1.10.2.6.2.2.2.3 2008/07/24 00:24:03 scottmac Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -95,12 +95,6 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "PDO Driver for SQLite 3.x", "enabled");
- php_info_print_table_row(2, "PECL Module version",
-#if PDO_SQLITE_BUNDLED
- "(bundled) "
-#endif
- PHP_PDO_SQLITE_MODULE_VERSION
- " $Id: pdo_sqlite.c,v 1.10.2.6.2.2.2.2 2007/12/31 07:17:12
sebastian Exp $");
php_info_print_table_row(2, "SQLite Library", sqlite3_libversion());
php_info_print_table_end();
}
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/libsqlite/sqlite3.c?view=markup&rev=1.1
Index: php-src/ext/pdo_sqlite/libsqlite/sqlite3.c
+++ php-src/ext/pdo_sqlite/libsqlite/sqlite3.c
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/libsqlite/sqlite3.h?view=markup&rev=1.1
Index: php-src/ext/pdo_sqlite/libsqlite/sqlite3.h
+++ php-src/ext/pdo_sqlite/libsqlite/sqlite3.h
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/libsqlite/sqlite3ext.h?view=markup&rev=1.1
Index: php-src/ext/pdo_sqlite/libsqlite/sqlite3ext.h
+++ php-src/ext/pdo_sqlite/libsqlite/sqlite3ext.h
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
