Commit f89cefe8 authored by Joachim Eibl's avatar Joachim Eibl

0.9.86


git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@69 c8aa9fed-2811-0410-8543-893ada326672
parent 2a0abc6f
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
Version 2, June 1991 Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc. Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Everyone is permitted to copy and distribute verbatim copies Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed. of this license document, but changing it is not allowed.
...@@ -278,3 +278,63 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE ...@@ -278,3 +278,63 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES. POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.
You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
`Gnomovision' (which makes passes at compilers) written by James Hacker.
<signature of Ty Coon>, 1 April 1989
Ty Coon, President of Vice
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Library General
Public License instead of this License.
Version 0.9.86 - 2004/06/14
===========================
- Double click on any file in directory merge would close the directory merge window. (Regression in 0.9.85)
Version 0.9.85 - 2004/06/14
===========================
- When solving a conflict KDiff3 reports the number of remaining unsolved conflicts in the status bar.
Bugfixes:
- Fix for MergeResultWindow-contextmenu: All items were disabled always. (new in 0.9.84)
- Fix for problem when opening files specified relative to current directory. (new in 0.9.84, qt-only-version)
- Fix for compilation with older gcc (2.9x)
- Several Word-wrap problems fixed:
- Find string with word wrap active didn't work if found text was not in first wrap-line.
- overview-position was not updated when toggling word wrap
- horizontal scrollbar was not updated when toggling word wrap
- current selection was lost when toggling word wrap
- selecting a conflict in the diff-text-window didn't work right with word wrap.
- Qt-only: Bold attribute for fonts was not persistent
- Qt-only: Toolbar position was not persistent
- Qt-only: Language-choice shows also the full language name.
- Cursor and windows-boundary-lines were always black instead of having the foreground color
- Starting KDiff3 with two not existing files showed a dialog saying that files are binary equal.
- Errors while starting a directory comparison now also reopens the open-dialog.
- Speedup during directory comparison by avoiding unnecessary redraws. (These always creep in again :-()
- On KDE: When resetting to default options (or first start) now the default KDE-fixed font will be used.
- Mergeresultwindow: Improved behaviour after automatic merge operation.
Version 0.9.84 - 2004/05/29
============================
New Features:
- Word Wrap for DiffTextWindow
- Directory-Comparison: Option "Full Analysis" allows to show the number of solved vs. unsolved
conflicts or deltas vs. whitespace-changes in the directory tree.
- Diff-Menu for Diff-view specific entries
- Docs now contain a new chapter for uses of preprocessor and line-matching-preprocessor.
- Added several credits which now are also visible in the Qt-only version.
- The Qt-only version now also shows all command-line options. Under windows a dialog shows them.
- Command line options -u and -L for Subversion-support.
- Command line options --L1/2/3 for specifying alias names.
- In the Qt-only-version the user-interface-language can be set via the regional-settings
(only effective after a restart).
- ProgressDialog redesign for recursive use.
- Overview now allows to show the delta between two other files in triplediff-mode.
- Option to ignore case which treats case-changes like white space (instead of conversion to upcase).
Bugfixes:
- Dir-Comp: When one file exists, but the other doesn't then instead the latest used other file was displayed.
- Open dialog: When previously a file C was used, but should be empty now, it reappeared unbidden.
- Several bugs for 64-bit systems fixed.
- Fixed crash when one file ended with a newline and the other did not.
- Windows: Case insensitive filename-pattern matching.
- Corrected behaviour for files with size 0.
- Fix for crash due to a race-condition (Patch by Eike Sauer)
- Windows: Scrolling didn't work right when another window was in front.
- Mergeresultwindow didn't show correct position when starting a second or later merge.
- Fix for problem where sometimes the A/B/C-buttons were in wrong state.
- Pasting from selection via the middle mousebutton.
Version 0.9.83 - 2004/03/06 Version 0.9.83 - 2004/03/06
=========================== ===========================
- Reading directorys fixed for Win95/98 - Reading directorys fixed for Win95/98
......
...@@ -2,8 +2,8 @@ KDiff3-Readme ...@@ -2,8 +2,8 @@ KDiff3-Readme
============= =============
Author: Joachim Eibl (joachim.eibl@gmx.de) Author: Joachim Eibl (joachim.eibl@gmx.de)
Copyright: (C) 2002-2003 by Joachim Eibl Copyright: (C) 2002-2004 by Joachim Eibl
KDiff3-Version: 0.9.83 KDiff3-Version: 0.9.86
KDiff3 is a program that KDiff3 is a program that
...@@ -45,29 +45,29 @@ Exception from the GPL: ...@@ -45,29 +45,29 @@ Exception from the GPL:
Requirements & Installation: Requirements & Installation:
Version 0.9.83 provides special support for KDE3, but it can also be Version 0.9.86 provides special support for KDE3, but it can also be
built without KDE3 if the Qt-libraries are available. built without KDE3 if the Qt-libraries are available.
(I also tested the program under Windows.) (I also test and use the program under Windows.)
You always need You always need
- kdiff3-0.9.83.tar.gz - kdiff3-0.9.86.tar.gz
For building the KDE3-version For building the KDE3-version
- KDE>=3.1 and QT>=3.1-libraries. - KDE>=3.1 and QT>=3.1-libraries. (QT>=3.2 is recommended)
- gcc, g++ with version >=3.2 - gcc, g++ with version >=3.2
For building the Qt-only-version For building the Qt-only-version
- QT-libraries (version >=3.1.0). - QT-libraries (version >=3.1.0).
(www.trolltech.com) (www.trolltech.com)
- for Un*x: gcc, g++ with version >=3.2 - for Un*x: gcc, g++ with version >=3.2
- for Windows: VC6 - for Windows: VC6 / VC7.1
Installation for KDE3: Installation for KDE3:
- Make sure your shell-variable QTDIR is correct. (echo $QTDIR). - Make sure your shell-variable QTDIR is correct. (echo $QTDIR).
If it doesn't contain the correct path, type If it doesn't contain the correct path, type
export QTDIR=your_path_to_qt (e.g. /usr/lib/qt3) export QTDIR=your_path_to_qt (e.g. /usr/lib/qt3)
- cd into the directory kdiff3-0.9.83 and type - cd into the directory kdiff3-0.9.86 and type
- ./configure --prefix=/opt/kde3 (your KDE3 directory here) - ./configure --prefix=/opt/kde3 (your KDE3 directory here)
- (make clean) (Required if you already compiled once.) - (make clean) (Required if you already compiled once.)
- make (Run compilation) - make (Run compilation)
...@@ -82,7 +82,7 @@ Installation for KDE3: ...@@ -82,7 +82,7 @@ Installation for KDE3:
This command should tell you: kde-config --prefix This command should tell you: kde-config --prefix
For SuSE and most distributions the prefix usually is /opt/kde3. For SuSE and most distributions the prefix usually is /opt/kde3.
For Redhat and Mandrake the prefix usually is /usr. For Redhat/Fedora and Mandrake the prefix usually is /usr.
For a local installation, that doesn't need root rights try For a local installation, that doesn't need root rights try
- ./configure --prefix=$KDEHOME ($KDEHOME probably is the same as $HOME/.kde) - ./configure --prefix=$KDEHOME ($KDEHOME probably is the same as $HOME/.kde)
- make - make
...@@ -108,14 +108,14 @@ Installation for the Qt-only-platforms for Un*x: ...@@ -108,14 +108,14 @@ Installation for the Qt-only-platforms for Un*x:
- Make sure your shell-variable QTDIR is correct. (echo $QTDIR). - Make sure your shell-variable QTDIR is correct. (echo $QTDIR).
If it doesn't contain the correct path, type If it doesn't contain the correct path, type
export QTDIR=your_path_to_qt (e.g. /usr/lib/qt) export QTDIR=your_path_to_qt (e.g. /usr/lib/qt)
- cd into the directory kdiff3-0.9.83/src and type - cd into the directory kdiff3-0.9.86/src and type
- make -f Makefile.qt - make -f Makefile.qt
- make -f Makefile.qt install (You must have root-rights for this step.) - 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) (copies the files into /usr/local/bin and /usr/local/share/doc/kdiff3)
- Note: The file kdiff3.pro was used to generate the Makefile.qt: - Note: The file kdiff3.pro was used to generate the Makefile.qt:
qmake kdiff3.pro -o Makefile.qt qmake kdiff3.pro -o Makefile.qt
If you want to build the Qt-only version _and_ the KDE-version, do this
in separate directories, otherwise there will be errors.
Build for Windows: Build for Windows:
Use qmake and kdiff3.pro to generate Use qmake and kdiff3.pro to generate
......
This file contains some feature-wishes for future KDiff3-versions. This file contains some feature-wishes for future KDiff3-versions.
TODO TODO
==== ====
- Overview-option to show only remaining conflicts.
- Colors for disabled and enabled arrow are very similar
- ??? The gutters (kdiff3 have 2 "gutters") fonts and background-foreground colors sholud be configured other
than the "general" foreground-background colors. Otherwise they are confused with the main dialog.
- Unicode and UTF8 support
- Try to autodetect the line-end-style
- Ignore cvs-keywords like $Revision$
- Correct Christof crash with the Find-function.
- Windows: Check if folders can match case-insensitive.
- Close diff/merge window-menu-action.
- Automatic line wrap for too long lines in the difference windows
- Printing of the diff-windows (requires automatic line wrap) - Printing of the diff-windows (requires automatic line wrap)
- Undo function in the merge-editor. - Undo function in the merge-editor.
- More viewing options for directory widget. - More viewing options for directory widget.
- And one observation. When select Cyrillic charset - it looks like it was - And one observation. When select Cyrillic charset - it looks like it was
not saved. When open this dialog again - Latin charset is selected anyway. not saved. When open this dialog again - Latin charset is selected anyway.
- Add options to specify a language and charset. - Add options to specify charset.
- Ask before saving to a file that already exists (optionally). - Ask before saving to a file that already exists (optionally).
- Don't overwrite existing .orig-file, when saving the second time. - Don't overwrite existing .orig-file, when saving the second time.
...@@ -20,16 +32,13 @@ TODO ...@@ -20,16 +32,13 @@ TODO
- Optionally show size/date for A/B/C - Optionally show size/date for A/B/C
- Choose what to see (all or only different items) - Choose what to see (all or only different items)
- If only different items are visible: copy the others nevertheless to destdir. - If only different items are visible: copy the others nevertheless to destdir.
- Improve Ctrl-1/2/3 shortcuts in Dirview. - Warnung wenn Datum in B oder C �ter als A ist.
- Warnung wenn Datum in B oder C älter als A ist. - Zielverzeichnis nachtr�lich �derbar
- Zielverzeichnis nachträglich änderbar
- Bei Kopie von Remote nach lokal: Auf jeden Fall das modification Datum setzen. - Bei Kopie von Remote nach lokal: Auf jeden Fall das modification Datum setzen.
- Ctrl-Space doesn't work when a file comparison takes place. - Ctrl-Space doesn't work when a file comparison takes place.
- Option to allow case-insensitive filename-matching. - Option to allow case-insensitive filename-matching.
- Options to show/suppress annoying messages - Options to show/suppress annoying messages
- Unicode-support
- What's this-Help. - What's this-Help.
- Tip of the day. - Tip of the day.
...@@ -49,32 +58,3 @@ More Statistics before the merge begins: ...@@ -49,32 +58,3 @@ More Statistics before the merge begins:
- Allow analysis of unified directory-diff/patch-file. - Allow analysis of unified directory-diff/patch-file.
- Add example for line-matching preprocessor to the documentation.
Simple testcase: Consider file a.txt (6 lines):
aa
ba
ca
da
ea
fa
And file b.txt (3 lines):
cg
dg
eg
And the following line matching preprocessor command, that replaces 'g' with 'a':
/usr/bin/perl -p -e 's/g/a/;'
Without that command the following lines would be placed next to each other:
aa - cg
ba - dg
ca - eg
da
ea
fa
But with this command the result of the comparison would be:
aa
ba
ca - cg
da - dg
ea - eg
fa
...@@ -17,6 +17,9 @@ apidox-am-yes: ...@@ -17,6 +17,9 @@ apidox-am-yes:
echo "IMAGE_PATH = $(top_srcdir)/doc/api" >> Doxyfile ;\ echo "IMAGE_PATH = $(top_srcdir)/doc/api" >> Doxyfile ;\
echo "OUTPUT_DIRECTORY = $(top_builddir)/apidocs" >> Doxyfile; \ echo "OUTPUT_DIRECTORY = $(top_builddir)/apidocs" >> Doxyfile; \
echo "HTML_OUTPUT = $(subdir)/html" >> Doxyfile; \ echo "HTML_OUTPUT = $(subdir)/html" >> Doxyfile; \
echo "HTML_HEADER = $(top_builddir)/apidocs/common/header.html" >> Doxyfile;\
echo "HTML_FOOTER = $(top_builddir)/apidocs/common/footer.html" >> Doxyfile;\
echo "HTML_STYLESHEET = $(top_builddir)/apidocs/common/doxygen.css" >> Doxyfile;\
echo "LATEX_OUTPUT = $(subdir)/latex" >> Doxyfile; \ echo "LATEX_OUTPUT = $(subdir)/latex" >> Doxyfile; \
echo "RTF_OUTPUT = $(subdir)/rtf" >> Doxyfile; \ echo "RTF_OUTPUT = $(subdir)/rtf" >> Doxyfile; \
echo "MAN_OUTPUT = $(subdir)/man" >> Doxyfile; \ echo "MAN_OUTPUT = $(subdir)/man" >> Doxyfile; \
...@@ -24,7 +27,17 @@ apidox-am-yes: ...@@ -24,7 +27,17 @@ apidox-am-yes:
echo "GENERATE_MAN = $(GENERATE_FLAG)" >> Doxyfile ;\ echo "GENERATE_MAN = $(GENERATE_FLAG)" >> Doxyfile ;\
echo "GENERATE_LATEX = $(GENERATE_FLAG)" >> Doxyfile ;\ echo "GENERATE_LATEX = $(GENERATE_FLAG)" >> Doxyfile ;\
if test -n "$(DOXYGEN_EXCLUDE)"; then \ if test -n "$(DOXYGEN_EXCLUDE)"; then \
echo "EXCLUDE_PATTERNS += $(DOXYGEN_EXCLUDE)" >> Doxyfile; \ patterns= ;\
dirs= ;\
for item in `echo "$(DOXYGEN_EXCLUDE)"`; do \
if test -d "$(srcdir)/$$item"; then \
dirs="$$dirs $(srcdir)/$$item/" ;\
else \
patterns="$$patterns $$item" ;\
fi ;\
done ;\
echo "EXCLUDE_PATTERNS += $$patterns" >> Doxyfile; \
echo "EXCLUDE += $$dirs" >> Doxyfile ;\
fi ;\ fi ;\
echo "TAGFILES = \\" >> Doxyfile; \ echo "TAGFILES = \\" >> Doxyfile; \
tags='$(DOXYGEN_REFERENCES) qt'; for tag in $$tags; do \ tags='$(DOXYGEN_REFERENCES) qt'; for tag in $$tags; do \
...@@ -45,7 +58,7 @@ apidox-am-yes: ...@@ -45,7 +58,7 @@ apidox-am-yes:
fi ;\ fi ;\
fi ;\ fi ;\
done ;\ done ;\
echo "GENERATE_TAGFILE = $(top_builddir)/apidocs/$(subdir)/$(subdir).tag" >> Doxyfile ;\ echo "GENERATE_TAGFILE = $(top_builddir)/apidocs/$(subdir)/`basename $(subdir)`.tag" >> Doxyfile ;\
echo "IGNORE_PREFIX = K" >> Doxyfile ;\ echo "IGNORE_PREFIX = K" >> Doxyfile ;\
echo "HAVE_DOT = $(KDE_HAVE_DOT)" >> Doxyfile ;\ echo "HAVE_DOT = $(KDE_HAVE_DOT)" >> Doxyfile ;\
$(DOXYGEN) Doxyfile ;\ $(DOXYGEN) Doxyfile ;\
...@@ -65,9 +78,9 @@ install-apidox: ...@@ -65,9 +78,9 @@ install-apidox:
fi; \ fi; \
if test -d $(top_builddir)/apidocs/$(subdir)/html; then \ if test -d $(top_builddir)/apidocs/$(subdir)/html; then \
list=`ls $(top_builddir)/apidocs/$(subdir)/html`; \ list=`ls $(top_builddir)/apidocs/$(subdir)/html`; \
echo "installing $(top_builddir)/apidocs/$(subdir)/html" ;\
for file in $$list; do \ for file in $$list; do \
echo $(INSTALL_DATA) $(top_builddir)/apidocs/$(subdir)/html/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir)/html; \ $(INSTALL_DATA) $(top_builddir)/apidocs/$(subdir)/html/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir)/html; \
$(INSTALL_DATA) $(top_builddir)/apidocs/$(subdir)/html/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir)/html; \
done; \ done; \
fi; \ fi; \
rm -f $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/common; \ rm -f $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/common; \
...@@ -76,9 +89,9 @@ install-apidox: ...@@ -76,9 +89,9 @@ install-apidox:
if test -d $(top_builddir)/apidocs; then \ if test -d $(top_builddir)/apidocs; then \
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs ;\ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs ;\
list=`cd $(top_builddir)/apidocs && ls -1`; \ list=`cd $(top_builddir)/apidocs && ls -1`; \
echo "installing $(top_builddir)/apidocs/$$file" ;\
for file in $$list; do \ for file in $$list; do \
if test -f $(top_builddir)/apidocs/$$file; then \ if test -f $(top_builddir)/apidocs/$$file; then \
echo $(INSTALL_DATA) $(top_builddir)/apidocs/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \
$(INSTALL_DATA) $(top_builddir)/apidocs/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \ $(INSTALL_DATA) $(top_builddir)/apidocs/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \
fi; \ fi; \
done ; fi; \ done ; fi; \
...@@ -126,8 +139,8 @@ apidox-am-toplevel-no: ...@@ -126,8 +139,8 @@ apidox-am-toplevel-no:
apidox-am-toplevel-yes: apidox-am-toplevel-yes:
@echo "*** Creating API documentation main page"; \ @echo "*** Creating API documentation main page"; \
cp $(top_srcdir)/admin/Doxyfile.global Doxyfile; \ cp $(top_srcdir)/admin/Doxyfile.global Doxyfile; \
echo "PROJECT_NAME = $(DOXYGEN_PROJECT_NAME)" >> Doxyfile ; \ echo "PROJECT_NAME = \"$(DOXYGEN_PROJECT_NAME)\"" >> Doxyfile ; \
echo "PROJECT_NUMBER = $(DOXYGEN_PROJECT_NUMBER)" >> Doxyfile ; \ echo "PROJECT_NUMBER = \"$(DOXYGEN_PROJECT_NUMBER)\"" >> Doxyfile ; \
echo "INPUT = $(top_srcdir)" >> Doxyfile ; \ echo "INPUT = $(top_srcdir)" >> Doxyfile ; \
echo "OUTPUT_DIRECTORY = $(top_builddir)/apidocs" >> Doxyfile ; \ echo "OUTPUT_DIRECTORY = $(top_builddir)/apidocs" >> Doxyfile ; \
echo "FILE_PATTERNS = *.dox" >> Doxyfile ; \ echo "FILE_PATTERNS = *.dox" >> Doxyfile ; \
...@@ -158,6 +171,9 @@ apidox-am-toplevel-yes: ...@@ -158,6 +171,9 @@ apidox-am-toplevel-yes:
doxygen Doxyfile; \ doxygen Doxyfile; \
rm -f Doxyfile rm -f Doxyfile
.PHONY: apidox-am-yes apidox-am-no install-data-local install-apidox install-apidox uninstall-local uninstall-apidox uninstall-apidox apidox apidox-am-toplevel-no apidox-am-toplevel-yes
# Local Variables: # Local Variables:
# mode: makefile # mode: makefile
# End: # End:
This diff is collapsed.
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
SHELL=/bin/sh SHELL=/bin/sh
cvs dist cvs-clean configure configure.in configure.files subdirs package-messages package-merge Makefile.am: cvs dist cvs-clean configure configure.in configure.files subdirs package-messages package-merge Makefile.am acinclude.m4:
@admindir=$(admindir); \ @admindir=$(admindir); \
if test "x$$admindir" = x; then \ if test "x$$admindir" = x; then \
admindir=.; until test -f $$admindir/admin/cvs.sh; do \ admindir=.; until test -f $$admindir/admin/cvs.sh; do \
...@@ -23,10 +23,11 @@ cvs dist cvs-clean configure configure.in configure.files subdirs package-messag ...@@ -23,10 +23,11 @@ cvs dist cvs-clean configure configure.in configure.files subdirs package-messag
if test "$@" = "package-merge"; then \ if test "$@" = "package-merge"; then \
MAKE="$(MAKE)" POFILES="$(POFILES)" PACKAGE="$(PACKAGE)" \ MAKE="$(MAKE)" POFILES="$(POFILES)" PACKAGE="$(PACKAGE)" \
$(SHELL) $$admindir/cvs.sh package-merge ;\ $(SHELL) $$admindir/cvs.sh package-merge ;\
else MAKE="$(MAKE)" $(SHELL) $$admindir/cvs.sh $@ ;\ else \
MAKE="$(MAKE)" $(SHELL) $$admindir/cvs.sh $@ ;\
fi fi
configure.in: configure.files $(shell test -f configure.files && cat configure.files) subdirs configure.in: configure.files subdirs
configure.files: subdirs configure.files: subdirs
.SILENT: .SILENT:
......
This diff is collapsed.
This diff is collapsed.
...@@ -68,7 +68,7 @@ sub diff_chunk($$) ...@@ -68,7 +68,7 @@ sub diff_chunk($$)
print "-----------------------------------------------\n"; print "-----------------------------------------------\n";
print @new; print @new;
$haschanges = 1; $haschanges = 1;
return; return $haschanges;
} }
print $old[0]; print $old[0];
...@@ -84,7 +84,6 @@ sub diff_chunk($$) ...@@ -84,7 +84,6 @@ sub diff_chunk($$)
next if ($o eq $n); next if ($o eq $n);
if(defined($class) and $n =~ /^(\d+\s+)\w+(::\S+\s*.*)$/) { if(defined($class) and $n =~ /^(\d+\s+)\w+(::\S+\s*.*)$/) {
print "comparing >$n< against >$1$class$2<\n";
next if ($n eq "$1$class$2"); next if ($n eq "$1$class$2");
} }
...@@ -118,6 +117,8 @@ while (<IN>) { ...@@ -118,6 +117,8 @@ while (<IN>) {
chop; chop;
s/0x[0-9a-fA-F]+/0x......../g; s/0x[0-9a-fA-F]+/0x......../g;
s/base size=/size=/g;
s/base align=/align=/g;
$chunk .= $_ . "\n"; $chunk .= $_ . "\n";
......
#!/usr/bin/perl -w #!/usr/bin/env perl
# this script patches a config.status file, to use our own perl script # this script patches a config.status file, to use our own perl script
# in the main loop # in the main loop
...@@ -27,11 +27,12 @@ ...@@ -27,11 +27,12 @@
# later autoconf's # later autoconf's
# 2. the big main loop which patches all Makefile.in's # 2. the big main loop which patches all Makefile.in's
use strict;
use File::Basename; use File::Basename;
my $ac_aux_dir = dirname($0); my $ac_aux_dir = dirname($0);
my ($flag); my ($flag);
local $ac_version = 0; my $ac_version = 0;
my $vpath_seen = 0; my $vpath_seen = 0;
$flag = 0; $flag = 0;
...@@ -99,9 +100,9 @@ while (<>) { ...@@ -99,9 +100,9 @@ while (<>) {
if ($ac_version != 2141) { if ($ac_version != 2141) {
print STDERR "hmm, don't know autoconf version\n"; print STDERR "hmm, don't know autoconf version\n";
} }
} elsif (/^\#\s*CONFIG_HEADER section.*|^\s+#\s(Run) the commands associated/) { } elsif (/^\#\s*CONFIG_(HEADER|COMMANDS) section.*|^\s+#\s(Run) the commands associated/) {
$flag = 4; $flag = 4;
$commands = defined $1; my $commands = defined $2;
&insert_main_loop(); &insert_main_loop();
$commands && insert_command_loop(); $commands && insert_command_loop();
if($ac_version != 250) { if($ac_version != 250) {
......
#!/usr/bin/perl #!/usr/bin/env perl
# a script for use by autoconf to make the Makefiles # a script for use by autoconf to make the Makefiles
# from the Makefile.in's # from the Makefile.in's
# #
...@@ -28,19 +28,28 @@ ...@@ -28,19 +28,28 @@
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330, # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA. # Boston, MA 02111-1307, USA.
use strict;
use File::Path;
my $ac_subs=$ARGV[0]; my $ac_subs=$ARGV[0];
my $ac_sacfiles = $ARGV[1]; my $ac_sacfiles = $ARGV[1];
my $ac_given_srcdir=$ARGV[2]; my $ac_given_srcdir=$ARGV[2];
my $ac_given_INSTALL=$ARGV[3]; my $ac_given_INSTALL=$ARGV[3];
my @comp_match;
my @comp_subs;
#print "ac_subs=$ac_subs\n"; #print "ac_subs=$ac_subs\n";
#print "ac_sacfiles=$ac_sacfiles\n"; #print "ac_sacfiles=$ac_sacfiles\n";
#print "ac_given_srcdir=$ac_given_srcdir\n"; #print "ac_given_srcdir=$ac_given_srcdir\n";
#print "ac_given_INSTALL=$ac_given_INSTALL\n"; #print "ac_given_INSTALL=$ac_given_INSTALL\n";
my $configure_input;
my ($srcdir, $top_srcdir); my ($srcdir, $top_srcdir);
my $INSTALL; my $INSTALL;
my $bad_perl = ($] < 5.005); my $bad_perl = ($] < 5.005);
my $created_file_count = 0;
open(CF, "< $ac_subs") || die "can't open $ac_subs: $!"; open(CF, "< $ac_subs") || die "can't open $ac_subs: $!";
my @subs = <CF>; my @subs = <CF>;
...@@ -94,7 +103,7 @@ if ($bad_perl) { ...@@ -94,7 +103,7 @@ if ($bad_perl) {
push @comp_match, eval "qr/\Q$1\E/"; push @comp_match, eval "qr/\Q$1\E/";
push @comp_subs, ""; push @comp_subs, "";
} else { } else {
die "Uhh. Malformed pattern in $ac_cs_root.subs ($pat)" die "Uhh. Malformed pattern in $ac_subs ($pat)"
unless ( $pat =~ /^\s*$/ ); # ignore white lines unless ( $pat =~ /^\s*$/ ); # ignore white lines
} }
} }
...@@ -130,7 +139,7 @@ foreach $ac_file (@ac_files) { ...@@ -130,7 +139,7 @@ foreach $ac_file (@ac_files) {
($ac_dir = $ac_file) =~ s%/[^/][^/]*$%%; ($ac_dir = $ac_file) =~ s%/[^/][^/]*$%%;
if ( ($ac_dir ne $ac_file) && ($ac_dir ne ".")) { if ( ($ac_dir ne $ac_file) && ($ac_dir ne ".")) {
# The file is in a subdirectory. # The file is in a subdirectory.
if (! -d "$ac_dir") { mkdir "$ac_dir", 0777; } if (! -d "$ac_dir") { mkpath "$ac_dir", 0, 0777; }
($ac_dir_suffix = $ac_dir) =~ s%^./%%; ($ac_dir_suffix = $ac_dir) =~ s%^./%%;
$ac_dir_suffix="/".$ac_dir_suffix; $ac_dir_suffix="/".$ac_dir_suffix;
# A "../" for each directory in $ac_dir_suffix. # A "../" for each directory in $ac_dir_suffix.
...@@ -166,20 +175,20 @@ foreach $ac_file (@ac_files) { ...@@ -166,20 +175,20 @@ foreach $ac_file (@ac_files) {
my $ac_comsub=""; my $ac_comsub="";
my $fname=$ac_file_in; my $fname=$ac_file_in;
$fname =~ s%.*/%%; $fname =~ s%.*/%%;
my $configure_input="Generated automatically from $fname by config.pl."; $configure_input="$ac_file. Generated from $fname by config.pl.";
if ($ac_file =~ /.*[Mm]akefile.*/) {
$ac_comsub="# ".$configure_input."\n"; # for the first line in $ac_file
}
my $ac_file_inputs; my $ac_file_inputs;
($ac_file_inputs = $ac_file_in) =~ s%^%$ac_given_srcdir/%; ($ac_file_inputs = $ac_file_in) =~ s%^%$ac_given_srcdir/%;
$ac_file_inputs =~ s%:% $ac_given_srcdir/%g; $ac_file_inputs =~ s%:% $ac_given_srcdir/%g;
patch_file($ac_file, $ac_file_inputs, $ac_comsub); patch_file($ac_file, $ac_file_inputs);
++$created_file_count;
} }
print "config.pl: fast created $created_file_count file(s).\n";
sub patch_file { sub patch_file {
my ($outf, $infiles, $identline) = @_; my ($outf, $infiles) = @_;
my $filedata; my $filedata;
my @infiles=split(' ', $infiles); my @infiles=split(' ', $infiles);
my $i=0; my $i=0;
...@@ -194,10 +203,6 @@ sub patch_file { ...@@ -194,10 +203,6 @@ sub patch_file {
print STDERR "can't open $name: $!"."\n"; print STDERR "can't open $name: $!"."\n";
} }
} }
if ($identline) {
# Put the ident in the second line. For shitty automake 1.6x.
$filedata =~ s%\n%\n$identline%;
}
$filedata =~ s%\@configure_input\@%$configure_input%g; $filedata =~ s%\@configure_input\@%$configure_input%g;
$filedata =~ s%\@srcdir\@%$srcdir%g; $filedata =~ s%\@srcdir\@%$srcdir%g;
...@@ -223,11 +228,7 @@ sub patch_file { ...@@ -223,11 +228,7 @@ sub patch_file {
sub make_closure { sub make_closure {
my ($pat, $sub) = @_; my ($pat, $sub) = @_;
$pat =~ s/\@/\\@/g; # @bla@ -> \@bla\@ my $ret = eval "return sub { my \$ref=shift; \$\$ref =~ s%\Q$pat\E%\Q$sub\E%g; }";
$pat =~ s/\$/\\\$/g; # $bla -> \$bla
$sub =~ s/\@/\\@/g;
$sub =~ s/\$/\\\$/g;
my $ret = eval "return sub { my \$ref=shift; \$\$ref =~ s%$pat%$sub%g; }";
if ($@) { if ($@) {
print "can't create CODE: $@\n"; print "can't create CODE: $@\n";
} }
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# written by Oswald Buddenhagen <ossi@kde.org> # written by Oswald Buddenhagen <ossi@kde.org>
# inspired by the "old" cvs-clean target from Makefile.common # inspired by the "old" cvs-clean target from Makefile.common
# #
# This file is free software in terms of the BSD licence. That means # This file is free software in terms of the BSD l