diff options
-rw-r--r-- | ChangeLog | 12 | ||||
-rw-r--r-- | Makefile.am | 7 | ||||
-rw-r--r-- | libexslt/exslt.c | 4 | ||||
-rw-r--r-- | libexslt/exslt.h | 9 | ||||
-rw-r--r-- | libexslt/exsltconfig.h.in | 17 | ||||
-rw-r--r-- | libexslt/functions.c | 2 | ||||
-rw-r--r-- | libexslt/math.c | 2 | ||||
-rw-r--r-- | libxslt/win32config.h | 40 | ||||
-rw-r--r-- | libxslt/xsltconfig.h.in | 9 | ||||
-rw-r--r-- | libxslt/xsltutils.h | 14 | ||||
-rw-r--r-- | libxslt/xsltwin32config.h | 17 | ||||
-rw-r--r-- | libxslt/xsltwin32config.h.in | 17 | ||||
-rw-r--r-- | tests/general/bug-21-.out | 2 | ||||
-rw-r--r-- | tests/general/bug-31-.out | 1 | ||||
-rw-r--r-- | win32/dsp/libexslt.def | 11 | ||||
-rw-r--r-- | win32/dsp/libexslt_a.dsp | 122 | ||||
-rw-r--r-- | win32/dsp/libexslt_so.dsp | 137 | ||||
-rw-r--r-- | win32/dsp/libxslt.def | 159 | ||||
-rw-r--r-- | win32/dsp/libxslt.dsw | 77 | ||||
-rw-r--r-- | win32/dsp/libxslt_a.dsp | 238 | ||||
-rw-r--r-- | win32/dsp/libxslt_so.dsp | 257 | ||||
-rw-r--r-- | win32/dsp/xsltproc.dsp | 104 | ||||
-rw-r--r-- | win32/readme.msvc | 43 | ||||
-rw-r--r-- | xsltproc/xsltproc.c | 4 |
24 files changed, 1276 insertions, 29 deletions
@@ -1,3 +1,15 @@ +Fri Aug 3 14:23:25 CEST 2001 Daniel Veillard <daniel@veillard.com> + + * tests/general/bug-21-.out tests/general/bug-31-.out: + this got fixed by libxml patches + * win32/readme.msvc win32/dsp/* xsltproc/xsltproc.c + Makefile.am libexslt/exslt.[ch] libexslt/exsltconfig.h.in + libexslt/functions.c libexslt/math.c libxslt/win32config.h + libxslt/xsltconfig.h.in libxslt/xsltutils.h + libxslt/xsltwin32config.h libxslt/xsltwin32config.h.in: + Applied Igor Zlatkovic Win32 Facelift No.2 patch, and fixed + a few things related to those changes. + Wed Aug 1 13:58:21 CEST 2001 Daniel Veillard <daniel@veillard.com> * libxslt/xsltutils.c: well one need one \n after DOCTYPE diff --git a/Makefile.am b/Makefile.am index bc271343..dd8c4001 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,10 +10,11 @@ confexec_DATA = xsltConf.sh bin_SCRIPTS = xslt-config +dist-hook: libxml.spec + (cd $(srcdir) ; tar -cf - --exclude CVS win32) | (cd $(distdir); tar xf -) + EXTRA_DIST = xsltConf.sh.in xslt-config.in libxslt.spec libxslt.spec.in \ - FEATURES TODO COPYING.LIB Copyright IPR \ - win32/libxslt/libxslt.def win32/libxslt/libxslt.dsw \ - win32/libxslt/libxslt_so.dsp win32/xsltproc/xsltproc.dsp + FEATURES TODO COPYING.LIB Copyright IPR ## We create xsltConf.sh here and not from configure because we want ## to get the paths expanded correctly. Macros like srcdir are given diff --git a/libexslt/exslt.c b/libexslt/exslt.c index 9213b084..9298500c 100644 --- a/libexslt/exslt.c +++ b/libexslt/exslt.c @@ -1,6 +1,10 @@ #include <libxml/xmlversion.h> +#if defined(WIN32) && defined(_MSC_VER) +#include <libxslt/xsltwin32config.h> +#else #include <libxslt/xsltconfig.h> +#endif #include <libxslt/extensions.h> #include "exsltconfig.h" diff --git a/libexslt/exslt.h b/libexslt/exslt.h index 743d15b1..fd7f5db2 100644 --- a/libexslt/exslt.h +++ b/libexslt/exslt.h @@ -3,11 +3,12 @@ #define __EXSLT_H__ #include <libxml/tree.h> +#include "exsltconfig.h" -extern const char *exsltLibraryVersion; -extern const int exsltLibexsltVersion; -extern const int exsltLibxsltVersion; -extern const int exsltLibxmlVersion; +LIBEXSLT_PUBLIC extern const char *exsltLibraryVersion; +LIBEXSLT_PUBLIC extern const int exsltLibexsltVersion; +LIBEXSLT_PUBLIC extern const int exsltLibxsltVersion; +LIBEXSLT_PUBLIC extern const int exsltLibxmlVersion; #define EXSLT_COMMON_NAMESPACE ((const xmlChar *) "http://exslt.org/common") #define EXSLT_MATH_NAMESPACE ((const xmlChar *) "http://exslt.org/math") diff --git a/libexslt/exsltconfig.h.in b/libexslt/exsltconfig.h.in index 0dcf0ce8..a5c28b48 100644 --- a/libexslt/exsltconfig.h.in +++ b/libexslt/exsltconfig.h.in @@ -56,6 +56,23 @@ extern "C" { #define ATTRIBUTE_UNUSED #endif +/** + * LIBEXSLT_PUBLIC: + * + * This macro is needed on Win32 when using MSVC. It enables the client code + * to access exported variables. It should expand to nothing when compiling + * this library itself, but must expand to __declspec(dllimport) when a + * client includes the library header and that only if it links dynamically + * against this library. + */ +#if !defined LIBEXSLT_PUBLIC +#if defined _MSC_VER && !defined IN_LIBEXSLT && !defined LIBEXSLT_STATIC +#define LIBEXSLT_PUBLIC __declspec(dllimport) +#else +#define LIBEXSLT_PUBLIC +#endif +#endif + #ifdef __cplusplus } #endif diff --git a/libexslt/functions.c b/libexslt/functions.c index 7023a7e2..2f813fb0 100644 --- a/libexslt/functions.c +++ b/libexslt/functions.c @@ -259,7 +259,9 @@ exsltFuncFunctionFunction (xmlXPathParserContextPtr ctxt, int nargs) { * the generation of result nodes. */ if (fake->children != NULL) { +#ifdef LIBXML_DEBUG_ENABLED xmlDebugDumpNode (stderr, fake, 1); +#endif xsltGenericError(xsltGenericErrorContext, "{%s}%s: cannot write to result tree while " "executing a function\n", diff --git a/libexslt/math.c b/libexslt/math.c index ddb2fbdb..93b704f1 100644 --- a/libexslt/math.c +++ b/libexslt/math.c @@ -8,7 +8,7 @@ #include "exslt.h" -extern double xmlXPathNAN; +/* extern double xmlXPathNAN; */ /** * exsltMathMin: diff --git a/libxslt/win32config.h b/libxslt/win32config.h index 5daf21bb..046bfa9a 100644 --- a/libxslt/win32config.h +++ b/libxslt/win32config.h @@ -9,14 +9,28 @@ #include <io.h> -#ifndef LIBXSLT_DLL_IMPORT -#define LIBXSLT_DLL_IMPORT -#endif - #define HAVE_ISINF #define HAVE_ISNAN #include <math.h> +#ifdef _MSC_VER +/* MS C-runtime has functions which can be used in order to determine if + a given floating-point variable contains NaN, (+-)INF. These are + preferred, because floating-point technology is considered propriatary + by MS and we can assume that their functions know more about their + oddities than we do. */ +#include <float.h> +/* Bjorn Reese figured a quite nice construct for isinf() using the + _fpclass() function. */ +#ifndef isinf +#define isinf(d) ((_fpclass(d) == _FPCLASS_PINF) ? 1 \ + : ((_fpclass(d) == _FPCLASS_NINF) ? -1 : 0)) +#endif +/* _isnan(x) returns nonzero if (x == NaN) and zero otherwise. */ +#ifndef isnan +#define isnan(d) (_isnan(d)) +#endif +#else /* _MSC_VER */ static int isinf (double d) { int expon = 0; double val = frexp (d, &expon); @@ -47,24 +61,22 @@ static int isnan (double d) { return 0; } } +#endif /* _MSC_VER */ #include <direct.h> #define HAVE_SYS_STAT_H #define HAVE__STAT -/* Microsoft's C runtime names all non-ANSI functions with a leading - underscore. Since functionality is still the same, they can be used. */ -#ifdef _MSC_VER #include <libxml/xmlwin32version.h> -#ifndef WITH_TRIO -#define snprintf _snprintf -#define vsnprintf _vsnprintf -#endif /* WITH_TRIO */ -#else -#include <libxml/xmlversion.h> -#endif /* _MSC_VER */ +#if !defined LIBXSLT_PUBLIC +#if defined _MSC_VER && !defined IN_LIBXSLT && !defined LIBXSLT_STATIC +#define LIBXSLT_PUBLIC __declspec(dllimport) +#else +#define LIBXSLT_PUBLIC +#endif +#endif #ifndef ATTRIBUTE_UNUSED #define ATTRIBUTE_UNUSED diff --git a/libxslt/xsltconfig.h.in b/libxslt/xsltconfig.h.in index a87b01c0..ed027874 100644 --- a/libxslt/xsltconfig.h.in +++ b/libxslt/xsltconfig.h.in @@ -87,6 +87,15 @@ extern "C" { #define ATTRIBUTE_UNUSED #endif +/** + * LIBXSLT_PUBLIC: + * + * This macro is used to declare PUBLIC variables for MSC on Windows + */ +#if !defined(WIN32) || defined(__CYGWIN__) +#define LIBXSLT_PUBLIC +#endif + #ifdef __cplusplus } #endif diff --git a/libxslt/xsltutils.h b/libxslt/xsltutils.h index 9b4808d1..5ec221f2 100644 --- a/libxslt/xsltutils.h +++ b/libxslt/xsltutils.h @@ -9,6 +9,12 @@ #ifndef __XML_XSLTUTILS_H__ #define __XML_XSLTUTILS_H__ +#if defined(WIN32) && defined(_MSC_VER) +#include <libxslt/xsltwin32config.h> +#else +#include <libxslt/xsltconfig.h> +#endif + #include <libxml/xpath.h> #include <libxml/xmlerror.h> #include "xsltInternals.h" @@ -64,10 +70,10 @@ xmlChar * xsltGetNsProp (xmlNodePtr node, /* * XSLT specific error and debug reporting functions */ -extern xmlGenericErrorFunc xsltGenericError; -extern void *xsltGenericErrorContext; -extern xmlGenericErrorFunc xsltGenericDebug; -extern void *xsltGenericDebugContext; +LIBXSLT_PUBLIC extern xmlGenericErrorFunc xsltGenericError; +LIBXSLT_PUBLIC extern void *xsltGenericErrorContext; +LIBXSLT_PUBLIC extern xmlGenericErrorFunc xsltGenericDebug; +LIBXSLT_PUBLIC extern void *xsltGenericDebugContext; void xsltPrintErrorContext (xsltTransformContextPtr ctxt, xsltStylesheetPtr style, diff --git a/libxslt/xsltwin32config.h b/libxslt/xsltwin32config.h index d992379a..9372a937 100644 --- a/libxslt/xsltwin32config.h +++ b/libxslt/xsltwin32config.h @@ -57,6 +57,23 @@ extern "C" { #define ATTRIBUTE_UNUSED #endif +/** + * LIBXSLT_PUBLIC: + * + * This macro is needed on Win32 when using MSVC. It enables the client code + * to access exported variables. It should expand to nothing when compiling + * this library itself, but must expand to __declspec(dllimport) when a + * client includes the library header and that only if it links dynamically + * against this library. + */ +#if !defined LIBXSLT_PUBLIC +#if defined _MSC_VER && !defined IN_LIBXSLT && !defined LIBXSLT_STATIC +#define LIBXSLT_PUBLIC __declspec(dllimport) +#else +#define LIBXSLT_PUBLIC +#endif +#endif + #ifdef __cplusplus } #endif diff --git a/libxslt/xsltwin32config.h.in b/libxslt/xsltwin32config.h.in index 1e865786..cc70d900 100644 --- a/libxslt/xsltwin32config.h.in +++ b/libxslt/xsltwin32config.h.in @@ -57,6 +57,23 @@ extern "C" { #define ATTRIBUTE_UNUSED #endif +/** + * LIBXSLT_PUBLIC: + * + * This macro is needed on Win32 when using MSVC. It enables the client code + * to access exported variables. It should expand to nothing when compiling + * this library itself, but must expand to __declspec(dllimport) when a + * client includes the library header and that only if it links dynamically + * against this library. + */ +#if !defined LIBXSLT_PUBLIC +#if defined _MSC_VER && !defined IN_LIBXSLT && !defined LIBXSLT_STATIC +#define LIBXSLT_PUBLIC __declspec(dllimport) +#else +#define LIBXSLT_PUBLIC +#endif +#endif + #ifdef __cplusplus } #endif diff --git a/tests/general/bug-21-.out b/tests/general/bug-21-.out index 4598ae22..8a98dfde 100644 --- a/tests/general/bug-21-.out +++ b/tests/general/bug-21-.out @@ -1,2 +1,2 @@ <?xml version="1.0"?> - +../docs/test.jpg diff --git a/tests/general/bug-31-.out b/tests/general/bug-31-.out index fccc93ea..16842970 100644 --- a/tests/general/bug-31-.out +++ b/tests/general/bug-31-.out @@ -1,4 +1,3 @@ <?xml version="1.0"?> <?xml-stylesheet type="text/css" href="style.css"?> - diff --git a/win32/dsp/libexslt.def b/win32/dsp/libexslt.def new file mode 100644 index 00000000..d1e3b413 --- /dev/null +++ b/win32/dsp/libexslt.def @@ -0,0 +1,11 @@ +LIBRARY libexslt
+EXPORTS
+ exsltLibraryVersion DATA
+ exsltLibexsltVersion DATA
+ exsltLibxsltVersion DATA
+ exsltLibxmlVersion DATA
+ exsltCommonRegister
+ exsltMathRegister
+ exsltSetsRegister
+ exsltFuncRegister
+ exsltRegisterAll
diff --git a/win32/dsp/libexslt_a.dsp b/win32/dsp/libexslt_a.dsp new file mode 100644 index 00000000..6bb674f6 --- /dev/null +++ b/win32/dsp/libexslt_a.dsp @@ -0,0 +1,122 @@ +# Microsoft Developer Studio Project File - Name="libexslt_a" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=libexslt_a - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "libexslt_a.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "libexslt_a.mak" CFG="libexslt_a - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "libexslt_a - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "libexslt_a - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "libexslt_a - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "libexslt_a"
+# PROP Intermediate_Dir "libexslt_a"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "../.." /I "../../../gnome-xml/include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "IN_LIBEXSLT" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x809 /d "NDEBUG"
+# ADD RSC /l 0x809 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"libexslt_a\libexslt.lib"
+
+!ELSEIF "$(CFG)" == "libexslt_a - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "libexslt_a"
+# PROP Intermediate_Dir "libexslt_a"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MD /W3 /Gm /Zi /Od /I "../.." /I "../../../gnome-xml/include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "IN_LIBEXSLT" /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x809 /d "_DEBUG"
+# ADD RSC /l 0x809 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"libexslt_a\libexslt.lib"
+
+!ENDIF
+
+# Begin Target
+
+# Name "libexslt_a - Win32 Release"
+# Name "libexslt_a - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\libexslt\common.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libexslt\exslt.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libexslt\functions.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libexslt\math.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libexslt\sets.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\libexslt\exslt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libexslt\exsltconfig.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/win32/dsp/libexslt_so.dsp b/win32/dsp/libexslt_so.dsp new file mode 100644 index 00000000..21924583 --- /dev/null +++ b/win32/dsp/libexslt_so.dsp @@ -0,0 +1,137 @@ +# Microsoft Developer Studio Project File - Name="libexslt_so" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=libexslt_so - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "libexslt_so.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "libexslt_so.mak" CFG="libexslt_so - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "libexslt_so - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libexslt_so - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "libexslt_so - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "libexslt_so"
+# PROP Intermediate_Dir "libexslt_so"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBEXSLT_SO_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "../.." /I "../../../gnome-xml/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IN_LIBEXSLT" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x809 /d "NDEBUG"
+# ADD RSC /l 0x809 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 libxslt.lib libxml2.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"libexslt_so/libexslt.dll" /libpath:"./libxslt_so" /libpath:"../../../gnome-xml/win32/dsp/libxml2_so"
+
+!ELSEIF "$(CFG)" == "libexslt_so - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "libexslt_so___Win32_Debug"
+# PROP BASE Intermediate_Dir "libexslt_so___Win32_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "libexslt_so"
+# PROP Intermediate_Dir "libexslt_so"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBEXSLT_SO_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MD /W3 /Gm /Zi /Od /I "../.." /I "../../../gnome-xml/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IN_LIBEXSLT" /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x809 /d "_DEBUG"
+# ADD RSC /l 0x809 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 libxslt.lib libxml2.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"libexslt_so/libexslt.dll" /pdbtype:sept /libpath:"./libxslt_so" /libpath:"../../../gnome-xml/win32/dsp/libxml2_so"
+
+!ENDIF
+
+# Begin Target
+
+# Name "libexslt_so - Win32 Release"
+# Name "libexslt_so - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\libexslt\common.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libexslt\exslt.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libexslt\functions.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\libexslt.def
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libexslt\math.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libexslt\sets.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\libexslt\exslt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libexslt\exsltconfig.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 Target
+# End Project
diff --git a/win32/dsp/libxslt.def b/win32/dsp/libxslt.def new file mode 100644 index 00000000..b2ba4461 --- /dev/null +++ b/win32/dsp/libxslt.def @@ -0,0 +1,159 @@ +
+LIBRARY libxslt
+EXPORTS
+
+ xsltNewStylesheet
+ xsltParseStylesheetFile
+ xsltFreeStylesheet
+ xsltIsBlank
+ xsltFreeStackElemList
+ xsltDecimalFormatGetByName
+ xsltParseStylesheetProcess
+ xsltParseStylesheetOutput
+ xsltParseStylesheetDoc
+ xsltNumberFormat
+ xsltFormatNumberConversion
+ xsltProfileStylesheet
+
+ xsltParseStylesheetAttributeSet
+ xsltFreeAttributeSetsHashes
+ xsltApplyAttributeSet
+
+ xsltNewDocument
+ xsltLoadDocument
+ xsltFreeDocuments
+ xsltLoadStyleDocument
+ xsltNewStyleDocument
+ xsltFreeStyleDocuments
+
+
+ xsltRegisterExtPrefix
+ xsltCheckExtPrefix
+ xsltRegisterExtFunction
+ xsltRegisterExtElement
+ xsltFreeCtxtExts
+ xsltFreeExts
+ xsltGetExtData
+ xsltShutdownCtxtExts
+ xsltXPathGetTransformContext
+ xsltUnregisterExtModule
+ xsltRegisterExtModule
+
+
+ xsltDocumentFunction
+ xsltKeyFunction
+ xsltUnparsedEntityURIFunction
+ xsltFormatNumberFunction
+ xsltGenerateIdFunction
+ xsltSystemPropertyFunction
+ xsltElementAvailableFunction
+ xsltFunctionAvailableFunction
+ xsltRegisterAllFunctions
+
+ xsltParseStylesheetImport
+ xsltParseStylesheetInclude
+ xsltNextImport
+ xsltFindElemSpaceHandling
+ xsltFindTemplate
+
+ xsltAddKey
+ xsltGetKey
+ xsltInitCtxtKeys
+ xsltFreeKeys
+ xsltFreeDocumentKeys
+
+ xsltNamespaceAlias
+ xsltGetNamespace
+ xsltGetSpecialNamespace
+ xsltCopyNamespaceList
+ xsltCopyNamespaceList
+ xsltFreeNamespaceAliasHashes
+
+ xsltCompilePattern
+ xsltFreeCompMatchList
+ xsltTestCompMatchList
+ xsltAddTemplate
+ xsltGetTemplate
+ xsltFreeTemplateHashes
+ xsltCleanupTemplates
+
+ xsltStylePreCompute
+ xsltFreeStylePreComps
+
+ xsltEvalXPathPredicate
+ xsltEvalTemplateString
+ xsltEvalAttrValueTemplate
+ xsltEvalStaticAttrValueTemplate
+ xsltEvalXPathString
+ xsltTemplateProcess
+ xsltAttrListTemplateProcess
+ xsltAttrTemplateProcess
+ xsltAttrTemplateValueProcess
+
+ xsltApplyStylesheet
+ xsltApplyOneTemplate
+ xsltDocumentElem
+ xsltSort
+ xsltCopy
+ xsltText
+ xsltElement
+ xsltComment
+ xsltAttribute
+ xsltProcessingInstruction
+ xsltCopyOf
+ xsltValueOf
+ xsltNumber
+ xsltApplyImports
+ xsltCallTemplate
+ xsltApplyTemplates
+ xsltChoose
+ xsltIf
+ xsltForEach
+
+ xsltEvalGlobalVariables
+ xsltEvalUserParams
+ xsltParseGlobalVariable
+ xsltParseGlobalParam
+ xsltParseStylesheetVariable
+ xsltParseStylesheetParam
+ xsltParseStylesheetCallerParam
+ xsltAddStackElemList
+ xsltFreeGlobalVariables
+ xsltVariableLookup
+ xsltXPathVariableLookup
+
+ xsltMessage
+ xsltSetGenericErrorFunc
+ xsltSetGenericDebugFunc
+ xsltDocumentSortFunction
+ xsltDoSortFunction
+ xsltSaveResultTo
+ xsltSaveResultToFilename
+ xsltSaveResultToFile
+ xsltSaveResultToFd
+
+ xsltMaxDepth
+ xsltSetXIncludeDefault
+ xsltLibxmlVersion
+ xsltLibxsltVersion
+ xsltEngineVersion
+
+ xsltRunStylesheet
+ xsltLoadStylesheetPI
+ xsltRegisterAllElement
+
+ xsltGenericError DATA
+ xsltGenericErrorContext DATA
+ xsltGenericDebug DATA
+ xsltGenericDebugContext DATA
+
+ xsltFunctionNodeSet
+
+ xsltRegisterExtModuleElement
+ xsltRegisterExtModuleFunction
+ xsltRegisterExtModuleTopLevel
+ xsltRegisterExtModuleFull
+ xsltStyleGetExtData
+ xsltParseTemplateContent
+ xsltRegisterTestModule
+ xsltCleanupGlobals
diff --git a/win32/dsp/libxslt.dsw b/win32/dsp/libxslt.dsw new file mode 100644 index 00000000..e56d8731 --- /dev/null +++ b/win32/dsp/libxslt.dsw @@ -0,0 +1,77 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "libexslt_a"=.\libexslt_a.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "libexslt_so"=.\libexslt_so.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "libxslt_a"=.\libxslt_a.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "libxslt_so"=.\libxslt_so.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "xsltproc"=.\xsltproc.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/win32/dsp/libxslt_a.dsp b/win32/dsp/libxslt_a.dsp new file mode 100644 index 00000000..54582589 --- /dev/null +++ b/win32/dsp/libxslt_a.dsp @@ -0,0 +1,238 @@ +# Microsoft Developer Studio Project File - Name="libxslt_a" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=libxslt_a - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "libxslt_a.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "libxslt_a.mak" CFG="libxslt_a - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "libxslt_a - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "libxslt_a - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "libxslt_a - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "libxslt_a"
+# PROP Intermediate_Dir "libxslt_a"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /O2 /I "../.." /I "../../libxslt" /I "../../../gnome-xml/include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "IN_LIBXSLT" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x809 /d "NDEBUG"
+# ADD RSC /l 0x809 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"libxslt_a\libxslt.lib"
+
+!ELSEIF "$(CFG)" == "libxslt_a - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "libxslt_a"
+# PROP Intermediate_Dir "libxslt_a"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MD /W3 /Gm /Zi /Od /I "../.." /I "../../libxslt" /I "../../../gnome-xml/include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "IN_LIBXSLT" /FR /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x809 /d "_DEBUG"
+# ADD RSC /l 0x809 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"libxslt_a\libxslt.lib"
+
+!ENDIF
+
+# Begin Target
+
+# Name "libxslt_a - Win32 Release"
+# Name "libxslt_a - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\libxslt\attributes.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\documents.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\extensions.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\extra.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\functions.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\imports.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\keys.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\namespaces.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\numbers.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\pattern.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\preproc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\templates.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\transform.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\variables.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\xslt.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\xsltutils.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\libxslt\attributes.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\documents.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\extensions.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\extra.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\functions.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\imports.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\keys.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\libxslt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\namespaces.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\numbersInternals.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\pattern.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\preproc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\templates.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\transform.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\variables.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\win32config.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\xslt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\xsltInternals.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\xsltutils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\xsltwin32config.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/win32/dsp/libxslt_so.dsp b/win32/dsp/libxslt_so.dsp new file mode 100644 index 00000000..4f518f58 --- /dev/null +++ b/win32/dsp/libxslt_so.dsp @@ -0,0 +1,257 @@ +# Microsoft Developer Studio Project File - Name="libxslt_so" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=libxslt_so - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "libxslt_so.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "libxslt_so.mak" CFG="libxslt_so - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "libxslt_so - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libxslt_so - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "libxslt_so - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "libxslt_so"
+# PROP Intermediate_Dir "libxslt_so"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXSLT_SO_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "../.." /I "../../libxslt" /I "../../../gnome-xml/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IN_LIBXSLT" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x809 /d "NDEBUG"
+# ADD RSC /l 0x809 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 libxml2.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"libxslt_so/libxslt.dll" /libpath:"../../../gnome-xml/win32/dsp/libxml2_so"
+
+!ELSEIF "$(CFG)" == "libxslt_so - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "libxslt_so___Win32_Debug"
+# PROP BASE Intermediate_Dir "libxslt_so___Win32_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "libxslt_so"
+# PROP Intermediate_Dir "libxslt_so"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXSLT_SO_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MD /W3 /Gm /Zi /Od /I "../.." /I "../../libxslt" /I "../../../gnome-xml/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IN_LIBXSLT" /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x809 /d "_DEBUG"
+# ADD RSC /l 0x809 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 libxml2.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"libxslt_so/libxslt.dll" /pdbtype:sept /libpath:"../../../gnome-xml/win32/dsp/libxml2_so"
+
+!ENDIF
+
+# Begin Target
+
+# Name "libxslt_so - Win32 Release"
+# Name "libxslt_so - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\libxslt\attributes.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\documents.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\extensions.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\extra.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\functions.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\imports.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\keys.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\libxslt.def
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\namespaces.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\numbers.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\pattern.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\preproc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\templates.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\transform.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\variables.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\xslt.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\xsltutils.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\libxslt\attributes.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\documents.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\extensions.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\extra.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\functions.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\imports.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\keys.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\libxslt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\namespaces.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\numbersInternals.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\pattern.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\preproc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\templates.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\transform.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\variables.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\win32config.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\xslt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\xsltconfig.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\xsltInternals.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\xsltutils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\libxslt\xsltwin32config.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 Target
+# End Project
diff --git a/win32/dsp/xsltproc.dsp b/win32/dsp/xsltproc.dsp new file mode 100644 index 00000000..62aa6566 --- /dev/null +++ b/win32/dsp/xsltproc.dsp @@ -0,0 +1,104 @@ +# Microsoft Developer Studio Project File - Name="xsltproc" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=xsltproc - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "xsltproc.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "xsltproc.mak" CFG="xsltproc - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "xsltproc - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "xsltproc - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "xsltproc - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "xsltproc"
+# PROP Intermediate_Dir "xsltproc"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "../.." /I "../../../gnome-xml/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x809 /d "NDEBUG"
+# ADD RSC /l 0x809 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 libexslt.lib libxslt.lib libxml2.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"./libexslt_so" /libpath:"./libxslt_so" /libpath:"../../../gnome-xml/win32/dsp/libxml2_so"
+
+!ELSEIF "$(CFG)" == "xsltproc - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "xsltproc___Win32_Debug"
+# PROP BASE Intermediate_Dir "xsltproc___Win32_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "xsltproc"
+# PROP Intermediate_Dir "xsltproc"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MD /W3 /Gm /Zi /Od /I "../.." /I "../../../gnome-xml/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x809 /d "_DEBUG"
+# ADD RSC /l 0x809 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 libexslt.lib libxslt.lib libxml2.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"./libexslt_so" /libpath:"./libxslt_so" /libpath:"../../../gnome-xml/win32/dsp/libxml2_so"
+
+!ENDIF
+
+# Begin Target
+
+# Name "xsltproc - Win32 Release"
+# Name "xsltproc - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\xsltproc\xsltproc.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/win32/readme.msvc b/win32/readme.msvc new file mode 100644 index 00000000..6dd5bb2e --- /dev/null +++ b/win32/readme.msvc @@ -0,0 +1,43 @@ +libxslt Readme For Usage With MSVC
+----------------------------------
+
+If you would like to compile libxslt using Microsoft Visual
+C/C++ IDE, then you must know that it cannot work out of the
+box. You have to modify the project files.
+
+This is not happening just in order to be inconvenient. The fact
+is that libxslt needs libxml in order to compile and work and that
+I have no way to know where you keep libxml on your system.
+
+In order to compile, you must tell the compiler where to look
+for the libxml headers. Likewise, you must tell the linker where
+to look for libxml library.
+
+
+Adapting The Header Search Path
+-------------------------------
+
+In the MSVC IDE, go to Project->Settings and choose the C/C++
+options and select the Preprocessor category. Now, there is a list
+of additional include directories, separated by comma. The last
+entry is the location of libxml headers and this is the one which
+you must adapt to your environment.
+
+Adapting The Library Search Path
+--------------------------------
+
+In the MSVC IDE, go to Project->Settings and choose the Link
+options and select the Input category. Now, there is an Additional
+Library Path which contains the list of additional directories,
+separated by comma. The last entry is the location of the libxml
+library and this is the one which you must adapt to your environment.
+
+If Something Goes Wrong
+-----------------------
+
+Don't panic. Use your common sense and investigate the problem.
+If you cannot escape the dread, send me an email and tell me your
+problems
+
+
+27. July 2001, Igor Zlatkovic [igor@stud.fh-frankfurt.de]
\ No newline at end of file diff --git a/xsltproc/xsltproc.c b/xsltproc/xsltproc.c index 29a4c2dd..c0f4c1a5 100644 --- a/xsltproc/xsltproc.c +++ b/xsltproc/xsltproc.c @@ -33,11 +33,14 @@ #ifdef LIBXML_CATALOG_ENABLED #include <libxml/catalog.h> #endif +#include <libxml/parserInternals.h> + #include <libxslt/xslt.h> #include <libxslt/xsltInternals.h> #include <libxslt/transform.h> #include <libxslt/xsltutils.h> #include <libxslt/extensions.h> + #include <libexslt/exsltconfig.h> #ifdef WIN32 @@ -50,7 +53,6 @@ #include <sys/time.h> #endif /* WIN32 */ -extern int xmlLoadExtDtdDefaultValue; static int debug = 0; static int repeat = 0; |