[PHP-CVS] cvs: php-src /ext/simplexml config.w32 php_simplexml.h
rrichards Sat Dec 27 12:21:36 2008 UTC
Modified files:
/php-src/ext/simplexml config.w32 php_simplexml.h
Log:
proper exports/imports for win32
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/config.w32?r1=1.7r2=1.8diff_format=u
Index: php-src/ext/simplexml/config.w32
diff -u php-src/ext/simplexml/config.w32:1.7
php-src/ext/simplexml/config.w32:1.8
--- php-src/ext/simplexml/config.w32:1.7Fri Dec 26 14:16:38 2008
+++ php-src/ext/simplexml/config.w32Sat Dec 27 12:21:36 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.7 2008/12/26 14:16:38 pajoye Exp $
+// $Id: config.w32,v 1.8 2008/12/27 12:21:36 rrichards Exp $
// vim:ft=javascript
ARG_WITH(simplexml, Simple XML support, yes);
@@ -13,6 +13,7 @@
if (!ADD_EXTENSION_DEP('simplexml', 'spl', true)) {
MESSAGE(\tSPL support in simplexml disabled);
}
+ ADD_FLAG(CFLAGS_SIMPLEXML, /D PHP_SIMPLEXML_EXPORTS );
} else {
PHP_SIMPLEXML == no;
WARNING(simplexml not enabled; libraries and headers not
found);
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/php_simplexml.h?r1=1.32r2=1.33diff_format=u
Index: php-src/ext/simplexml/php_simplexml.h
diff -u php-src/ext/simplexml/php_simplexml.h:1.32
php-src/ext/simplexml/php_simplexml.h:1.33
--- php-src/ext/simplexml/php_simplexml.h:1.32 Sat Dec 27 01:07:18 2008
+++ php-src/ext/simplexml/php_simplexml.h Sat Dec 27 12:21:36 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_simplexml.h,v 1.32 2008/12/27 01:07:18 rrichards Exp $ */
+/* $Id: php_simplexml.h,v 1.33 2008/12/27 12:21:36 rrichards Exp $ */
#ifndef PHP_SIMPLEXML_H
#define PHP_SIMPLEXML_H
@@ -77,7 +77,15 @@
#define SIMPLEXML_G(v) (simplexml_globals.v)
#endif
-#define PHP_SXE_API ZEND_DLEXPORT
+#ifdef PHP_WIN32
+# ifdef PHP_SIMPLEXML_EXPORTS
+# define PHP_SXE_API __declspec(dllexport)
+# else
+# define PHP_SXE_API __declspec(dllimport)
+# endif
+#else
+# define PHP_SXE_API ZEND_API
+#endif
PHP_SXE_API zend_class_entry *sxe_get_element_class_entry(TSRMLS_D);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml config.w32
pajoye Fri Dec 26 14:16:38 2008 UTC
Modified files:
/php-src/ext/simplexml config.w32
Log:
- MFB:
- remove the temp hack for libxml path (fixed now)
- do not raise a warning if the extension was not enabled anyway
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/config.w32?r1=1.6r2=1.7diff_format=u
Index: php-src/ext/simplexml/config.w32
diff -u php-src/ext/simplexml/config.w32:1.6
php-src/ext/simplexml/config.w32:1.7
--- php-src/ext/simplexml/config.w32:1.6Thu Dec 25 00:00:49 2008
+++ php-src/ext/simplexml/config.w32Fri Dec 26 14:16:38 2008
@@ -1,21 +1,22 @@
-// $Id: config.w32,v 1.6 2008/12/25 00:00:49 pajoye Exp $
+// $Id: config.w32,v 1.7 2008/12/26 14:16:38 pajoye Exp $
// vim:ft=javascript
ARG_WITH(simplexml, Simple XML support, yes);
-if (PHP_SIMPLEXML == yes PHP_LIBXML == yes
-ADD_EXTENSION_DEP('simplexml', 'libxml')) {
- EXTENSION(simplexml, simplexml.c sxe.c);
- AC_DEFINE(HAVE_SIMPLEXML, 1, Simple XML support);
- if (!PHP_SIMPLEXML_SHARED) {
- ADD_FLAG(CFLAGS_SIMPLEXML, /D LIBXML_STATIC);
+if (PHP_SIMPLEXML == yes) {
+ if (PHP_LIBXML == yes ADD_EXTENSION_DEP('simplexml', 'libxml')) {
+ EXTENSION(simplexml, simplexml.c sxe.c);
+ AC_DEFINE(HAVE_SIMPLEXML, 1, Simple XML support);
+ if (!PHP_SIMPLEXML_SHARED) {
+ ADD_FLAG(CFLAGS_SIMPLEXML, /D LIBXML_STATIC);
+ }
+ if (!ADD_EXTENSION_DEP('simplexml', 'spl', true)) {
+ MESSAGE(\tSPL support in simplexml disabled);
+ }
+ } else {
+ PHP_SIMPLEXML == no;
+ WARNING(simplexml not enabled; libraries and headers not
found);
}
- if (!ADD_EXTENSION_DEP('simplexml', 'spl', true)) {
- MESSAGE(\tSPL support in simplexml disabled);
- }
-} else {
- PHP_SIMPLEXML == no;
- WARNING(simplexml not enabled; libraries and headers not found);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml config.w32
pajoye Thu Dec 25 00:00:49 2008 UTC
Modified files:
/php-src/ext/simplexml config.w32
Log:
- disable simplexml when libxml is not enabled
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/config.w32?r1=1.5r2=1.6diff_format=u
Index: php-src/ext/simplexml/config.w32
diff -u php-src/ext/simplexml/config.w32:1.5
php-src/ext/simplexml/config.w32:1.6
--- php-src/ext/simplexml/config.w32:1.5Thu Nov 6 00:36:28 2008
+++ php-src/ext/simplexml/config.w32Thu Dec 25 00:00:49 2008
@@ -1,16 +1,21 @@
-// $Id: config.w32,v 1.5 2008/11/06 00:36:28 colder Exp $
+// $Id: config.w32,v 1.6 2008/12/25 00:00:49 pajoye Exp $
// vim:ft=javascript
ARG_WITH(simplexml, Simple XML support, yes);
-if (PHP_SIMPLEXML == yes PHP_LIBXML == yes) {
+if (PHP_SIMPLEXML == yes PHP_LIBXML == yes
+ADD_EXTENSION_DEP('simplexml', 'libxml')) {
EXTENSION(simplexml, simplexml.c sxe.c);
AC_DEFINE(HAVE_SIMPLEXML, 1, Simple XML support);
if (!PHP_SIMPLEXML_SHARED) {
ADD_FLAG(CFLAGS_SIMPLEXML, /D LIBXML_STATIC);
}
- ADD_EXTENSION_DEP('simplexml', 'libxml');
- ADD_EXTENSION_DEP('simplexml', 'spl', true);
+ if (!ADD_EXTENSION_DEP('simplexml', 'spl', true)) {
+ MESSAGE(\tSPL support in simplexml disabled);
+ }
+} else {
+ PHP_SIMPLEXML == no;
+ WARNING(simplexml not enabled; libraries and headers not found);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml config.w32 /win32/build buildconf.js confutils.js
wez Thu Jan 8 16:53:49 2004 EDT
Modified files:
/php-src/ext/simplexml config.w32
/php-src/win32/buildbuildconf.js confutils.js
Log:
add optional dep on spl for simplexml.
Fix dep handling in buildconf
Index: php-src/ext/simplexml/config.w32
diff -u php-src/ext/simplexml/config.w32:1.3 php-src/ext/simplexml/config.w32:1.4
--- php-src/ext/simplexml/config.w32:1.3Mon Dec 22 08:16:40 2003
+++ php-src/ext/simplexml/config.w32Thu Jan 8 16:53:48 2004
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.3 2003/12/22 13:16:40 wez Exp $
+// $Id: config.w32,v 1.4 2004/01/08 21:53:48 wez Exp $
// vim:ft=javascript
ARG_WITH(simplexml, Simple XML support, yes);
@@ -10,6 +10,7 @@
ADD_FLAG(CFLAGS_SIMPLEXML, /D LIBXML_STATIC);
}
ADD_EXTENSION_DEP('simplexml', 'libxml');
+ ADD_EXTENSION_DEP('simplexml', 'spl', true);
}
Index: php-src/win32/build/buildconf.js
diff -u php-src/win32/build/buildconf.js:1.9 php-src/win32/build/buildconf.js:1.10
--- php-src/win32/build/buildconf.js:1.9Thu Jan 8 12:33:29 2004
+++ php-src/win32/build/buildconf.jsThu Jan 8 16:53:48 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: buildconf.js,v 1.9 2004/01/08 17:33:29 sniper Exp $ */
+/* $Id: buildconf.js,v 1.10 2004/01/08 21:53:48 wez Exp $ */
// This generates a configure script for win32 build
WScript.StdOut.WriteLine(Rebuilding configure.js);
@@ -53,7 +53,7 @@
var fc = new Enumerator(f.SubFolders);
var c, i, ok, n;
var item = null;
- var re_dep_line = new
RegExp(ADD_EXTENSION_DEP\\([^,]*\\s*,\\s*['\]([^'\]+)['\]\\);, gm);
+ var re_dep_line = new
RegExp(ADD_EXTENSION_DEP\\([^,]*\\s*,\\s*['\]([^'\]+)['\].*\\);, gm);
for (; !fc.atEnd(); fc.moveNext())
{
@@ -108,17 +108,19 @@
{
var i, mod_name, j;
var output = ;
+ var item = null;
for (i in module_names) {
mod_name = module_names[i];
- if (!MODULES.Exists(mod_name)) {
+ if (MODULES.Exists(mod_name)) {
+ item = MODULES.Item(mod_name);
+ MODULES.Remove(mod_name);
+ if (item.deps.length) {
+ output += emit_dep_modules(item.deps);
+ }
output += emit_module(item);
- continue;
}
-
- item = MODULES.Item(mod_name);
- output += emit_dep_modules(item.deps);
}
return output;
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.33 php-src/win32/build/confutils.js:1.34
--- php-src/win32/build/confutils.js:1.33 Thu Jan 8 12:33:29 2004
+++ php-src/win32/build/confutils.jsThu Jan 8 16:53:48 2004
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.33 2004/01/08 17:33:29 sniper Exp $
+// $Id: confutils.js,v 1.34 2004/01/08 21:53:48 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -788,16 +788,26 @@
// Add a dependency on another extension, so that
// the dependencies are built before extname
-function ADD_EXTENSION_DEP(extname, dependson)
+function ADD_EXTENSION_DEP(extname, dependson, optional)
{
var EXT = extname.toUpperCase();
var DEP = dependson.toUpperCase();
+ if (optional) {
+ var dep_present = eval(PHP_ + DEP);
+
+ if (dep_present == no)
+ return;
+ }
+
var dep_shared = eval(PHP_ + DEP + _SHARED);
var ext_shared = eval(PHP_ + EXT + _SHARED);
if (dep_shared) {
if (!ext_shared) {
+ if (optional) {
+ return;
+ }
ERROR(static + extname + cannot depend on shared +
dependson);
}
ADD_FLAG(LDFLAGS_ + EXT, /libpath:$(BUILD_DIR));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
