Mercurial > hg > easyhg-kdiff3
comparison kdiff3/README @ 92:4e6ebbbae925 0.9.95
KDiff3 0.9.95
author | joachim99 |
---|---|
date | Tue, 03 Mar 2009 23:50:12 +0000 |
parents | fcd146072e0c |
children |
comparison
equal
deleted
inserted
replaced
91:fa1a49fc1ec1 | 92:4e6ebbbae925 |
---|---|
1 KDiff3-Readme | 1 KDiff3-Readme |
2 ============= | 2 ============= |
3 | 3 |
4 Author: Joachim Eibl (joachim.eibl at gmx.de) | 4 Author: Joachim Eibl (joachim.eibl at gmx.de) |
5 Copyright: (C) 2002-2008 by Joachim Eibl | 5 Copyright: (C) 2002-2009 by Joachim Eibl |
6 KDiff3-Version: 0.9.93 | 6 KDiff3-Version: 0.9.94 |
7 | 7 |
8 KDiff3 runs best on KDE but can be built without it, depending only on Qt-libs. | 8 KDiff3 runs best on KDE but can be built without it, depending only on Qt-libs. |
9 These are available for Un*x, Windows, Mac. | 9 These are available for Un*x, Windows, Mac. |
10 Thus there are many setup possibilities to consider. | 10 Thus there are many setup possibilities to consider. |
11 | 11 |
12 From version 0.9.93 on the main target platform is KDE4/Qt4. | 12 From version 0.9.94 on the main target platform is KDE4/Qt4. |
13 For KDiff3 for KDE3/Qt3 use KDiff3-0.9.92 or older. | 13 For KDiff3 for KDE3/Qt3 use KDiff3-0.9.92 or older. |
14 | 14 |
15 Contents | 15 Contents |
16 -------- | 16 -------- |
17 | 17 |
22 - With Qt4-libs, without KDE | 22 - With Qt4-libs, without KDE |
23 - for Linux/Un*x | 23 - for Linux/Un*x |
24 - for Windows | 24 - for Windows |
25 - Debugging with MinGW under Windows: | 25 - Debugging with MinGW under Windows: |
26 - for Mac: Building KDiff3 for Mac OSX (with Intel processor) as a universal binary | 26 - for Mac: Building KDiff3 for Mac OSX (with Intel processor) as a universal binary |
27 - Creating and installing translation messages | |
27 - Additional hints | 28 - Additional hints |
28 | 29 |
29 | 30 |
30 Introduction | 31 Introduction |
31 ------------ | 32 ------------ |
73 | 74 |
74 Requirements & Installation | 75 Requirements & Installation |
75 --------------------------- | 76 --------------------------- |
76 | 77 |
77 - for KDE4: | 78 - for KDE4: |
78 From version 0.9.93 on KDiff3 supports KDE4. | 79 From version 0.9.94 on KDiff3 supports KDE4. |
79 For installation on most distributions you usually also require these packages (names as on opensuse): | 80 For installation on most distributions you usually also require these packages (names as on opensuse): |
80 - g++ (g++, version 3.4 or newer) | 81 - g++ (g++, version 3.4 or newer) |
81 - libqt4-devel (Qt4-libs, version 4.4.0 or newer) | 82 - libqt4-devel (Qt4-libs, version 4.4.0 or newer) |
82 - libkde4-devel (KDE4 Header files and development libraries) | 83 - libkde4-devel (KDE4 Header files and development libraries) |
83 - libkonq-devel (optional, needed for the kdiff3-plugin, if not installed | 84 - libkonq-devel (optional, needed for the kdiff3-plugin, if not installed |
111 - Building KDiff3 with Qt4-libs, but without KDE | 112 - Building KDiff3 with Qt4-libs, but without KDE |
112 - for Linux/Un*x | 113 - for Linux/Un*x |
113 - for Windows | 114 - for Windows |
114 - for Mac | 115 - for Mac |
115 | 116 |
116 The version 0.9.93 requires Qt 4.4.0 or newer (from www.trolltech.com) for compilation. | 117 The version 0.9.94 requires Qt 4.4.0 or newer (from www.trolltech.com) for compilation. |
117 | 118 |
118 You always need | 119 You always need |
119 - kdiff3-0.9.93.tar.gz | 120 - kdiff3-0.9.94.tar.gz |
120 | 121 |
121 - for Un*x: gcc, g++ with version >=3.4.2 | 122 - for Un*x: gcc, g++ with version >=3.4.2 |
122 Qt-X11-libraries | 123 Qt-X11-libraries |
123 | 124 |
124 - for Windows: Qt-win-libs | 125 - for Windows: Qt-win-libs |
139 - Optional: Qt Creator IDE: Development environment optimized for Qt (http://trolltech.com/developer/qt-creator) | 140 - Optional: Qt Creator IDE: Development environment optimized for Qt (http://trolltech.com/developer/qt-creator) |
140 | 141 |
141 Build-instructions (Un*x): | 142 Build-instructions (Un*x): |
142 - Make sure your shell-variable QTDIR is correct and that | 143 - Make sure your shell-variable QTDIR is correct and that |
143 your path contains the Qt4-bin-directory. | 144 your path contains the Qt4-bin-directory. |
144 - cd into the directory kdiff3-0.9.93/src-QT4 and type | 145 - cd into the directory kdiff3-0.9.94/src-QT4 and type |
145 - qmake kdiff3.pro | 146 - qmake kdiff3.pro |
146 - make (or "gmake" for GNU-Make) | 147 - make (or "gmake" for GNU-Make) |
147 | 148 |
148 Build-instructions (Windows): | 149 Build-instructions (Windows): |
149 - set QTDIR=<QT4-dir> e.g.: c:\qt\4.4.1 | 150 - set QTDIR=<QT4-dir> e.g.: c:\qt\4.4.1 |
150 set "PATH=%QTDIR%\bin;%PATH%" | 151 set "PATH=%QTDIR%\bin;%PATH%" |
151 - cd into the directory kdiff3-0.9.93\src-Qt4 and type | 152 - cd into the directory kdiff3-0.9.94\src-Qt4 and type |
152 - qmake kdiff3.pro | 153 - qmake kdiff3.pro |
153 - Either "nmake" for Visual Studio or "mingw32-make" depending on what you have. | 154 - Either "nmake" for Visual Studio or "mingw32-make" depending on what you have. |
154 | 155 |
155 Debugging with MinGW under Windows: | 156 Debugging with MinGW under Windows: |
156 - Qt Creator worked very good as debugger frontend too! | 157 - Qt Creator worked very good as debugger frontend too! |
157 - Debugging without gdb on the console: | 158 - Debugging without gdb on the console: |
158 - The qt-win-opensource-4.4.1-mingw.exe only installs release dlls. You will have to compile the | 159 - The qt-win-opensource-4.4.1-mingw.exe only installs release dlls. You will have to compile the |
159 debug dlls yourself. Enter the qt-4.4.1-directory and run "configure -debug" and then "mingw32-make". | 160 debug dlls yourself. Enter the qt-4.4.1-directory and run "configure -debug" and then "mingw32-make". |
160 - cd into the directory kdiff3-0.9.93\src-Qt4 | 161 - cd into the directory kdiff3-0.9.94\src-Qt4 |
161 - edit the file "Makefile.Debug" and in the LFLAGS replace "-Wl,-subsystem,windows" with "-Wl,-subsystem,console" | 162 - edit the file "Makefile.Debug" and in the LFLAGS replace "-Wl,-subsystem,windows" with "-Wl,-subsystem,console" |
162 (this is necessary so that gdb can send a break signal to the running program) | 163 (this is necessary so that gdb can send a break signal to the running program) |
163 - mingw32-make debug (create a debuggable executable) | 164 - mingw32-make debug (create a debuggable executable) |
164 - gdb debug\kdiff3.exe | 165 - gdb debug\kdiff3.exe |
165 - At the "(gdb)"-prompt type "run" and enter to start. | 166 - At the "(gdb)"-prompt type "run" and enter to start. |
168 Using break with c++-methods requires to specify the parameter types too. Breakpoints in constructors might not work. | 169 Using break with c++-methods requires to specify the parameter types too. Breakpoints in constructors might not work. |
169 | 170 |
170 Building KDiff3 (Qt4) for Mac OSX (with Intel processor) as a universal binary (by Michael Schmidt) | 171 Building KDiff3 (Qt4) for Mac OSX (with Intel processor) as a universal binary (by Michael Schmidt) |
171 1) Install Qt/Mac 4.x with thread support, static libraries and universal flag. | 172 1) Install Qt/Mac 4.x with thread support, static libraries and universal flag. |
172 (For Qt4 run "configure -static"; only necessary if the final binary should not require shared Qt4-libs.) | 173 (For Qt4 run "configure -static"; only necessary if the final binary should not require shared Qt4-libs.) |
173 2) cd .../kdiff3-0.9.93/src-QT4 | 174 2) cd .../kdiff3-0.9.94/src-QT4 |
174 3a) Create a makefile for kdiff3 by executing: | 175 3a) Create a makefile for kdiff3 by executing: |
175 qmake kdiff3.pro | 176 qmake kdiff3.pro |
176 3b) optionally generate XCode-Project (for debugging purposes only) by executing: | 177 3b) optionally generate XCode-Project (for debugging purposes only) by executing: |
177 qmake -spec macx-xcode kdiff3.pro | 178 qmake -spec macx-xcode kdiff3.pro |
178 4) Execute: | 179 4) Execute: |
179 make | 180 make |
180 5) After the build completes copy kdiff3 from the kdiff3-0.9.93/src-QT4 directory to | 181 5) After the build completes copy kdiff3 from the kdiff3-0.9.94/src-QT4 directory to |
181 /Applications | 182 /Applications |
183 | |
184 Creating and installing the translation messages | |
185 The po directory contains translations from the KDE-translation teams. | |
186 If you use the Qt-only-version of KDiff3, then the installation described above | |
187 won't install translations automatically. | |
188 To create and install the translations: | |
189 0) Make sure /usr/lib/qt3/bin/msg2qm exists | |
190 (comes with qt3-devel-tools. [Yes, really Qt3. There is no Qt4 replacement yet.]) | |
191 1) cd .../kdiff3-0.9.95/po | |
192 2) sh create_qm_files install (asks for a super user password) | |
193 Just to create the files in the po directory (as needed for the windows version): | |
194 2) sh create_qm_files local | |
182 | 195 |
183 | 196 |
184 (End of KDiff3 with Qt4-instructions) | 197 (End of KDiff3 with Qt4-instructions) |
185 ------------------------------------------------------------------------ | 198 ------------------------------------------------------------------------ |
186 | 199 |