Commits

Anonymous committed a007f23

Patch by Patrick Mézard for max line length of README file and unused
function getLineEndStyleName().
Updated README.

Comments (0)

Files changed (3)

 =============
 
 Author: Joachim Eibl  (joachim.eibl at gmx.de)
-Copyright: (C) 2002-2009 by Joachim Eibl
-KDiff3-Version: 0.9.94
+Copyright: (C) 2002-2012 by Joachim Eibl
+KDiff3-Version: 0.9.97
 
 KDiff3 runs best on KDE but can be built without it, depending only on Qt-libs.
 These are available for Un*x, Windows, Mac.
     - for Linux/Un*x
     - for Windows
     - Debugging with MinGW under Windows:
-    - for Mac: Building KDiff3 for Mac OSX (with Intel processor) as a universal binary
+    - for Mac: Building KDiff3 for Mac OSX (with Intel processor) as a
+      universal binary
     - Creating and installing translation messages
 - Additional hints
 
 
     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 Steet, Fifth Floor, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307
+    USA
 
     For details see file "COPYING".
 
-Exception from the GPL:
-    As a special exception, the copyright holder Joachim Eibl gives permission
-    to link this program with the Qt-library (commercial or open source edition)
-    from Trolltech (www.trolltech.com), and he permits to distribute the resulting
-    executable, without including the source code for the Qt-library in the
-    source distribution.
-
 
 Requirements & Installation
 ---------------------------
 
 - for KDE4:
    From version 0.9.94 on KDiff3 supports KDE4.
-   For installation on most distributions you usually also require these packages (names as on opensuse):
+   For installation on most distributions you usually also need these packages
+   (names as on opensuse):
    - g++ (g++, version 3.4 or newer)
    - libqt4-devel (Qt4-libs, version 4.4.0 or newer)
    - libkde4-devel (KDE4 Header files and development libraries)
-   - libkonq-devel (optional, needed for the kdiff3-plugin, if not installed 
+   - libkonq-devel (optional, needed for the kdiff3-plugin, if not installed
                     then the contextmenu plugin for konqueror won't be built.)
-   - cmake (>2.6, checks dependencies and creates the Makefiles appopriate for your system)
+   - cmake (>2.6, checks dependencies and creates the appropriate Makefiles for
+     your system)
 
-   Typically in a terminal (e.g. konsole) you cd into the kdiff3-directory and run these commands.
+   Typically in a terminal (e.g. konsole) you cd into the kdiff3-directory and
+   run "./configure kde4". This script is essentially the same as these commands:
 
-      mkdir release                                  # create sub directory
-      cd release                                     # cd into that directory
-      kde4-config --prefix                           # Find out your KDE4-directory and note the result
-      cmake .. -DCMAKE_INSTALL_PREFIX=<KDE4-prefix>  # create Makefile, replace <KDE4-prefix> with the prior result
-      make                                           # run make (compile and link)
-      sudo make install                              # install as root user
+      mkdir release
+      cd release
+      # Find out your KDE4-directory and note the result
+      kde4-config --prefix
+      # create Makefile, replace <KDE4-prefix> with the prior result
+      cmake .. -DCMAKE_INSTALL_PREFIX=<KDE4-prefix>
+      # run make (compile and link)
+      make
+      # install as root user
+      sudo make install
 
    Now KDiff3 should be ready to use. Type "kdiff3" to start it.
-   There should also be a entry in your KDE-start menu in "(Applications->)Development".
+   There should also be a entry in your KDE-start menu in
+   "(Applications->)Development".
 
    For creating a debug version:
       mkdir debug
       cd debug
-      kde4-config --prefix                           # Find out your KDE4-directory and note the result
-      cmake .. -DCMAKE_INSTALL_PREFIX=<KDE4-prefix>  -DCMAKE_BUILD_TYPE=debugfull
+      # Find out your KDE4-directory and note the result
+      kde4-config --prefix
+      cmake .. -DCMAKE_INSTALL_PREFIX=<KDE4-prefix> -DCMAKE_BUILD_TYPE=debugfull
       make
       sudo make install
 
     - for Windows
     - for Mac
 
-   The version 0.9.94 requires Qt 4.4.0 or newer (from www.trolltech.com) for compilation. 
+   The version 0.9.97 requires Qt 4.4.0 or newer (from qt.nokia.com) for
+   compilation.
 
-   You always need
-      - kdiff3-0.9.94.tar.gz
+   You always need:
+      - kdiff3-0.9.97.tar.gz
 
       - for Un*x:    gcc, g++ with version >=3.4.2
                      Qt-X11-libraries
 
       - for Windows: Qt-win-libs
-                     If you have the Qt4 commercial edition, then compile with Visual Studio.NET2003 or newer.
-                     If you use the Qt4 open source edition, then you'll need MinGW.
-                     I verified that compilation and debugging works with these packages (probably newer ones will also work):
-                     - Use MinGW-5.1.4.exe or newer to install the following or newer:
+                     If you have the Qt4 commercial edition, then compile with
+                     Visual Studio.NET 2003 or newer.
+                     If you use the Qt4 open source edition, then you'll need
+                     MinGW.
+                     I verified that compilation and debugging works with
+                     these packages (probably newer ones will also work):
+                     - Use MinGW-5.1.4.exe or newer to install the following
+                       or newer:
                        - gcc-core-3.4.5-20060117-1.tar.gz
                        - binutils-2.17.50-20060824-1.tar.gz
                        - gcc-g++-3.4.5-20060117-1.tar.gz
 
       - for Mac:     gcc, g++ with version >=3.4.2
                      Qt-Mac-libraries
-      - Optional: Qt Creator IDE: Development environment optimized for Qt (http://trolltech.com/developer/qt-creator)
+      - Optional: Qt Creator IDE: Development environment optimized for Qt
+        (http://qt.nokia.com)
 
   Build-instructions (Un*x):
-    - Make sure your shell-variable QTDIR is correct and that 
-      your path contains the Qt4-bin-directory.
-    - cd into the directory kdiff3-0.9.94/src-QT4 and type
-    - qmake kdiff3.pro
+    Assuming Qt is correctly installed run "./configure qt4" which essentially
+    does the same as:
+    - mkdir release
+    - cd release
+    - qmake ../src-QT4/kdiff3.pro
     - make (or "gmake" for GNU-Make)
 
   Build-instructions (Windows):
     - set QTDIR=<QT4-dir>         e.g.: c:\qt\4.4.1
       set "PATH=%QTDIR%\bin;%PATH%"
-    - cd into the directory kdiff3-0.9.94\src-Qt4 and type
+    - cd into the directory kdiff3-0.9.97\src-Qt4 and type
     - qmake kdiff3.pro
-    - Either "nmake" for Visual Studio or "mingw32-make" depending on what you have.
+    - Either "nmake" for Visual Studio or "mingw32-make" depending on what you
+      have.
 
   Debugging with MinGW under Windows:
-    - Qt Creator worked very good as debugger frontend too!
+    - Qt Creator worked very well as debugger frontend too!
     - Debugging without gdb on the console:
-      - The qt-win-opensource-4.4.1-mingw.exe only installs release dlls. You will have to compile the
-         debug dlls yourself. Enter the qt-4.4.1-directory and run "configure -debug" and then "mingw32-make".
-      - cd into the directory kdiff3-0.9.94\src-Qt4
-      - edit the file "Makefile.Debug" and in the LFLAGS replace "-Wl,-subsystem,windows" with "-Wl,-subsystem,console"
-         (this is necessary so that gdb can send a break signal to the running program)
+      - The qt-win-opensource-4.4.1-mingw.exe only installs release dlls. You
+        will have to compile the debug dlls yourself. Enter the
+        qt-4.4.1-directory and run "configure -debug" and then "mingw32-make".
+      - cd into the directory kdiff3-0.9.97\src-Qt4
+      - edit the file "Makefile.Debug" and in the LFLAGS replace
+        "-Wl,-subsystem,windows" with "-Wl,-subsystem,console" (this is
+        necessary so that gdb can send a break signal to the running program)
       - mingw32-make debug (create a debuggable executable)
       - gdb debug\kdiff3.exe
       - At the "(gdb)"-prompt type "run" and enter to start.
-      - While the program runs you can't set breakpoints, first interrupt it with Ctrl-C.
-      - Use "help" to find out about how to use gdb. (Important commands: run, break, backtrace, print, quit)
-         Using break with c++-methods requires to specify the parameter types too. Breakpoints in constructors might not work.
+      - While the program runs you can't set breakpoints, first interrupt it
+        with Ctrl-C.
+      - Use "help" to find out about how to use gdb. (Important commands: run,
+        break, backtrace, print, quit)
+         Using break with c++-methods requires to specify the parameter types
+         too. Breakpoints in constructors might not work.
 
-  Building KDiff3 (Qt4) for Mac OSX (with Intel processor) as a universal binary (by Michael Schmidt)
-    1) Install Qt/Mac 4.x with thread support, static libraries and universal flag.
-       (For Qt4 run "configure -static"; only necessary if the final binary should not require shared Qt4-libs.)
-    2) cd .../kdiff3-0.9.94/src-QT4
+  Building KDiff3 (Qt4) for Mac OSX (with Intel processor) as a universal
+  binary (by Michael Schmidt)
+    1) Install Qt/Mac 4.x with thread support, static libraries and universal
+    flag. (For Qt4 run "configure -static"; only necessary if the final binary
+    should not require shared Qt4-libs.)
+    2) cd .../kdiff3-0.9.97/src-QT4
     3a) Create a makefile for kdiff3 by executing:
        qmake kdiff3.pro
-    3b) optionally generate XCode-Project (for debugging purposes only) by executing:
+    3b) optionally generate XCode-Project (for debugging purposes only) by
+    executing:
        qmake -spec macx-xcode kdiff3.pro
     4) Execute:
        make
-    5) After the build completes copy kdiff3 from the kdiff3-0.9.94/src-QT4 directory to
+    5) After the build completes copy kdiff3 from the kdiff3-0.9.97/src-QT4
+    directory to:
        /Applications
 
   Creating and installing the translation messages
     The po directory contains translations from the KDE-translation teams.
-    If you use the Qt-only-version of KDiff3, then the installation described above 
-    won't install translations automatically.
+    If you use the Qt-only-version of KDiff3, then the installation described
+    above won't install translations automatically.
     To create and install the translations:
-    0) Make sure /usr/lib/qt3/bin/msg2qm exists 
-       (comes with qt3-devel-tools. [Yes, really Qt3. There is no Qt4 replacement yet.])
-    1) cd .../kdiff3-0.9.95/po
+    1) cd .../kdiff3-0.9.97/po
     2) sh create_qm_files install    (asks for a super user password)
-    Just to create the files in the po directory (as needed for the windows version): 
+    Just to create the files in the po directory (as needed for the windows
+    version):
     2) sh create_qm_files local
 
 

kdiff3/po/create_qm_files

 # create_qm_files: 
 # Create translation files needed by qt-only version.
 # Requirements: lconvert from qt4 (Thanks to Richard Hoyle for that tip)
-#               (previously: msg2qm from qt3-devel-tools)
 export LANG=en_US.UTF-8
 echo "Create qm files (KDiff3 translation files for the qt-only version)"
 if [ "$1" = "local" ]; then
 
    for i in `ls ` ; do
       if [ -s $i/kdiff3.po ]; then
-         # (msg2qm is from "qt3-devel-tools"-package.)
          echo Creating ./kdiff3_$i.qm
-         #/usr/lib/qt3/bin/msg2qm $i/kdiff3.po kdiff3_$i.qm
          lconvert -if po -of qm -o $path/kdiff3_$i.qm $i/kdiff3.po
       fi
    done
 elif [ "$1" = "install" ]; then
    for i in `ls` ; do
       if [ -s $i/kdiff3.po ]; then
-         # (msg2qm is from "qt3-devel-tools"-package.)
          echo Installing /usr/share/locale/$i/LC_MESSAGES/kdiff3.qm
-         #sudo /usr/lib/qt3/bin/msg2qm $i/kdiff3.po /usr/share/locale/$i/LC_MESSAGES/kdiff3.qm
          sudo lconvert -if po -of qm -o /usr/share/locale/$i/LC_MESSAGES/kdiff3.qm $i/kdiff3.po
       fi
    done

kdiff3/src-QT4/mergeresultwindow.cpp

    return m_pFileNameLineEdit->text();
 }
 
-static QString getLineEndStyleName( e_LineEndStyle eLineEndStyle )
-{
-   if ( eLineEndStyle == eLineEndStyleDos )
-      return "DOS";
-   else if ( eLineEndStyle == eLineEndStyleUnix )
-      return "Unix";
-   return QString();
-}
+//static QString getLineEndStyleName( e_LineEndStyle eLineEndStyle )
+//{
+//   if ( eLineEndStyle == eLineEndStyleDos )
+//      return "DOS";
+//   else if ( eLineEndStyle == eLineEndStyleUnix )
+//      return "Unix";
+//   return QString();
+//}
 
 void WindowTitleWidget::setLineEndStyles( e_LineEndStyle eLineEndStyleA, e_LineEndStyle eLineEndStyleB, e_LineEndStyle eLineEndStyleC)
 {
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.