[PHP-CVS] cvs: php-src /ext/date config.m4
sniper Mon Oct 3 16:20:25 2005 EDT Modified files: /php-src/ext/date config.m4 Log: Add include path to the timelib headers http://cvs.php.net/diff.php/php-src/ext/date/config.m4?r1=1.10r2=1.11ty=u Index: php-src/ext/date/config.m4 diff -u php-src/ext/date/config.m4:1.10 php-src/ext/date/config.m4:1.11 --- php-src/ext/date/config.m4:1.10 Thu Jul 7 19:18:22 2005 +++ php-src/ext/date/config.m4 Mon Oct 3 16:20:20 2005 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.10 2005/07/07 23:18:22 sniper Exp $ +dnl $Id: config.m4,v 1.11 2005/10/03 20:20:20 sniper Exp $ dnl config.m4 for date extension sinclude(ext/date/lib/timelib.m4) @@ -9,7 +9,11 @@ lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c PHP_NEW_EXTENSION(date, php_date.c $timelib_sources, no,, $PHP_DATE_CFLAGS) + PHP_ADD_BUILD_DIR([$ext_builddir/lib], 1) +PHP_ADD_INCLUDE([$ext_builddir/lib]) +PHP_ADD_INCLUDE([$ext_srcdir/lib]) + PHP_INSTALL_HEADERS([ext/date], [php_date.h lib/timelib.h lib/timelib_structs.h lib/timelib_config.h]) cat $ext_builddir/lib/timelib_config.h EOF -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date config.m4
derick Thu Jun 30 02:40:57 2005 EDT Modified files: /php-src/ext/date config.m4 Log: - Make the Netware guys happy by removing the config.nw.h define. http://cvs.php.net/diff.php/php-src/ext/date/config.m4?r1=1.8r2=1.9ty=u Index: php-src/ext/date/config.m4 diff -u php-src/ext/date/config.m4:1.8 php-src/ext/date/config.m4:1.9 --- php-src/ext/date/config.m4:1.8 Sun Jun 19 19:36:18 2005 +++ php-src/ext/date/config.m4 Thu Jun 30 02:40:57 2005 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.8 2005/06/19 23:36:18 sniper Exp $ +dnl $Id: config.m4,v 1.9 2005/06/30 06:40:57 derick Exp $ dnl config.m4 for date extension sinclude(ext/date/lib/timelib.m4) @@ -15,8 +15,6 @@ cat $ext_builddir/lib/timelib_config.h EOF #if PHP_WIN32 # include config.w32.h -#elif defined(NETWARE) -# include config.nw.h #else # include php_config.h #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date config.m4
sniper Sun Jun 19 19:36:19 2005 EDT Modified files: /php-src/ext/date config.m4 Log: Install headers too http://cvs.php.net/diff.php/php-src/ext/date/config.m4?r1=1.7r2=1.8ty=u Index: php-src/ext/date/config.m4 diff -u php-src/ext/date/config.m4:1.7 php-src/ext/date/config.m4:1.8 --- php-src/ext/date/config.m4:1.7 Fri Jun 17 08:03:02 2005 +++ php-src/ext/date/config.m4 Sun Jun 19 19:36:18 2005 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.7 2005/06/17 12:03:02 derick Exp $ +dnl $Id: config.m4,v 1.8 2005/06/19 23:36:18 sniper Exp $ dnl config.m4 for date extension sinclude(ext/date/lib/timelib.m4) @@ -10,6 +10,7 @@ PHP_NEW_EXTENSION(date, php_date.c $timelib_sources, no,, $PHP_DATE_CFLAGS) PHP_ADD_BUILD_DIR([$ext_builddir/lib], 1) +PHP_INSTALL_HEADERS([ext/date], [php_date.h lib/timelib.h lib/timelib_structs.h]) cat $ext_builddir/lib/timelib_config.h EOF #if PHP_WIN32 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date config.m4 config.w32 php_date.c /ext/date/lib datetime.c datetime.h parse_date.c parse_tz.c timelib.c timelib.h tm2unixtime.c unixtime2tm.c /ext/date/lib/resource pa
derick Thu Jun 16 13:12:42 2005 EDT Added files: /php-src/ext/date/lib timelib.c timelib.h Removed files: /php-src/ext/date/lib datetime.c datetime.h Modified files: /php-src/ext/date config.m4 config.w32 php_date.c /php-src/ext/date/lib parse_date.c parse_tz.c tm2unixtime.c unixtime2tm.c /php-src/ext/date/lib/resource parse_date.re Log: - Rename datetime.c and datetime.h to timelib.c and timelib.h to prevent duplicate header names. http://cvs.php.net/diff.php/php-src/ext/date/config.m4?r1=1.2r2=1.3ty=u Index: php-src/ext/date/config.m4 diff -u php-src/ext/date/config.m4:1.2 php-src/ext/date/config.m4:1.3 --- php-src/ext/date/config.m4:1.2 Tue Jun 14 18:50:55 2005 +++ php-src/ext/date/config.m4 Thu Jun 16 13:12:40 2005 @@ -1,5 +1,5 @@ -dnl $Id: config.m4,v 1.2 2005/06/14 22:50:55 sniper Exp $ +dnl $Id: config.m4,v 1.3 2005/06/16 17:12:40 derick Exp $ dnl config.m4 for date extension -PHP_NEW_EXTENSION(date, php_date.c lib/datetime.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/tm2unixtime.c lib/unixtime2tm.c) +PHP_NEW_EXTENSION(date, php_date.c lib/timelib.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/tm2unixtime.c lib/unixtime2tm.c) PHP_ADD_BUILD_DIR([$ext_builddir/lib]) http://cvs.php.net/diff.php/php-src/ext/date/config.w32?r1=1.2r2=1.3ty=u Index: php-src/ext/date/config.w32 diff -u php-src/ext/date/config.w32:1.2 php-src/ext/date/config.w32:1.3 --- php-src/ext/date/config.w32:1.2 Wed Jun 15 04:44:23 2005 +++ php-src/ext/date/config.w32 Thu Jun 16 13:12:40 2005 @@ -1,6 +1,6 @@ -// $Id: config.w32,v 1.2 2005/06/15 08:44:23 edink Exp $ +// $Id: config.w32,v 1.3 2005/06/16 17:12:40 derick Exp $ // vim:ft=javascript EXTENSION(date, php_date.c, false, -Iext/date/lib); -ADD_SOURCES(ext/date/lib, datetime.c dow.c parse_date.c parse_tz.c tm2unixtime.c unixtime2tm.c, date); +ADD_SOURCES(ext/date/lib, timelib.c dow.c parse_date.c parse_tz.c tm2unixtime.c unixtime2tm.c, date); AC_DEFINE('HAVE_DATE', 1, 'Have date/time support'); http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.7r2=1.8ty=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.7 php-src/ext/date/php_date.c:1.8 --- php-src/ext/date/php_date.c:1.7 Wed Jun 15 19:30:20 2005 +++ php-src/ext/date/php_date.c Thu Jun 16 13:12:41 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_date.c,v 1.7 2005/06/15 23:30:20 iliaa Exp $ */ +/* $Id: php_date.c,v 1.8 2005/06/16 17:12:41 derick Exp $ */ #include php.h #include php_streams.h @@ -26,7 +26,7 @@ #include ext/standard/info.h #include php_date.h #include lib/timelib_structs.h -#include lib/datetime.h +#include lib/timelib.h #include time.h function_entry date_functions[] = { http://cvs.php.net/diff.php/php-src/ext/date/lib/parse_date.c?r1=1.8r2=1.9ty=u Index: php-src/ext/date/lib/parse_date.c diff -u php-src/ext/date/lib/parse_date.c:1.8 php-src/ext/date/lib/parse_date.c:1.9 --- php-src/ext/date/lib/parse_date.c:1.8 Thu Jun 16 09:30:25 2005 +++ php-src/ext/date/lib/parse_date.c Thu Jun 16 13:12:41 2005 @@ -18,12 +18,12 @@ +--+ */ -/* $Id: parse_date.c,v 1.8 2005/06/16 13:30:25 derick Exp $ */ +/* $Id: parse_date.c,v 1.9 2005/06/16 17:12:41 derick Exp $ */ #include stdlib.h #include stdio.h #include string.h -#include datetime.h +#include timelib.h #if defined(_MSC_VER) #define strcasecmp stricmp http://cvs.php.net/diff.php/php-src/ext/date/lib/parse_tz.c?r1=1.4r2=1.5ty=u Index: php-src/ext/date/lib/parse_tz.c diff -u php-src/ext/date/lib/parse_tz.c:1.4 php-src/ext/date/lib/parse_tz.c:1.5 --- php-src/ext/date/lib/parse_tz.c:1.4 Wed Jun 15 07:01:04 2005 +++ php-src/ext/date/lib/parse_tz.c Thu Jun 16 13:12:41 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: parse_tz.c,v 1.4 2005/06/15 11:01:04 derick Exp $ */ +/* $Id: parse_tz.c,v 1.5 2005/06/16 17:12:41 derick Exp $ */ #include stdio.h #ifdef WIN32 @@ -26,7 +26,7 @@ #endif #include string.h -#include datetime.h +#include timelib.h #include timezonedb.h static void read_header(char **tzf, timelib_tzinfo *tz) http://cvs.php.net/diff.php/php-src/ext/date/lib/tm2unixtime.c?r1=1.4r2=1.5ty=u Index: php-src/ext/date/lib/tm2unixtime.c diff -u php-src/ext/date/lib/tm2unixtime.c:1.4 php-src/ext/date/lib/tm2unixtime.c:1.5 --- php-src/ext/date/lib/tm2unixtime.c:1.4 Wed Jun 15 19:42:55 2005 +++ php-src/ext/date/lib/tm2unixtime.c Thu Jun 16 13:12:41 2005 @@ -16,9 +16,9 @@ +--+ */ -/* $Id: tm2unixtime.c,v 1.4 2005/06/15 23:42:55 iliaa Exp $ */ +/* $Id: tm2unixtime.c,v 1.5 2005/06/16 17:12:41 derick Exp $ */ -#include
[PHP-CVS] cvs: php-src /ext/date config.m4
derick Thu Jun 16 14:15:30 2005 EDT Modified files: /php-src/ext/date config.m4 Log: - Added include dir. http://cvs.php.net/diff.php/php-src/ext/date/config.m4?r1=1.3r2=1.4ty=u Index: php-src/ext/date/config.m4 diff -u php-src/ext/date/config.m4:1.3 php-src/ext/date/config.m4:1.4 --- php-src/ext/date/config.m4:1.3 Thu Jun 16 13:12:40 2005 +++ php-src/ext/date/config.m4 Thu Jun 16 14:15:30 2005 @@ -1,5 +1,6 @@ -dnl $Id: config.m4,v 1.3 2005/06/16 17:12:40 derick Exp $ +dnl $Id: config.m4,v 1.4 2005/06/16 18:15:30 derick Exp $ dnl config.m4 for date extension PHP_NEW_EXTENSION(date, php_date.c lib/timelib.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/tm2unixtime.c lib/unixtime2tm.c) +PHP_ADD_INCLUDE([$ext_builddir/lib]) PHP_ADD_BUILD_DIR([$ext_builddir/lib]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date config.m4
sniper Thu Jun 16 17:23:16 2005 EDT Modified files: /php-src/ext/date config.m4 Log: Fix VPATH build (again) http://cvs.php.net/diff.php/php-src/ext/date/config.m4?r1=1.4r2=1.5ty=u Index: php-src/ext/date/config.m4 diff -u php-src/ext/date/config.m4:1.4 php-src/ext/date/config.m4:1.5 --- php-src/ext/date/config.m4:1.4 Thu Jun 16 14:15:30 2005 +++ php-src/ext/date/config.m4 Thu Jun 16 17:23:16 2005 @@ -1,6 +1,9 @@ -dnl $Id: config.m4,v 1.4 2005/06/16 18:15:30 derick Exp $ +dnl $Id: config.m4,v 1.5 2005/06/16 21:23:16 sniper Exp $ dnl config.m4 for date extension -PHP_NEW_EXTENSION(date, php_date.c lib/timelib.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/tm2unixtime.c lib/unixtime2tm.c) -PHP_ADD_INCLUDE([$ext_builddir/lib]) +PHP_DATE_CFLAGS=[EMAIL PROTECTED]@/lib +timelib_sources=lib/dow.c lib/parse_date.c lib/parse_tz.c + lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c + +PHP_NEW_EXTENSION(date, php_date.c $timelib_sources, no,, $PHP_DATE_CFLAGS) PHP_ADD_BUILD_DIR([$ext_builddir/lib]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date config.m4 php_date.c /ext/date/lib .cvsignore dow.c parse_date.c parse_tz.c timelib.c timelib.h timelib.m4 timelib_structs.h tm2unixtime.c unixtime2tm.c /ext/date/li
sniper Thu Jun 16 19:12:11 2005 EDT Added files: /php-src/ext/date/lib timelib.m4 Modified files: /php-src/ext/date config.m4 php_date.c /php-src/ext/date/lib .cvsignore dow.c parse_date.c parse_tz.c timelib.c timelib.h timelib_structs.h tm2unixtime.c unixtime2tm.c /php-src/ext/date/lib/resource parse_date.re Log: - Improve portability. # TODO: The standalone lib needs it's own build stuff, pretty much same as # Zend has for standalone builds. http://cvs.php.net/diff.php/php-src/ext/date/config.m4?r1=1.5r2=1.6ty=u Index: php-src/ext/date/config.m4 diff -u php-src/ext/date/config.m4:1.5 php-src/ext/date/config.m4:1.6 --- php-src/ext/date/config.m4:1.5 Thu Jun 16 17:23:16 2005 +++ php-src/ext/date/config.m4 Thu Jun 16 19:12:08 2005 @@ -1,9 +1,22 @@ -dnl $Id: config.m4,v 1.5 2005/06/16 21:23:16 sniper Exp $ +dnl $Id: config.m4,v 1.6 2005/06/16 23:12:08 sniper Exp $ dnl config.m4 for date extension -PHP_DATE_CFLAGS=[EMAIL PROTECTED]@/lib +sinclude(ext/date/lib/timelib.m4) +sinclude(lib/timelib.m4) + +PHP_DATE_CFLAGS=[EMAIL PROTECTED]@/lib timelib_sources=lib/dow.c lib/parse_date.c lib/parse_tz.c lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c PHP_NEW_EXTENSION(date, php_date.c $timelib_sources, no,, $PHP_DATE_CFLAGS) -PHP_ADD_BUILD_DIR([$ext_builddir/lib]) +PHP_ADD_BUILD_DIR([$ext_builddir/lib], 1) + +cat $ext_builddir/lib/tl_config.h EOF +#if PHP_WIN32 +# include config.w32.h +#elif defined(NETWARE) +# include config.nw.h +#else +# include php_config.h +#endif +EOF http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.8r2=1.9ty=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.8 php-src/ext/date/php_date.c:1.9 --- php-src/ext/date/php_date.c:1.8 Thu Jun 16 13:12:41 2005 +++ php-src/ext/date/php_date.c Thu Jun 16 19:12:08 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_date.c,v 1.8 2005/06/16 17:12:41 derick Exp $ */ +/* $Id: php_date.c,v 1.9 2005/06/16 23:12:08 sniper Exp $ */ #include php.h #include php_streams.h @@ -25,7 +25,6 @@ #include php_ini.h #include ext/standard/info.h #include php_date.h -#include lib/timelib_structs.h #include lib/timelib.h #include time.h http://cvs.php.net/diff.php/php-src/ext/date/lib/.cvsignore?r1=1.2r2=1.3ty=u Index: php-src/ext/date/lib/.cvsignore diff -u php-src/ext/date/lib/.cvsignore:1.2 php-src/ext/date/lib/.cvsignore:1.3 --- php-src/ext/date/lib/.cvsignore:1.2 Thu Jun 16 17:22:33 2005 +++ php-src/ext/date/lib/.cvsignore Thu Jun 16 19:12:09 2005 @@ -5,3 +5,4 @@ .libs *.gcda *.gcno +tl_config.h http://cvs.php.net/diff.php/php-src/ext/date/lib/dow.c?r1=1.2r2=1.3ty=u Index: php-src/ext/date/lib/dow.c diff -u php-src/ext/date/lib/dow.c:1.2 php-src/ext/date/lib/dow.c:1.3 --- php-src/ext/date/lib/dow.c:1.2 Wed Jun 15 07:01:04 2005 +++ php-src/ext/date/lib/dow.c Thu Jun 16 19:12:09 2005 @@ -16,7 +16,9 @@ +--+ */ -/* $Id: dow.c,v 1.2 2005/06/15 11:01:04 derick Exp $ */ +/* $Id: dow.c,v 1.3 2005/06/16 23:12:09 sniper Exp $ */ + +#include tl_config.h #include timelib_structs.h http://cvs.php.net/diff.php/php-src/ext/date/lib/parse_date.c?r1=1.9r2=1.10ty=u Index: php-src/ext/date/lib/parse_date.c diff -u php-src/ext/date/lib/parse_date.c:1.9 php-src/ext/date/lib/parse_date.c:1.10 --- php-src/ext/date/lib/parse_date.c:1.9 Thu Jun 16 13:12:41 2005 +++ php-src/ext/date/lib/parse_date.c Thu Jun 16 19:12:09 2005 @@ -18,11 +18,21 @@ +--+ */ -/* $Id: parse_date.c,v 1.9 2005/06/16 17:12:41 derick Exp $ */ +/* $Id: parse_date.c,v 1.10 2005/06/16 23:12:09 sniper Exp $ */ + +#include tl_config.h -#include stdlib.h #include stdio.h + +#ifdef HAVE_STDLIB_H +#include stdlib.h +#endif +#ifdef HAVE_STRING_H #include string.h +#else +#include strings.h +#endif + #include timelib.h #if defined(_MSC_VER) http://cvs.php.net/diff.php/php-src/ext/date/lib/parse_tz.c?r1=1.6r2=1.7ty=u Index: php-src/ext/date/lib/parse_tz.c diff -u php-src/ext/date/lib/parse_tz.c:1.6 php-src/ext/date/lib/parse_tz.c:1.7 --- php-src/ext/date/lib/parse_tz.c:1.6 Thu Jun 16 14:34:42 2005 +++ php-src/ext/date/lib/parse_tz.c Thu Jun 16 19:12:10 2005 @@ -16,15 +16,17 @@ +--+ */ -/* $Id: parse_tz.c,v 1.6 2005/06/16 18:34:42 derick Exp $ */ +/* $Id: parse_tz.c,v 1.7 2005/06/16 23:12:10 sniper Exp $ */ + +#include tl_config.h #include stdio.h -#ifdef WIN32 -#include winsock2.h + +#ifdef HAVE_STRING_H +#include string.h #else -#include inttypes.h +#include strings.h #endif -#include string.h #include timelib.h #include timezonedb.h
[PHP-CVS] cvs: php-src /ext/date config.m4
sniper Tue Jun 14 18:50:55 2005 EDT Modified files: /php-src/ext/date config.m4 Log: fix VPATH builds + nuked unnecessary lines http://cvs.php.net/diff.php/php-src/ext/date/config.m4?r1=1.1r2=1.2ty=u Index: php-src/ext/date/config.m4 diff -u php-src/ext/date/config.m4:1.1 php-src/ext/date/config.m4:1.2 --- php-src/ext/date/config.m4:1.1 Tue Jun 14 17:32:27 2005 +++ php-src/ext/date/config.m4 Tue Jun 14 18:50:55 2005 @@ -1,6 +1,5 @@ -dnl $Id: config.m4,v 1.1 2005/06/14 21:32:27 derick Exp $ +dnl $Id: config.m4,v 1.2 2005/06/14 22:50:55 sniper Exp $ dnl config.m4 for date extension -AC_DEFINE(HAVE_DATE, 1, [Whether you want date/time support]) -AC_DEFINE(TIMEZONE_DB_PATH, $libdir/timezonedb, [The path to the timezone database]) -PHP_NEW_EXTENSION(date, php_date.c lib/datetime.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/tm2unixtime.c lib/unixtime2tm.c, no) +PHP_NEW_EXTENSION(date, php_date.c lib/datetime.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/tm2unixtime.c lib/unixtime2tm.c) +PHP_ADD_BUILD_DIR([$ext_builddir/lib]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/date config.m4
Enabled without asking, eh? Edin - Original Message - From: Jani Taskinen [EMAIL PROTECTED] To: php-cvs@lists.php.net Sent: Wednesday, June 15, 2005 12:50 AM Subject: [PHP-CVS] cvs: php-src /ext/date config.m4 sniper Tue Jun 14 18:50:55 2005 EDT Modified files: /php-src/ext/date config.m4 Log: fix VPATH builds + nuked unnecessary lines http://cvs.php.net/diff.php/php-src/ext/date/config.m4?r1=1.1r2=1.2ty=u Index: php-src/ext/date/config.m4 diff -u php-src/ext/date/config.m4:1.1 php-src/ext/date/config.m4:1.2 --- php-src/ext/date/config.m4:1.1 Tue Jun 14 17:32:27 2005 +++ php-src/ext/date/config.m4 Tue Jun 14 18:50:55 2005 @@ -1,6 +1,5 @@ -dnl $Id: config.m4,v 1.1 2005/06/14 21:32:27 derick Exp $ +dnl $Id: config.m4,v 1.2 2005/06/14 22:50:55 sniper Exp $ dnl config.m4 for date extension -AC_DEFINE(HAVE_DATE, 1, [Whether you want date/time support]) -AC_DEFINE(TIMEZONE_DB_PATH, $libdir/timezonedb, [The path to the timezone database]) -PHP_NEW_EXTENSION(date, php_date.c lib/datetime.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/tm2unixtime.c lib/unixtime2tm.c, no) +PHP_NEW_EXTENSION(date, php_date.c lib/datetime.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/tm2unixtime.c lib/unixtime2tm.c) +PHP_ADD_BUILD_DIR([$ext_builddir/lib]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php