# HG changeset patch # User joachim99 # Date 1176758768 0 # Node ID 1184fc843210995ec4a1e9ce983332a8683fb578 # Parent 257ccb866dc3686c860dc22ef3649e49b460779c KDiff3-0.9.92 diff -r 257ccb866dc3 -r 1184fc843210 kdiff3/ChangeLog --- a/kdiff3/ChangeLog Sat Nov 04 00:36:16 2006 +0000 +++ b/kdiff3/ChangeLog Mon Apr 16 21:26:08 2007 +0000 @@ -1,3 +1,23 @@ +Version 0.9.92 - 2007/04/15 +=========================== +- Windows installer now allows to install KDiff3 as Clearcase Diff and Merge Tool +- Windows installer "SVN Merge tool" corrected: Not creating $AppData\Subversion\config subdir anymore. +- KDE-Konqueror plugin: Launch KDiff3 from Konqueror. (Similar to Diff-Ext on Windows.) +- Qt4-version + - Printing crash fixed + - Compilation issue for Mac fixed +- Dir Rescan keeps settings for Show identical files etc. +- Bugfix: Empty file and not existing file were detected as binary equal. +- Temp file names use the process id in file name to allow several instances. +- Suppress flicker during startup. (Don't show status info window on creation.) +- New File comparison mode: Trust the size and date, but use binary comparison if date doesn't match (unsafe) +- After explicitely selecting files any file of the selected may be right clicked for context menu. +- Open dialog also shows current directories in directory comparison mode. +- Writing a file via --auto option didn't work for relative files. (Reported by Guilhem Bichot) +- New option for history merge: Max number of history entries +- New option "Auto save and quit on merge without conflicts" +- Directory Merge with Case sensitivity disabled: Correct destination filename chosen for merge. + Version 0.9.91 - 2006/10/29 =========================== - Encoding auto detection diff -r 257ccb866dc3 -r 1184fc843210 kdiff3/README --- a/kdiff3/README Sat Nov 04 00:36:16 2006 +0000 +++ b/kdiff3/README Mon Apr 16 21:26:08 2007 +0000 @@ -3,7 +3,7 @@ Author: Joachim Eibl (joachim.eibl at gmx.de) Copyright: (C) 2002-2006 by Joachim Eibl -KDiff3-Version: 0.9.91 +KDiff3-Version: 0.9.92 KDiff3 is a program that @@ -12,13 +12,14 @@ - provides an automatic merge-facility and - an integrated editor for comfortable solving of merge-conflicts - has support for KDE-KIO (ftp, sftp, http, fish, smb) -- and has an intuitive graphical user interface. +- and has an intuitive graphical user interface, +- also supports 64 bit systems. (Some build issues are discussed in here.) Do you want help translating? Read the README in the po-subdirectory! -Licence: +License: GNU GENERAL PUBLIC LICENSE, Version 2, June 1991 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 @@ -147,6 +148,9 @@ 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. + - A user reported that on his 64-bit machine running FC4 he had to edit his Makefile.qt + LIBS = $(SUBLIBS) -L/usr/lib64/ -L$(QTDIR)/lib64/ -L/usr/lib -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ -L/usr/X11R6/lib64/ -lqt-mt -lXext -lX11 -lm -lpthread + Build for Windows: Use qmake and kdiff3.pro to generate @@ -154,21 +158,31 @@ qmake kdiff3.pro -o Makefile -Building Kdiff3 for Mac OSX 10.3.8 (by Mark Teel) --------------------------------------------------- +Building KDiff3 (Qt3) for Mac OSX 10.3.8 (by Mark Teel) +------------------------------------------------------- 1) Install Qt/Mac with thread support and static libraries. - 2) cd .../kdiff3-0.9.91 + 2) cd .../kdiff3-0.9.91/src 3) Create a makefile for kdiff3 by executing: - qmake src/kdiff3.pro -o Makefile.qt - 4) Edit Makefile.qt and add the definition "KDIFF3" to the following two lines: - CFLAGS = -pipe -Wall -W -Os -DKDIFF3 -DQT_NO_DEBUG ... - CXXFLAGS = -pipe -Wall -W -Os -DKDIFF3 -DQT_NO_DEBUG ... - 5) Edit Makefile.qt and change the include path like so: + qmake kdiff3.pro -o Makefile.qt + 4) Edit Makefile.qt and change the include path like so: (old) INCPATH = -I/Library/qt3/mkspecs/default -Isrc ... (new) INCPATH = -I/Library/qt3/mkspecs/macx-g++ -Isrc ... - 6) Execute: + 5) Execute: make -f Makefile.qt - 7) After the build completes copy kdiff3 from the kdiff3-0.9.91 directory to + 6) After the build completes copy kdiff3 from the kdiff3-0.9.91/src directory to + /Applications + +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. + 2) cd .../kdiff3-0.9.91/src-QT4 + 3a) Create a makefile for kdiff3 by executing: + qmake kdiff3.pro + 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.91/src-QT4 directory to /Applications ---------------------------------------------------------------- diff -r 257ccb866dc3 -r 1184fc843210 kdiff3/admin/Doxyfile.am --- a/kdiff3/admin/Doxyfile.am Sat Nov 04 00:36:16 2006 +0000 +++ b/kdiff3/admin/Doxyfile.am Mon Apr 16 21:26:08 2007 +0000 @@ -73,11 +73,11 @@ @if test "$(subdir)" != "."; then \ if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); then \ rm -rfv $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \ - fi\ - else\ + fi \ + else \ if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; then \ rm -rfv $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \ - fi\ + fi \ fi install-apidox-recurse: install-apidox diff -r 257ccb866dc3 -r 1184fc843210 kdiff3/admin/acinclude.m4.in --- a/kdiff3/admin/acinclude.m4.in Sat Nov 04 00:36:16 2006 +0000 +++ b/kdiff3/admin/acinclude.m4.in Mon Apr 16 21:26:08 2007 +0000 @@ -784,7 +784,7 @@ # CoreAudio framework AC_CHECK_HEADER(CoreAudio/CoreAudio.h, [ AC_DEFINE(HAVE_COREAUDIO, 1, [Define if you have the CoreAudio API]) - FRAMEWORK_COREAUDIO="-Xlinker -framework -Xlinker CoreAudio" + FRAMEWORK_COREAUDIO="-Wl,-framework,CoreAudio" ]) AC_CHECK_RES_INIT @@ -2747,7 +2747,7 @@ EXRSTATUS=old else kde_save_LIBS="$LIBS" - LIBS="$LIBS $all_libraries $USER_LDFLAGS $LIBZ `pkg-config --libs OpenEXR`" + LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ" AC_LANG_SAVE AC_LANG_CPLUSPLUS kde_save_CXXFLAGS="$CXXFLAGS" @@ -3015,6 +3015,35 @@ ]) + +AC_DEFUN([KDE_CHECK_FOR_OPT_NOINLINE_MATCH], +[ + AC_CACHE_CHECK([whether system headers can cope with -O2 -fno-inline], + kde_cv_opt_noinline_match, + [ + kde_cv_opt_noinline_match=irrelevant + dnl if we don't use both -O2 and -fno-inline, this check is moot + if echo "$CFLAGS" | grep -e -O2 >/dev/null 2>/dev/null \ + && echo "$CFLAGS" | grep -e -fno-inline >/dev/null 2>/dev/null ; then + + ac_cflags_save="$CFLAGS" + CFLAGS="$CFLAGS -D_USE_GNU" + + AC_TRY_LINK([ + #include +], [ const char *pt, *et; + et = __extension__ ({ char __a0, __a1, __a2; (__builtin_constant_p ( ";," ) && ((size_t)(const void *)(( ";," )+ 1) - (size_t)(const void *)( ";," ) == 1) ? ((__a0 =((__const char *) ( ";," ))[0], __a0 == '\0') ? ((void) ( pt ),((void *)0) ) : ((__a1 = ((__const char *) ( ";," ))[1], __a1== '\0') ? (__extension__ (__builtin_constant_p ( __a0 ) && ( __a0 ) == '\0' ? (char *) __rawmemchr ( pt , __a0) : strchr( pt , __a0 ))) : ((__a2 = ((__const char *) ( ";," ))[2], __a2 == '\0') ? __strpbrk_c2 ( pt , __a0, __a1) :(((__const char *) ( ";," ))[3] == '\0' ? __strpbrk_c3 ( pt ,__a0, __a1, __a2): strpbrk ( pt , ";," ))))) : strpbrk ( pt , ";," )); }) ; +], + kde_cv_opt_noinline_match=yes, + kde_cv_opt_noinline_match=no + ) + + CFLAGS="$ac_cflags_save" + fi + ]) +]) + + dnl AC_VALIDIFY_CXXFLAGS checks for forbidden flags the user may have given AC_DEFUN([AC_VALIDIFY_CXXFLAGS], [dnl @@ -3099,7 +3128,7 @@ if test $kde_use_debug_code = "full"; then CFLAGS="-g3 -fno-inline $CFLAGS" else - CFLAGS="-g -O2 $CFLAGS" + CFLAGS="-g -O2 -fno-schedule-insns -fno-inline $CFLAGS" fi else CFLAGS="-O2 $CFLAGS" @@ -3134,7 +3163,7 @@ if test "$kde_use_debug_code" = "full"; then CXXFLAGS="-g3 -fno-inline $CXXFLAGS" else - CXXFLAGS="-g -O2 $CXXFLAGS" + CXXFLAGS="-g -O2 -fno-schedule-insns -fno-inline $CXXFLAGS" fi fi KDE_CHECK_COMPILER_FLAG(fno-builtin,[CXXFLAGS="-fno-builtin $CXXFLAGS"]) @@ -3147,7 +3176,7 @@ CXXFLAGS="+K3 $CXXFLAGS" else CXXFLAGS="-O2 $CXXFLAGS" - fi + fi fi fi @@ -3194,6 +3223,14 @@ AC_SUBST([HAVE_GCC_VISIBILITY]) if test "$GXX" = "yes"; then + gcc_no_reorder_blocks=NO + KDE_CHECK_COMPILER_FLAG(fno-reorder-blocks,[gcc_no_reorder_blocks=YES]) + if test $kde_use_debug_code != "no" && \ + test $kde_use_debug_code != "full" && \ + test "YES" = "$gcc_no_reorder_blocks" ; then + CXXFLAGS="$CXXFLAGS -fno-reorder-blocks" + CFLAGS="$CFLAGS -fno-reorder-blocks" + fi KDE_CHECK_COMPILER_FLAG(fno-exceptions,[CXXFLAGS="$CXXFLAGS -fno-exceptions"]) KDE_CHECK_COMPILER_FLAG(fno-check-new, [CXXFLAGS="$CXXFLAGS -fno-check-new"]) KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"]) @@ -3222,6 +3259,11 @@ fi rm -f conftest.h conftest.h.gch fi + + KDE_CHECK_FOR_OPT_NOINLINE_MATCH + if test "x$kde_cv_opt_noinline_match" = "xno" ; then + CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`" + fi fi AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes") if test "$CXX" = "KCC"; then @@ -3457,17 +3499,27 @@ AC_DEFUN([KDE_CHECK_LIB64], [ - kdelibsuff="$kde_libs_suffix" - if test -z "$kdelibsuff"; then - kdelibsuff=no - fi AC_ARG_ENABLE(libsuffix, AC_HELP_STRING([--enable-libsuffix], - [/lib directory suffix (64,32,none[=default])]), - kdelibsuff=$enableval) - # TODO: add an auto case that compiles a little C app to check - # where the glibc is - if test "$kdelibsuff" = "no"; then + [/lib directory suffix (64,32,none,auto[=default])]), + kdelibsuff=$enableval, kdelibsuff="auto") + + if test "$kdelibsuff" = "auto"; then + +cat > conftest.c << EOF +#include +int main() { + return 0; +} +EOF + kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ + s,.*/lib\([[^\/]]*\)/.*,\1, + p +}'` + rm -rf conftest.* + fi + + if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then kdelibsuff= fi if test -z "$kdelibsuff"; then @@ -4572,12 +4624,14 @@ AC_DEFUN([KDE_CHECK_PYTHON], [ - KDE_CHECK_PYTHON_INTERN("2.4", - [KDE_CHECK_PYTHON_INTERN("2.3", - [KDE_CHECK_PYTHON_INTERN("2.2", - [KDE_CHECK_PYTHON_INTERN("2.1", - [KDE_CHECK_PYTHON_INTERN("2.0", - [KDE_CHECK_PYTHON_INTERN($1, $2) ]) + KDE_CHECK_PYTHON_INTERN("2.5", + [KDE_CHECK_PYTHON_INTERN("2.4", + [KDE_CHECK_PYTHON_INTERN("2.3", + [KDE_CHECK_PYTHON_INTERN("2.2", + [KDE_CHECK_PYTHON_INTERN("2.1", + [KDE_CHECK_PYTHON_INTERN("2.0", + [KDE_CHECK_PYTHON_INTERN($1, $2) ]) + ]) ]) ]) ]) @@ -4946,7 +5000,6 @@ ]) fi kde_libs_htmldir=`$KDECONFIG --install html --expandvars` - kde_libs_suffix=`$KDECONFIG --libsuffix` AC_MSG_CHECKING([where to install]) if test "x$prefix" = "xNONE"; then @@ -5322,7 +5375,7 @@ JAVAC=$kde_java_bindir/javac JAVAH=$kde_java_bindir/javah JAR=$kde_java_bindir/jar - JVMLIBS="-Xlinker -framework -Xlinker JavaVM" + JVMLIBS="-Wl,-framework,JavaVM" AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is]) AC_MSG_RESULT([Apple Java Framework]) @@ -5865,12 +5918,12 @@ dnl also defines KSTUFF_PKG_ERRORS on error AC_DEFUN([KDE_PKG_CHECK_MODULES], [ - PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" if test "$prefix" != "$kde_libs_prefix"; then - PKG_CONFIG_PATH="$kde_libs_prefix/lib/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" fi export PKG_CONFIG_PATH - PKG_CHECK_MODULES($1,$2,$3,$4) + PKG_CHECK_MODULES([$1],[$2],[$3],[$4]) ]) @@ -5883,7 +5936,7 @@ AC_LANG_CPLUSPLUS safe_CXXFLAGS=$CXXFLAGS safe_LDFLAGS=$LDFLAGS - CXXFLAGS="$CXXFLAGS -fpie" + CXXFLAGS="$CXXFLAGS -fPIE" LDFLAGS="$LDFLAGS -pie" AC_TRY_LINK([int foo;], [], [kde_cv_val_pie_support=yes], [kde_cv_val_pie_support=no]) @@ -5893,7 +5946,7 @@ AC_LANG_RESTORE ]) - AC_MSG_CHECKING(if enabling -pie/fpie support) + AC_MSG_CHECKING(if enabling -pie/fPIE support) AC_ARG_ENABLE(pie, AC_HELP_STRING([--enable-pie],[platform supports PIE linking [default=detect]]), @@ -5913,7 +5966,7 @@ AC_SUBST([KDE_USE_PIE]) if test "$kde_has_pie_support" = "yes"; then - KDE_USE_FPIE="-fpie" + KDE_USE_FPIE="-fPIE" KDE_USE_PIE="-pie" fi ]) diff -r 257ccb866dc3 -r 1184fc843210 kdiff3/admin/am_edit --- a/kdiff3/admin/am_edit Sat Nov 04 00:36:16 2006 +0000 +++ b/kdiff3/admin/am_edit Mon Apr 16 21:26:08 2007 +0000 @@ -2028,7 +2028,7 @@ $lines .= "\n"; $lines .= "uninstall-docs:\n"; - $lines .= "\t-rm -rf \$(kde_htmldir)/$kdelang/$appname\n"; + $lines .= "\t-rm -rf \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname\n"; $lines .= "\n"; $lines .= "clean-docs:\n"; $lines .= "\t-rm -f index.cache.bz2\n"; diff -r 257ccb866dc3 -r 1184fc843210 kdiff3/admin/conf.change.pl --- a/kdiff3/admin/conf.change.pl Sat Nov 04 00:36:16 2006 +0000 +++ b/kdiff3/admin/conf.change.pl Mon Apr 16 21:26:08 2007 +0000 @@ -114,8 +114,8 @@ } } -die "wrong input (flag != 4)" unless $flag == 4; -print STDERR "hmm, don't know autoconf version\n" unless $ac_version; +#die "wrong input (flag != 4)" unless $flag == 4; +#print STDERR "hmm, don't know autoconf version\n" unless $ac_version; sub insert_main_loop { diff -r 257ccb866dc3 -r 1184fc843210 kdiff3/admin/configure.in.bot.end --- a/kdiff3/admin/configure.in.bot.end Sat Nov 04 00:36:16 2006 +0000 +++ b/kdiff3/admin/configure.in.bot.end Mon Apr 16 21:26:08 2007 +0000 @@ -31,6 +31,10 @@ echo "" fi +if (test $warn_konq); + then echo "NOTICE: Since the Konqueror-headers were not found KDiff3 will be built without support for its service-menus and the KDiff3-service menu will not be built. (Install the package containing konq_popupmenu.h. Possibly kdebase-devel or on Debian libkonq4-dev etc.)" +fi + if test "$all_tests" = "bad"; then if test ! "$cache_file" = "/dev/null"; then echo "" diff -r 257ccb866dc3 -r 1184fc843210 kdiff3/admin/cvs.sh --- a/kdiff3/admin/cvs.sh Sat Nov 04 00:36:16 2006 +0000 +++ b/kdiff3/admin/cvs.sh Mon Apr 16 21:26:08 2007 +0000 @@ -32,7 +32,7 @@ required_autoconf_version="2.53 or newer" AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1` case $AUTOCONF_VERSION in - Autoconf*2.5* | autoconf*2.5* ) : ;; + Autoconf*2.5* | autoconf*2.5* | autoconf*2.6* ) : ;; "" ) echo "*** AUTOCONF NOT FOUND!." echo "*** KDE requires autoconf $required_autoconf_version" @@ -47,7 +47,7 @@ AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1` case $AUTOHEADER_VERSION in - Autoconf*2.5* | autoheader*2.5* ) : ;; + Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;; "" ) echo "*** AUTOHEADER NOT FOUND!." echo "*** KDE requires autoheader $required_autoconf_version" @@ -68,7 +68,7 @@ echo "*** KDE requires automake $required_automake_version" exit 1 ;; - automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*) + automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*) echo "*** $AUTOMAKE_STRING found." UNSERMAKE=no ;; @@ -316,7 +316,7 @@ fi fi if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then - VERSION="\"3.5.0\"" + VERSION="\"3.5.5\"" fi if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then modulename=`pwd`; diff -r 257ccb866dc3 -r 1184fc843210 kdiff3/admin/depcomp --- a/kdiff3/admin/depcomp Sat Nov 04 00:36:16 2006 +0000 +++ b/kdiff3/admin/depcomp Mon Apr 16 21:26:08 2007 +0000 @@ -1,7 +1,7 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2005-05-14.22 +scriptversion=2005-07-09.11 # Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. @@ -467,7 +467,8 @@ done "$@" -E | - sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | + sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" diff -r 257ccb866dc3 -r 1184fc843210 kdiff3/admin/doxygen.sh --- a/kdiff3/admin/doxygen.sh Sat Nov 04 00:36:16 2006 +0000 +++ b/kdiff3/admin/doxygen.sh Mon Apr 16 21:26:08 2007 +0000 @@ -63,15 +63,18 @@ echo "Usage: doxygen.sh " exit 1 fi -if ! test -d "$top_srcdir" ; then +if test ! -d "$top_srcdir" ; then echo "top_srcdir ($top_srcdir) is not a directory." exit 1 fi ### Normalize top_srcdir so it is an absolute path. -if ! expr "x$top_srcdir" : "x/" > /dev/null ; then +if expr "x$top_srcdir" : "x/" > /dev/null ; then + # top_srcdir is absolute already + : +else top_srcdir=`cd "$top_srcdir" 2> /dev/null && pwd` - if ! test -d "$top_srcdir" ; then + if test ! -d "$top_srcdir" ; then echo "top_srcdir ($top_srcdir) is not a directory." exit 1 fi @@ -95,7 +98,7 @@ done fi fi -if test -z "$QTDOCDIR" || test \! -d "$QTDOCDIR" ; then +if test -z "$QTDOCDIR" || test ! -d "$QTDOCDIR" ; then if test -z "$QTDOCDIR" ; then echo "* QTDOCDIR could not be guessed." else @@ -137,7 +140,7 @@ DOXDATA="$top_srcdir/doc/common" fi -if ! test -d "$DOXDATA" ; then +if test ! -d "$DOXDATA" ; then echo "* \$DOXDATA does not name a directory ( or is unset ), tried \"$DOXDATA\"" exit 1 fi @@ -155,7 +158,7 @@ { eval `grep 'VERSION="' "$top_srcdir/admin/cvs.sh"` echo "PROJECT_NUMBER = $VERSION" > Doxyfile.in - grep ^KDE_INIT_DOXYGEN "$top_srcdir/configure.in.in" | \ + grep '^KDE_INIT_DOXYGEN' "$top_srcdir/configure.in.in" | \ sed -e 's+[^[]*\[\([^]]*\)+PROJECT_NAME = "\1"+' \ -e 's+].*++' >> Doxyfile.in } @@ -167,13 +170,13 @@ ### for the apidox and initialize it. Otherwise, just use the ### structure assumed to be there. if test -z "$subdir" ; then - if ! test -d "$apidoxdir" ; then + if test ! -d "$apidoxdir" ; then mkdir "$apidoxdir" > /dev/null 2>&1 fi - if ! cd "$apidoxdir" > /dev/null 2>&1 ; then + cd "$apidoxdir" > /dev/null 2>&1 || { echo "Cannot create and cd into $apidoxdir" exit 1 - fi + } test -f "Doxyfile.in" || create_doxyfile_in @@ -192,15 +195,15 @@ srcdir="$1" subdir="." else - if ! cd "$apidoxdir" > /dev/null 2>&1 ; then + cd "$apidoxdir" > /dev/null 2>&1 || { echo "Cannot cd into $apidoxdir -- maybe you need to" echo "build the top-level dox first." exit 1 - fi + } if test "x1" = "x$recurse" ; then # OK, so --recurse was requested - if ! test -f "subdirs.top" ; then + if test ! -f "subdirs.top" ; then echo "* No subdirs.top available in the $apidoxdir." echo "* The --recurse option will be ignored." recurse=0 @@ -389,7 +392,10 @@ test -f "$subdir/classmap.inc" && \ CMENU=`grep '=>' "$subdir/classmap.inc" | sed -e 's+"\([^"]*\)" => "'"$subdir/html/"'\([^"]*\)"+