From 9818573975fca87ca40e2ebf9cf7c0850f6ccda8 Mon Sep 17 00:00:00 2001 From: Berke Viktor Date: Fri, 28 Sep 2012 21:01:59 +0200 Subject: [PATCH] Add libxml2 solution and release scripts --- win32/deps/libxml2/config.h | 125 ++++++++++++ win32/deps/libxml2/release-x64.bat | 38 ++++ win32/deps/libxml2/release-x86.bat | 38 ++++ .../deps/libxml2/win32/VC11/RuleSet1.ruleset | 3 + .../libxml2/win32/VC11/libxml2-focus.vcxproj | 184 +++++++++++++++++ win32/deps/libxml2/win32/VC11/libxml2.sln | 56 ++++++ win32/deps/libxml2/win32/VC11/libxml2.vcxproj | 190 ++++++++++++++++++ .../win32/VC11/libxml2.vcxproj.filters | 174 ++++++++++++++++ .../deps/libxml2/win32/VC11/runsuite.vcxproj | 142 +++++++++++++ .../win32/VC11/runsuite.vcxproj.filters | 22 ++ 10 files changed, 972 insertions(+) create mode 100644 win32/deps/libxml2/config.h create mode 100644 win32/deps/libxml2/release-x64.bat create mode 100644 win32/deps/libxml2/release-x86.bat create mode 100644 win32/deps/libxml2/win32/VC11/RuleSet1.ruleset create mode 100644 win32/deps/libxml2/win32/VC11/libxml2-focus.vcxproj create mode 100644 win32/deps/libxml2/win32/VC11/libxml2.sln create mode 100644 win32/deps/libxml2/win32/VC11/libxml2.vcxproj create mode 100644 win32/deps/libxml2/win32/VC11/libxml2.vcxproj.filters create mode 100644 win32/deps/libxml2/win32/VC11/runsuite.vcxproj create mode 100644 win32/deps/libxml2/win32/VC11/runsuite.vcxproj.filters diff --git a/win32/deps/libxml2/config.h b/win32/deps/libxml2/config.h new file mode 100644 index 00000000..8629944e --- /dev/null +++ b/win32/deps/libxml2/config.h @@ -0,0 +1,125 @@ +#ifndef __LIBXML_WIN32_CONFIG__ +#define __LIBXML_WIN32_CONFIG__ + +#define HAVE_CTYPE_H +#define HAVE_STDARG_H +#define HAVE_MALLOC_H +#define HAVE_ERRNO_H +#define HAVE_STDINT_H + +#if defined(_WIN32_WCE) +#undef HAVE_ERRNO_H +#include +#include "wincecompat.h" +#else +#define HAVE_SYS_STAT_H +#define HAVE__STAT +#define HAVE_STAT +#define HAVE_STDLIB_H +#define HAVE_TIME_H +#define HAVE_FCNTL_H +#include +#include +#endif + +#include + +#ifndef ICONV_CONST +#define ICONV_CONST const +#endif + +#ifdef NEED_SOCKETS +#include +#endif + +/* + * Windows platforms may define except + */ +#undef except + +#define HAVE_ISINF +#define HAVE_ISNAN +#include +#if defined(_MSC_VER) || defined(__BORLANDC__) +/* 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 +/* 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 */ +#ifndef isinf +static int isinf (double d) { + int expon = 0; + double val = frexp (d, &expon); + if (expon == 1025) { + if (val == 0.5) { + return 1; + } else if (val == -0.5) { + return -1; + } else { + return 0; + } + } else { + return 0; + } +} +#endif +#ifndef isnan +static int isnan (double d) { + int expon = 0; + double val = frexp (d, &expon); + if (expon == 1025) { + if (val == 0.5) { + return 0; + } else if (val == -0.5) { + return 0; + } else { + return 1; + } + } else { + return 0; + } +} +#endif +#endif /* _MSC_VER */ + +#if defined(_MSC_VER) +#define mkdir(p,m) _mkdir(p) +#define snprintf _snprintf +#if _MSC_VER < 1500 +#define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a) +#endif +#elif defined(__MINGW32__) +#define mkdir(p,m) _mkdir(p) +#endif + +/* Threading API to use should be specified here for compatibility reasons. + This is however best specified on the compiler's command-line. */ +#if defined(LIBXML_THREAD_ENABLED) +#if !defined(HAVE_PTHREAD_H) && !defined(HAVE_WIN32_THREADS) && !defined(_WIN32_WCE) +#define HAVE_WIN32_THREADS +#endif +#endif + +/* Some third-party libraries far from our control assume the following + is defined, which it is not if we don't include windows.h. */ +#if !defined(FALSE) +#define FALSE 0 +#endif +#if !defined(TRUE) +#define TRUE (!(FALSE)) +#endif + +#endif /* __LIBXML_WIN32_CONFIG__ */ + diff --git a/win32/deps/libxml2/release-x64.bat b/win32/deps/libxml2/release-x64.bat new file mode 100644 index 00000000..5f2411c9 --- /dev/null +++ b/win32/deps/libxml2/release-x64.bat @@ -0,0 +1,38 @@ +:: run this from a command prompt +@echo off + +SET PACKAGE_NAME=libxml2-2.9.0 + +copy win32\vc11\x64\Release\runsuite.exe . +set PATH=%PATH%;..\build\x64\bin;win32\vc11\x64\Release +runsuite.exe +del runsuite.exe +set LIBXML_SRC=%cd% +set LIBXML_DEST=%cd%-x64 +echo.Press return when ready to install! +pause + +rmdir /q /s %LIBXML_DEST% +mkdir %LIBXML_DEST% +mkdir %LIBXML_DEST%\bin +mkdir %LIBXML_DEST%\include +mkdir %LIBXML_DEST%\include\libxml +mkdir %LIBXML_DEST%\lib +copy win32\vc11\x64\Release\libxml2.dll %LIBXML_DEST%\bin +copy win32\vc11\x64\Release\runsuite.exe %LIBXML_DEST%\bin +copy win32\vc11\x64\Release\libxml2.exp %LIBXML_DEST%\lib +copy win32\vc11\x64\Release\libxml2.lib %LIBXML_DEST%\lib +copy include\win32config.h %LIBXML_DEST%\include +copy include\wsockcompat.h %LIBXML_DEST%\include +xcopy /s include\libxml\*.h %LIBXML_DEST%\include\libxml\ +copy COPYING %EXPAT_DEST%\LICENSE.LIBXML2 + +cd %LIBXML_DEST% +set PATH=%PATH%;%ProgramFiles%\7-zip +del ..\%PACKAGE_NAME%-x64.7z +7z a ..\%PACKAGE_NAME%-x64.7z * +cd %LIBXML_SRC% +rmdir /q /s %LIBXML_DEST% + +echo.Finished! +pause diff --git a/win32/deps/libxml2/release-x86.bat b/win32/deps/libxml2/release-x86.bat new file mode 100644 index 00000000..a73b0ac6 --- /dev/null +++ b/win32/deps/libxml2/release-x86.bat @@ -0,0 +1,38 @@ +:: run this from a command prompt +@echo off + +SET PACKAGE_NAME=libxml2-2.9.0 + +copy win32\vc11\Release\runsuite.exe . +set PATH=%PATH%;..\build\Win32\bin;win32\vc11\Release +runsuite.exe +del runsuite.exe +set LIBXML_SRC=%cd% +set LIBXML_DEST=%cd%-x86 +echo.Press return when ready to install! +pause + +rmdir /q /s %LIBXML_DEST% +mkdir %LIBXML_DEST% +mkdir %LIBXML_DEST%\bin +mkdir %LIBXML_DEST%\include +mkdir %LIBXML_DEST%\include\libxml +mkdir %LIBXML_DEST%\lib +copy win32\vc11\Release\libxml2.dll %LIBXML_DEST%\bin +copy win32\vc11\Release\runsuite.exe %LIBXML_DEST%\bin +copy win32\vc11\Release\libxml2.exp %LIBXML_DEST%\lib +copy win32\vc11\Release\libxml2.lib %LIBXML_DEST%\lib +copy include\win32config.h %LIBXML_DEST%\include +copy include\wsockcompat.h %LIBXML_DEST%\include +xcopy /s include\libxml\*.h %LIBXML_DEST%\include\libxml\ +copy COPYING %EXPAT_DEST%\LICENSE.LIBXML2 + +cd %LIBXML_DEST% +set PATH=%PATH%;%ProgramFiles%\7-zip +del ..\%PACKAGE_NAME%-x86.7z +7z a ..\%PACKAGE_NAME%-x86.7z * +cd %LIBXML_SRC% +rmdir /q /s %LIBXML_DEST% + +echo.Finished! +pause diff --git a/win32/deps/libxml2/win32/VC11/RuleSet1.ruleset b/win32/deps/libxml2/win32/VC11/RuleSet1.ruleset new file mode 100644 index 00000000..9985a6c6 --- /dev/null +++ b/win32/deps/libxml2/win32/VC11/RuleSet1.ruleset @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/win32/deps/libxml2/win32/VC11/libxml2-focus.vcxproj b/win32/deps/libxml2/win32/VC11/libxml2-focus.vcxproj new file mode 100644 index 00000000..914ce251 --- /dev/null +++ b/win32/deps/libxml2/win32/VC11/libxml2-focus.vcxproj @@ -0,0 +1,184 @@ + + + + + Debug DLL + Win32 + + + Debug + Win32 + + + Release DLL + Win32 + + + Release + Win32 + + + + {7EA50C94-26BD-4893-B773-625CD3D3DEA6} + libxml2 + + + + StaticLibrary + true + Unicode + + + StaticLibrary + true + Unicode + + + StaticLibrary + false + true + Unicode + + + StaticLibrary + Unicode + true + + + + + + + + + + + + + + + + + + + + + + $(ProjectDir)..\..\lib\ + + + $(ProjectDir)..\..\lib\ + + + + + $(ProjectDir)..\..\lib\ + + + $(ProjectDir)..\..\lib\ + + + + Level3 + Disabled + $(ProjectDir);$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libiconv-1.14\include + 4018; 4996 + /MP %(AdditionalOptions) + false + + + true + + + + + Level3 + Disabled + $(ProjectDir);$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libiconv-1.14\include + 4018; 4996 + /MP %(AdditionalOptions) + false + + + true + + + + + Level3 + MaxSpeed + true + true + /MP %(AdditionalOptions) + $(ProjectDir);$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libiconv-1.14\include + 4018; 4996 + + + true + true + true + + + + + /MP %(AdditionalOptions) + $(ProjectDir);$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libiconv-1.14\include + 4018; 4996 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/win32/deps/libxml2/win32/VC11/libxml2.sln b/win32/deps/libxml2/win32/VC11/libxml2.sln new file mode 100644 index 00000000..4bc6d7fe --- /dev/null +++ b/win32/deps/libxml2/win32/VC11/libxml2.sln @@ -0,0 +1,56 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Express 2012 for Windows Desktop +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml2", "libxml2.vcxproj", "{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "runsuite", "runsuite.vcxproj", "{D841B4F7-C277-49CB-B379-8B1801C8EE35}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug DLL|Win32 = Debug DLL|Win32 + Debug DLL|x64 = Debug DLL|x64 + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release DLL|Win32 = Release DLL|Win32 + Release DLL|x64 = Release DLL|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug DLL|Win32.ActiveCfg = Debug|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug DLL|Win32.Build.0 = Debug|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug DLL|x64.ActiveCfg = Debug|x64 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug DLL|x64.Build.0 = Debug|x64 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug|Win32.ActiveCfg = Debug|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug|Win32.Build.0 = Debug|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug|x64.ActiveCfg = Debug|x64 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug|x64.Build.0 = Debug|x64 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release DLL|Win32.ActiveCfg = Release|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release DLL|Win32.Build.0 = Release|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release DLL|x64.ActiveCfg = Release|x64 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release DLL|x64.Build.0 = Release|x64 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release|Win32.ActiveCfg = Release|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release|Win32.Build.0 = Release|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release|x64.ActiveCfg = Release|x64 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release|x64.Build.0 = Release|x64 + {D841B4F7-C277-49CB-B379-8B1801C8EE35}.Debug DLL|Win32.ActiveCfg = Debug|Win32 + {D841B4F7-C277-49CB-B379-8B1801C8EE35}.Debug DLL|Win32.Build.0 = Debug|Win32 + {D841B4F7-C277-49CB-B379-8B1801C8EE35}.Debug DLL|x64.ActiveCfg = Debug|x64 + {D841B4F7-C277-49CB-B379-8B1801C8EE35}.Debug DLL|x64.Build.0 = Debug|x64 + {D841B4F7-C277-49CB-B379-8B1801C8EE35}.Debug|Win32.ActiveCfg = Debug|Win32 + {D841B4F7-C277-49CB-B379-8B1801C8EE35}.Debug|Win32.Build.0 = Debug|Win32 + {D841B4F7-C277-49CB-B379-8B1801C8EE35}.Debug|x64.ActiveCfg = Debug|x64 + {D841B4F7-C277-49CB-B379-8B1801C8EE35}.Debug|x64.Build.0 = Debug|x64 + {D841B4F7-C277-49CB-B379-8B1801C8EE35}.Release DLL|Win32.ActiveCfg = Release|Win32 + {D841B4F7-C277-49CB-B379-8B1801C8EE35}.Release DLL|Win32.Build.0 = Release|Win32 + {D841B4F7-C277-49CB-B379-8B1801C8EE35}.Release DLL|x64.ActiveCfg = Release|x64 + {D841B4F7-C277-49CB-B379-8B1801C8EE35}.Release DLL|x64.Build.0 = Release|x64 + {D841B4F7-C277-49CB-B379-8B1801C8EE35}.Release|Win32.ActiveCfg = Release|Win32 + {D841B4F7-C277-49CB-B379-8B1801C8EE35}.Release|Win32.Build.0 = Release|Win32 + {D841B4F7-C277-49CB-B379-8B1801C8EE35}.Release|x64.ActiveCfg = Release|x64 + {D841B4F7-C277-49CB-B379-8B1801C8EE35}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/win32/deps/libxml2/win32/VC11/libxml2.vcxproj b/win32/deps/libxml2/win32/VC11/libxml2.vcxproj new file mode 100644 index 00000000..101b7845 --- /dev/null +++ b/win32/deps/libxml2/win32/VC11/libxml2.vcxproj @@ -0,0 +1,190 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C} + libxml2 + + + + StaticLibrary + true + Unicode + v110 + + + StaticLibrary + true + Unicode + v110 + + + DynamicLibrary + false + true + MultiByte + v110 + + + DynamicLibrary + false + true + MultiByte + v110 + + + + + + + + + + + + + + + + + + + $(ProjectDir)..\..\lib\ + + + + build\$(ProjectName)$(Configuration)\ + + + + + Level3 + Disabled + $(ProjectDir);$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libiconv-1.14.vc10\include;%(AdditionalIncludeDirectories) + 4996 + false + true + + + true + + + + + Level3 + Disabled + $(ProjectDir);$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libiconv-1.14.vc10\include;%(AdditionalIncludeDirectories) + 4996 + false + true + + + true + + + + + Level3 + MaxSpeed + true + true + ..\..\include;..\..\..\build\$(Platform)\include + + + true + true + true + ws2_32.lib;iconv.lib;%(AdditionalDependencies) + ..\..\..\build\$(Platform)\lib + + + + + Level3 + MaxSpeed + true + true + ..\..\include;..\..\..\build\$(Platform)\include + + + true + true + true + ws2_32.lib;iconv.lib;%(AdditionalDependencies) + ..\..\..\build\$(Platform)\lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/win32/deps/libxml2/win32/VC11/libxml2.vcxproj.filters b/win32/deps/libxml2/win32/VC11/libxml2.vcxproj.filters new file mode 100644 index 00000000..60319981 --- /dev/null +++ b/win32/deps/libxml2/win32/VC11/libxml2.vcxproj.filters @@ -0,0 +1,174 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {22791c14-7c07-4222-ad58-8c18d3fb10ba} + + + {bfddc99f-05d4-4f06-98d1-346b1be73d6f} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files\windows\VC11 + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/win32/deps/libxml2/win32/VC11/runsuite.vcxproj b/win32/deps/libxml2/win32/VC11/runsuite.vcxproj new file mode 100644 index 00000000..61dfb6ac --- /dev/null +++ b/win32/deps/libxml2/win32/VC11/runsuite.vcxproj @@ -0,0 +1,142 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {D841B4F7-C277-49CB-B379-8B1801C8EE35} + runsuite + + + + Application + true + Unicode + v110 + + + Application + true + Unicode + v110 + + + Application + false + true + MultiByte + v110 + + + Application + false + true + MultiByte + v110 + + + + + + + + + + + + + + + + + + + $(ProjectDir)..\..\lib\ + build\$(ProjectName)$(Configuration)\ + + + + + Level3 + Disabled + $(ProjectDir);$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libiconv-1.14.vc10\include;%(AdditionalIncludeDirectories) + 4996 + _UNICODE;UNICODE;%(PreprocessorDefinitions) + /MP %(AdditionalOptions) + false + + + true + Ws2_32.lib;%(AdditionalDependencies) + + + + + Level3 + Disabled + $(ProjectDir);$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libiconv-1.14.vc10\include;%(AdditionalIncludeDirectories) + 4996 + _UNICODE;UNICODE;%(PreprocessorDefinitions) + /MP %(AdditionalOptions) + false + + + true + Ws2_32.lib;%(AdditionalDependencies) + + + + + Level3 + MaxSpeed + true + true + ..\..\include;..\..\..\build\$(Platform)\include + + + true + true + true + + + + + Level3 + MaxSpeed + true + true + ..\..\include;..\..\..\build\$(Platform)\include + + + true + true + true + + + + + + + + {1d6039f6-5078-416f-a3af-a36efc7e6a1c} + + + + + + \ No newline at end of file diff --git a/win32/deps/libxml2/win32/VC11/runsuite.vcxproj.filters b/win32/deps/libxml2/win32/VC11/runsuite.vcxproj.filters new file mode 100644 index 00000000..d7dce007 --- /dev/null +++ b/win32/deps/libxml2/win32/VC11/runsuite.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + \ No newline at end of file