Mercurial > hg > easyhg-kdiff3

comparison kdiff3/README @ 51:c59d5a3a8ff3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
0.9.80
author joachim99
date Tue, 09 Dec 2003 20:29:43 +0000
parents 31907692deee
children 32d5cbf9db71
comparison
equal deleted inserted replaced
50:8c9752066f09 51:c59d5a3a8ff3
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-2003 by Joachim Eibl 5 Copyright: (C) 2002-2003 by Joachim Eibl
6 KDiff3-Version: 0.9.70 6 KDiff3-Version: 0.9.80
7 7
8 8
9 KDiff3 is a program that 9 KDiff3 is a program that
10 - compares two or three input files, 10 - compares two or three input files,
11 - shows the differences line by line and character by character (!), 11 - shows the differences line by line and character by character (!),
40 executable, without including the source code for the Qt-library in the 40 executable, without including the source code for the Qt-library in the
41 source distribution. 41 source distribution.
42 42
43 43
44 Requirements & Installation: 44 Requirements & Installation:
45 Version 0.9.70 provides special support for KDE3, but it can also be 45 Version 0.9.80 provides special support for KDE3, but it can also be
46 built without KDE3 if the Qt-libraries are available. 46 built without KDE3 if the Qt-libraries are available.
47 (I also tested the program under Windows.) 47 (I also tested the program under Windows.)
48 48
49 You always need 49 You always need
50 - kdiff3-0.9.70.tar.gz 50 - kdiff3-0.9.80.tar.gz
51 51
52 For building the KDE3-version 52 For building the KDE3-version
53 - KDE>=3.1 and QT>=3.1-libraries. 53 - KDE>=3.1 and QT>=3.1-libraries.
54 - gcc, g++ with version >=3.2 54 - gcc, g++ with version >=3.2
55 55
62 62
63 Installation for KDE3: 63 Installation for KDE3:
64 - Make sure your shell-variable QTDIR is correct. (echo $QTDIR). 64 - Make sure your shell-variable QTDIR is correct. (echo $QTDIR).
65 If it doesn't contain the correct path, type 65 If it doesn't contain the correct path, type
66 export QTDIR=your_path_to_qt (e.g. /usr/lib/qt3) 66 export QTDIR=your_path_to_qt (e.g. /usr/lib/qt3)
67 - cd into the directory kdiff3-0.9.70 and type 67 - cd into the directory kdiff3-0.9.80 and type
68 - ./configure --prefix=/opt/kde3 (your KDE3 directory here) 68 - ./configure --prefix=/opt/kde3 (your KDE3 directory here)
69 - (make clean) (Required if you already compiled once.) 69 - (make clean) (Required if you already compiled once.)
70 - make (Run compilation) 70 - make (Run compilation)
71 - make install (You must have root-rights for this step.) 71 - make install (You must have root-rights for this step.)
72 72
91 Installation for the Qt-only-platforms for Un*x: 91 Installation for the Qt-only-platforms for Un*x:
92 (for Qt >=3.1.0) 92 (for Qt >=3.1.0)
93 - Make sure your shell-variable QTDIR is correct. (echo $QTDIR). 93 - Make sure your shell-variable QTDIR is correct. (echo $QTDIR).
94 If it doesn't contain the correct path, type 94 If it doesn't contain the correct path, type
95 export QTDIR=your_path_to_qt (e.g. /usr/lib/qt) 95 export QTDIR=your_path_to_qt (e.g. /usr/lib/qt)
96 - cd into the directory kdiff3-0.9.70/src and type 96 - cd into the directory kdiff3-0.9.80/src and type
97 - make -f Makefile.qt 97 - make -f Makefile.qt
98 - make -f Makefile.qt install (You must have root-rights for this step.) 98 - make -f Makefile.qt install (You must have root-rights for this step.)
99 (copies the files into /usr/local/bin and /usr/local/share/doc/kdiff3) 99 (copies the files into /usr/local/bin and /usr/local/share/doc/kdiff3)
100 - Note: The file kdiff3.pro was used to generate the Makefile.qt: 100 - Note: The file kdiff3.pro was used to generate the Makefile.qt:
101 qmake kdiff3.pro -o Makefile.qt 101 qmake kdiff3.pro -o Makefile.qt
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 set QTDIR=your_path_to_qt (e.g. c:\qt) 110 set QTDIR=your_path_to_qt (e.g. c:\qt)
111 - Make sure your VC6 environment variables are set. Run VCVARS32.BAT. 111 - Make sure your VC6 environment variables are set. Run VCVARS32.BAT.
112 (Typically located in "c:\programs\Microsoft Visual Studio\VC98\bin") 112 (Typically located in "c:\programs\Microsoft Visual Studio\VC98\bin")
113 - cd into the directory kdiff3-0.9.70\src and type 113 - cd into the directory kdiff3-0.9.80\src and type
114 - nmake /f Makefile.win_qt230 114 - nmake /f Makefile.win_qt230
115 - For execution the Qt-DLL must be in the path or in the same directory. 115 - For execution the Qt-DLL must be in the path or in the same directory.
116 For newer versions of Qt, use qmake and kdiff3.pro to generate 116 For newer versions of Qt, use qmake and kdiff3.pro to generate
117 an appropriate Makefile. 117 an appropriate Makefile.
118 qmake kdiff3.pro -o Makefile 118 qmake kdiff3.pro -o Makefile