Commit 3d743cb0 authored by Joachim Eibl's avatar Joachim Eibl
Browse files

0.9.80


git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@54 c8aa9fed-2811-0410-8543-893ada326672
parent 2d3108cc
Version 0.9.80 - 2003/12/08
===========================
New Text Diff/Merge Features:
- Now using GNU-diff algorithms internally. (Option "External Diff" removed.)
- Option for treating C/C++ comments as whitespace during diff.
- Bugfix for locale character encoding (+ new option "Use string encoding")
- Option for suppressing highlighting in white-space changes.
(Also suppresses highlighting in comments and numbers when the
respective options are active.)
- Merge-menu: Choose A/B/C for all unsolved conflicts.
Choose A/B/C for all unsolved whitespace conflicts.
- Options to automatically choose a certain source for whitespace conflicts.
- Shorcut F5 now used to reload the current file.
New Directory-Comparison/Merge Features:
- Option to trust filesize. (Some directory services don't copy the date/time correctly.)
- Shortcut F7 now starts complete directory merge (previously F5).
- Do the selected merge operation for the selected file/dir only
"Run Operation For Current Item" (F6).
- Shortcuts for selecting the merge operation for the selected item.
Ctrl-1/2/3/4/Del select A/B/C/Merge/Delete respectively.
Other Improvements:
- Several i18n-corrections (by Stephan Binner)
- Bugfix for option CVS-ignore: Didn't work correctly in subdirectories.
- Bugfix for remote operations: Operation can now be aborted, when KIO-slaves doesn't respond.
- Cancel-Button in progress bar.
- Default diff-view now again side by side instead of one above the other.
Version 0.9.71 - 2003/10/14
===========================
- Windows-Installer by Sebastien Fricker.
......
......@@ -3,7 +3,7 @@ KDiff3-Readme
Author: Joachim Eibl (joachim.eibl@gmx.de)
Copyright: (C) 2002-2003 by Joachim Eibl
KDiff3-Version: 0.9.70
KDiff3-Version: 0.9.80
KDiff3 is a program that
......@@ -42,12 +42,12 @@ Exception from the GPL:
Requirements & Installation:
Version 0.9.70 provides special support for KDE3, but it can also be
Version 0.9.80 provides special support for KDE3, but it can also be
built without KDE3 if the Qt-libraries are available.
(I also tested the program under Windows.)
You always need
- kdiff3-0.9.70.tar.gz
- kdiff3-0.9.80.tar.gz
For building the KDE3-version
- KDE>=3.1 and QT>=3.1-libraries.
......@@ -64,7 +64,7 @@ Installation for KDE3:
- Make sure your shell-variable QTDIR is correct. (echo $QTDIR).
If it doesn't contain the correct path, type
export QTDIR=your_path_to_qt (e.g. /usr/lib/qt3)
- cd into the directory kdiff3-0.9.70 and type
- cd into the directory kdiff3-0.9.80 and type
- ./configure --prefix=/opt/kde3 (your KDE3 directory here)
- (make clean) (Required if you already compiled once.)
- make (Run compilation)
......@@ -93,7 +93,7 @@ Installation for the Qt-only-platforms for Un*x:
- Make sure your shell-variable QTDIR is correct. (echo $QTDIR).
If it doesn't contain the correct path, type
export QTDIR=your_path_to_qt (e.g. /usr/lib/qt)
- cd into the directory kdiff3-0.9.70/src and type
- cd into the directory kdiff3-0.9.80/src and type
- make -f Makefile.qt
- make -f Makefile.qt install (You must have root-rights for this step.)
(copies the files into /usr/local/bin and /usr/local/share/doc/kdiff3)
......@@ -110,7 +110,7 @@ Build for Windows:
set QTDIR=your_path_to_qt (e.g. c:\qt)
- Make sure your VC6 environment variables are set. Run VCVARS32.BAT.
(Typically located in "c:\programs\Microsoft Visual Studio\VC98\bin")
- cd into the directory kdiff3-0.9.70\src and type
- cd into the directory kdiff3-0.9.80\src and type
- nmake /f Makefile.win_qt230
- For execution the Qt-DLL must be in the path or in the same directory.
For newer versions of Qt, use qmake and kdiff3.pro to generate
......
......@@ -3,7 +3,7 @@ KDiff3-Readme for Windows
Author: Joachim Eibl (joachim.eibl@gmx.de)
Copyright: (C) 2002-2003 by Joachim Eibl
KDiff3-Version: 0.9.71
KDiff3-Version: 0.9.80
Homepage: http://kdiff3.sourceforge.net
KDiff3 is a program that
......
......@@ -6,6 +6,4 @@ TODO
- Automatic line wrap in the difference windows
- Printing of the diff-windows (requires automatic line wrap)
- Undo function in the merge-editor.
- Diff should allow to treat C/C++-comments as white space.
- A inserted or removed linefeed should be detected and treated like white space.
- More viewing options for directory widget.
......@@ -45,8 +45,8 @@ Please respect the format of the date (YYYY-MM-DD) and of the version
(V.MM.LL), it could be used by automation scripts.
Do NOT change these in the translation. -->
<date>2003-09-15</date>
<releaseinfo>0.9.70</releaseinfo>
<date>2003-12-07</date>
<releaseinfo>0.9.80</releaseinfo>
<abstract>
......@@ -59,10 +59,10 @@ Do NOT change these in the translation. -->
<listitem><para>provides an automatic merge-facility,</para></listitem>
<listitem><para>has an editor for comfortable solving of merge-conflicts,</para></listitem>
<listitem><para>provides networktransparency via KIO,</para></listitem>
<listitem><para>and is very colorful (by default) :-)</para></listitem>
<listitem><para>has options to highlight or hide changes in white-space or comments.</para></listitem>
</itemizedlist>
</para><para>
This document describes KDiff3-version 0.9.70.
This document describes KDiff3-version 0.9.80.
</para>
</abstract>
......@@ -89,6 +89,8 @@ Please at least include KDE, the KDE package it is in, the name
<keyword>kio</keyword>
<keyword>networktransparent</keyword>
<keyword>editor</keyword>
<keyword>white space</keyword>
<keyword>comments</keyword>
</keywordset>
</bookinfo>
......@@ -217,6 +219,7 @@ This screenshot shows KDiff3 during a directory merge:
<listitem><para> Show the line numbers for each line. </para></listitem>
<listitem><para> Paste clipboard or drag text into a diff input window.</para></listitem>
<listitem><para> Networktransparency via KIO.</para></listitem>
<listitem><para> Can be used as diff-viewer in KDevelop 3.</para></listitem>
<listitem><para> ...</para></listitem>
</itemizedlist>
</sect2>
......@@ -445,12 +448,20 @@ reduce typework by specifying the filename only for the first file. E.g.:
copy and paste some text containing such a line. But still be careful to
do so.
</para><para>
The "Merge" menu contains some actions that let you select "A", "B" or
"C" everywhere. When you select "Automatically solve simple conflicts" then
KDiff3 restarts the merge and solves as many conflicts as it can. "Set deltas
to conflicts" does the opposite: Even simple conflicts have to be solved
manually then. For all these actions the manual selections that happened
before are lost. (KDiff3 will tell you so, before proceeding.)
The normal merge will start by solving simple conflicts automatically.
But the "Merge"-menu provides some actions for other common needs.
If you have to select the same source for most conflicts, then you can
choose "A", "B" or "C" everywhere, or only for the remaining unsolved
conflicts, or for unsolved whitespace conflicts. If you want to decide every
single delta yourself, you can "Set deltas to conflicts". Or if you want to
return to the automatic choices of KDiff3 then select
"Automatically solve simple conflicts". KDiff3 then restarts the merge.
For actions that change your previous modifications KDiff3 will ask for your
confirmation before proceeding.
</para><para>
Note: When choosing either source for unsolved whitespace conflicts and
the options "Ignore Numbers" or "Ignore C/C++ Comments" are used then changes in
numbers or comments will be treated like whitespace too.
</para>
</sect1>
......@@ -592,6 +603,8 @@ reduce typework by specifying the filename only for the first file. E.g.:
of the previous line is used for the new line. </para></listitem></varlistentry>
<varlistentry><term><emphasis> Auto copy selection:</emphasis></term><listitem><para> Every selection is immediately copied
to the clipboard when active and you needn't explicitely copy it. </para></listitem></varlistentry>
<varlistentry><term><emphasis> Use locale encoding:</emphasis></term><listitem><para> For displaying foreign characters.
Try changing this if some characters of your language aren't displayed correctly. </para></listitem></varlistentry>
</variablelist>
</sect2>
......@@ -604,10 +617,6 @@ reduce typework by specifying the filename only for the first file. E.g.:
</para>
<variablelist>
<varlistentry><term><emphasis>Ignore white space:</emphasis></term><listitem><para> Default is on. White space will be
ignored in the first part of the analysis in which the line matching is
done. In the result the white space differences will be shown nevertheless.
</para></listitem></varlistentry>
<varlistentry><term><emphasis>Preserve Carriage Return:</emphasis></term><listitem><para> Some editors (on some systems) save
carriage return '\r' and linefeed '\n'-characters at the end of line, while
others will only save the linefeed '\n'. Usually KDiff3 ignores the carriage
......@@ -620,6 +629,9 @@ reduce typework by specifying the filename only for the first file. E.g.:
done. In the result the differences will be shown nevertheless, but they are treated
as white space.
</para></listitem></varlistentry>
<varlistentry><term><emphasis>Ignore C/C++ comments:</emphasis></term><listitem><para> Default is off.
Changes in comments will be treated like changes in white space.
</para></listitem></varlistentry>
<varlistentry><term><emphasis>Convert to Upper Case:</emphasis></term><listitem><para> Default is off. Converts the input to upper case
while reading. Hence the comparison is not case sensitive. Take care during merging
because the case information will be lost in the merge-result too.
......@@ -639,28 +651,21 @@ reduce typework by specifying the filename only for the first file. E.g.:
You can write your own preprocessor that fulfills your specific needs.
Each input line must have a corresponding output line.
</para></listitem></varlistentry>
<varlistentry><term><emphasis>Use external diff:</emphasis></term><listitem><para> If you have an external diff-tool (e.g. GNU-diff)
you can use it for the line matching phase. For some complicated files this
might be better than the internal algorithm of KDiff3.
</para></listitem></varlistentry>
<varlistentry><term><emphasis>Try Hard:</emphasis></term><listitem><para> Passes the "--minimal"-option to the external diff
tool, which then will try hard to find an even smaller delta. This will probably
<varlistentry><term><emphasis>Try Hard:</emphasis></term><listitem><para>
Try hard to find an even smaller delta. (Default is on.) This will probably
be effective for complicated and big files. And slow for very big files.
</para></listitem></varlistentry>
<varlistentry><term><emphasis>Ignore trivial matches:</emphasis></term><listitem><para> Default is on. When trivial lines
match after an difference, this will be ignored and the search for a nontrivial
matching line continues. This improves the results for inputs with empty
lines and lines containing only a open or close-brace character, which is
often the case for C/C++-programs.
</para></listitem></varlistentry>
<varlistentry><term><emphasis>Max search length:</emphasis></term><listitem><para> Searching for a match is aborted after this
number of lines. The diff might fail for small values but take too long
for big values. Default is 1000.
</para></listitem></varlistentry>
<varlistentry><term><emphasis>Auto Advance Delay (ms):</emphasis></term><listitem><para> When in auto-advance-mode this setting specifies
how long to show the result of the selection before jumping to the next unsolved
conflict.
</para></listitem></varlistentry>
<varlistentry><term><emphasis>White space 2/3-file merge default:</emphasis></term><listitem><para>
Automatically solve all white-space conflict by choosing the specified file.
(Default is manual choice.) Useful if white-space really isn't important in many files.
If you need this only occasionally better use "Choose A/B/C For All Unsolved Whitespace Conflicts"
in the merge menu. Note that if you enable either "Ignore numbers" or "Ignore C/C++ comments"
then this auto-choice also applies for conflicts in numbers or comments.
</para></listitem></varlistentry>
</variablelist>
</sect2>
......@@ -689,6 +694,10 @@ Yet there is one option here that is also relevant for saving single files:
shown for the input files.</para></listitem></varlistentry>
<varlistentry><term><emphasis>Show space and tabulator characters for differences:</emphasis></term><listitem><para> Sometimes
the visible spaces and tabs are disturbing. You can turn this off.</para></listitem></varlistentry>
<varlistentry><term><emphasis>Show white space:</emphasis></term><listitem><para> Turn this off to suppress
any highlighting of white-space-only changes in the text or overview-columns.
(Note that this also applies to changes in numbers or comments if the options "Ignore numbers"
or "Ignore C/C++ comments" are active.)</para></listitem></varlistentry>
<varlistentry><term><emphasis>Show Window A/B/C:</emphasis></term><listitem><para> Sometimes you want to use the space on
the screen better for long lines. Hide the windows that are not important.
(In the Windows-menu.)</para></listitem></varlistentry>
......@@ -696,8 +705,9 @@ Yet there is one option here that is also relevant for saving single files:
Switch between diff windows shown next to each other (A left of B left of C) or above
each other (A above B above C). This should also help for long lines. (In the Windows-menu.)
</para></listitem></varlistentry>
<varlistentry><term><emphasis>Start a merge quickly:</emphasis></term><listitem><para> Sometimes you are viewing the deltas
and decide to merge. <inlinemediaobject><imageobject><imagedata fileref="merge_current.png" format="PNG"/></imageobject></inlinemediaobject>
<varlistentry><term><emphasis>Start a merge quickly:</emphasis></term><listitem><para>
Sometimes you are viewing the deltas and decide to merge.
<inlinemediaobject><imageobject><imagedata fileref="merge_current.png" format="PNG"/></imageobject></inlinemediaobject>
"Merge current file" in the Directory-menu also works if you only compare
two files. A single click starts the merge and uses the filename of the last
input-file as the default output filename. (When this is used to restart
......@@ -750,7 +760,8 @@ So this is what this program can do for you: KDiff3 ...
take place, without actually doing them,</para></listitem>
<listitem><para>... lets you really do the merge, and lets you interact whenever
manual interaction is needed,</para></listitem>
<listitem><para>... lets you continue the merge after manual interaction with key F5,</para></listitem>
<listitem><para>... lets you run the selected operation for all items (key F7) or the selected item (key F6),</para></listitem>
<listitem><para>... lets you continue the merge after manual interaction with key F7,</para></listitem>
<listitem><para>... optionally creates backups, with the ".orig" extension,</para></listitem>
<listitem><para>...</para></listitem>
</itemizedlist>
......@@ -786,7 +797,7 @@ So this is what this program can do for you: KDiff3 ...
<para>
Note that only the comparison starts automatically, not the merge. For this you first must
select a menu entry or the key F5. (More details later.)
select a menu entry or the key F7. (More details later.)
</para>
</sect2>
</sect1>
......@@ -874,12 +885,14 @@ So this is what this program can do for you: KDiff3 ...
After comparing the directories KDiff3 also evaluates a proposal for a
merge operation. This is shown in the "Operation" column. You can modify
the operation by clicking on the operation you want to change. A small menu
will popup and allows you to select an operation for that item. This operation
will be executed during the merge. It depends on the item and on the merge-mode
you are in, what operations are available. The merge-mode is one of
will popup and allows you to select an operation for that item. (You can also
select the most needed operations via keyboard.
Ctrl+1/2/3/4/Del will select A/B/C/Merge/Delete respectively if available.)
This operation will be executed during the merge. It depends on the item and
on the merge-mode you are in, what operations are available. The merge-mode is one of
</para>
<itemizedlist>
<listitem><para>Three directory-merge (A is treated as older base of both).</para></listitem>
<listitem><para>Three directory-merge ("A" is treated as older base of both).</para></listitem>
<listitem><para>Two directory-merge.</para></listitem>
<listitem><para>Two directory-sync-mode (activate via option "Synchronize Directories").</para></listitem>
</itemizedlist>
......@@ -954,6 +967,7 @@ So this is what this program can do for you: KDiff3 ...
<sect1 id="dothemerge"><title>Doing A Merge</title>
<para>
You can either merge the currently selected item (file or directory), or all items.
When you have made all your operation choices (in all subdirectories too)
then you can start the merge.
</para><para>
......@@ -975,19 +989,21 @@ So this is what this program can do for you: KDiff3 ...
in the tree, and hence also not in the destination.</para></listitem>
</itemizedlist>
<para>
(In the current version, you must do a rescan yourself, after changing
options affecting the directory scan.)
(In the current version, you must do a rescan via menu "Directory"->"Rescan"
yourself, after changing options affecting the directory scan.)
</para><para>
If you are satisfied so far, the rest is easy.
</para><para>
In the "Directory"-menu select "Start/Continue directory merge" or press
F5 (which is the shortcut).
To merge all items: Select "Start/Continue directory merge" in the "Directory"-menu
or press F7 (which is the shortcut).
To merge only the current item: Select "Run Operation For Current Item"
or press F6.
</para><para>
If due to conflicting filetypes still some items with invalid operations
exist, then a messagebox will appear and these items will be pointed out,
so you can select a valid operation for the item.
</para><para>
Otherwise a dialog will appear giving you the options "Do it", "Simulate
If you merge all items a dialog will appear giving you the options "Do it", "Simulate
it" and "Cancel".
</para>
<itemizedlist>
......@@ -1001,18 +1017,24 @@ So this is what this program can do for you: KDiff3 ...
(<link linkend="dirmergebigscreenshot">see the big screenshot</link>).
</para><para>
When you have finished with a file, again select "Start/Continue directory
merge" or the key F5. If you haven't saved yet, a dialog will ask you to
merge" or the key F7. If you haven't saved yet, a dialog will ask you to
do so. Then KDiff3 will continue with the next item.
</para><para>
When KDiff3 encounters an error, it will tell you so and will show the
verbose-status-information. At the bottom of this list, there will be some
error messages which should help you to understand the cause of the problem.
When you continue merging (F5 key) KDiff3 will give you the choice to retry
or skip the item that caused the problem. This means that before continuing
you can choose another operation or solve the problem by other means.
verbose-status-information. At the bottom of this list, there will be some
error messages which should help you to understand the cause of the problem.
When you continue merging (F7 key) KDiff3 will give you the choice to retry
or skip the item that caused the problem. This means that before continuing
you can choose another operation or solve the problem by other means.
</para><para>
When the merge is complete, then KDiff3 will inform you via a message
box.
</para><para>
If some items were merged individually then KDiff3 remembers this (while this
merge-session goes on), and doesn't merge them again when later the merge for
all items is run. Even when the merge was skipped or nothing was saved these
items count as completed. Only when you change the merge operation the item
will be merged again.
</para>
</sect1>
......@@ -1062,6 +1084,11 @@ So this is what this program can do for you: KDiff3 ...
over a slow network, it might be faster to compare the modification dates
and file length alone. But this speed improvement comes with the price of
a little uncertainty. Use this option with care. Default is off.</para></listitem></varlistentry>
<varlistentry><term><emphasis>Trust the size:</emphasis></term><listitem><para>
Similar to trusting the modification date. No real comparison happens. Two
files are considered equal if their file-sizes are equal. This is useful
when the file-copy operation didn't preserve the modification date.
Use this option with care. Default is off.</para></listitem></varlistentry>
<varlistentry><term><emphasis>Synchronize Directories:</emphasis></term><listitem><para> Activates "Sync-Mode" when two directories
are compared and no explicit destination directory was specified. In this
mode the proposed operations will be chosen so that both source directories
......@@ -1152,7 +1179,8 @@ Other things that are possible, but probably less useful are:
</para>
<itemizedlist>
<listitem><para>
A path can be relative and can contain "." or "..". This is not possible for URLs which are always absolute.
A path can be relative and can contain "." or "..". This is not possible for URLs
which are always absolute.
</para></listitem><listitem><para>
Special characters must be written with "escaping". ("#"->"%23", space->"%20", etc.)
E.g. A file with the name "/#foo#" would have the URL "file:/%23foo%23".
......@@ -1174,13 +1202,15 @@ Other things that are possible, but probably less useful are:
<listitem><para>
Sometimes there is no support for links.
</para></listitem><listitem><para>
Or there is no way to distinguish if a link points to a file or a directory; always assuming a file. (ftp:, sftp:).
Or there is no way to distinguish if a link points to a file or a directory; always
assuming a file. (ftp:, sftp:).
</para></listitem><listitem><para>
Can't always determine the filesize.
</para></listitem><listitem><para>
Limited support for permissions.
</para></listitem><listitem><para>
No possibility to modify permissions or modification time, so permissions or time of a copy will differ from the original.
No possibility to modify permissions or modification time, so permissions or time
of a copy will differ from the original. (See the option "Trust the size".)
(Only possible for local files.)
</para></listitem>
</itemizedlist>
......
......@@ -5,7 +5,7 @@ INCLUDES = $(all_includes)
# these are the headers for your project
noinst_HEADERS = kdiff3_part.h kdiff3_shell.h \
kdiff3.h common.h diff.h directorymergewindow.h \
merger.h optiondialog.h fileaccess.h
merger.h optiondialog.h fileaccess.h version.h
# let automoc handle all of the meta source files (moc)
METASOURCES = AUTO
......@@ -44,7 +44,8 @@ kde_module_LTLIBRARIES = libkdiff3part.la
# the Part's source, library search path, and link libraries
libkdiff3part_la_SOURCES = kdiff3_part.cpp kdiff3.cpp directorymergewindow.cpp \
merger.cpp pdiff.cpp difftextwindow.cpp diff.cpp \
optiondialog.cpp mergeresultwindow.cpp fileaccess.cpp
optiondialog.cpp mergeresultwindow.cpp fileaccess.cpp \
gnudiff_analyze.cpp gnudiff_io.cpp gnudiff_xmalloc.cpp
libkdiff3part_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
libkdiff3part_la_LIBADD = $(LIB_KPARTS) $(LIB_KFILE)
......
#############################################################################
# Makefile for building: kdiff3
# Generated by qmake (1.05a) (Qt 3.1.2-snapshot-20030618) on: Thu Oct 2 22:13:20 2003
# Generated by qmake (1.06c) (Qt 3.2.1) on: Mon Dec 8 20:06:47 2003
# Project: kdiff3.pro
# Template: app
# Command: $(QMAKE) -o Makefile kdiff3.pro
......@@ -12,8 +12,8 @@ CC = gcc
CXX = g++
LEX = flex
YACC = yacc
CFLAGS = -pipe -O2 -march=i586 -mcpu=i686 -fmessage-length=0 -fPIC -DNO_DEBUG -Wall -W -O2 -march=i586 -mcpu=i686 -fmessage-length=0 -fPIC -DNO_DEBUG -D_REENTRANT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
CXXFLAGS = -pipe -O2 -march=i586 -mcpu=i686 -fmessage-length=0 -fPIC -DNO_DEBUG -Wall -W -O2 -march=i586 -mcpu=i686 -fmessage-length=0 -fPIC -DNO_DEBUG -D_REENTRANT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
CFLAGS = -pipe -O2 -march=i586 -mcpu=i686 -fmessage-length=0 -fPIC -Wall -W -O2 -march=i586 -mcpu=i686 -fmessage-length=0 -fPIC -D_REENTRANT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT
CXXFLAGS = -pipe -O2 -march=i586 -mcpu=i686 -fmessage-length=0 -fPIC -Wall -W -O2 -march=i586 -mcpu=i686 -fmessage-length=0 -fPIC -D_REENTRANT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT
LEXFLAGS =
YACCFLAGS= -d
INCPATH = -I$(QTDIR)/mkspecs/default -I. -Ikreplacements -I/usr/include -I$(QTDIR)/include
......@@ -28,8 +28,8 @@ QMAKE = qmake
TAR = tar -cf
GZIP = gzip -9f
COPY = cp -f
COPY_FILE= $(COPY) -p
COPY_DIR = $(COPY) -pR
COPY_FILE= $(COPY)
COPY_DIR = $(COPY) -r
DEL_FILE = rm -f
SYMLINK = ln -sf
DEL_DIR = rmdir
......@@ -43,7 +43,8 @@ OBJECTS_DIR = ./
####### Files
HEADERS = diff.h \
HEADERS = version.h \
diff.h \
kdiff3.h \
merger.h \
optiondialog.h \
......@@ -64,7 +65,10 @@ SOURCES = diff.cpp \
fileaccess.cpp \
kdiff3_shell.cpp \
kdiff3_part.cpp \
kreplacements/kreplacements.cpp
kreplacements/kreplacements.cpp \
gnudiff_analyze.cpp \
gnudiff_io.cpp \
gnudiff_xmalloc.cpp
OBJECTS = diff.o \
difftextwindow.o \
kdiff3.o \
......@@ -77,7 +81,10 @@ OBJECTS = diff.o \
fileaccess.o \
kdiff3_shell.o \
kdiff3_part.o \
kreplacements.o
kreplacements.o \
gnudiff_analyze.o \
gnudiff_io.o \
gnudiff_xmalloc.o
FORMS =
UICDECLS =
UICIMPLS =
......@@ -105,7 +112,7 @@ TARGET = kdiff3
first: all
####### Implicit rules
.SUFFIXES: .c .cpp .cc .cxx .C
.SUFFIXES: .c .o .cpp .cc .cxx .C
.cpp.o:
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
......@@ -126,10 +133,11 @@ first: all
all: $(TARGET)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
mocables: $(SRCMOC)
uicables: $(UICDECLS) $(UICIMPLS)
$(MOC):
( cd $(QTDIR)/src/moc ; $(MAKE) )
......@@ -146,7 +154,7 @@ uiclean:
yaccclean:
lexclean:
clean: mocclean
-$(DEL_FILE) $(OBJECTS)
-$(DEL_FILE) $(OBJECTS)
-$(DEL_FILE) *~ core *.core
......@@ -191,10 +199,10 @@ kdiff3.o: kdiff3.cpp diff.h \
xpm/autoadvance.xpm \
xpm/showwhitespace.xpm \
xpm/showlinenumbers.xpm \
xpm/startmerge.xpm \
common.h
main.o: main.cpp kdiff3_shell.h
main.o: main.cpp kdiff3_shell.h \
version.h
merger.o: merger.cpp merger.h \
diff.h \
......@@ -216,10 +224,13 @@ pdiff.o: pdiff.cpp diff.h \
kdiff3.h \
optiondialog.h \
fileaccess.h \
common.h
gnudiff_diff.h \
common.h \
gnudiff_system.h
directorymergewindow.o: directorymergewindow.cpp directorymergewindow.h \
optiondialog.h \
xpm/startmerge.xpm \
common.h \
fileaccess.h
......@@ -243,6 +254,16 @@ kreplacements.o: kreplacements/kreplacements.cpp kreplacements/kreplacements.h \
kreplacements/kreplacements.moc
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o kreplacements.o kreplacements/kreplacements.cpp
gnudiff_analyze.o: gnudiff_analyze.cpp gnudiff_diff.h \
gnudiff_xalloc.h \
gnudiff_system.h
gnudiff_io.o: gnudiff_io.cpp gnudiff_diff.h \
gnudiff_xalloc.h \
gnudiff_system.h
gnudiff_xmalloc.o: gnudiff_xmalloc.cpp gnudiff_xalloc.h
moc_diff.o: moc_diff.cpp diff.h common.h \
fileaccess.h
......@@ -302,7 +323,6 @@ uninstall_documentation:
install_target:
@$(CHK_DIR_EXISTS) "$(INSTALL_ROOT)/usr/local/bin/" || $(MKDIR) "$(INSTALL_ROOT)/usr/local/bin/"
-$(COPY) "$(QMAKE_TARGET)" "$(INSTALL_ROOT)/usr/local/bin/$(QMAKE_TARGET)"
-strip "$(INSTALL_ROOT)/usr/local/bin/$(QMAKE_TARGET)"
uninstall_target:
-$(DEL_FILE) "$(INSTALL_ROOT)/usr/local/bin/$(QMAKE_TARGET)"
......
#############################################################################
# Makefile for building kdiff3
# Generated by tmake at 22:40, 2003/10/01
# Generated by tmake at 12:39, 2003/12/06
# Project: kdiff3_tmake
# Template: app
#############################################################################
......@@ -43,7 +43,10 @@ SOURCES = diff.cpp \
fileaccess.cpp \
kdiff3_shell.cpp \
kdiff3_part.cpp \
kreplacements\kreplacements.cpp
kreplacements\kreplacements.cpp \
gnudiff_analyze.cpp \
gnudiff_io.cpp \
gnudiff_xmalloc.cpp
OBJECTS = diff.obj \
difftextwindow.obj \
kdiff3.obj \
......@@ -56,7 +59,10 @@ OBJECTS = diff.obj \
fileaccess.obj \
kdiff3_shell.obj \
kdiff3_part.obj \
kreplacements\kreplacements.obj
kreplacements\kreplacements.obj \
gnudiff_analyze.obj \
gnudiff_io.obj \
gnudiff_xmalloc.obj
INTERFACES =
UICDECLS =
UICIMPLS =
......@@ -128,6 +134,9 @@ clean:
-del kdiff3_shell.obj
-del kdiff3_part.obj
-del kreplacements\kreplacements.obj
-del gnudiff_analyze.obj
-del gnudiff_io.obj
-del gnudiff_xmalloc.obj
-del moc_diff.cpp
-del moc_kdiff3.cpp
-del moc_optiondialog.cpp
......@@ -182,11 +191,11 @@ kdiff3.obj: kdiff3.cpp \
xpm\iconC.xpm \
xpm\autoadvance.xpm \
xpm\showwhitespace.xpm \
xpm\showlinenumbers.xpm \
xpm\startmerge.xpm
xpm\showlinenumbers.xpm
main.obj: main.cpp \
kdiff3_shell.h
kdiff3_shell.h \
version.h
merger.obj: merger.cpp \
merger.h \
......@@ -212,7 +221,9 @@ pdiff.obj: pdiff.cpp \
fileaccess.h \
directorymergewindow.h \
kdiff3.h \
optiondialog.h
optiondialog.h \
gnudiff_diff.h \
gnudiff_system.h
directorymergewindow.obj: directorymergewindow.cpp \
directorymergewindow.h \
......@@ -225,7 +236,8 @@ directorymergewindow.obj: directorymergewindow.cpp \
xpm\not_there.xpm \
xpm\link_arrow.xpm \
xpm\file.xpm \
xpm\folder.xpm
xpm\folder.xpm \
xpm\startmerge.xpm
fileaccess.obj: fileaccess.cpp \
fileaccess.h \
......@@ -251,6 +263,19 @@ kreplacements\kreplacements.obj: kreplacements\kreplacements.cpp \
kreplacements\..\xpm\fileopen.xpm \
kreplacements\..\xpm\filesave.xpm
gnudiff_analyze.obj: gnudiff_analyze.cpp \
gnudiff_diff.h \
gnudiff_system.h \
gnudiff_xalloc.h
gnudiff_io.obj: gnudiff_io.cpp \
gnudiff_diff.h \
gnudiff_system.h \
gnudiff_xalloc.h
gnudiff_xmalloc.obj: gnudiff_xmalloc.cpp \
gnudiff_xalloc.h
</