diff --git a/libxslt-1.1.32/libxslt/win32config.h b/libxslt/libxslt/win32config.h index 8fe7042..00d9a97 100755 --- a/libxslt-1.1.32/libxslt/win32config.h +++ b/libxslt/libxslt/win32config.h @@ -80,7 +80,10 @@ static int isnan (double d) { /* snprintf emulation taken from http://stackoverflow.com/a/8712996/1956010 */ #if defined(_MSC_VER) && _MSC_VER < 1900 - +#if _MSC_VER < 1500 +#define snprintf _snprintf +#define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a) +#else #include #include @@ -110,7 +113,7 @@ __inline int c99_snprintf(char *outBuf, size_t size, const char *format, ...) return count; } - +#endif /* _MSC_VER < 1500 */ #endif /* defined(_MSC_VER) && _MSC_VER < 1900 */ #define HAVE_SYS_STAT_H diff --git a/libxslt-1.1.32/win32/Makefile.msvc b/libxslt/win32/Makefile.msvc index a6d57a1..f8a81a5 100755 --- a/libxslt-1.1.32/win32/Makefile.msvc +++ b/libxslt/win32/Makefile.msvc @@ -28,12 +28,16 @@ BINDIR = bin.msvc XSLT_NAME = xslt XSLT_BASENAME = lib$(XSLT_NAME) XSLT_SO = $(XSLT_BASENAME).dll +XSLT_RES = $(XSLT_BASENAME).res +XSLT_RC = $(XSLT_BASENAME).rc XSLT_IMP = $(XSLT_BASENAME).lib XSLT_DEF = $(XSLT_BASENAME).def XSLT_A = $(XSLT_BASENAME)_a.lib EXSLT_NAME = exslt EXSLT_BASENAME = lib$(EXSLT_NAME) EXSLT_SO = $(EXSLT_BASENAME).dll +EXSLT_RES = $(EXSLT_BASENAME).res +EXSLT_RC = $(EXSLT_BASENAME).rc EXSLT_IMP = $(EXSLT_BASENAME).lib EXSLT_DEF = $(EXSLT_BASENAME).def EXSLT_A = $(EXSLT_BASENAME)_a.lib @@ -237,12 +241,15 @@ $(XSLT_OBJS_A) : $(XSLT_INTDIR_A) $(XSLT_INTDIR)\$(XSLT_DEF) : $(XSLT_INTDIR) $(XSLT_DEF).src $(CPP) $(CPPFLAGS) $(XSLT_DEF).src > $(XSLT_INTDIR)\$(XSLT_DEF) +$(XSLT_INTDIR)\$(XSLT_RES) : $(XSLT_INTDIR) $(XSLT_RC) + rc -Fo $(XSLT_INTDIR)\$(XSLT_RES) $(XSLT_RC) + # Creates the libxslt shared object. -$(BINDIR)\$(XSLT_SO) : $(BINDIR) $(XSLT_OBJS) $(XSLT_INTDIR)\$(XSLT_DEF) +$(BINDIR)\$(XSLT_SO) : $(BINDIR) $(XSLT_OBJS) $(XSLT_INTDIR)\$(XSLT_DEF) $(XSLT_INTDIR)\$(XSLT_RES) $(LD) $(LDFLAGS) /DLL \ /VERSION:$(LIBXSLT_MAJOR_VERSION).$(LIBXSLT_MINOR_VERSION) \ /IMPLIB:$(BINDIR)\$(XSLT_IMP) /OUT:$(BINDIR)\$(XSLT_SO) \ - $(XSLT_OBJS) $(LIBS) libxml2.lib + $(XSLT_OBJS) $(XSLT_INTDIR)\$(XSLT_RES) $(LIBS) libxml2.lib @$(_VC_MANIFEST_EMBED_DLL) #$(BINDIR)\$(XSLT_SO) : $(BINDIR) $(XSLT_OBJS) $(XSLT_INTDIR)\$(XSLT_DEF) @@ -283,12 +290,15 @@ $(EXSLT_OBJS_A) : $(EXSLT_INTDIR_A) $(EXSLT_INTDIR)\$(EXSLT_DEF) : $(EXSLT_INTDIR) $(EXSLT_DEF).src $(CPP) $(CPPFLAGS) $(EXSLT_DEF).src > $(EXSLT_INTDIR)\$(EXSLT_DEF) +$(EXSLT_INTDIR)\$(EXSLT_RES) : $(EXSLT_INTDIR) $(EXSLT_RC) + rc -Fo $(EXSLT_INTDIR)\$(EXSLT_RES) $(EXSLT_RC) + # Creates the libexslt shared object. -$(BINDIR)\$(EXSLT_SO) : $(BINDIR) $(EXSLT_OBJS) $(EXSLT_INTDIR)\$(EXSLT_DEF) libxslt +$(BINDIR)\$(EXSLT_SO) : $(BINDIR) $(EXSLT_OBJS) $(EXSLT_INTDIR)\$(EXSLT_DEF) $(EXSLT_INTDIR)\$(EXSLT_RES) libxslt $(LD) $(LDFLAGS) /DLL \ /VERSION:$(LIBEXSLT_MAJOR_VERSION).$(LIBEXSLT_MINOR_VERSION) \ /IMPLIB:$(BINDIR)\$(EXSLT_IMP) /OUT:$(BINDIR)\$(EXSLT_SO) \ - $(EXSLT_OBJS) $(XSLT_IMP) $(LIBS) libxml2.lib + $(EXSLT_OBJS) $(EXSLT_INTDIR)\$(EXSLT_RES) $(XSLT_IMP) $(LIBS) libxml2.lib @$(_VC_MANIFEST_EMBED_DLL) #$(BINDIR)\$(EXSLT_SO) : $(BINDIR) $(EXSLT_OBJS) $(EXSLT_INTDIR)\$(EXSLT_DEF) libxslt diff --git a/libxslt-1.1.32/win32/configure.js b/libxslt/win32/configure.js index 56694cc..04f1b8e 100755 --- a/libxslt-1.1.32/win32/configure.js +++ b/libxslt/win32/configure.js @@ -209,6 +209,22 @@ function discoverVersion() vf.WriteLine("LIB+=;" + buildLib); } vf.Close(); + versionFile = "rcVersion.h" + vf = fso.CreateTextFile(versionFile, true); + vf.WriteLine("/*"); + vf.WriteLine(" " + versionFile); + vf.WriteLine(" This file is generated automatically by " + WScript.ScriptName + "."); + vf.WriteLine("*/"); + vf.WriteBlankLines(1); + vf.WriteLine("#define LIBXSLT_MAJOR_VERSION " + verMajorXslt); + vf.WriteLine("#define LIBXSLT_MINOR_VERSION " + verMinorXslt); + vf.WriteLine("#define LIBXSLT_MICRO_VERSION " + verMicroXslt); + vf.WriteLine("#define LIBXSLT_DOTTED_VERSION " + "\"" + verMajorXslt + "." + verMinorXslt + "." + verMicroXslt + "\""); + vf.WriteLine("#define LIBEXSLT_MAJOR_VERSION " + verMajorExslt); + vf.WriteLine("#define LIBEXSLT_MINOR_VERSION " + verMinorExslt); + vf.WriteLine("#define LIBEXSLT_MICRO_VERSION " + verMicroExslt); + vf.WriteLine("#define LIBEXSLT_DOTTED_VERSION " + "\"" + verMajorExslt + "." + verMinorExslt + "." + verMicroExslt + "\""); + vf.Close() } /* Configures libxslt. This one will generate xsltconfig.h from xsltconfig.h.in diff --git a/libxslt/win32/libexslt.rc b/libxslt/win32/libexslt.rc new file mode 100755 index 0000000..801774b --- /dev/null +++ b/libxslt/win32/libexslt.rc @@ -0,0 +1,36 @@ +#include +#include "rcVersion.h" + +VS_VERSION_INFO VERSIONINFO + FILEVERSION LIBEXSLT_MAJOR_VERSION,LIBEXSLT_MINOR_VERSION,LIBEXSLT_MICRO_VERSION,0 + PRODUCTVERSION LIBEXSLT_MAJOR_VERSION,LIBEXSLT_MINOR_VERSION,LIBEXSLT_MICRO_VERSION,0 + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0 +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_DLL + FILESUBTYPE VFT2_UNKNOWN // not used +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "04090000" /* Lang = US English, Charset = ASCII */ + BEGIN + VALUE "FileDescription", "libexslt library\0" + VALUE "FileVersion", LIBEXSLT_DOTTED_VERSION "\0" + VALUE "InternalName", "libexslt.dll\0" + VALUE "LegalCopyright", "Copyright (C) 1998-2012 Daniel Veillard\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "libexslt.dll\0" + VALUE "ProductName", "libexslt\0" + VALUE "ProductVersion", LIBEXSLT_DOTTED_VERSION "\0" + VALUE "Comments", "For more information visit http://xmlsoft.org/\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0409, 0 /* US English, ASCII */ + END +END diff --git a/libxslt/win32/libxslt.rc b/libxslt/win32/libxslt.rc new file mode 100755 index 0000000..f55f899 --- /dev/null +++ b/libxslt/win32/libxslt.rc @@ -0,0 +1,36 @@ +#include +#include "rcVersion.h" + +VS_VERSION_INFO VERSIONINFO + FILEVERSION LIBXSLT_MAJOR_VERSION,LIBXSLT_MINOR_VERSION,LIBXSLT_MICRO_VERSION,0 + PRODUCTVERSION LIBXSLT_MAJOR_VERSION,LIBXSLT_MINOR_VERSION,LIBXSLT_MICRO_VERSION,0 + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0 +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_DLL + FILESUBTYPE VFT2_UNKNOWN // not used +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "04090000" /* Lang = US English, Charset = ASCII */ + BEGIN + VALUE "FileDescription", "libxslt library\0" + VALUE "FileVersion", LIBXSLT_DOTTED_VERSION "\0" + VALUE "InternalName", "libxslt.dll\0" + VALUE "LegalCopyright", "Copyright (C) 1998-2012 Daniel Veillard\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "libxslt.dll\0" + VALUE "ProductName", "libxslt\0" + VALUE "ProductVersion", LIBXSLT_DOTTED_VERSION "\0" + VALUE "Comments", "For more information visit http://xmlsoft.org/\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0409, 0 /* US English, ASCII */ + END +END