sebastian Wed Jun 25 17:37:50 2003 EDT
Modified files:
/php-src/main config.w32.h internal_functions_win32.c
/php-src/win32 php4dllts.dsp
Log:
Add ext/dom and ext/simplexml to the Win32 default build. #Apart from a linker error
when HAVE_SIMPLEXML=1 is set this already works. More research, after a good night's
sleep, is required ;-)
Index: php-src/main/config.w32.h
diff -u php-src/main/config.w32.h:1.71 php-src/main/config.w32.h:1.72
--- php-src/main/config.w32.h:1.71 Wed Jun 25 01:01:50 2003
+++ php-src/main/config.w32.h Wed Jun 25 17:37:50 2003
@@ -2,7 +2,7 @@
Build Configuration for Win32.
This has only been tested with MS VisualC++ 6 (and later).
- $Id: config.w32.h,v 1.71 2003/06/25 05:01:50 sebastian Exp $
+ $Id: config.w32.h,v 1.72 2003/06/25 21:37:50 sebastian Exp $
*/
/* Default PHP / PEAR directories */
@@ -66,9 +66,11 @@
/* Enable / Disable WDDX extension (default: enabled) */
#define HAVE_WDDX 1
-/* Enable / Disable XML extension (default: enabled) */
-#define HAVE_XML 1
+/* Enable / Disable XML extensions (default: enabled) */
#define HAVE_LIBXML 1
+#define HAVE_DOM 1
+#define HAVE_SIMPLEXML 1
+#define HAVE_XML 1
/* Enable / Disable ZLIB extension (default: enabled) */
#define HAVE_ZLIB 1
Index: php-src/main/internal_functions_win32.c
diff -u php-src/main/internal_functions_win32.c:1.75
php-src/main/internal_functions_win32.c:1.76
--- php-src/main/internal_functions_win32.c:1.75 Wed Jun 25 00:54:23 2003
+++ php-src/main/internal_functions_win32.c Wed Jun 25 17:37:50 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: internal_functions_win32.c,v 1.75 2003/06/25 04:54:23 sebastian Exp $ */
+/* $Id: internal_functions_win32.c,v 1.76 2003/06/25 21:37:50 sebastian Exp $ */
/* {{{ includes
*/
@@ -71,12 +71,6 @@
#if HAVE_SESSION
#include "ext/session/php_session.h"
#endif
-#if HAVE_XML
-#include "ext/xml/php_xml.h"
-#endif
-#if HAVE_XML && HAVE_WDDX
-#include "ext/wddx/php_wddx.h"
-#endif
#if HAVE_MYSQL
#include "ext/mysql/php_mysql.h"
#endif
@@ -89,6 +83,21 @@
#if HAVE_ZLIB
#include "ext/zlib/php_zlib.h"
#endif
+#if HAVE_LIBXML
+#if HAVE_DOM
+#include "ext/dom/php_dom.h"
+#endif
+#if HAVE_SIMPLEXML
+#include "ext/simplexml/php_simplexml.h"
+#endif
+#endif
+#if HAVE_XML
+#include "ext/xml/php_xml.h"
+#endif
+#if HAVE_XML && HAVE_WDDX
+#include "ext/wddx/php_wddx.h"
+#endif
+
/* }}} */
/* {{{ php_builtin_extensions[]
@@ -125,14 +134,22 @@
#if HAVE_TOKENIZER
,phpext_tokenizer_ptr
#endif
+#if HAVE_ZLIB
+ ,phpext_zlib_ptr
+#endif
+#if HAVE_LIBXML
+#if HAVE_DOM
+ ,phpext_dom_ptr
+#endif
+#if HAVE_SIMPLEXML
+ ,phpext_simplexml_ptr
+#endif
+#endif
#if HAVE_XML
,phpext_xml_ptr
#endif
#if HAVE_XML && HAVE_WDDX
,phpext_wddx_ptr
-#endif
-#if HAVE_ZLIB
- ,phpext_zlib_ptr
#endif
};
/* }}} */
Index: php-src/win32/php4dllts.dsp
diff -u php-src/win32/php4dllts.dsp:1.115 php-src/win32/php4dllts.dsp:1.116
--- php-src/win32/php4dllts.dsp:1.115 Wed Jun 25 00:54:23 2003
+++ php-src/win32/php4dllts.dsp Wed Jun 25 17:37:50 2003
@@ -433,6 +433,185 @@
# End Source File
# End Group
# End Group
+
+# Begin Group "DOM"
+# Begin Group "DOM Source Files"
+
+# PROP Default_Filter ".c"
+# Begin Source File
+
+SOURCE=..\ext\dom\attr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\cdatasection.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\characterdata.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\comment.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\document.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\documentfragment.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\documenttype.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\domconfiguration.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\domerror.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\domerrorhandler.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\domexception.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\domimplementation.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\domimplementationlist.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\domimplementationsource.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\domlocator.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\domstringlist.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\element.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\entity.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\entityreference.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\namednodemap.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\namelist.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\node.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\nodelist.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\notation.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\php_dom.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\processinginstruction.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\string_extend.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\text.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\typeinfo.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\userdatahandler.c
+# End Source File
+# End Group
+# Begin Group "DOM Header Files"
+
+# PROP Default_Filter ".h"
+# Begin Source File
+
+SOURCE=..\ext\dom\dom_ce.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\dom_fe.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\dom_properties.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\php_dom.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\xml_common.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Group
+
+# Begin Group "SimpleXML"
+# Begin Group "SimpleXML Source Files"
+
+# PROP Default_Filter ".c"
+# Begin Source File
+
+SOURCE=..\ext\simplexml\simplexml.c
+# End Source File
+# End Group
+# Begin Group "SimpleXML Header Files"
+
+# PROP Default_Filter ".h"
+# Begin Source File
+
+SOURCE=..\ext\simplexml\php_simplexml.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Group
+
# Begin Group "Regular Expressions"
# PROP Default_Filter ""
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
