Merge branch 'develop' into master

.gitignore

@@ -0,0 +1,5 @@
+# Clion project files
+/.idea
+/cmake-build*
+/build*
+/bin

CMakeLists.txt

@@ -0,0 +1,49 @@
+cmake_minimum_required(VERSION 3.15)
+project(AdvCmpEx CXX)
+
+#====================================================
+# Enable policy
+#====================================================
+# enable CMAKE_MSVC_RUNTIME_LIBRARY
+cmake_policy(SET CMP0091 NEW)
+
+#====================================================
+# Set default build to release
+#====================================================
+if (NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type, one of: Release, Debug" FORCE)
+endif ()
+message("Build type for AdvCmpEx: ${CMAKE_BUILD_TYPE}")
+
+# check platform for build
+set(IS_x64_PLATFORM FALSE CACHE BOOL "" FORCE)
+if ("$ENV{PLATFORM}" MATCHES "x64")
+  set(IS_x64_PLATFORM TRUE CACHE BOOL "" FORCE)
+endif ()
+
+# Get plugin version from src/version.hpp and put it in PLUGIN_VERSION
+function(plugin_extract_version)
+  file(READ "${CMAKE_CURRENT_LIST_DIR}/src/version.hpp" file_contents)
+  string(REGEX MATCH "PLUGIN_VER_MAJOR ([0-9]+)" _ "${file_contents}")
+  if (NOT CMAKE_MATCH_COUNT EQUAL 1)
+    message(FATAL_ERROR "Could not extract major version number from version.hpp")
+  endif ()
+  set(ver_major ${CMAKE_MATCH_1})
+
+  string(REGEX MATCH "PLUGIN_VER_MINOR ([0-9]+)" _ "${file_contents}")
+  if (NOT CMAKE_MATCH_COUNT EQUAL 1)
+    message(FATAL_ERROR "Could not extract minor version number from version.hpp")
+  endif ()
+
+  set(ver_minor ${CMAKE_MATCH_1})
+  string(REGEX MATCH "PLUGIN_VER_PATCH ([0-9]+)" _ "${file_contents}")
+  if (NOT CMAKE_MATCH_COUNT EQUAL 1)
+    message(FATAL_ERROR "Could not extract patch version number from version.hpp")
+  endif ()
+  set(ver_patch ${CMAKE_MATCH_1})
+
+  set(PLUGIN_VERSION "${ver_major}.${ver_minor}.${ver_patch}" PARENT_SCOPE)
+endfunction()
+
+plugin_extract_version()
+add_subdirectory(src)

LICENSE

@@ -0,0 +1,30 @@
+BSD 3-Clause License
+
+Copyright (c) 2006, Alexey Samlyukov
+Copyright (c) 2020, FarPlugins Team
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -3,6 +3,19 @@ Plugin for advanced compare of files in Far Manager 3.
 
 ![](AdvCmpEx.png)
 
+How to build from source
+==========
+To build plugin from source, you will need:
+
+* Visual Studio 2019
+* cmake 3.15 (included in Visual Studio 2019)
+
+From root of source call
+
+    vc.build.release.bat
+
+The built binaries will be in ./bin/x86 and ./bin/x64
+
 # Common info
 * Extracted from: https://github.com/FarPlugins/farplug-alvls 
 * PlugRing page: https://plugring.farmanager.com/plugin.php?pid=19

Readme.txt

@@ -1,62 +1,30 @@
 
 
-       AdvCmpEx - ����������� ��������� ������, ������ ��� Far Manager
+       AdvCmpEx - Расширенное сравнение файлов, плагин для Far Manager
        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-             http://code.google.com/p/farplug-alvls/
-
-  ���������������� ��� ��� �� ���������, ��� � ��� Far Manager, �.�.:
-
-Copyright (c) 2006 Alexey Samlyukov
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. The name of the authors may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-���������
-~~~~~~~~~
+             https://github.com/FarPlugins/AdvCmpEx
+
+Распространяется под той же лицензией, что и сам Far Manager, т.е. BSD 3-Clause License
 
-  �������� �������� � �������� ...\Far\Plugins, ���������� ����
-���������� �������� ������.
+Установка
+~~~~~~~~~
 
-  ��� ������ ������� ��������� ���������� MSVCR100.dll, ������ � 
-"���������������� ����� Microsoft Visual C++ 2010", ������� �
-���������� ����� � ����� �����������:
-- ��� �86 ������ http://www.microsoft.com/ru-ru/download/details.aspx?id=5555
-- ��� �64 ������ http://www.microsoft.com/ru-ru/download/details.aspx?id=14632
+  Создайте подпапку в каталоге ...\Far\Plugins, скопируйте туда
+содержимое текущего архива.
 
 
-�������������
+Использование
 ~~~~~~~~~~~~~
 
-  ��������� ������:  F11 -> AdvCmpEx
-                     � ���������� ������� (������� F1).
+  Запустите плагин:  F11 -> AdvCmpEx
+                     и прочитайте справку (нажмите F1).
 
 
-�������������
+Благодарности
 ~~~~~~~~~~~~~
 
-  Eugene Roshal & FAR group �� ������ � ���� �������� ��������.
+  Eugene Roshal & FAR group за лучший в мире файловый менеджер.
 
 
-                                                       ������� �������� ~
+                                                       Алексей Самлюков ~
                                                       samlyukov@gmail.com