Mercurial > hg > easyhg-kdiff3

comparison kdiff3/README @ 68:d7cafcda8c99

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
KDiff3 0.9.87
author joachim99
date Mon, 31 Jan 2005 22:30:47 +0000
parents efe33e938730
children 8febbfb1148c
comparison
equal deleted inserted replaced
67:ec82d69e8b0c 68:d7cafcda8c99
1 KDiff3-Readme 1 KDiff3-Readme
2 ============= 2 =============
3 3
4 Author: Joachim Eibl (joachim.eibl@gmx.de) 4 Author: Joachim Eibl (joachim.eibl@gmx.de)
5 Copyright: (C) 2002-2004 by Joachim Eibl 5 Copyright: (C) 2002-2005 by Joachim Eibl
6 KDiff3-Version: 0.9.86 6 KDiff3-Version: 0.9.87
7 7
8 8
9 KDiff3 is a program that 9 KDiff3 is a program that
10 - compares and merges two or three input files or directories, 10 - compares and merges two or three input files or directories,
11 - shows the differences line by line and character by character (!), 11 - shows the differences line by line and character by character (!),
43 executable, without including the source code for the Qt-library in the 43 executable, without including the source code for the Qt-library in the
44 source distribution. 44 source distribution.
45 45
46 46
47 Requirements & Installation: 47 Requirements & Installation:
48 Version 0.9.86 provides special support for KDE3, but it can also be 48 Version 0.9.87 provides special support for KDE3, but it can also be
49 built without KDE3 if the Qt-libraries are available. 49 built without KDE3 if the Qt-libraries are available.
50 (I also test and use the program under Windows.) 50 (I also test and use the program under Windows.)
51 51
52 You always need 52 You always need
53 - kdiff3-0.9.86.tar.gz 53 - kdiff3-0.9.87.tar.gz
54 54
55 For building the KDE3-version 55 For building the KDE3-version
56 - KDE>=3.1 and QT>=3.1-libraries. (QT>=3.2 is recommended) 56 - KDE>=3.1 and QT>=3.1-libraries. (QT>=3.2 is recommended)
57 - gcc, g++ with version >=3.2 57 - gcc, g++ with version >=3.2
58 58
65 65
66 Installation for KDE3: 66 Installation for KDE3:
67 - Make sure your shell-variable QTDIR is correct. (echo $QTDIR). 67 - Make sure your shell-variable QTDIR is correct. (echo $QTDIR).
68 If it doesn't contain the correct path, type 68 If it doesn't contain the correct path, type
69 export QTDIR=your_path_to_qt (e.g. /usr/lib/qt3) 69 export QTDIR=your_path_to_qt (e.g. /usr/lib/qt3)
70 - cd into the directory kdiff3-0.9.86 and type 70 - cd into the directory kdiff3-0.9.87 and type
71 - ./configure --prefix=/opt/kde3 (your KDE3 directory here) 71 - ./configure --prefix=/opt/kde3 (your KDE3 directory here)
72 - (make clean) (Required if you already compiled once.) 72 - (make clean) (Required if you already compiled once.)
73 - make (Run compilation) 73 - make (Run compilation)
74 - make install (You must have root-rights for this step.) 74 - make install (You must have root-rights for this step.)
75 75
106 Installation for the Qt-only-platforms for Un*x: 106 Installation for the Qt-only-platforms for Un*x:
107 (for Qt >=3.1.0) 107 (for Qt >=3.1.0)
108 - Make sure your shell-variable QTDIR is correct. (echo $QTDIR). 108 - Make sure your shell-variable QTDIR is correct. (echo $QTDIR).
109 If it doesn't contain the correct path, type 109 If it doesn't contain the correct path, type
110 export QTDIR=your_path_to_qt (e.g. /usr/lib/qt) 110 export QTDIR=your_path_to_qt (e.g. /usr/lib/qt)
111 - cd into the directory kdiff3-0.9.86/src and type 111 - cd into the directory kdiff3-0.9.87/src and type
112 - make -f Makefile.qt 112 - make -f Makefile.qt
113 - make -f Makefile.qt install (You must have root-rights for this step.) 113 - make -f Makefile.qt install (You must have root-rights for this step.)
114 (copies the files into /usr/local/bin and /usr/local/share/doc/kdiff3) 114 (copies the files into /usr/local/bin and /usr/local/share/doc/kdiff3)
115 - Note: The file kdiff3.pro was used to generate the Makefile.qt: 115 - Note: The file kdiff3.pro was used to generate the Makefile.qt:
116 qmake kdiff3.pro -o Makefile.qt 116 qmake kdiff3.pro -o Makefile.qt