diff options
Diffstat (limited to 'third_party/libxslt/win32')
| -rw-r--r-- | third_party/libxslt/win32/Makefile.mingw | 2 | ||||
| -rw-r--r-- | third_party/libxslt/win32/Makefile.msvc | 3 | ||||
| -rw-r--r-- | third_party/libxslt/win32/configure.js | 13 | ||||
| -rw-r--r-- | third_party/libxslt/win32/libexslt.def.src | 4 | ||||
| -rw-r--r-- | third_party/libxslt/win32/libxslt.def.src | 7 |
5 files changed, 26 insertions, 3 deletions
diff --git a/third_party/libxslt/win32/Makefile.mingw b/third_party/libxslt/win32/Makefile.mingw index 0b2249d..946ffa3 100644 --- a/third_party/libxslt/win32/Makefile.mingw +++ b/third_party/libxslt/win32/Makefile.mingw @@ -87,6 +87,7 @@ XSLT_OBJS = $(XSLT_INTDIR)/attributes.o\ $(XSLT_INTDIR)/transform.o\ $(XSLT_INTDIR)/variables.o\ $(XSLT_INTDIR)/xslt.o\ + $(XSLT_INTDIR)/xsltlocale.o\ $(XSLT_INTDIR)/xsltutils.o XSLT_SRCS = $(subst .o,.c,$(subst $(XSLT_INTDIR),$(XSLT_SRCDIR),$(XSLT_OBJS))) @@ -107,6 +108,7 @@ XSLT_OBJS_A = $(XSLT_INTDIR_A)/attributes.o\ $(XSLT_INTDIR_A)/transform.o\ $(XSLT_INTDIR_A)/variables.o\ $(XSLT_INTDIR_A)/xslt.o\ + $(XSLT_INTDIR_A)/xsltlocale.o\ $(XSLT_INTDIR_A)/xsltutils.o # Libexslt object files. diff --git a/third_party/libxslt/win32/Makefile.msvc b/third_party/libxslt/win32/Makefile.msvc index b5810de..54e8e23 100644 --- a/third_party/libxslt/win32/Makefile.msvc +++ b/third_party/libxslt/win32/Makefile.msvc @@ -53,6 +53,7 @@ CPPFLAGS = /nologo CC = cl.exe CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /W3 $(CRUNTIME) /D "_REENTRANT" CFLAGS = $(CFLAGS) /I$(BASEDIR) /I$(XSLT_SRCDIR) /I$(INCPREFIX) +CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE # The linker and its options. LD = link.exe @@ -90,6 +91,7 @@ XSLT_OBJS = $(XSLT_INTDIR)\attributes.obj\ $(XSLT_INTDIR)\transform.obj\ $(XSLT_INTDIR)\variables.obj\ $(XSLT_INTDIR)\xslt.obj\ + $(XSLT_INTDIR)\xsltlocale.obj\ $(XSLT_INTDIR)\xsltutils.obj\ $(XSLT_INTDIR)\attrvt.obj @@ -110,6 +112,7 @@ XSLT_OBJS_A = $(XSLT_INTDIR_A)\attributes.obj\ $(XSLT_INTDIR_A)\transform.obj\ $(XSLT_INTDIR_A)\variables.obj\ $(XSLT_INTDIR_A)\xslt.obj\ + $(XSLT_INTDIR_A)\xsltlocale.obj\ $(XSLT_INTDIR_A)\xsltutils.obj\ $(XSLT_INTDIR_A)\attrvt.obj diff --git a/third_party/libxslt/win32/configure.js b/third_party/libxslt/win32/configure.js index 9e0ba2c..64c0775 100644 --- a/third_party/libxslt/win32/configure.js +++ b/third_party/libxslt/win32/configure.js @@ -47,6 +47,7 @@ var withIconv = true; var withZlib = false; var withCrypto = true; var withModules = false; +var withLocale = true; /* Win32 build options. */ var dirSep = "\\"; var compiler = "msvc"; @@ -106,6 +107,7 @@ function usage() txt += " zlib: Use zlib library (" + (withZlib? "yes" : "no") + ")\n"; txt += " crypto: Enable Crypto support (" + (withCrypto? "yes" : "no") + ")\n"; txt += " modules: Enable Module support (" + (withModules? "yes" : "no") + ")\n"; + txt += " locale: Enable Locale support, requires unicode OS support (" + (withLocale? "yes" : "no") + ")\n"; txt += "\nWin32 build options, default value given in parentheses:\n\n"; txt += " compiler: Compiler to be used [msvc|mingw] (" + compiler + ")\n"; txt += " cruntime: C-runtime compiler option (only msvc) (" + cruntime + ")\n"; @@ -240,6 +242,10 @@ function configureXslt() of.WriteLine(s.replace(/\@WITH_DEBUGGER\@/, withDebugger? "1" : "0")); } else if (s.search(/\@WITH_MODULES\@/) != -1) { of.WriteLine(s.replace(/\@WITH_MODULES\@/, withModules? "1" : "0")); + } else if (s.search(/\@XSLT_LOCALE_XLOCALE\@/) != -1) { + of.WriteLine(s.replace(/\@XSLT_LOCALE_XLOCALE\@/, "0")); + } else if (s.search(/\@XSLT_LOCALE_WINAPI\@/) != -1) { + of.WriteLine(s.replace(/\@XSLT_LOCALE_WINAPI\@/, withLocale? "1" : "0")); } else if (s.search(/\@LIBXSLT_DEFAULT_PLUGINS_PATH\@/) != -1) { of.WriteLine(s.replace(/\@LIBXSLT_DEFAULT_PLUGINS_PATH\@/, "NULL")); } else @@ -343,6 +349,8 @@ for (i = 0; (i < WScript.Arguments.length) && (error == 0); i++) { withCrypto = strToBool(arg.substring(opt.length + 1, arg.length)); else if (opt == "modules") withModules = strToBool(arg.substring(opt.length + 1, arg.length)); + else if (opt == "locale") + withLocale = strToBool(arg.substring(opt.length + 1, arg.length)); else if (opt == "compiler") compiler = arg.substring(opt.length + 1, arg.length); else if (opt == "cruntime") @@ -456,8 +464,8 @@ if (compiler == "mingw") var new_makefile = ".\\Makefile"; var f = fso.FileExists(new_makefile); if (f) { - var t = fso.GetFile(new_makefile); - t.Attributes =0; + var t = fso.GetFile(new_makefile); + t.Attributes =0; } fso.CopyFile(makefile, new_makefile, true); WScript.Echo("Created Makefile."); @@ -483,6 +491,7 @@ txtOut += " Use iconv: " + boolToStr(withIconv) + "\n"; txtOut += " With zlib: " + boolToStr(withZlib) + "\n"; txtOut += " Crypto: " + boolToStr(withCrypto) + "\n"; txtOut += " Modules: " + boolToStr(withModules) + "\n"; +txtOut += " Locale: " + boolToStr(withLocale) + "\n"; txtOut += "\n"; txtOut += "Win32 build configuration\n"; txtOut += "-------------------------\n"; diff --git a/third_party/libxslt/win32/libexslt.def.src b/third_party/libxslt/win32/libexslt.def.src index ac4b3c7..cb02e028 100644 --- a/third_party/libxslt/win32/libexslt.def.src +++ b/third_party/libxslt/win32/libexslt.def.src @@ -7,10 +7,14 @@ exsltLibxsltVersion DATA exsltCommonRegister exsltCryptoRegister exsltDateRegister +exsltDateXpathCtxtRegister exsltDynRegister exsltFuncRegister exsltMathRegister +exsltMathXpathCtxtRegister exsltRegisterAll exsltSaxonRegister exsltSetsRegister +exsltSetsXpathCtxtRegister exsltStrRegister +exsltStrXpathCtxtRegister diff --git a/third_party/libxslt/win32/libxslt.def.src b/third_party/libxslt/win32/libxslt.def.src index 48af874..892d34b 100644 --- a/third_party/libxslt/win32/libxslt.def.src +++ b/third_party/libxslt/win32/libxslt.def.src @@ -76,7 +76,6 @@ xsltEvalXPathPredicate xsltEvalXPathString xsltEvalXPathStringNs xsltExtElementLookup -/*xsltExtFunctionLookup*/ xsltExtModuleElementLookup xsltExtModuleElementPreComputeLookup xsltExtModuleFunctionLookup @@ -98,6 +97,7 @@ xsltFreeDocuments xsltFreeExts xsltFreeGlobalVariables xsltFreeKeys +xsltFreeLocale xsltFreeNamespaceAliasHashes xsltFreeRVTs xsltFreeSecurityPrefs @@ -134,6 +134,7 @@ xsltInitCtxtExts xsltInitCtxtKey xsltInitCtxtKeys xsltInitElemPreComp +xsltInitGlobals xsltIsBlank xsltKeyFunction xsltLoadDocument @@ -141,12 +142,14 @@ xsltLoadStyleDocument xsltLoadStylesheetPI xsltLocalVariablePop xsltLocalVariablePush +xsltLocaleStrcmp /*xsltMatchPattern*/ xsltMessage xsltNamespaceAlias xsltNeedElemSpaceHandling xsltNewDocument xsltNewElemPreComp +xsltNewLocale xsltNewSecurityPrefs xsltNewStyleDocument xsltNewStylesheet @@ -177,6 +180,7 @@ xsltPointerListCreate xsltPointerListFree xsltPreComputeExtModuleElement xsltPrintErrorContext +xsltProcessOneNode xsltProcessingInstruction xsltProfileStylesheet xsltQuoteOneUserParam @@ -227,6 +231,7 @@ xsltShutdownCtxtExts xsltShutdownExts xsltSort xsltSplitQName +xsltStrxfrm xsltStyleGetExtData xsltStylePreCompute xsltStyleStylesheetLevelGetExtData |