Commit c11bae1e authored by Michael Reeves's avatar Michael Reeves

Update readme add build instructions for 1.8 branch

parent 0b02b44a
Pipeline #13069 passed with stage
in 8 minutes and 12 seconds
......@@ -40,6 +40,11 @@ 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
......@@ -47,7 +52,7 @@ 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.
......
......@@ -3,18 +3,20 @@ 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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment