From ec7db38b0ccaac6f31951d1a8e8540d8c2509c3a Mon Sep 17 00:00:00 2001 From: Arnavion Date: Sat, 11 Jun 2016 14:49:54 -0700 Subject: [PATCH] libxml2: Updated to version 2.9.4 --- README.md | 2 +- build.ps1 | 10 +- libxml2/mod.md | 98 ++++++----- libxml2/win32/VC12/libxml2.sln | 56 ------ libxml2/win32/VC12/libxml2.vcxproj.filters | 174 ------------------- libxml2/win32/VC12/runsuite.vcxproj | 143 --------------- libxml2/win32/VC12/runsuite.vcxproj.filters | 22 --- libxml2/win32/{VC12 => VC14}/config.h | 2 +- libxml2/win32/{VC12 => VC14}/libxml2.vcxproj | 41 +---- 9 files changed, 62 insertions(+), 486 deletions(-) delete mode 100644 libxml2/win32/VC12/libxml2.sln delete mode 100644 libxml2/win32/VC12/libxml2.vcxproj.filters delete mode 100644 libxml2/win32/VC12/runsuite.vcxproj delete mode 100644 libxml2/win32/VC12/runsuite.vcxproj.filters rename libxml2/win32/{VC12 => VC14}/config.h (97%) rename libxml2/win32/{VC12 => VC14}/libxml2.vcxproj (79%) diff --git a/README.md b/README.md index 4bd742b3..4e503dfe 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ These are the libraries in the bundle: | lgi | 0.9.1 | [Source](https://dl.hexchat.net/gtk-win32/src/lgi-0.9.1.tar.gz) | libffi | 3.2.1 | [Source](https://dl.hexchat.net/gtk-win32/src/libffi-3.2.1.tar.gz) | libpng | 1.6.22 | [Source](https://dl.hexchat.net/gtk-win32/src/libpng-1.6.22.tar.xz) -| libxml2 | 2.9.3 | [Source](https://dl.hexchat.net/gtk-win32/src/libxml2-2.9.3.tar.gz) +| libxml2 | 2.9.4 | [Source](https://dl.hexchat.net/gtk-win32/src/libxml2-2.9.4.tar.gz) | luajit | 2.0.4 | [Source](https://dl.hexchat.net/gtk-win32/src/luajit-2.0.4.tar.gz) | OpenSSL | 1.0.2g | [Source](https://dl.hexchat.net/gtk-win32/src/openssl-1.0.2g.tar.gz) | Pango | 1.39.0 | [Source](https://dl.hexchat.net/gtk-win32/src/pango-1.39.0.tar.xz) diff --git a/build.ps1 b/build.ps1 index b00083ac..d11351b4 100644 --- a/build.ps1 +++ b/build.ps1 @@ -218,7 +218,7 @@ $items = @{ }; 'libxml2' = @{ - 'ArchiveUrl' = 'http://dl.hexchat.net/gtk-win32/src/libxml2-2.9.3.tar.gz' + 'ArchiveUrl' = 'https://dl.hexchat.net/gtk-win32/src/libxml2-2.9.4.tar.gz' 'Dependencies' = @('win-iconv') }; @@ -803,21 +803,19 @@ $items['libxml2'].BuildScript = { $originalEnvironment = Swap-Environment $vcvarsEnvironment - Exec msbuild win32\vc12\libxml2.sln /p:Platform=$platform /p:Configuration=Release /maxcpucount /nodeReuse:True $windowsTargetPlatformVersion + Exec msbuild win32\VC14\libxml2.vcxproj /p:Platform=$platform /p:Configuration=Release /maxcpucount /nodeReuse:True $windowsTargetPlatformVersion [void] (Swap-Environment $originalEnvironment) New-Item -Type Directory $packageDestination\bin Copy-Item ` .\lib\libxml2.dll, ` - .\lib\libxml2.pdb, ` - .\lib\runsuite.exe, ` - .\lib\runsuite.pdb ` + .\lib\libxml2.pdb ` $packageDestination\bin New-Item -Type Directory $packageDestination\include\libxml Copy-Item ` - .\win32\VC12\config.h, ` + .\win32\VC14\config.h, ` .\include\wsockcompat.h, ` .\include\libxml\*.h ` $packageDestination\include\libxml diff --git a/libxml2/mod.md b/libxml2/mod.md index 656a2ac7..9563394a 100644 --- a/libxml2/mod.md +++ b/libxml2/mod.md @@ -1,66 +1,68 @@ -* Download [libxml2 2.9.3](ftp://xmlsoft.org/libxml2/libxml2-2.9.3.tar.gz) -* Copy win32\VC10 to win32\VC12 -* Remove the `iconv` project and its references from `win32\VC12\libxml2.sln`, `win32\VC12\libxml2.vcxproj` and `win32\VC12\runsuite.vcxproj` -* Open `win32\VC12\libxml2.sln` with VS -* Add x64 configuration -* For the `libxml2` and `runsuite` projects: - * Set `' to `$(ProjectDir);$(ProjectDir)..\..\include;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\..\..\gtk\$(Platform)\include;%(AdditionalIncludeDirectories)` - * Add `4996` -* For the `libxml2` project: - * Change _Configuration Type_ to _Dynamic Library (.dll)_ under _Configuration Properties_ `->` _General_ - * Set `` to `..\..\..\..\..\gtk\$(Platform)\lib` - * Set `` to `ws2_32.lib;iconv.lib` +* Download [libxml2 2.9.3](ftp://xmlsoft.org/libxml2/libxml2-2.9.4.tar.gz) +* Copy `win32\VC10` to `win32\VC14` +* In `libxml2.vcxproj`: + * Add + ``` + + Release + x64 + + ``` + * Add `v140` to all `` elements that have `Label="Configuration"` + * Replace `Application` with `DynamicLibrary` + * Add + ``` + + + + ``` + * Add `` * Replace ``` - $(ProjectDir)..\..\lib\ + $(ProjectDir)..\..\lib\ - build\$(ProjectName)$(Configuration)\ - - ``` - with - ``` - - $(ProjectDir)..\..\lib\ - build\$(ProjectName)$(Configuration)\ - - ``` -* Add to libxml2.vcxproj.filters: - ``` - - Source Files - - ``` -* For the `runsuites` project: - * Replace - ``` - - $(ProjectDir)..\..\lib\ - build\$(ProjectName)$(Configuration)\ + build\$(ProjectName)$(Configuration)\ ``` with ``` - $(ProjectDir)..\..\lib\ - build\$(ProjectName)$(Configuration)\ + $(ProjectDir)..\..\lib\ + build\$(ProjectName)$(Configuration)\ ``` -* In `win32\VC12\config.h` + * Remove all `` elements + * Add `4996` + * In the `` elements' `` tags for `Release|Win32` and `Release|x64`: + * Under ``, add: + ``` + $(ProjectDir);$(ProjectDir)..\..\include;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\..\..\gtk\$(Platform)\include;%(AdditionalIncludeDirectories) + 4996 + ``` + * Under ``, add: + ``` + ..\..\..\..\..\gtk\$(Platform)\lib;$(AdditionalLibraryDirectories) + ws2_32.lib;iconv.lib;%(AdditionalDependencies) + ``` + * Remove + ``` + + + {bec03130-a64c-48f8-863c-52da83cfb3ae} + true + true + false + true + false + + + ``` +* In `win32\VC14\config.h` * Add ``` #define SEND_ARG2_CAST #define GETHOSTBYNAME_ARG_CAST ``` - * Replace - ``` - #define snprintf _snprintf - ``` - with - ``` - #if _MSC_VER < 1900 - #define snprintf _snprintf - #endif - ``` * Add `#undef LIBXML_LZMA_ENABLED` diff --git a/libxml2/win32/VC12/libxml2.sln b/libxml2/win32/VC12/libxml2.sln deleted file mode 100644 index 4bc6d7fe..00000000 --- a/libxml2/win32/VC12/libxml2.sln +++ /dev/null @@ -1,56 +0,0 @@ - -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/libxml2/win32/VC12/libxml2.vcxproj.filters b/libxml2/win32/VC12/libxml2.vcxproj.filters deleted file mode 100644 index 7988f0ca..00000000 --- a/libxml2/win32/VC12/libxml2.vcxproj.filters +++ /dev/null @@ -1,174 +0,0 @@ - - - - - {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\VC12 - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/libxml2/win32/VC12/runsuite.vcxproj b/libxml2/win32/VC12/runsuite.vcxproj deleted file mode 100644 index 3cbb60a4..00000000 --- a/libxml2/win32/VC12/runsuite.vcxproj +++ /dev/null @@ -1,143 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {D841B4F7-C277-49CB-B379-8B1801C8EE35} - runsuite - - - - Application - true - Unicode - v120 - - - Application - true - Unicode - v120 - - - Application - false - true - MultiByte - v120 - - - Application - false - true - MultiByte - v120 - - - - - - - - - - - - - - - - - - - - - - - $(ProjectDir)..\..\lib\ - build\$(ProjectName)$(Configuration)\ - - - - Level3 - $(ProjectDir);$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libiconv-1.14.vc10\include;%(AdditionalIncludeDirectories) - 4996 - _UNICODE;UNICODE;%(PreprocessorDefinitions) - /MP %(AdditionalOptions) - false - - - true - Ws2_32.lib;%(AdditionalDependencies) - - - - - Level3 - $(ProjectDir);$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libiconv-1.14.vc10\include;%(AdditionalIncludeDirectories) - 4996 - _UNICODE;UNICODE;%(PreprocessorDefinitions) - /MP %(AdditionalOptions) - false - - - true - Ws2_32.lib;%(AdditionalDependencies) - - - - - Level3 - true - true - $(ProjectDir);$(ProjectDir)..\..\include;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\..\..\gtk\$(Platform)\include;%(AdditionalIncludeDirectories) - 4996 - - - true - true - true - - - - - Level3 - true - true - $(ProjectDir);$(ProjectDir)..\..\include;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\..\..\gtk\$(Platform)\include;%(AdditionalIncludeDirectories) - 4996 - - - true - true - true - - - - - - - - {1d6039f6-5078-416f-a3af-a36efc7e6a1c} - - - - - - \ No newline at end of file diff --git a/libxml2/win32/VC12/runsuite.vcxproj.filters b/libxml2/win32/VC12/runsuite.vcxproj.filters deleted file mode 100644 index d7dce007..00000000 --- a/libxml2/win32/VC12/runsuite.vcxproj.filters +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {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 diff --git a/libxml2/win32/VC12/config.h b/libxml2/win32/VC14/config.h similarity index 97% rename from libxml2/win32/VC12/config.h rename to libxml2/win32/VC14/config.h index 79c47c5f..bbf657ba 100644 --- a/libxml2/win32/VC12/config.h +++ b/libxml2/win32/VC14/config.h @@ -98,7 +98,7 @@ static int isnan (double d) { #if defined(_MSC_VER) #define mkdir(p,m) _mkdir(p) -#if _MSC_VER < 1900 +#if _MSC_VER < 1900 // Cannot define this in VS 2015 and above! #define snprintf _snprintf #endif #if _MSC_VER < 1500 diff --git a/libxml2/win32/VC12/libxml2.vcxproj b/libxml2/win32/VC14/libxml2.vcxproj similarity index 79% rename from libxml2/win32/VC12/libxml2.vcxproj rename to libxml2/win32/VC14/libxml2.vcxproj index a5d670ca..5b88a943 100644 --- a/libxml2/win32/VC12/libxml2.vcxproj +++ b/libxml2/win32/VC14/libxml2.vcxproj @@ -5,10 +5,6 @@ Debug Win32 - - Debug - x64 - Release Win32 @@ -27,53 +23,40 @@ StaticLibrary true Unicode - v120 - - - StaticLibrary - true - Unicode - v120 + v140 DynamicLibrary false true MultiByte - v120 + v140 DynamicLibrary false true MultiByte - v120 + v140 - - - - - - - + $(ProjectDir)..\..\lib\ build\$(ProjectName)$(Configuration)\ - Level3 @@ -86,18 +69,6 @@ true - - - Level3 - $(ProjectDir);$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libiconv-1.14.vc10\include;%(AdditionalIncludeDirectories) - 4996 - false - true - - - true - - Level3 @@ -110,7 +81,7 @@ true true true - ..\..\..\..\..\gtk\$(Platform)\lib + ..\..\..\..\..\gtk\$(Platform)\lib;$(AdditionalLibraryDirectories) ws2_32.lib;iconv.lib;%(AdditionalDependencies) @@ -126,7 +97,7 @@ true true true - ..\..\..\..\..\gtk\$(Platform)\lib + ..\..\..\..\..\gtk\$(Platform)\lib;$(AdditionalLibraryDirectories) ws2_32.lib;iconv.lib;%(AdditionalDependencies)