wez             Sun Feb 27 22:23:57 2005 EDT

  Added files:                 
    /php-src/ext/pdo_sqlite/sqlite/src  sqlite_config.w32.h 

  Modified files:              
    /php-src/ext/pdo_sqlite     config.w32 
  Log:
  build bundled sqlite on win32
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/config.w32?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/pdo_sqlite/config.w32
diff -u php-src/ext/pdo_sqlite/config.w32:1.3 
php-src/ext/pdo_sqlite/config.w32:1.4
--- php-src/ext/pdo_sqlite/config.w32:1.3       Mon Sep 20 17:26:24 2004
+++ php-src/ext/pdo_sqlite/config.w32   Sun Feb 27 22:23:56 2005
@@ -1,16 +1,31 @@
-// $Id: config.w32,v 1.3 2004/09/20 21:26:24 edink Exp $
+// $Id: config.w32,v 1.4 2005/02/28 03:23:56 wez Exp $
 // vim:ft=javascript
 
 ARG_WITH("pdo-sqlite", "for pdo_sqlite support", "no");
 
 if (PHP_PDO_SQLITE != "no") {
-       if (CHECK_LIB("sqlite3.lib", "pdo_sqlite", PHP_PDO_SQLITE) &&
-                       CHECK_HEADER_ADD_INCLUDE("sqlite3.h", 
"CFLAGS_PDO_SQLITE", PHP_PDO_SQLITE + ";" + PHP_PHP_BUILD + 
"\\include\\sqlite3")) {
-               EXTENSION("pdo_sqlite", "pdo_sqlite.c sqlite_driver.c 
sqlite_statement.c");
-               ADD_FLAG('CFLAGS_PDO_SQLITE', "/I ..\\pecl");
-       } else {
-               WARNING("pdo_sqlite not enabled; libraries and headers not 
found");
-       }
+
+       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 ..\\pecl /I" + configure_module_dirname);
+       ADD_SOURCES(configure_module_dirname + "/sqlite/src",
+               "attach.c auth.c btree.c build.c date.c delete.c expr.c func.c 
hash.c insert.c \
+                legacy.c main.c os_mac.c os_unix.c os_win.c pager.c pragma.c 
printf.c random.c \
+                select.c table.c tokenize.c trigger.c update.c utf.c util.c 
vacuum.c vdbeapi.c \
+                vdbeaux.c vdbe.c vdbemem.c where.c parse.c opcodes.c alter.c 
experimental.c", "pdo_sqlite");
+       
        ADD_EXTENSION_DEP('pdo_sqlite', 'pdo');
 }
 

http://cvs.php.net/co.php/php-src/ext/pdo_sqlite/sqlite/src/sqlite_config.w32.h?r=1.1&p=1
Index: php-src/ext/pdo_sqlite/sqlite/src/sqlite_config.w32.h
+++ php-src/ext/pdo_sqlite/sqlite/src/sqlite_config.w32.h
#include "config.w32.h"
#if ZTS
# define THREADSAFE 1
#endif
#if !ZEND_DEBUG && !defined(NDEBUG)
# define NDEBUG
#endif
#define SQLITE_PTR_SZ 4

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to