diff --git a/INSTALL b/INSTALL index 1906797..5b83648 100644 --- a/INSTALL +++ b/INSTALL @@ -1,57 +1,62 @@ Building KDiff3 requires the fallowing minimium versions: 1)Qt 5.6 or later 2)KF5 5.27+ 3)CMake 3.1 4)ECM 1.8 Support compilers: 5)MSVC 2015+, gcc 5.0+, clang 3.3+ *nix: On debian based systems you needed to install the fallowing. gettext, qtbase5-dev, extra-cmake-modules libkf5i18n-dev, libkf5coreaddons-dev, libkf5iconthemes-dev libkf5parts-dev, libkf5doctools-dev, libkf5crash-dev, cmake, (gcc or clang) These should aviable as part of the standard repos. To build KDiff3 run: cmake && make sudo make install cmake will automacticly verify that the requirements are met before attempting to build. Windows: For windows the build should be done via. craft. Although other methods may work they are not tested. Craft requires python 3.6 or later to be installed it can be downloaded here: https://www.python.org/downloads/windows/ This should be automacticly installed by craft. You will also need to start a power shell envirionment as administrator instruction for that are at: https://docs.microsoft.com/en-us/powershell/scripting/getting-started/starting-windows-powershell?view=powershell-6 On windows 10 this will be the default shell. Run the fallowing. 1)Set-ExecutionPolicy -Scope CurrentUser RemoteSigned 2)iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/KDE/craft/master/setup/install_craft.ps1')) You may also have to exempt your craft directory from virus scans as these can interefer with the build process. 1)cd to your craft root Run: 2)C:\CraftRoot\craft\craftenv.ps1 3)craft png2ico 4)craft kdiff3 +If you what to build 1.8x than use: +4) craft --target 1.8 kdiff3 + +Otherwise craft will use master which is the developement branch and therefor more likely to experiance breakage. + At this point you can run kdiff3 itself via the following: cb kdiff3 bin/kdiff3 If you want to create an install package you would run: 5)craft nsis -6)craft --package kdiff3 +6)craft --package kdiff3 or craft --target 1.8 --package kdiff3 This will be a time consuming process on first run as craft will have to download all dependencies. KDiff3 does not require special configuration for craft. There should be an installer package generated in CraftRoot/tmp Please contact kde-windows@kde.org before filing a bug report regarding this process. \ No newline at end of file diff --git a/README b/README index edd3ba4..2046bb7 100644 --- a/README +++ b/README @@ -1,100 +1,102 @@ KDiff3-Readme ============= Author: Joachim Eibl (joachim.eibl at gmx.de) Port to KF5/Qt5 by Michael Reeves (reeves.87@gmail.com) -KDiff3-Version: 1.8 +KDiff3-Version: 1.8.2 -Now requires Qt 5.6 or later and KF5 5.14+. Legacy 0.9.98 and earlier builds are not supported. +Now requires Qt 5.6 or later and KF5 5.27+. Legacy 0.9.98 and earlier builds are not supported. MacOSX build is untested since port. The Konqueror specific plugin is not ported and no longer maintained. -This plugin would only apply to KDE before 4.6. Support as been removed from main CMakeLists.txt. -As of 1/13/17 cmake 3.1+ is the targeted cmake version. - +This plugin would only apply to KDE before 4.6. As of 1/13/17 cmake 3.1+ is the targeted cmake version. cmake is now the only build system supported. KF5/Qt5 was big jump. A lot changed besides just the API. I am not against a Qt5-only build variant but see no reason to maintain two separate build systems. At present KF5 is my focus. +The current reprository is at https://invent.kde.org/kde/kdiff3 + +Bugs can be reported at https://bugs.kde.org + The original pre KF5/Qt5 Readme follows old build instructions have been removed to avoid confusion: Copyright: (C) 2002-2014 by Joachim Eibl KDiff3 runs best on KDE but can be built without it, depending only on Qt-libs. These are available for Un*x, Windows, Mac. Thus there are many setup possibilities to consider. Supported Qt-versions: 4.8, 5.2 or higher. Supported KDE-version: 4, 5 (For KDE3/Qt3 use KDiff3-0.9.92 or older.) Contents -------- - Introduction - License - Additional hints Introduction ------------ KDiff3 is a program that - compares and merges two or three input files or directories, - shows the differences line by line and character by character (!), - provides an automatic merge-facility and - an integrated editor for comfortable solving of merge-conflicts - has support for KDE-KIO (ftp, sftp, http, fish, smb), - has an intuitive graphical user interface, - provides a context menu for KDE-Dolphin and Windows-Explorer, - supports 64 bit systems. (Some build issues are discussed in here.) - Support for many encodings and Unicode. Do you want help translating? Read the instructions on https://l10n.kde.org/ ! License ------- GNU GENERAL PUBLIC LICENSE, Version 2, June 1991 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA For details see file "COPYING". ------------------------------------------------------------------------ Additional hints ---------------- Start from commandline: - Comparing 2 files: kdiff3 file1 file2 - Merging 2 files: kdiff3 file1 file2 -o outputfile - Comparing 3 files: kdiff3 file1 file2 file3 - Merging 3 files: kdiff3 file1 file2 file3 -o outputfile Note that file1 will be treated as base of file2 and file3. If all files have the same name but are in different directories, you can reduce typework by specifying the filename only for the first file. E.g.: - Comparing 3 files: kdiff3 dir1/filename dir2 dir3 (This also works in the open-dialog.) If you start without arguments, then a dialog will appear where you can select your files via a filebrowser. For more documentation, see the help-menu or the subdirectory doc. Have fun!