Release 0.3.4

rpeyron · May 9, 2020 · b1fcbe1 · b1fcbe1
1 parent 856ae4e
commit b1fcbe1
Show file tree

Hide file tree

Showing 19 changed files with 1,158 additions and 565 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2020-05-09 14:33  remi 0.3.4
+	* libxmldiff 0.2.9
+	* vs2019 & vcpkg build
+
 2019-04-22 14:33  remi 0.3.4beta
 	* libxmldiff 0.2.9beta
 	* Add new parameters for special nodes

diff --git a/build/debian/changelog b/build/debian/changelog
@@ -1,3 +1,9 @@
+xmltreenav (0.3.4ppa3) focal; urgency=low
+
+  * Release 0.3.4 ; see Changelog
+
+ -- Remi Peyronnet <[email protected]>  Sat,  9 May 2020 20:55:00 +0000
+
 xmltreenav (0.3.3) stable; urgency=low
 
   * Release 0.3.3 ; see Changelog

diff --git a/build/debian/control b/build/debian/control
@@ -1,14 +1,14 @@
 Source: xmltreenav
 Section: contrib/text
 Priority: optional
-Maintainer: Remi Peyronnet <remi+xmltreenav@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, libxmldiff, libwxgtk3.0-dev, zip
+Build-Depends: pkg-config, libxml2-dev, libxslt-dev, libxmldiff, libwxgtk3.0-gtk3-dev, zip, libtool, autotools-dev, automake, autoconf
 
 # Pour Ubuntu : libwxgtk3.0-0v5 / pour debian : libwxgtk3.0
 Package: xmltreenav
 Architecture: any
-Depends: libc6, libxml2, libxslt1.1, libxmldiff, libwxgtk3.0-0v5
+Depends: libc6, libxml2, libxslt1.1, libxmldiff, libwxgtk3.0-gtk3-0v5
 Description: This is a XML viewer specially designed for diffing XML files.
  xmlTreeNav includes diff functionnalities of libxmldiff, and provides a
  graphical display of the differences. It also have several useful functions,

diff --git a/build/vc2017/xmlTreeNav.sln b/build/vc2017/xmlTreeNav.sln
@@ -0,0 +1,34 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.1062
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmlTreeNav", "xmlTreeNav.vcxproj", "{4F231D63-EFF7-5077-BBC9-A257EA09085E}"
+	ProjectSection(ProjectDependencies) = postProject
+		{85888AE5-2AF6-8B58-3801-011A3BF73764} = {85888AE5-2AF6-8B58-3801-011A3BF73764}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxmldiff", "..\..\..\libxmldiff\build\vc2017\libxmldiff.vcxproj", "{85888AE5-2AF6-8B58-3801-011A3BF73764}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{4F231D63-EFF7-5077-BBC9-A257EA09085E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4F231D63-EFF7-5077-BBC9-A257EA09085E}.Debug|Win32.Build.0 = Debug|Win32
+		{4F231D63-EFF7-5077-BBC9-A257EA09085E}.Release|Win32.ActiveCfg = Release|Win32
+		{4F231D63-EFF7-5077-BBC9-A257EA09085E}.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
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {341CF4CA-D3AF-440C-BE94-2FBD6C27D5BD}
+	EndGlobalSection
+EndGlobal
diff --git a/build/vc2017/xmlTreeNav.vcxproj b/build/vc2017/xmlTreeNav.vcxproj
@@ -0,0 +1,138 @@
+<?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>{4F231D63-EFF7-5077-BBC9-A257EA09085E}</ProjectGuid>
+    <SccProjectName>Svn</SccProjectName>
+    <SccAuxPath>Svn</SccAuxPath>
+    <SccLocalPath>Svn</SccLocalPath>
+    <SccProvider>SubversionScc</SccProvider>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v141</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'">
+    <LinkIncremental>true</LinkIncremental>
+    <IncludePath>$(SolutionDir)\..\..\lib;$(SolutionDir)\..\..\..\libxmldiff;$(IncludePath)</IncludePath>
+    <LibraryPath>$(SolutionDir)\..\..\bin;D:\Util\Prog\VSLibs\lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <IncludePath>$(SolutionDir)\..\..\lib;$(SolutionDir)\..\..\..\libxmldiff;$(IncludePath)</IncludePath>
+    <ReferencePath>$(ReferencePath)</ReferencePath>
+    <LibraryPath>$(SolutionDir)\..\..\bin;D:\Util\Prog\VSLibs\lib;$(LibraryPath)</LibraryPath>
+    <OutDir>$(SolutionDir)\..\..\bin\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0400;_MT;_UNICODE;__WXMSW__;wxUSE_GUI=1;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <Optimization>Disabled</Optimization>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <TargetMachine>MachineX86</TargetMachine>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <AdditionalDependencies>libcmtd.lib;libcpmtd.lib;libxmldiff.lib;iconv_a.lib;wxmsw30ud_core.lib;wxbase30ud.lib;comctl32.lib;rpcrt4.lib;winmm.lib;advapi32.lib;wsock32.lib;wxpngd.lib;wxzlibd.lib;wxjpegd.lib;wxtiffd.lib;libxml2_a.lib;libxslt_a.lib;libexslt_a.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <IgnoreSpecificDefaultLibraries>msvcrt.lib;msvcrtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;WINVER=0x0400;_MT;_UNICODE;__WXMSW__;wxUSE_GUI=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <TargetMachine>MachineX86</TargetMachine>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>libcmt.lib;libcpmt.lib;libxmldiff.lib;iconv_a.lib;wxmsw31u_core.lib;wxbase31u.lib;wxmsw31u_html.lib;wxmsw31u_adv.lib;comctl32.lib;rpcrt4.lib;winmm.lib;advapi32.lib;wsock32.lib;wxpng.lib;wxzlib.lib;wxjpeg.lib;wxtiff.lib;libxml2_a.lib;libxslt_a.lib;libexslt_a.lib;zlib.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib</AdditionalDependencies>
+      <IgnoreSpecificDefaultLibraries>msvcrt.lib</IgnoreSpecificDefaultLibraries>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\lib\wxmisc\ConfigDialog.cpp" />
+    <ClCompile Include="..\..\lib\wxmisc\wxUniCompat.cpp" />
+    <Text Include="..\..\po\extra-strings.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </Text>
+    <ClCompile Include="..\..\src\xtnApp.cpp" />
+    <ClCompile Include="..\..\src\xtnDialogDiffCurrent.cpp" />
+    <ClCompile Include="..\..\src\xtnDialogDiffDual.cpp" />
+    <ClCompile Include="..\..\src\xtnFrame.cpp" />
+    <ClCompile Include="..\..\src\xtnPrecomp.cpp" />
+    <ClCompile Include="..\..\src\xtnXmlTree.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\lib\wxactivex\resource.h" />
+    <ClInclude Include="..\..\lib\wxmisc\ConfigDialog.h" />
+    <ClInclude Include="..\..\lib\wxmisc\wxUniCompat.h" />
+    <ClInclude Include="..\..\resources\resource.h" />
+    <ClInclude Include="..\..\src\xtnApp.h" />
+    <ClInclude Include="..\..\src\xtnDialogDiffCurrent.h" />
+    <ClInclude Include="..\..\src\xtnDialogDiffDual.h" />
+    <ClInclude Include="..\..\src\xtnFrame.h" />
+    <ClInclude Include="..\..\src\xtnPrecomp.h" />
+    <ClInclude Include="..\..\src\xtnXmlTree.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\ChangeLog" />
+    <None Include="..\..\configure.ac" />
+    <None Include="..\..\po\fr.po" />
+    <None Include="..\..\po\it.po" />
+    <None Include="..\..\po\po_build.bat" />
+    <None Include="..\..\po\po_update.bat" />
+    <None Include="..\..\po\xmlTreeNav.pot" />
+    <None Include="..\..\resources\resource.inc" />
+    <None Include="..\..\TODO" />
+    <None Include="..\win32\XmlTreeNav.iss" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\lib\wxactivex\wxIE.rc" />
+    <ResourceCompile Include="..\..\resources\resources.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <Xml Include="..\..\bin\config.xml" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/build/vc2017/xmlTreeNav.vcxproj.filters b/build/vc2017/xmlTreeNav.vcxproj.filters
@@ -0,0 +1,116 @@
+<?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>
+    <Filter Include="Internalization">
+      <UniqueIdentifier>{a2f2007f-ecb4-4e9c-b227-ef059f7c98a9}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\lib\wxmisc\wxUniCompat.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\xtnApp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\xtnDialogDiffCurrent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\xtnDialogDiffDual.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\xtnFrame.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\xtnPrecomp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\xtnXmlTree.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\wxmisc\ConfigDialog.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\lib\wxactivex\resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\wxmisc\wxUniCompat.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\xtnApp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\xtnDialogDiffCurrent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\xtnDialogDiffDual.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\xtnFrame.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\xtnPrecomp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\xtnXmlTree.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\resources\resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\wxmisc\ConfigDialog.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\resources\resource.inc">
+      <Filter>Header Files</Filter>
+    </None>
+    <None Include="..\..\TODO" />
+    <None Include="..\..\ChangeLog" />
+    <None Include="..\..\po\fr.po">
+      <Filter>Internalization</Filter>
+    </None>
+    <None Include="..\..\po\it.po">
+      <Filter>Internalization</Filter>
+    </None>
+    <None Include="..\..\po\po_build.bat">
+      <Filter>Internalization</Filter>
+    </None>
+    <None Include="..\..\po\po_update.bat">
+      <Filter>Internalization</Filter>
+    </None>
+    <None Include="..\..\po\xmlTreeNav.pot">
+      <Filter>Internalization</Filter>
+    </None>
+    <None Include="..\..\configure.ac" />
+    <None Include="..\win32\XmlTreeNav.iss" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\lib\wxactivex\wxIE.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <ResourceCompile Include="..\..\resources\resources.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Xml Include="..\..\bin\config.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="..\..\po\extra-strings.cpp" />
+  </ItemGroup>
+</Project>
diff --git a/build/vc2019/clean.bat b/build/vc2019/clean.bat
@@ -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
diff --git a/build/vc2019/xmlTreeNav.sln b/build/vc2019/xmlTreeNav.sln
@@ -0,0 +1,34 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.1062
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmlTreeNav", "xmlTreeNav.vcxproj", "{4F231D63-EFF7-5077-BBC9-A257EA09085E}"
+	ProjectSection(ProjectDependencies) = postProject
+		{85888AE5-2AF6-8B58-3801-011A3BF73764} = {85888AE5-2AF6-8B58-3801-011A3BF73764}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxmldiff", "..\..\..\libxmldiff\build\vc2019\libxmldiff.vcxproj", "{85888AE5-2AF6-8B58-3801-011A3BF73764}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{4F231D63-EFF7-5077-BBC9-A257EA09085E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4F231D63-EFF7-5077-BBC9-A257EA09085E}.Debug|Win32.Build.0 = Debug|Win32
+		{4F231D63-EFF7-5077-BBC9-A257EA09085E}.Release|Win32.ActiveCfg = Release|Win32
+		{4F231D63-EFF7-5077-BBC9-A257EA09085E}.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
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {341CF4CA-D3AF-440C-BE94-2FBD6C27D5BD}
+	EndGlobalSection
+EndGlobal