Skip to content

Commit

Permalink
Release 0.2.9
Browse files Browse the repository at this point in the history
  • Loading branch information
rpeyron committed May 9, 2020
1 parent 04d1066 commit e317fcb
Show file tree
Hide file tree
Showing 16 changed files with 292 additions and 16 deletions.
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2020-05-09 19:52 [0.2.9] remi
* Release 0.2.9
* Moved Windows build to vs2019

2020-03-29 11:52 [0.2.9pre] remi
* Removed global 'using namespace std'

Expand Down
6 changes: 6 additions & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ EXTRA_DIST = \
build/vc2017/xmldiff.sln \
build/vc2017/xmldiff.vcxproj \
build/vc2017/libxmldiff.sln \
build/vc2019/xmldiff.vcxproj.filters \
build/vc2019/libxmldiff.vcxproj \
build/vc2019/xmldiff.sln \
build/vc2019/xmldiff.vcxproj \
build/vc2019/libxmldiff.sln \
build/vc2019/clean.bat \
build/vscode/c_cpp_properties.json \
build/vscode/launch.json \
build/vscode/tasks.json \
Expand Down
6 changes: 6 additions & 0 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,12 @@ EXTRA_DIST = \
build/vc2017/xmldiff.sln \
build/vc2017/xmldiff.vcxproj \
build/vc2017/libxmldiff.sln \
build/vc2019/xmldiff.vcxproj.filters \
build/vc2019/libxmldiff.vcxproj \
build/vc2019/xmldiff.sln \
build/vc2019/xmldiff.vcxproj \
build/vc2019/libxmldiff.sln \
build/vc2019/clean.bat \
build/vscode/c_cpp_properties.json \
build/vscode/launch.json \
build/vscode/tasks.json \
Expand Down
6 changes: 6 additions & 0 deletions build/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
libxmldiff (0.2.9ppa3) focal; urgency=low

* Release 0.2.9 ; see ChangeLog

-- Remi Peyronnet <[email protected]> Sun, 9 May 2020 21:46:25 +0200

libxmldiff (0.2.8-2) stable; urgency=low

* Minor fixes ; see ChangeLog
Expand Down
4 changes: 2 additions & 2 deletions build/debian/control
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Source: libxmldiff
Section: contrib/libs
Priority: optional
Maintainer: Remi Peyronnet <remi+libxmldiff@via.ecp.fr>
Maintainer: Remi Peyronnet <remi+debian@via.ecp.fr>
Standards-Version: 2.4.1.2
Build-Depends: pkg-config, libxml2-dev, libxslt-dev, autotools-dev, automake, autoconf
Build-Depends: pkg-config, libxml2-dev, libxslt-dev, autotools-dev, automake, autoconf, libtool

Package: libxmldiff
Architecture: any
Expand Down
7 changes: 7 additions & 0 deletions build/vc2019/clean.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
rmdir /s / q .vs
for /d %%G in ("Debug*") do rd /s /q "%%~G"
for /d %%G in ("Release*") do rd /s /q "%%~G"
del /q ..\..\bin\*.ilk
del /q ..\..\bin\*.pdb
del /q ..\..\bin\*.bsc
pause
20 changes: 20 additions & 0 deletions build/vc2019/libxmldiff.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual C++ Express 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxmldiff", "libxmldiff.vcxproj", "{85888AE5-2AF6-8B58-3801-011A3BF73764}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{85888AE5-2AF6-8B58-3801-011A3BF73764}.Debug|Win32.ActiveCfg = Debug|Win32
{85888AE5-2AF6-8B58-3801-011A3BF73764}.Debug|Win32.Build.0 = Debug|Win32
{85888AE5-2AF6-8B58-3801-011A3BF73764}.Release|Win32.ActiveCfg = Release|Win32
{85888AE5-2AF6-8B58-3801-011A3BF73764}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
85 changes: 85 additions & 0 deletions build/vc2019/libxmldiff.vcxproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<Keyword>Win32Proj</Keyword>
<ProjectGuid>{85888AE5-2AF6-8B58-3801-011A3BF73764}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
<VcpkgTriplet Condition="'$(Platform)'=='Win32'">x86-windows-static</VcpkgTriplet>
<VcpkgTriplet Condition="'$(Platform)'=='x64'">x64-windows-static</VcpkgTriplet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(SolutionDir)\..\..\bin</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(SolutionDir)\..\..\bin</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Disabled</Optimization>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;_MT</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
</ClCompile>
<Lib>
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\src\errors.cpp" />
<ClCompile Include="..\..\src\lx2_diff.cpp" />
<ClCompile Include="..\..\src\lx2_ops.cpp" />
<ClCompile Include="..\..\src\lx2_parse.cpp" />
<ClCompile Include="..\..\src\lx2_util.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\errors.h" />
<ClInclude Include="..\..\src\libxmldiff.h" />
<ClInclude Include="..\..\src\lx2_diff.h" />
<ClInclude Include="..\..\src\lx2_ops.h" />
<ClInclude Include="..\..\src\lx2_parse.h" />
<ClInclude Include="..\..\src\lx2_str.h" />
<ClInclude Include="..\..\src\lx2_util.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
29 changes: 29 additions & 0 deletions build/vc2019/xmldiff.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual C++ Express 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmldiff", "xmldiff.vcxproj", "{3476B868-F809-2DFC-1783-90C51F02B143}"
ProjectSection(ProjectDependencies) = postProject
{85888AE5-2AF6-8B58-3801-011A3BF73764} = {85888AE5-2AF6-8B58-3801-011A3BF73764}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxmldiff", "libxmldiff.vcxproj", "{85888AE5-2AF6-8B58-3801-011A3BF73764}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{3476B868-F809-2DFC-1783-90C51F02B143}.Debug|Win32.ActiveCfg = Debug|Win32
{3476B868-F809-2DFC-1783-90C51F02B143}.Debug|Win32.Build.0 = Debug|Win32
{3476B868-F809-2DFC-1783-90C51F02B143}.Release|Win32.ActiveCfg = Release|Win32
{3476B868-F809-2DFC-1783-90C51F02B143}.Release|Win32.Build.0 = Release|Win32
{85888AE5-2AF6-8B58-3801-011A3BF73764}.Debug|Win32.ActiveCfg = Debug|Win32
{85888AE5-2AF6-8B58-3801-011A3BF73764}.Debug|Win32.Build.0 = Debug|Win32
{85888AE5-2AF6-8B58-3801-011A3BF73764}.Release|Win32.ActiveCfg = Release|Win32
{85888AE5-2AF6-8B58-3801-011A3BF73764}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
86 changes: 86 additions & 0 deletions build/vc2019/xmldiff.vcxproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<Keyword>Win32Proj</Keyword>
<ProjectGuid>{3476B868-F809-2DFC-1783-90C51F02B143}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
<VcpkgTriplet Condition="'$(Platform)'=='Win32'">x86-windows-static</VcpkgTriplet>
<VcpkgTriplet Condition="'$(Platform)'=='x64'">x64-windows-static</VcpkgTriplet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros">
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)\..\..\bin</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Disabled</Optimization>
</ClCompile>
<Link>
<TargetMachine>MachineX86</TargetMachine>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<AdditionalDependencies>libxmldiff.lib;libxml2.lib;libxslt.lib;libexslt.lib;libiconv.lib;libcharset.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\..\..\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<TargetMachine>MachineX86</TargetMachine>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>zlib.lib;libxmldiff.lib;libxml2.lib;libxslt.lib;libexslt.lib;libiconv.lib;libcharset.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\..\..\bin;</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\src\xmldiff.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\xmldiff.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
27 changes: 27 additions & 0 deletions build/vc2019/xmldiff.vcxproj.filters
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?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</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\xmldiff.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\xmldiff.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>
Loading

0 comments on commit e317fcb

Please sign in to comment.