This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

libxml2: Updated to version 2.9.4

  • Loading branch information...
Arnavion committed Jun 11, 2016
1 parent de43592 commit ec7db38b0ccaac6f31951d1a8e8540d8c2509c3a
View
@@ -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)
View
@@ -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
View
@@ -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 `<AdditionalIncludeDirectories>' to `$(ProjectDir);$(ProjectDir)..\..\include;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\..\..\gtk\$(Platform)\include;%(AdditionalIncludeDirectories)`
* Add `<DisableSpecificWarnings>4996</DisableSpecificWarnings>`
* For the `libxml2` project:
* Change _Configuration Type_ to _Dynamic Library (.dll)_ under _Configuration Properties_ `->` _General_
* Set `<AdditionalLibraryDirectories>` to `..\..\..\..\..\gtk\$(Platform)\lib`
* Set `<AdditionalDependencies>` 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
```
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
```
* Add `<PlatformToolset>v140</PlatformToolset>` to all `<PropertyGroup>` elements that have `Label="Configuration"`
* Replace `<ConfigurationType>Application</ConfigurationType>` with `<ConfigurationType>DynamicLibrary</ConfigurationType>`
* Add
```
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
```
* Add `<Import Project="..\..\..\stack.props" />`
* Replace
```
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(ProjectDir)..\..\lib\</OutDir>
<OutDir>$(ProjectDir)..\..\lib\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IntDir>build\$(ProjectName)$(Configuration)\</IntDir>
</PropertyGroup>
```
with
```
<PropertyGroup>
<OutDir>$(ProjectDir)..\..\lib\</OutDir>
<IntDir>build\$(ProjectName)$(Configuration)\</IntDir>
</PropertyGroup>
```
* Add to libxml2.vcxproj.filters:
```
<ClCompile Include="..\..\buf.c">
<Filter>Source Files</Filter>
</ClCompile>
```
* For the `runsuites` project:
* Replace
```
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(ProjectDir)..\..\lib\</OutDir>
<IntDir>build\$(ProjectName)$(Configuration)\</IntDir>
<IntDir>build\$(ProjectName)$(Configuration)\</IntDir>
</PropertyGroup>
```
with
```
<PropertyGroup>
<OutDir>$(ProjectDir)..\..\lib\</OutDir>
<IntDir>build\$(ProjectName)$(Configuration)\</IntDir>
<OutDir>$(ProjectDir)..\..\lib\</OutDir>
<IntDir>build\$(ProjectName)$(Configuration)\</IntDir>
</PropertyGroup>
```
* In `win32\VC12\config.h`
* Remove all `<Optimization>` elements
* Add `<DisableSpecificWarnings>4996</DisableSpecificWarnings>`
* In the `<ItemDefinitionGroup>` elements' `<Link>` tags for `Release|Win32` and `Release|x64`:
* Under `<Compile>`, add:
```
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\..\include;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\..\..\gtk\$(Platform)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
```
* Under `<Link>`, add:
```
<AdditionalLibraryDirectories>..\..\..\..\..\gtk\$(Platform)\lib;$(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>ws2_32.lib;iconv.lib;%(AdditionalDependencies)</AdditionalDependencies>
```
* Remove
```
<ItemGroup>
<ProjectReference Include="..\..\..\libiconv-1.14.vc10\windows\VC10\iconv.vcxproj">
<Project>{bec03130-a64c-48f8-863c-52da83cfb3ae}</Project>
<Private>true</Private>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<LinkLibraryDependencies>true</LinkLibraryDependencies>
<UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
</ProjectReference>
</ItemGroup>
```
* 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`
@@ -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
@@ -1,174 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
<Filter Include="Header Files\windows">
<UniqueIdentifier>{22791c14-7c07-4222-ad58-8c18d3fb10ba}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\windows\VC12">
<UniqueIdentifier>{bfddc99f-05d4-4f06-98d1-346b1be73d6f}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\buf.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\c14n.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\catalog.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\chvalid.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\debugXML.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\dict.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\DOCBparser.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\encoding.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\entities.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\error.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\globals.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\hash.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\legacy.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\list.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\parser.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\parserInternals.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\pattern.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\relaxng.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\SAX.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\SAX2.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\schematron.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\threads.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\tree.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\uri.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\valid.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\xinclude.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\xlink.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\xmlcatalog.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\xmlIO.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\xmlmemory.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\xmlmodule.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\xmlreader.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\xmlregexp.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\xmlsave.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\xmlschemas.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\xmlschemastypes.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\xmlstring.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\xmlunicode.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\xmlwriter.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\xpath.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\xpointer.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\nanohttp.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\nanoftp.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\HTMLparser.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\HTMLtree.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="config.h">
<Filter>Header Files\windows\VC12</Filter>
</ClInclude>
<ClInclude Include="..\..\acconfig.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\elfgcchack.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\libxml.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>
Oops, something went wrong.

0 comments on commit ec7db38

Please sign in to comment.