scottmac Thu Jul 24 11:24:28 2008 UTC
Added files:
/php-src/ext/pdo_sqlite/libsqlite .cvsignore
Removed files:
/php-src/ext/pdo_sqlite/sqlite Makefile.in Makefile.linux-gcc
README VERSION aclocal.m4
addopcodes.awk config.guess
config.sub configure configure.ac
install-sh ltmain.sh main.mk
mkdll.sh mkopcodec.awk mkopcodeh.awk
mkso.sh publish.sh spec.template
sqlite.1 sqlite.pc.in sqlite3.def
sqlite3.pc.in
/php-src/ext/pdo_sqlite/sqlite/src .cvsignore alter.c analyze.c
attach.c auth.c btmutex.c
btree.c btree.h btreeInt.h
build.c callback.c complete.c
date.c delete.c expr.c fault.c
func.c hash.c hash.h insert.c
journal.c keywordhash.h legacy.c
loadext.c main.c malloc.c md5.c
mem1.c mutex.c mutex.h
mutex_unix.c mutex_w32.c
opcodes.c opcodes.h os.c os.h
os_common.h os_test.c os_test.h
os_unix.c os_unix.h os_win.c
os_win.h pager.c pager.h parse.c
parse.h parse.y pragma.c
prepare.c printf.c random.c
select.c shell.c sqlite.h.in
sqlite3ext.h sqliteInt.h
sqliteLimit.h
sqlite_config.w32.h table.c
tclsqlite.c test1.c test2.c
test3.c test4.c test5.c
tokenize.c trigger.c update.c
utf.c util.c vacuum.c vdbe.c
vdbe.h vdbeInt.h vdbeapi.c
vdbeaux.c vdbeblob.c vdbefifo.c
vdbemem.c vtab.c where.c
/php-src/ext/pdo_sqlite/sqlite/tool diffdb.c fragck.tcl lemon.c
lempar.c memleak.awk
memleak2.awk memleak3.tcl
mkkeywordhash.c mkopts.tcl
mksqlite3c.tcl
mksqlite3internalh.tcl
omittest.tcl opcodeDoc.awk
report1.txt showdb.c
showjournal.c soak1.tcl
space_used.tcl spaceanal.tcl
speedtest.tcl speedtest2.tcl
Modified files:
/php-src/ext/pdo_sqlite config.w32
Log:
Add .cvsignore, update config.w32 and remove the other bundled sqlite library
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.w32?r1=1.10&r2=1.11&diff_format=u
Index: php-src/ext/pdo_sqlite/config.w32
diff -u php-src/ext/pdo_sqlite/config.w32:1.10
php-src/ext/pdo_sqlite/config.w32:1.11
--- php-src/ext/pdo_sqlite/config.w32:1.10 Fri Mar 7 10:55:04 2008
+++ php-src/ext/pdo_sqlite/config.w32 Thu Jul 24 11:24:26 2008
@@ -1,31 +1,12 @@
-// $Id: config.w32,v 1.10 2008/03/07 10:55:04 scottmac Exp $
+// $Id: config.w32,v 1.11 2008/07/24 11:24:26 scottmac Exp $
// vim:ft=javascript
ARG_WITH("pdo-sqlite", "for pdo_sqlite support", "no");
if (PHP_PDO_SQLITE != "no") {
- php_pdo_sqlite_version = file_get_contents(configure_module_dirname +
"\\sqlite\\VERSION").replace(new RegExp("[\r\n]+", "g"));
- php_pdo_sqlite_version.match(/(\d+)\.(\d+)\.(\d+)/);
- // this only works for single digit numbers
- php_pdo_sqlite_lib_version = RegExp.$1 + "000" + RegExp.$2 + "000" +
RegExp.$3;
-
- copy_and_subst(configure_module_dirname + "\\sqlite\\src\\sqlite.h.in",
- configure_module_dirname + "\\sqlite3.h", new Array(
- "--VERS--", php_pdo_sqlite_version,
- "--VERSION-NUMBER--", php_pdo_sqlite_lib_version
- ));
-
- FSO.CopyFile(configure_module_dirname +
"\\sqlite\\src\\sqlite_config.w32.h",
- configure_module_dirname + "\\sqlite\\src\\config.h");
-
- EXTENSION("pdo_sqlite", "pdo_sqlite.c sqlite_driver.c
sqlite_statement.c", null, "/DSQLITE_OMIT_CURSOR /I" + configure_module_dirname
+ "/sqlite/src /I" + configure_module_dirname);
- ADD_SOURCES(configure_module_dirname + "/sqlite/src",
- "attach.c auth.c btree.c build.c callback.c date.c delete.c
expr.c func.c hash.c insert.c \
- legacy.c main.c os.c os_unix.c os_win.c pager.c pragma.c
prepare.c printf.c random.c \
- select.c table.c tokenize.c trigger.c update.c utf.c util.c
vacuum.c vdbeapi.c analyze.c complete.c \
- vdbeaux.c vdbe.c vdbemem.c vdbefifo.c where.c parse.c
opcodes.c alter.c vtab.c loadext.c \
- btmutex.c fault.c journal.c malloc.c mem1.c mutex.c
mutex_unix.c mutex_w32.c vdbeblob.c", "pdo_sqlite");
+ EXTENSION("pdo_sqlite", "pdo_sqlite.c sqlite_driver.c
sqlite_statement.c", null, "/DSQLITE_OMIT_CURSOR /DSQLITE_THREADSAFE=1 /I" +
configure_module_dirname + "/libsqlite /I" + configure_module_dirname);
+ ADD_SOURCES(configure_module_dirname + "/libsqlite", "sqlite3.c",
"pdo_sqlite");
ADD_EXTENSION_DEP('pdo_sqlite', 'pdo');
}
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/libsqlite/.cvsignore?view=markup&rev=1.1
Index: php-src/ext/pdo_sqlite/libsqlite/.cvsignore
+++ php-src/ext/pdo_sqlite/libsqlite/.cvsignore
*.lo
*.la
*.gcda
*.gcno..libs
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
