rrichards Sun Jul 18 09:22:46 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/xsl config.w32
/php-src/ext/xsl/tests exslt.xml exslt.xsl
Log:
enable exslt support for win32 builds
WS fixes for exslt tests
http://cvs.php.net/diff.php/php-src/ext/xsl/config.w32?r1=1.8&r2=1.8.2.1&ty=u
Index: php-src/ext/xsl/config.w32
diff -u php-src/ext/xsl/config.w32:1.8 php-src/ext/xsl/config.w32:1.8.2.1
--- php-src/ext/xsl/config.w32:1.8 Mon Dec 22 08:16:43 2003
+++ php-src/ext/xsl/config.w32 Sun Jul 18 09:22:46 2004
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.8 2003/12/22 13:16:43 wez Exp $
+// $Id: config.w32,v 1.8.2.1 2004/07/18 13:22:46 rrichards Exp $
// vim: ft=javascript
ARG_WITH("xsl", "xsl support", "no");
@@ -6,16 +6,28 @@
if (PHP_XSL != "no") {
if (PHP_DOM == "yes" && PHP_LIBXML == "yes") {
var ext_xsl_lib_found = false;
+ var ext_exslt_lib_found = false;
if (CHECK_LIB("libxslt_a.lib", "xsl", PHP_XSL)) {
- ADD_FLAG("CFLAGS_XSL", "/D LIBXSLT_STATIC ");
ext_xsl_lib_found = true;
+ ADD_FLAG("CFLAGS_XSL", "/D LIBXSLT_STATIC ");
+ if (CHECK_LIB("libexslt_a.lib", "xsl", PHP_XSL)) {
+ ADD_FLAG("CFLAGS_XSL", "/D LIBEXSLT_STATIC ");
+ ext_exslt_lib_found = true;
+ }
} else if (CHECK_LIB("libxslt.lib", "xsl", PHP_XSL)) {
ext_xsl_lib_found = true;
+ if (CHECK_LIB("libexslt.lib", "xsl", PHP_XSL)) {
+ ext_exslt_lib_found = true;
+ }
}
if (ext_xsl_lib_found && CHECK_HEADER_ADD_INCLUDE("libxslt\\xslt.h",
"CFLAGS_XSL")) {
-
+ if (ext_exslt_lib_found) {
+ if (CHECK_HEADER_ADD_INCLUDE("libexslt\\exslt.h",
"CFLAGS_XSL")) {
+ AC_DEFINE("HAVE_XSL_EXSLT", 1, "");
+ }
+ }
EXTENSION("xsl", "php_xsl.c xsltprocessor.c", PHP_XSL_SHARED);
AC_DEFINE("HAVE_XSL", 1, "Define if xsl extension is enabled");
if (! PHP_XSL_SHARED) {
http://cvs.php.net/diff.php/php-src/ext/xsl/tests/exslt.xml?r1=1.1&r2=1.1.2.1&ty=u
Index: php-src/ext/xsl/tests/exslt.xml
diff -u php-src/ext/xsl/tests/exslt.xml:1.1 php-src/ext/xsl/tests/exslt.xml:1.1.2.1
--- php-src/ext/xsl/tests/exslt.xml:1.1 Fri Nov 21 07:22:48 2003
+++ php-src/ext/xsl/tests/exslt.xml Sun Jul 18 09:22:46 2004
@@ -1,10 +1,9 @@
-<?xml version="1.0"?>
-<page>
- <!-- valid xs:date -->
- <date date="0001-12-31Z"/>
- <date date="3000-01-31"/>
- <date date="2000-02-29"/>
- <date date="9990001-12-31Z"/>
- <date date="-0004-02-29"/>
-</page>
-
+<?xml version="1.0"?>
+<page>
+ <!-- valid xs:date -->
+ <date date="0001-12-31Z"/>
+ <date date="3000-01-31"/>
+ <date date="2000-02-29"/>
+ <date date="9990001-12-31Z"/>
+ <date date="-0004-02-29"/>
+</page>
http://cvs.php.net/diff.php/php-src/ext/xsl/tests/exslt.xsl?r1=1.1&r2=1.1.2.1&ty=u
Index: php-src/ext/xsl/tests/exslt.xsl
diff -u php-src/ext/xsl/tests/exslt.xsl:1.1 php-src/ext/xsl/tests/exslt.xsl:1.1.2.1
--- php-src/ext/xsl/tests/exslt.xsl:1.1 Fri Nov 21 07:22:48 2003
+++ php-src/ext/xsl/tests/exslt.xsl Sun Jul 18 09:22:46 2004
@@ -1,46 +1,45 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
- xmlns:date="http://exslt.org/dates-and-times";
- extension-element-prefixes="date">
-
-<xsl:output method="text"/>
-
-<xsl:template match="date">
- Test Date : <xsl:value-of select="@date"/>
- <!-- dateTime, date, gYearMonth or gYear; else NaN -->
- year : <xsl:value-of select="date:year(@date)"/>
- <!-- dateTime, date, gYearMonth or gYear; else NaN -->
- leap-year : <xsl:value-of select="date:leap-year(@date)"/>
- <!-- dateTime, date, gYearMonth, gMonth or gMonthDay; else NaN -->
- month-in-year : <xsl:value-of select="date:month-in-year(@date)"/>
- <!-- dateTime, date, gYearMonth or gMonth; else '' -->
- month-name : <xsl:value-of select="date:month-name(@date)"/>
- <!-- dateTime, date, gYearMonth or gMonth; else '' -->
- month-abbreviation : <xsl:value-of select="date:month-abbreviation(@date)"/>
- <!-- dateTime or date; else NaN -->
- week-in-year : <xsl:value-of select="date:week-in-year(@date)"/>
- <!-- dateTime, date; else NaN -->
- day-in-year : <xsl:value-of select="date:day-in-year(@date)"/>
- <!-- dateTime, date, gMonthDay or gDay; else NaN -->
- day-in-month : <xsl:value-of select="date:day-in-month(@date)"/>
- <!-- dateTime, date; else NaN -->
- day-of-week-in-month : <xsl:value-of select="date:day-of-week-in-month(@date)"/>
- <!-- dateTime, date; else NaN -->
- day-in-week : <xsl:value-of select="date:day-in-week(@date)"/>
- <!-- dateTime or date; else NaN -->
- day-name : <xsl:value-of select="date:day-name(@date)"/>
- <!-- dateTime or date; else NaN -->
- day-abbreviation : <xsl:value-of select="date:day-abbreviation(@date)"/>
- <!-- dateTime or time; else '' -->
- time : <xsl:value-of select="date:time(@date)"/>
- <!-- dateTime or time; else NaN -->
- hour-in-day : <xsl:value-of select="date:hour-in-day(@date)"/>
- <!-- dateTime or time; else NaN -->
- minute-in-hour : <xsl:value-of select="date:minute-in-hour(@date)"/>
- <!-- dateTime or time; else NaN -->
- second-in-minute : <xsl:value-of select="date:second-in-minute(@date)"/>
-</xsl:template>
-
-</xsl:stylesheet>
-
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
+ xmlns:date="http://exslt.org/dates-and-times";
+ extension-element-prefixes="date">
+
+<xsl:output method="text"/>
+
+<xsl:template match="date">
+ Test Date : <xsl:value-of select="@date"/>
+ <!-- dateTime, date, gYearMonth or gYear; else NaN -->
+ year : <xsl:value-of select="date:year(@date)"/>
+ <!-- dateTime, date, gYearMonth or gYear; else NaN -->
+ leap-year : <xsl:value-of select="date:leap-year(@date)"/>
+ <!-- dateTime, date, gYearMonth, gMonth or gMonthDay; else NaN -->
+ month-in-year : <xsl:value-of select="date:month-in-year(@date)"/>
+ <!-- dateTime, date, gYearMonth or gMonth; else '' -->
+ month-name : <xsl:value-of select="date:month-name(@date)"/>
+ <!-- dateTime, date, gYearMonth or gMonth; else '' -->
+ month-abbreviation : <xsl:value-of select="date:month-abbreviation(@date)"/>
+ <!-- dateTime or date; else NaN -->
+ week-in-year : <xsl:value-of select="date:week-in-year(@date)"/>
+ <!-- dateTime, date; else NaN -->
+ day-in-year : <xsl:value-of select="date:day-in-year(@date)"/>
+ <!-- dateTime, date, gMonthDay or gDay; else NaN -->
+ day-in-month : <xsl:value-of select="date:day-in-month(@date)"/>
+ <!-- dateTime, date; else NaN -->
+ day-of-week-in-month : <xsl:value-of select="date:day-of-week-in-month(@date)"/>
+ <!-- dateTime, date; else NaN -->
+ day-in-week : <xsl:value-of select="date:day-in-week(@date)"/>
+ <!-- dateTime or date; else NaN -->
+ day-name : <xsl:value-of select="date:day-name(@date)"/>
+ <!-- dateTime or date; else NaN -->
+ day-abbreviation : <xsl:value-of select="date:day-abbreviation(@date)"/>
+ <!-- dateTime or time; else '' -->
+ time : <xsl:value-of select="date:time(@date)"/>
+ <!-- dateTime or time; else NaN -->
+ hour-in-day : <xsl:value-of select="date:hour-in-day(@date)"/>
+ <!-- dateTime or time; else NaN -->
+ minute-in-hour : <xsl:value-of select="date:minute-in-hour(@date)"/>
+ <!-- dateTime or time; else NaN -->
+ second-in-minute : <xsl:value-of select="date:second-in-minute(@date)"/>
+</xsl:template>
+
+</xsl:stylesheet>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
