kbear-cvs Mailing List for KBear, a graphical ftp client for KDE
Brought to you by:
kbjorn
Menu
▾
▴
kbear-cvs — Generated messages about CVS commits.
You can subscribe to this list here.
| 2003 |
Jan
(113) |
Feb
(143) |
Mar
(31) |
Apr
(88) |
May
(126) |
Jun
(163) |
Jul
(209) |
Aug
(36) |
Sep
(6) |
Oct
(4) |
Nov
(35) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
(11) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(11) |
Nov
|
Dec
|
Update of /cvsroot/kbear/kbear/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16289/admin Modified Files: Doxyfile.am Doxyfile.global Makefile.common acinclude.m4.in am_edit bcheck.pl compile conf.change.pl config.guess config.pl config.sub configure.in.bot.end configure.in.min cvs.sh depcomp install-sh libtool.m4.in ltmain.sh missing mkinstalldirs oldinclude.m4.in ylwrap Log Message: Index: Doxyfile.am =================================================================== RCS file: /cvsroot/kbear/kbear/admin/Doxyfile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Doxyfile.am 12 Apr 2005 13:06:43 -0000 1.4 --- Doxyfile.am 23 Oct 2005 20:52:20 -0000 1.5 *************** *** 1,69 **** ## generate API documentation with doxygen apidox-am-yes: @if test "$(subdir)" != "."; then \ ! $(mkinstalldirs) $(top_builddir)/apidocs/$(subdir) ;\ ! if test ! -x $(top_builddir)/apidocs/common; then \ ! if test -d $(top_srcdir)/doc/common; then \ ! common_dir=`cd $(top_srcdir)/doc/common && pwd` ;\ ! else \ ! common_dir=$(kde_libs_htmldir)/en/common ;\ ! fi ;\ ! $(LN_S) $$common_dir $(top_builddir)/apidocs/common; \ ! fi ;\ ! cp $(top_srcdir)/admin/Doxyfile.global Doxyfile; \ ! echo "PROJECT_NAME = \"$(subdir) Library\"" >> Doxyfile; \ ! echo "PROJECT_NUMBER = \"Version $(VERSION)\"" >> Doxyfile; \ ! echo "INPUT = $(srcdir)" >> Doxyfile; \ ! echo "IMAGE_PATH = $(top_srcdir)/doc/api" >> Doxyfile ;\ ! echo "OUTPUT_DIRECTORY = $(top_builddir)/apidocs" >> 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 "RTF_OUTPUT = $(subdir)/rtf" >> Doxyfile; \ ! echo "MAN_OUTPUT = $(subdir)/man" >> Doxyfile; \ ! echo "GENERATE_HTML = $(GENERATE_FLAG)" >> Doxyfile ;\ ! echo "GENERATE_MAN = $(GENERATE_FLAG)" >> Doxyfile ;\ ! echo "GENERATE_LATEX = $(GENERATE_FLAG)" >> Doxyfile ;\ ! if test -n "$(DOXYGEN_EXCLUDE)"; then \ ! 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 ;\ ! echo "TAGFILES = \\" >> Doxyfile; \ ! tags='$(DOXYGEN_REFERENCES) qt'; for tag in $$tags; do \ ! tagpath= ;\ ! path="../../$$tag" ;\ ! if test -f $(top_builddir)/apidocs/$$tag/$$tag.tag; then \ ! tagpath="$(top_builddir)/apidocs/$$tag/$$tag.tag" ;\ ! else \ ! tagpath=`ls -1 $(kde_htmldir)/en/*-apidocs/$$tag/$$tag.tag 2> /dev/null` ;\ ! if test -n "$$tagpath"; then \ ! path=`echo $$tagpath | sed -e "s,.*/\([^/]*-apidocs\)/$$tag/$$tag.tag,../../../\1/$$tag,"` ;\ ! fi ;\ ! fi ;\ ! if test "$$tag" = qt; then \ ! echo $$tagpath=$(QTDOCDIR) >> Doxyfile ;\ ! else if test -n "$$tagpath"; then \ ! echo "$$tagpath=$$path/html \\" >> Doxyfile ;\ ! fi ;\ ! fi ;\ ! done ;\ ! echo "GENERATE_TAGFILE = $(top_builddir)/apidocs/$(subdir)/`basename $(subdir)`.tag" >> Doxyfile ;\ ! echo "IGNORE_PREFIX = K" >> Doxyfile ;\ ! echo "HAVE_DOT = $(KDE_HAVE_DOT)" >> Doxyfile ;\ ! $(DOXYGEN) Doxyfile ;\ fi ! apidox-am-no: install-data-local: install-apidox --- 1,37 ---- ## generate API documentation with doxygen apidox-am-yes: + @if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$ADMIN" ; then \ + export DOXDATA=$(kde_libs_htmldir)/en/common ; \ + fi ; \ + test -d $(top_builddir)/apidocs || \ + ( cd $(top_builddir) && sh $(top_srcdir)/admin/doxygen.sh \ + --no-modulename --installdir=$(kde_libs_htmldir)/en \ + --no-recurse $(top_srcdir) . ) ; \ + cd $(top_builddir) && sh $(top_srcdir)/admin/doxygen.sh \ + --recurse --no-modulename --installdir=$(kde_libs_htmldir)/en \ + $(top_srcdir) $(subdir) + + apidox-am-toplevel-yes: + @if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$ADMIN" ; then \ + export DOXDATA=$(kde_libs_htmldir)/en/common ; \ + fi ; \ + cd $(top_builddir) && sh $(top_srcdir)/admin/doxygen.sh \ + --no-modulename --installdir=$(kde_libs_htmldir)/en \ + $(top_srcdir) + + ## Don't generate API documentation without doxygen + apidox-am-no: + + apidox-am-toplevel-no: + + + apidox: @if test "$(subdir)" != "."; then \ ! $(MAKE) apidox-am-@KDE_HAS_DOXYGEN@ ;\ ! else \ ! $(MAKE) apidox-am-toplevel-@KDE_HAS_DOXYGEN@ ;\ fi ! install-data-local: install-apidox *************** *** 84,93 **** done; \ fi; \ - symlink="$(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/common"; \ - if test ! -L "$symlink" -o `readlink "$symlink" 2>/dev/null` != "$(kde_libs_htmldir)/en/common"; then \ - echo "Creating symlink $(kde_htmldir)/en/$(PACKAGE)-apidocs/common"; \ - rm -f $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/common; \ - $(LN_S) $(kde_libs_htmldir)/en/common $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/common; \ - fi; \ else\ if test -d $(top_builddir)/apidocs; then \ --- 52,55 ---- *************** *** 95,98 **** --- 57,61 ---- list=`cd $(top_builddir)/apidocs && ls -1`; \ echo "installing $(top_builddir)/apidocs/$$file" ;\ + echo "target directory $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs" ; \ for file in $$list; do \ if test -f $(top_builddir)/apidocs/$$file; then \ *************** *** 116,178 **** fi ! apidox: ! @if test "$(subdir)" != "."; then \ ! $(MAKE) apidox-am-@KDE_HAS_DOXYGEN@ ;\ ! else \ ! $(MAKE) apidox-am-toplevel-@KDE_HAS_DOXYGEN@ ;\ ! fi @set fnord $(MAKEFLAGS); amf=$$2; if test -n '$(SUBDIRS)'; then \ list='$(SUBDIRS)'; \ for subdir in $$list; do \ ! if grep '^include .*Doxyfile.am' $(srcdir)/$$subdir/Makefile.am; then \ ! echo "Making apidox in $$subdir"; \ ! if test "$$subdir" != "."; then \ ! (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) GENERATE_FLAG=no apidox) || exit 1; \ ! fi ; fi ;\ ! done; \ ! for subdir in $$list; do \ ! if grep '^include .*Doxyfile.am' $(srcdir)/$$subdir/Makefile.am; then \ ! echo "Making apidox in $$subdir"; \ if test "$$subdir" != "."; then \ ! (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) GENERATE_FLAG=yes apidox) || exit 1; \ fi ; fi ;\ done; \ fi ! apidox-am-toplevel-no: ! apidox-am-toplevel-yes: ! @echo "*** Creating API documentation main page"; \ ! cp $(top_srcdir)/admin/Doxyfile.global Doxyfile; \ ! echo "PROJECT_NAME = \"$(DOXYGEN_PROJECT_NAME)\"" >> Doxyfile ; \ ! echo "PROJECT_NUMBER = \"$(DOXYGEN_PROJECT_NUMBER)\"" >> Doxyfile ; \ ! echo "INPUT = $(top_srcdir)" >> Doxyfile ; \ ! echo "OUTPUT_DIRECTORY = $(top_builddir)/apidocs" >> Doxyfile ; \ ! echo "FILE_PATTERNS = *.dox" >> Doxyfile ; \ ! echo "RECURSIVE = NO" >> Doxyfile ; \ ! echo "SOURCE_BROWSER = NO" >> Doxyfile ; \ ! echo "ALPHABETICAL_INDEX = NO" >> Doxyfile ; \ ! echo "HTML_OUTPUT = ." >> Doxyfile ; \ ! echo "HTML_HEADER = apidocs/common/mainheader.html" >> Doxyfile ; \ ! echo "HTML_FOOTER = apidocs/common/mainfooter.html" >> Doxyfile ; \ ! echo "HTML_STYLESHEET = apidocs/common/doxygen.css" >> Doxyfile ; \ ! echo "GENERATE_LATEX = NO" >> Doxyfile ; \ ! echo "GENERATE_RTF = NO" >> Doxyfile ; \ ! echo "GENERATE_MAN = NO" >> Doxyfile ; \ ! echo "GENERATE_XML = NO" >> Doxyfile ; \ ! echo "GENERATE_AUTOGEN_DEF = NO" >> Doxyfile ; \ ! echo "ENABLE_PREPROCESSING = NO" >> Doxyfile ; \ ! echo "CLASS_DIAGRAMS = NO" >> Doxyfile ; \ ! echo "HAVE_DOT = NO" >> Doxyfile ; \ ! echo "GENERATE_HTML = YES" >> Doxyfile ;\ ! $(mkinstalldirs) $(top_builddir)/apidocs ; \ ! rm -f $(top_builddir)/apidocs/common ; \ ! if test -d $(top_srcdir)/doc/common; then \ ! common_dir=`cd $(top_srcdir)/doc/common && pwd` ;\ ! else \ ! common_dir=$(kde_libs_htmldir)/en/common ;\ ! fi ;\ ! $(LN_S) $$common_dir $(top_builddir)/apidocs/common ;\ ! doxygen 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 --- 79,95 ---- fi ! install-apidox-recurse: install-apidox @set fnord $(MAKEFLAGS); amf=$$2; if test -n '$(SUBDIRS)'; then \ list='$(SUBDIRS)'; \ for subdir in $$list; do \ ! if grep '^include .*Doxyfile.am' $(srcdir)/$$subdir/Makefile.am > /dev/null ; then \ ! echo "Installing apidox from $$subdir"; \ if test "$$subdir" != "."; then \ ! (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) GENERATE_FLAG=no install-apidox-recurse) || exit 1; \ fi ; fi ;\ done; \ fi ! .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 Index: Doxyfile.global =================================================================== RCS file: /cvsroot/kbear/kbear/admin/Doxyfile.global,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Doxyfile.global 12 Apr 2005 13:06:44 -0000 1.3 --- Doxyfile.global 23 Oct 2005 20:52:20 -0000 1.4 *************** *** 1,404 **** - # Doxyfile 1.3.6 - - # This file describes the settings to be used by the documentation system - # doxygen (www.doxygen.org) for a project - # - # All text after a hash (#) is considered a comment and will be ignored - # The format is: - # TAG = value [value, ...] - # For lists items can also be appended using: - # TAG += value [value, ...] [...1231 lines suppressed...] ! HTML_ALIGN_MEMBERS = YES ! REFERENCED_BY_RELATION = NO ! REFERENCES_RELATION = NO ! VERBATIM_HEADERS = NO ! GENERATE_HTML = YES ! SOURCE_BROWSER = YES ! GENERATE_AUTOGEN_DEF = NO ! DETAILS_AT_TOP = YES ! SORT_MEMBER_DOCS = YES ! GENERATE_TODOLIST = YES ! IGNORE_PREFIX = K ! GENERATE_HTML = YES ! CLASS_GRAPH = YES ! COLLABORATION_GRAPH = NO ! MACRO_EXPANSION = YES ! EXPAND_ONLY_PREDEF = YES Index: Makefile.common =================================================================== RCS file: /cvsroot/kbear/kbear/admin/Makefile.common,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Makefile.common 12 Apr 2005 13:06:44 -0000 1.13 --- Makefile.common 23 Oct 2005 20:52:20 -0000 1.14 *************** *** 7,11 **** SHELL=/bin/sh ! cvs dist cvs-clean configure configure.in configure.files subdirs package-messages package-merge Makefile.am acinclude.m4 extract-messages: @admindir=$(admindir); \ if test "x$$admindir" = x; then \ --- 7,11 ---- SHELL=/bin/sh ! cvs dist configure configure.in configure.files subdirs package-messages package-merge Makefile.am acinclude.m4 extract-messages: @admindir=$(admindir); \ if test "x$$admindir" = x; then \ *************** *** 31,35 **** configure.files: subdirs .SILENT: ! .PHONY: cvs dist cvs-clean package-merge package-messages --- 31,37 ---- configure.files: subdirs + svn: cvs + .SILENT: ! .PHONY: svn cvs dist package-merge package-messages Index: acinclude.m4.in =================================================================== RCS file: /cvsroot/kbear/kbear/admin/acinclude.m4.in,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** acinclude.m4.in 12 Apr 2005 13:06:44 -0000 1.19 --- acinclude.m4.in 23 Oct 2005 20:52:20 -0000 1.20 *************** *** 17,22 **** dnl You should have received a copy of the GNU Library General Public License dnl along with this library; see the file COPYING.LIB. If not, write to ! dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ! dnl Boston, MA 02111-1307, USA. dnl IMPORTANT NOTE: --- 17,22 ---- dnl You should have received a copy of the GNU Library General Public License dnl along with this library; see the file COPYING.LIB. If not, write to ! dnl the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ! dnl Boston, MA 02110-1301, USA. dnl IMPORTANT NOTE: *************** *** 594,597 **** --- 594,602 ---- kde33ornewer= fi + if test "$KDECONFIG" != "compiled"; then + if test `$KDECONFIG --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then + kde33ornewer= + fi + fi fi fi *************** *** 607,611 **** KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) ! if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share" test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" --- 612,616 ---- KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) ! if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share" test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" *************** *** 804,807 **** --- 809,813 ---- KDE_CHECK_LIBDL KDE_CHECK_STRLCPY + KDE_CHECK_PIE_SUPPORT # darwin needs this to initialize the environment *************** *** 1175,1187 **** if test $kde_qtsubver -gt 1; then if test $kde_qtsubver -gt 2; then ! kde_qt_minversion=">= Qt 3.3" else ! kde_qt_minversion=">= Qt 3.2" fi else ! kde_qt_minversion=">= Qt 3.1 (20021021)" fi else ! kde_qt_minversion=">= Qt 3.0" fi fi --- 1181,1193 ---- if test $kde_qtsubver -gt 1; then if test $kde_qtsubver -gt 2; then ! kde_qt_minversion=">= Qt 3.3 and < 4.0" else ! kde_qt_minversion=">= Qt 3.2 and < 4.0" fi else ! kde_qt_minversion=">= Qt 3.1 (20021021) and < 4.0" fi else ! kde_qt_minversion=">= Qt 3.0 and < 4.0" fi fi *************** *** 1217,1220 **** --- 1223,1229 ---- fi + if test $kde_qtver = 4; then + kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4" + fi if test $kde_qtver = 3; then kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3" *************** *** 1348,1367 **** fi - if test -z "$LIBQT"; then dnl ------------------------------------------------------------ dnl If we got --enable-embedded then adjust the Qt library name. dnl ------------------------------------------------------------ ! if test "x$kde_use_qt_emb" = "xyes"; then ! qtlib="qte" ! else ! qtlib="qt" ! fi ! ! kde_int_qt="-l$qtlib" else ! kde_int_qt="$LIBQT" ! kde_lib_qt_set=yes fi if test -z "$LIBQPE"; then dnl ------------------------------------------------------------ --- 1357,1371 ---- fi dnl ------------------------------------------------------------ dnl If we got --enable-embedded then adjust the Qt library name. dnl ------------------------------------------------------------ ! if test "x$kde_use_qt_emb" = "xyes"; then ! qtlib="qte" else ! qtlib="qt" fi + kde_int_qt="-l$qtlib" + if test -z "$LIBQPE"; then dnl ------------------------------------------------------------ *************** *** 1384,1394 **** if test "x$kde_use_qt_mt" = "xyes"; then ! if test -z "$LIBQT"; then ! LIBQT="-l$qtlib-mt" ! kde_int_qt="-l$qtlib-mt" ! else ! LIBQT="$qtlib-mt" ! kde_int_qt="$qtlib-mt" ! fi LIBQT_GLOB="lib$qtlib-mt.*" USING_QT_MT="using -mt" --- 1388,1393 ---- if test "x$kde_use_qt_mt" = "xyes"; then ! LIBQT="-l$qtlib-mt" ! kde_int_qt="-l$qtlib-mt" LIBQT_GLOB="lib$qtlib-mt.*" USING_QT_MT="using -mt" *************** *** 1650,1655 **** If you did install kdelibs, then the Qt version that is picked up by this configure is not the same version you used to compile kdelibs. ! The Qt Plugin installed by kdelibs is *ONLY* loadable if its the ! same Qt version, compiled with the same compiler and the same Qt configuration settings. ]) --- 1649,1654 ---- If you did install kdelibs, then the Qt version that is picked up by this configure is not the same version you used to compile kdelibs. ! The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the ! _same Qt version_, compiled with the _same compiler_ and the same Qt configuration settings. ]) *************** *** 2065,2068 **** --- 2064,2072 ---- if test $kde_qtver = 3; then + case $host in + *cygwin*) lib_kded="-lkdeinit_kded" ;; + *) lib_kded="" ;; + esac + AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_KDECORE, "-lkdecore") AC_SUBST(LIB_KDEUI, "-lkdeui") *************** *** 2081,2084 **** --- 2085,2089 ---- AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KDNSSD, "-lkdnssd") + AC_SUBST(LIB_KUNITTEST, "-lkunittest") # these are for backward compatibility AC_SUBST(LIB_KSYCOCA, "-lkio") *************** *** 2499,2518 **** CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" AC_TRY_LINK( ! [/* Override any gcc2 internal prototype to avoid an error. */ ! struct jpeg_decompress_struct; ! typedef struct jpeg_decompress_struct * j_decompress_ptr; ! typedef int size_t; #ifdef __cplusplus extern "C" { #endif ! void jpeg_CreateDecompress(j_decompress_ptr cinfo, ! int version, size_t structsize); #ifdef __cplusplus } #endif - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ ], ! [jpeg_CreateDecompress(0L, 0, 0);], eval "ac_cv_lib_jpeg_$1=-ljpeg$2", eval "ac_cv_lib_jpeg_$1=no") --- 2504,2517 ---- CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" AC_TRY_LINK( ! [ #ifdef __cplusplus extern "C" { #endif ! void jpeg_CreateDecompress(); #ifdef __cplusplus } #endif ], ! [jpeg_CreateDecompress();], eval "ac_cv_lib_jpeg_$1=-ljpeg$2", eval "ac_cv_lib_jpeg_$1=no") *************** *** 2721,2724 **** --- 2720,2790 ---- ]) + AC_DEFUN([KDE_FIND_LIBEXR], + [ + AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) + AC_REQUIRE([AC_FIND_ZLIB]) + AC_CACHE_VAL(ac_cv_libexr, + [ + if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + fi + + AC_MSG_CHECKING([for OpenEXR libraries]) + + if test "$PKG_CONFIG" = "no" ; then + AC_MSG_RESULT(no) + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + if !(`$PKG_CONFIG --exists OpenEXR`) ; then + AC_MSG_RESULT(no) + EXRSTATUS=no + else + if !(`$PKG_CONFIG --atleast-version="1.1.1" OpenEXR`) ; then + AC_MSG_RESULT(no) + EXRSTATUS=old + else + kde_save_LIBS="$LIBS" + LIBS="$LIBS $all_libraries $USER_LDFLAGS $LIBZ `pkg-config --libs OpenEXR`" + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + kde_save_CXXFLAGS="$CXXFLAGS" + EXR_FLAGS=`$PKG_CONFIG --cflags OpenEXR` + CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES $EXR_FLAGS" + + AC_TRY_LINK(dnl + [ + #include <ImfRgbaFile.h> + ], + [ + using namespace Imf; + RgbaInputFile file ("dummy"); + return 0; + ], + eval "ac_cv_libexr='`pkg-config --libs OpenEXR`'", + eval "ac_cv_libexr=no" + ) + LIBS="$kde_save_LIBS" + CXXFLAGS="$kde_save_CXXFLAGS" + AC_LANG_RESTORE + ])dnl + if eval "test ! \"`echo $ac_cv_libexr`\" = no"; then + AC_DEFINE_UNQUOTED(HAVE_EXR, 1, [Define if you have OpenEXR]) + LIB_EXR="$ac_cv_libexr" + AC_MSG_RESULT($ac_cv_libexr) + else + AC_MSG_RESULT(no) + LIB_EXR="" + fi + fi + fi + fi + AC_SUBST(LIB_EXR) + AC_SUBST(EXR_FLAGS) + ]) + + AC_DEFUN([AC_FIND_PNG], *************** *** 2909,2912 **** --- 2975,3019 ---- ]) + + AC_DEFUN([KDE_CHECK_FOR_BAD_COMPILER], + [ + AC_MSG_CHECKING([whether $CC is blacklisted]) + + dnl In theory we have tu run this test against $CC and $CXX + dnl in C and in C++ mode, because its perfectly legal for + dnl the user to mix compiler versions, since C has a defined + dnl ABI. + dnl + dnl For now, we assume the user is not on crack. + + AC_TRY_COMPILE([ + #ifdef __GNUC__ + #if __GNUC__ == 4 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0 + choke me + #endif + #endif + ], , + kde_bad_compiler=no, + kde_bad_compiler=yes + ) + + AC_MSG_RESULT($kde_bad_compiler) + + if test "$kde_bad_compiler" = "yes"; then + AC_MSG_ERROR([ + + This particular compiler version is blacklisted because it + is known to miscompile KDE. Please use a newer version, or + if that is not yet available, choose an older version. + + Please do not report a bug or bother us reporting this + configure error. We know about it, and we introduced + it by intention to avoid untraceable bugs or crashes in KDE. + + ]) + fi + + ]) + dnl AC_VALIDIFY_CXXFLAGS checks for forbidden flags the user may have given AC_DEFUN([AC_VALIDIFY_CXXFLAGS], *************** *** 3018,3021 **** --- 3125,3130 ---- AC_PROG_CXX + KDE_CHECK_FOR_BAD_COMPILER + if test "$GXX" = "yes" || test "$CXX" = "KCC"; then if test "$kde_use_debug_code" != "no"; then *************** *** 3057,3061 **** if test "$kde_use_warnings" = "yes"; then if test "$GCC" = "yes"; then ! CXXFLAGS="-Wall -W -Wpointer-arith -Wwrite-strings $CXXFLAGS" case $host in *-*-linux-gnu) --- 3166,3170 ---- if test "$kde_use_warnings" = "yes"; then if test "$GCC" = "yes"; then ! CXXFLAGS="-Wall -W -Wpointer-arith $CXXFLAGS" case $host in *-*-linux-gnu) *************** *** 3068,3072 **** KDE_CHECK_COMPILER_FLAG(Wundef,[CXXFLAGS="-Wundef $CXXFLAGS"]) KDE_CHECK_COMPILER_FLAG(Wno-long-long,[CXXFLAGS="-Wno-long-long $CXXFLAGS"]) ! KDE_CHECK_COMPILER_FLAG(Wnon-virtual-dtor,[CXXFLAGS="-Wnon-virtual-dtor $CXXFLAGS"]) fi fi --- 3177,3182 ---- KDE_CHECK_COMPILER_FLAG(Wundef,[CXXFLAGS="-Wundef $CXXFLAGS"]) KDE_CHECK_COMPILER_FLAG(Wno-long-long,[CXXFLAGS="-Wno-long-long $CXXFLAGS"]) ! dnl ### FIXME: revert for KDE 4 ! KDE_CHECK_COMPILER_FLAG(Wno-non-virtual-dtor,[CXXFLAGS="$CXXFLAGS -Wno-non-virtual-dtor"]) fi fi *************** *** 3218,3234 **** [ /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */ ! template<typename CharT> ! struct VisTest ! { ! inline VisTest (); ! }; ! template<typename CharT> ! inline VisTest<CharT>::VisTest() ! {} ! extern template class VisTest<char>; // It works if we drop that line ! int some_function( int do_something ) __attribute__ ((visibility("default"))); ! int some_function( int ) { ! VisTest<char> a; return 0; } --- 3328,3336 ---- [ /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */ ! #include <string> ! int some_function( void ) __attribute__ ((visibility("default"))); ! int some_function( void ) { ! std::string s("blafasel"); return 0; } *************** *** 3248,3270 **** ) ! AC_DEFUN([KDE_CHECK_AND_ADD_HIDDEN_VISIBILITY], [ ! if test "$GXX" = "yes" && test "$kde_use_debug_code" = "no"; then KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, [ CXXFLAGS="$CXXFLAGS -fvisibility=hidden" KDE_CHECK_VISIBILITY_GCC_BUG - HAVE_GCC_VISIBILITY=1 AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported]) ]) fi ]) - AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY], - [ - AC_REQUIRE([KDE_CHECK_AND_ADD_HIDDEN_VISIBILITY]) - ]) - AC_DEFUN([KDE_ADD_DEPENDENCIES], [ --- 3350,3395 ---- ) ! AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY], [ ! AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY]) ! ! if test "x$GXX" = "xyes"; then ! kde_have_gcc_visibility=no KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, [ + kde_have_gcc_visibility=yes + AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched, + [ + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + + safe_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$CXXFLAGS $all_includes" + + AC_TRY_COMPILE( + [ + #include <qglobal.h> + #if Q_EXPORT - 0 != 0 + /* if this compiles, then Q_EXPORT is undefined */ + /* if Q_EXPORT is nonempty, this will break compilation */ + #endif + ], [/* elvis is alive */], + kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes) + + CXXFLAGS=$safe_CXXFLAGS + AC_LANG_RESTORE + ] + ) + + if test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then CXXFLAGS="$CXXFLAGS -fvisibility=hidden" KDE_CHECK_VISIBILITY_GCC_BUG HAVE_GCC_VISIBILITY=1 AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported]) + fi ]) fi ]) AC_DEFUN([KDE_ADD_DEPENDENCIES], [ *************** *** 3294,3297 **** --- 3419,3426 ---- AC_SUBST(KDE_PLUGIN) + # This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs. + KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)" + AC_SUBST(KDE_CHECK_PLUGIN) + # we patch configure quite some so we better keep that consistent for incremental runs AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch configure') *************** *** 3722,3726 **** ac_save_cflags="$CFLAGS" ac_save_libs="$LIBS" ! LDFLAGS="$LDFLAGS $DPMS_LDFLAGS $all_libraries -lX11 -lXext $LIBSOCKET" CFLAGS="$CFLAGS $X_INCLUDES" test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS" --- 3851,3856 ---- ac_save_cflags="$CFLAGS" ac_save_libs="$LIBS" ! LDFLAGS="$LDFLAGS $DPMS_LDFLAGS $all_libraries" ! LIBS="-lX11 -lXext $LIBSOCKET" CFLAGS="$CFLAGS $X_INCLUDES" test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS" *************** *** 3733,3742 **** { return DPMSSetTimeouts( 0, 0, 0, 0 ); }],[], ac_cv_have_dpms="yes", [ ! LDFLAGS="$ac_save_ldflags" ! CFLAGS="$ac_save_cflags" ! LDFLAGS="$LDFLAGS $DPMS_LDFLAGS $all_libraries -lX11 -lXext $LIBSOCKET" ! LIBS="$LIBS -lXdpms" ! CFLAGS="$CFLAGS $X_INCLUDES" ! test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS" AC_TRY_LINK([ #include <X11/Xproto.h> --- 3863,3867 ---- { return DPMSSetTimeouts( 0, 0, 0, 0 ); }],[], ac_cv_have_dpms="yes", [ ! LIBS="-lXdpms $LIBS" AC_TRY_LINK([ #include <X11/Xproto.h> *************** *** 3787,3796 **** AC_CHECK_DECL(DPMSCapable, AC_DEFINE(HAVE_DPMSCAPABLE_PROTO),, ! [#include <X11/extensions/dpms.h>]) AH_TEMPLATE(HAVE_DPMSINFO_PROTO, [Define if you have the DPMSInfo prototype in <X11/extensions/dpms.h>]) AC_CHECK_DECL(DPMSInfo, AC_DEFINE(HAVE_DPMSINFO_PROTO),, ! [#include <X11/extensions/dpms.h>]) CFLAGS="$ac_save_cflags" AC_SUBST(DPMSINC) --- 3912,3923 ---- AC_CHECK_DECL(DPMSCapable, AC_DEFINE(HAVE_DPMSCAPABLE_PROTO),, ! [#include <X11/Xlib.h> ! #include <X11/extensions/dpms.h>]) AH_TEMPLATE(HAVE_DPMSINFO_PROTO, [Define if you have the DPMSInfo prototype in <X11/extensions/dpms.h>]) AC_CHECK_DECL(DPMSInfo, AC_DEFINE(HAVE_DPMSINFO_PROTO),, ! [#include <X11/Xlib.h> ! #include <X11/extensions/dpms.h>]) CFLAGS="$ac_save_cflags" AC_SUBST(DPMSINC) *************** *** 3818,3826 **** AC_LANG_SAVE AC_LANG_CPLUSPLUS ! ac_save_ldflags="$LDFLAGS" ! ac_save_cxxflags="$CXXFLAGS" ! LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries -lGL -lGLU" ! test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LDFLAGS="$LDFLAGS -lX11" ! LDFLAGS="$LDFLAGS $LIB_XEXT -lm $LIBSOCKET" CXXFLAGS="$CFLAGS $X_INCLUDES" test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS" --- 3945,3955 ---- AC_LANG_SAVE AC_LANG_CPLUSPLUS ! ac_save_ldflags=$LDFLAGS ! ac_save_cxxflags=$CXXFLAGS ! ac_save_libs=$LIBS ! LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries" ! LIBS="$LIBS -lGL -lGLU" ! test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LIBS="$LIBS -lX11" ! LIBS="$LIBS $LIB_XEXT -lm $LIBSOCKET" CXXFLAGS="$CFLAGS $X_INCLUDES" test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS" *************** *** 3830,3835 **** ac_cv_have_gl="yes", ac_cv_have_gl="no") AC_LANG_RESTORE ! LDFLAGS="$ac_save_ldflags" ! CXXFLAGS="$ac_save_cxxflags" ])dnl --- 3959,3965 ---- ac_cv_have_gl="yes", ac_cv_have_gl="no") AC_LANG_RESTORE ! LDFLAGS=$ac_save_ldflags ! CXXFLAGS=$ac_save_cxxflags ! LIBS=$ac_save_libs ])dnl *************** *** 5714,5715 **** --- 5844,5889 ---- ]) + + dnl Check for PIE support in the compiler and linker + AC_DEFUN([KDE_CHECK_PIE_SUPPORT], + [ + AC_CACHE_CHECK([for PIE support], kde_cv_val_pie_support, + [ + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + safe_CXXFLAGS=$CXXFLAGS + safe_LDFLAGS=$LDFLAGS + CXXFLAGS="$CXXFLAGS -fpie" + LDFLAGS="$LDFLAGS -pie" + + AC_TRY_LINK([int foo;], [], [kde_cv_val_pie_support=yes], [kde_cv_val_pie_support=no]) + + CXXFLAGS=$safe_CXXFLAGS + LDFLAGS=$safe_LDFLAGS + AC_LANG_RESTORE + ]) + + AC_MSG_CHECKING(if enabling -pie/fpie support) + + AC_ARG_ENABLE(pie, + AC_HELP_STRING([--enable-pie],[platform supports PIE linking [default=detect]]), + [kde_has_pie_support=$enableval], + [kde_has_pie_support=detect]) + + if test "$kde_has_pie_support" = "detect"; then + kde_has_pie_support=$kde_cv_val_pie_support + fi + + AC_MSG_RESULT([$kde_has_pie_support]) + + KDE_USE_FPIE="" + KDE_USE_PIE="" + + AC_SUBST([KDE_USE_FPIE]) + AC_SUBST([KDE_USE_PIE]) + + if test "$kde_has_pie_support" = "yes"; then + KDE_USE_FPIE="-fpie" + KDE_USE_PIE="-pie" + fi + ]) Index: am_edit =================================================================== RCS file: /cvsroot/kbear/kbear/admin/am_edit,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** am_edit 12 Apr 2005 13:06:44 -0000 1.18 --- am_edit 23 Oct 2005 20:52:20 -0000 1.19 *************** *** 423,430 **** } - my $cvs_lines = "cvs-clean:\n"; - $cvs_lines .= "\t\$(MAKE) admindir=\$(top_srcdir)/admin -f \$(top_srcdir)/admin/Makefile.common cvs-clean\n"; - appendLines($cvs_lines); - $cvs_lines = "kde-rpo-clean:\n"; $cvs_lines .= "\t-rm -f *.rpo\n"; --- 423,426 ---- *************** *** 877,882 **** $lines .= "\n${kdeinit}_dummy.$cxxsuffix:\n"; ! $lines .= "\techo 'extern \"C\" int kdemain(int argc, char* argv[]);' > ${kdeinit}_dummy.$cxxsuffix; \\\n"; ! $lines .= "\techo 'extern \"C\" int kdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); }' >> ${kdeinit}_dummy.$cxxsuffix\n"; push(@cleanfiles, "${kdeinit}.la.$cxxsuffix"); --- 873,879 ---- $lines .= "\n${kdeinit}_dummy.$cxxsuffix:\n"; ! $lines .= "\techo '#include <kdemacros.h>' > ${kdeinit}_dummy.$cxxsuffix; \\\n"; ! $lines .= "\techo 'extern \"C\" int kdemain(int argc, char* argv[]);' >> ${kdeinit}_dummy.$cxxsuffix; \\\n"; ! $lines .= "\techo 'extern \"C\" KDE_EXPORT int kdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); }' >> ${kdeinit}_dummy.$cxxsuffix\n"; push(@cleanfiles, "${kdeinit}.la.$cxxsuffix"); *************** *** 1378,1383 **** $dep_lines .= "$source.h: $sourcedir$source.ui\n"; $dep_lines .= "\trm -rf $source.h;\n"; ! $dep_lines .= "\t\$(UIC) $sourcedir$source.ui | \$(PERL) -pi -e \"s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g\" >> $source.h ;\n"; ! $dep_lines .= "$source.moc: $source.h\n"; $dep_lines .= "\t\$(MOC) $source.h -o $source.moc\n"; --- 1375,1383 ---- $dep_lines .= "$source.h: $sourcedir$source.ui\n"; $dep_lines .= "\trm -rf $source.h;\n"; ! if (!$kdeopts{"qtonly"}) { ! $dep_lines .= "\t\$(UIC) $sourcedir$source.ui | \$(PERL) -pi -e \"s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g\" >> $source.h ;\n"; ! } else { ! $dep_lines .= "\t\$(UIC) -o $source.h $sourcedir$source.ui\n"; ! } $dep_lines .= "$source.moc: $source.h\n"; $dep_lines .= "\t\$(MOC) $source.h -o $source.moc\n"; Index: bcheck.pl =================================================================== RCS file: /cvsroot/kbear/kbear/admin/bcheck.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** bcheck.pl 12 Apr 2005 13:06:44 -0000 1.1 --- bcheck.pl 23 Oct 2005 20:52:21 -0000 1.2 *************** *** 119,122 **** --- 119,123 ---- s/0x[0-9a-fA-F]+/0x......../g; s/base size=/size=/g; + s/\(\)\s*$//g; s/base align=/align=/g; Index: compile =================================================================== RCS file: /cvsroot/kbear/kbear/admin/compile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** compile 8 Oct 2002 18:12:24 -0000 1.1 --- compile 23 Oct 2005 20:52:21 -0000 1.2 *************** *** 1,7 **** #! /bin/sh - # Wrapper for compilers which do not understand `-c -o'. ! # Copyright 1999, 2000 Free Software Foundation, Inc. # Written by Tom Tromey <tr...@cy...>. # --- 1,8 ---- #! /bin/sh # Wrapper for compilers which do not understand `-c -o'. ! scriptversion=2005-05-14.22 ! ! # Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. # Written by Tom Tromey <tr...@cy...>. # *************** *** 18,22 **** # 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. # As a special exception to the GNU General Public License, if you --- 19,23 ---- # 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 Street, Fifth Floor, Boston, MA 02110-1301, USA. # As a special exception to the GNU General Public License, if you *************** *** 25,76 **** # the same distribution terms that you use for the rest of that program. ! # Usage: ! # compile PROGRAM [ARGS]... ! # `-o FOO.o' is removed from the args passed to the actual compile. ! prog=$1 ! shift ofile= cfile= ! args= ! while test $# -gt 0; do ! case "$1" in ! -o) ! # configure might choose to run compile as `compile cc -o foo foo.c'. ! # So we do something ugly here. ! ofile=$2 ! shift ! case "$ofile" in ! *.o | *.obj) ! ;; ! *) ! args="$args -o $ofile" ! ofile= ! ;; ! esac ! ;; ! *.c) ! cfile=$1 ! args="$args $1" ! ;; ! *) ! args="$args $1" ! ;; ! esac ! shift done if test -z "$ofile" || test -z "$cfile"; then ! # If no `-o' option was seen then we might have been invoked from a ! # pattern rule where we don't need one. That is ok -- this is a ! # normal compilation that the losing compiler can handle. If no ! # `.c' file was seen then we are probably linking. That is also ! # ok. ! exec "$prog" $args fi # Name of file we expect compiler to create. ! cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'` # Create the lock directory. --- 26,108 ---- # the same distribution terms that you use for the rest of that program. ! # This file is maintained in Automake, please report ! # bugs to <bug...@gn...> or send patches to ! # <aut...@gn...>. ! case $1 in ! '') ! echo "$0: No command. Try \`$0 --help' for more information." 1>&2 ! exit 1; ! ;; ! -h | --h*) ! cat <<\EOF ! Usage: compile [--help] [--version] PROGRAM [ARGS] ! ! Wrapper for compilers which do not understand `-c -o'. ! Remove `-o dest.o' from ARGS, run PROGRAM with the remaining ! arguments, and rename the output as expected. ! ! If you are trying to build a whole package this is not the ! right script to run: please start by reading the file `INSTALL'. ! ! Report bugs to <bug...@gn...>. ! EOF ! exit $? ! ;; ! -v | --v*) ! echo "compile $scriptversion" ! exit $? ! ;; ! esac ofile= cfile= ! eat= ! ! for arg ! do ! if test -n "$eat"; then ! eat= ! else ! case $1 in ! -o) ! # configure might choose to run compile as `compile cc -o foo foo.c'. ! # So we strip `-o arg' only if arg is an object. ! eat=1 ! case $2 in ! *.o | *.obj) ! ofile=$2 ! ;; ! *) ! set x "$@" -o "$2" ! shift ! ;; ! esac ! ;; ! *.c) ! cfile=$1 ! set x "$@" "$1" ! shift ! ;; ! *) ! set x "$@" "$1" ! shift ! ;; ! esac ! fi ! shift done if test -z "$ofile" || test -z "$cfile"; then ! # If no `-o' option was seen then we might have been invoked from a ! # pattern rule where we don't need one. That is ok -- this is a ! # normal compilation that the losing compiler can handle. If no ! # `.c' file was seen then we are probably linking. That is also ! # ok. ! exec "$@" fi # Name of file we expect compiler to create. ! cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'` # Create the lock directory. *************** *** 78,99 **** # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. ! lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d while true; do ! if mkdir $lockdir > /dev/null 2>&1; then ! break ! fi ! sleep 1 done # FIXME: race condition here if user kills between mkdir and trap. ! trap "rmdir $lockdir; exit 1" 1 2 15 # Run the compile. ! "$prog" $args ! status=$? if test -f "$cofile"; then ! mv "$cofile" "$ofile" fi ! rmdir $lockdir ! exit $status --- 110,142 ---- # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. ! lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d while true; do ! if mkdir "$lockdir" >/dev/null 2>&1; then ! break ! fi ! sleep 1 done # FIXME: race condition here if user kills between mkdir and trap. ! trap "rmdir '$lockdir'; exit 1" 1 2 15 # Run the compile. ! "$@" ! ret=$? if test -f "$cofile"; then ! mv "$cofile" "$ofile" ! elif test -f "${cofile}bj"; then ! mv "${cofile}bj" "$ofile" fi ! rmdir "$lockdir" ! exit $ret ! ! # Local Variables: ! # mode: shell-script ! # sh-indentation: 2 ! # eval: (add-hook 'write-file-hooks 'time-stamp) ! # time-stamp-start: "scriptversion=" ! # time-stamp-format: "%:y-%02m-%02d.%02H" ! # time-stamp-end: "$" ! # End: Index: conf.change.pl =================================================================== RCS file: /cvsroot/kbear/kbear/admin/conf.change.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** conf.change.pl 12 Apr 2005 13:06:44 -0000 1.5 --- conf.change.pl 23 Oct 2005 20:52:21 -0000 1.6 *************** *** 20,25 **** # You should have received a copy of the GNU Library General Public License # along with this library; see the file COPYING.LIB. If not, write to ! # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ! # Boston, MA 02111-1307, USA. # we have to change two places --- 20,25 ---- # You should have received a copy of the GNU Library General Public License # along with this library; see the file COPYING.LIB. If not, write to ! # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ! # Boston, MA 02110-1301, USA. # we have to change two places Index: config.guess =================================================================== RCS file: /cvsroot/kbear/kbear/admin/config.guess,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** config.guess 12 Apr 2005 13:06:44 -0000 1.7 --- config.guess 23 Oct 2005 20:52:21 -0000 1.8 *************** *** 2,8 **** # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. ! timestamp='2004-06-24' # This file is free software; you can redistribute it and/or modify it --- 2,8 ---- # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, [...1720 lines suppressed...] c4*) echo c4-convex-bsd ! exit ;; esac fi *************** *** 1410,1414 **** download the most up to date version of the config scripts from ! ftp://ftp.gnu.org/pub/gnu/config/ If the version you run ($0) is already up to date, please --- 1423,1429 ---- download the most up to date version of the config scripts from ! http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess ! and ! http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub If the version you run ($0) is already up to date, please Index: config.pl =================================================================== RCS file: /cvsroot/kbear/kbear/admin/config.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** config.pl 12 Apr 2005 13:06:44 -0000 1.5 --- config.pl 23 Oct 2005 20:52:21 -0000 1.6 *************** *** 26,31 **** # You should have received a copy of the GNU Library General Public License # along with this library; see the file COPYING.LIB. If not, write to ! # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ! # Boston, MA 02111-1307, USA. use strict; --- 26,31 ---- # You should have received a copy of the GNU Library General Public License # along with this library; see the file COPYING.LIB. If not, write to ! # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ! # Boston, MA 02110-1301, USA. use strict; *************** *** 54,57 **** --- 54,58 ---- open(CF, "< $ac_subs") || die "can't open $ac_subs: $!"; my @subs = <CF>; + my $pat; close(CF); chomp @subs; *************** *** 61,65 **** if ($bad_perl) { print "Using perl older than version 5.005\n"; ! foreach my $pat (@subs) { if ( ($pat =~ m/s%([^%]*)%([^%]*)%g/ ) || ($pat =~ m/s%([^%]*)%([^%]*)%;t/ ) --- 62,66 ---- if ($bad_perl) { print "Using perl older than version 5.005\n"; ! foreach $pat (@subs) { if ( ($pat =~ m/s%([^%]*)%([^%]*)%g/ ) || ($pat =~ m/s%([^%]*)%([^%]*)%;t/ ) *************** *** 86,90 **** } } else { ! foreach my $pat (@subs) { if ( ($pat =~ /s%([^%]*)%([^%]*)%g/ ) || ($pat =~ /s%([^%]*)%([^%]*)%;t/ ) || --- 87,91 ---- } } else { ! foreach $pat (@subs) { if ( ($pat =~ /s%([^%]*)%([^%]*)%g/ ) || ($pat =~ /s%([^%]*)%([^%]*)%;t/ ) || *************** *** 193,198 **** my @infiles=split(' ', $infiles); my $i=0; ! foreach my $name (@infiles) { if (open(CF, "< $name")) { while (<CF>) { --- 194,200 ---- my @infiles=split(' ', $infiles); my $i=0; + my $name; ! foreach $name (@infiles) { if (open(CF, "< $name")) { while (<CF>) { Index: config.sub =================================================================== RCS file: /cvsroot/kbear/kbear/admin/config.sub,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** config.sub 12 Apr 2005 13:06:44 -0000 1.7 --- config.sub 23 Oct 2005 20:52:21 -0000 1.8 *************** *** 2,8 **** # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. ! timestamp='2004-06-24' # This file is (in principle) common to ALL GNU software. --- 2,8 ---- # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ! timestamp='2005-07-01' # This file is (in principle) common to ALL GNU software. *************** *** 22,28 **** # 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. ! # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a --- 22,28 ---- # 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 Street - Fifth Floor, Boston, MA ! # 02110-1301, USA. ! # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a *************** *** 30,33 **** --- 30,34 ---- # the same distribution terms that you use for the rest of that program. + # Please send patches to <con...@gn...>. Submit a context # diff and a properly formatted ChangeLog entry. *************** *** 71,75 **** GNU config.sub ($timestamp) ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. --- 72,76 ---- GNU config.sub ($timestamp) ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. *************** *** 84,92 **** case $1 in --time-stamp | --time* | -t ) ! echo "$timestamp" ; exit 0 ;; --version | -v ) ! echo "$version" ; exit 0 ;; --help | --h* | -h ) ! echo "$usage"; exit 0 ;; -- ) # Stop option processing shift; break ;; --- 85,93 ---- case $1 in --time-stamp | --time* | -t ) ! echo "$timestamp" ; exit ;; --version | -v ) ! echo "$version" ; exit ;; --help | --h* | -h ) ! echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; *************** *** 100,104 **** # First pass through any local machine types. echo $1 ! exit 0;; * ) --- 101,105 ---- # First pass through any local machine types. echo $1 ! exit ;; * ) *************** *** 232,235 **** --- 233,237 ---- | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ *************** *** 238,242 **** | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ ! | m32r | m32rle | m68000 | m68k | m88k | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ --- 240,244 ---- | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ ! | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ *************** *** 247,250 **** --- 249,253 ---- | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ *************** *** 255,261 **** | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | msp430 \ | ns16k | ns32k \ ! | openrisc | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ --- 258,265 ---- | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | ms1 \ | msp430 \ | ns16k | ns32k \ ! | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ *************** *** 263,275 **** | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ ! | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ ! | x86 | xscale | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. --- 267,283 ---- | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ ! | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ ! | sparcv8 | sparcv9 | sparcv9b \ | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ ! | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; + m32c) + basic_machine=$basic_machine-unknown + ;; m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. *************** *** 299,303 **** | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* \ ! | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ --- 307,311 ---- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* \ ! | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ *************** *** 311,315 **** | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ ! | m88110-* | m88k-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ --- 319,323 ---- | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ ! | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ *************** *** 320,323 **** --- 328,332 ---- | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ *************** *** 328,331 **** --- 337,341 ---- | mipstx39-* | mipstx39el-* \ | mmix-* \ + | ms1-* \ | msp430-* \ | none-* | np1-* | ns16k-* | ns32k-* \ *************** *** 337,341 **** | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ ! | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ --- 347,352 ---- | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ ! | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ ! | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ *************** *** 344,352 **** | v850-* | v850e-* | vax-* \ | we32k-* \ ! | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ ! | xtensa-* \ | ymp-* \ | z8k-*) ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. --- 355,365 ---- | v850-* | v850e-* | vax-* \ | we32k-* \ ! | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ ! | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) ;; + m32c-*) + ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. *************** *** 458,461 **** --- 471,477 ---- basic_machine=m68k-crds ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; cris | cris-* | etrax*) basic_machine=cris-axis *************** *** 487,490 **** --- 503,510 ---- os=-sysv3 ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; dpx20 | dpx20-*) basic_machine=rs6000-bull *************** *** 752,758 **** os=-proelf ;; ! or32 | or32-*) basic_machine=or32-unknown - os=-coff ;; os400) --- 772,777 ---- os=-proelf ;; ! openrisc | openrisc-*) basic_machine=or32-unknown ;; os400) *************** *** 1027,1030 **** --- 1046,1053 ---- os=-proelf ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; xps | xps100) basic_machine=xps100-honeywell *************** *** 1079,1085 **** basic_machine=sh-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; sparc | sparcv8 | sparcv9 | sparcv9b) basic_machine=sparc-sun --- 1102,1105 ---- *************** *** 1168,1172 **** | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ ! | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) # Remember, each alternative MUST END IN *, to match a version number. ;; --- 1188,1192 ---- | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ ! | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* | -skyos*) # Remember, each alternative MUST END IN *, to match a version number. ;; *************** *** 1295,1298 **** --- 1315,1321 ---- os=-kaos ;; + -zvmoe) + os=-zvmoe + ;; -none) ;; *************** *** 1543,1547 **** echo $basic_machine$os ! exit 0 # Local variables: --- 1566,1570 ---- echo $basic_machine$os ! exit # Local variables: Index: configure.in.bot.end =================================================================== RCS file: /cvsroot/kbear/kbear/admin/configure.in.bot.end,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** configure.in.bot.end 12 Apr 2005 13:06:44 -0000 1.2 --- configure.in.bot.end 23 Oct 2005 20:52:21 -0000 1.3 *************** *** 17,20 **** --- 17,35 ---- fi + if test x$GXX = "xyes" -a x$kde_have_gcc_visibility = "xyes" -a x$kde_cv_val_qt_gcc_visibility_patched = "xno"; then + echo "" + echo "Your GCC supports symbol visibility, but the patch for Qt supporting visibility" + echo "was not included. Therefore, GCC symbol visibility support remains disabled." + echo "" + echo "For better performance, consider including the Qt visibility supporting patch" + echo "located at:" + echo "" + echo "http://bugs.kde.org/show_bug.cgi?id=109386" + echo "" + echo "and recompile all of Qt and KDE. Note, this is entirely optional and" + echo "everything will continue to work just fine without it." + echo "" + fi + if test "$all_tests" = "bad"; then if test ! "$cache_file" = "/dev/null"; then Index: configure.in.min =================================================================== RCS file: /cvsroot/kbear/kbear/admin/configure.in.min,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** configure.in.min 9 Dec 2001 12:45:30 -0000 1.3 --- configure.in.min 23 Oct 2005 20:52:21 -0000 1.4 *************** *** 14,19 **** dnl You should have received a copy of the GNU Library General Public License dnl along with this library; see the file COPYING.LIB. If not, write to ! dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ! dnl Boston, MA 02111-1307, USA. # Original Author was Ka...@kd... --- 14,19 ---- dnl You should have received a copy of the GNU Library General Public License dnl along with this library; see the file COPYING.LIB. If not, write to ! dnl the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ! dnl Boston, MA 02110-1301, USA. # Original Author was Ka...@kd... Index: cvs.sh =================================================================== RCS file: /cvsroot/kbear/kbear/admin/cvs.sh,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** cvs.sh 12 Apr 2005 13:06:44 -0000 1.6 --- cvs.sh 23 Oct 2005 20:52:21 -0000 1.7 *************** *** 45,49 **** ;; esac ! AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1` case $AUTOHEADER_VERSION in --- 45,49 ---- ;; esac ! AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1` case $AUTOHEADER_VERSION in *************** *** 61,66 **** esac - unset UNSERMAKE || : - AUTOMAKE_STRING=`$AUTOMAKE --version | head -n 1` required_automake_version="1.6.1 or newer" --- 61,64 ---- *************** *** 71,75 **** exit 1 ;; ! automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*) : ;; "" ) echo "*** AUTOMAKE NOT FOUND!." --- 69,76 ---- exit 1 ;; ! automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*) ! echo "*** $AUTOMAKE_STRING found." ! UNSERMAKE=no ! ;; "" ) echo "*** AUTOMAKE NOT FOUND!." *************** *** 131,134 **** --- 132,136 ---- echo "*** Creating config.h template" $AUTOHEADER || exit 1 + touch config.h.in fi *************** *** 136,140 **** $AUTOMAKE || exit 1 ! if test -z "$UNSERMAKE"; then echo "*** Postprocessing Makefile templates" perl -w admin/am_edit || exit 1 --- 138,142 ---- $AUTOMAKE || exit 1 ! if test "$UNSERMAKE" = no; then echo "*** Postprocessing Makefile templates" perl -w admin/am_edit || exit 1 *************** *** 186,192 **** echo "*** Creating config.h template" $AUTOHEADER || exit 1 fi ! $AUTOMAKE --foreign ! if test -z "$UNSERMAKE"; then echo "*** Postprocessing Makefile templates" perl -w admin/am_edit || exit 1 --- 188,195 ---- echo "*** Creating config.h template" $AUTOHEADER || exit 1 + touch config.h.in fi ! $AUTOMAKE --foreign || exit 1 ! if test "$UNSERMAKE" = no; then echo "*** Postprocessing Makefile templates" perl -w admin/am_edit || exit 1 *************** *** 219,222 **** --- 222,226 ---- $ACLOCAL $ACLOCALFLAGS $AUTOHEADER + touch config.h.in $AUTOMAKE AUTOMAKE_STRING=`$AUTOMAKE --version | head -n 1` *************** *** 313,317 **** fi if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then ! VERSION="\"3.4.0\"" fi if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then --- 317,321 ---- fi if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then ! VERSION="\"3.4.92\"" fi if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then *************** *** 506,520 **** } - cvs_clean() - { - if test -d CVS; then :; else - echo "You don't have a toplevel CVS directory." - echo "You most certainly didn't use cvs to get these sources." - echo "But this function depends on cvs's inf... [truncated message content] |
|
From: <kb...@us...> - 2005-10-22 17:18:55
|
Update of /cvsroot/kbear/kbear In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30437 Modified Files: Tag: KBEAR_2_BRANCH VERSION configure.in.in kbear.kdevelop Log Message: Index: VERSION =================================================================== RCS file: /cvsroot/kbear/kbear/VERSION,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -d -r1.5 -r1.5.2.1 *** VERSION 17 Dec 2002 14:44:55 -0000 1.5 --- VERSION 22 Oct 2005 17:18:46 -0000 1.5.2.1 *************** *** 1 **** ! KBear 2.1 \ No newline at end of file --- 1 ---- ! KBear 2.1.2 \ No newline at end of file Index: configure.in.in =================================================================== RCS file: /cvsroot/kbear/kbear/configure.in.in,v retrieving revision 1.15 retrieving revision 1.15.2.1 diff -C2 -d -r1.15 -r1.15.2.1 *** configure.in.in 17 Dec 2002 14:44:54 -0000 1.15 --- configure.in.in 22 Oct 2005 17:18:46 -0000 1.15.2.1 *************** *** 1,5 **** #MIN_CONFIG(3.0) ! AM_INIT_AUTOMAKE(kbear,2.1) #AC_PATH_PROG(CONVERT,convert) --- 1,5 ---- #MIN_CONFIG(3.0) ! AM_INIT_AUTOMAKE(kbear,2.1.2) #AC_PATH_PROG(CONVERT,convert) Index: kbear.kdevelop =================================================================== RCS file: /cvsroot/kbear/kbear/Attic/kbear.kdevelop,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** kbear.kdevelop 21 Oct 2005 19:14:16 -0000 1.1.2.1 --- kbear.kdevelop 22 Oct 2005 17:18:46 -0000 1.1.2.2 *************** *** 10,14 **** <keyword>KDE</keyword> </keywords> ! <version>2.0.1</version> <description>KBear is a graphical ftp client for KDE with ability to connect to multiple hosts simultanously.</description> <ignoreparts/> --- 10,14 ---- <keyword>KDE</keyword> </keywords> ! <version>2.1.2</version> <description>KBear is a graphical ftp client for KDE with ability to connect to multiple hosts simultanously.</description> <ignoreparts/> *************** *** 24,29 **** <group pattern="*.po;*.ts" name="Translations" /> <group pattern="*" name="Others" /> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidenonlocation>false</hidenonlocation> </groups> <tree> --- 24,27 ---- *************** *** 45,56 **** <general> <dbgshell>libtool</dbgshell> ! <programargs/> ! <gdbpath/> <breakonloadinglibs>true</breakonloadinglibs> <separatetty>false</separatetty> <floatingtoolbar>false</floatingtoolbar> ! <configGdbScript/> ! <runShellScript/> ! <runGdbScript/> </general> <breakpoints/> --- 43,54 ---- <general> <dbgshell>libtool</dbgshell> ! <programargs></programargs> ! <gdbpath></gdbpath> <breakonloadinglibs>true</breakonloadinglibs> <separatetty>false</separatetty> <floatingtoolbar>false</floatingtoolbar> ! <configGdbScript></configGdbScript> ! <runShellScript></runShellScript> ! <runGdbScript></runGdbScript> </general> <breakpoints/> *************** *** 72,76 **** <run> <mainprogram>kbear/kbear</mainprogram> ! <programargs/> <directoryradio>executable</directoryradio> <customdirectory>/</customdirectory> --- 70,74 ---- <run> <mainprogram>kbear/kbear</mainprogram> ! <programargs></programargs> <directoryradio>executable</directoryradio> <customdirectory>/</customdirectory> *************** *** 84,88 **** <numberofjobs>1</numberofjobs> <dontact>false</dontact> ! <makebin/> <envvars> <envvar value="1" name="WANT_AUTOCONF_2_5" /> --- 82,86 ---- <numberofjobs>1</numberofjobs> <dontact>false</dontact> ! <makebin></makebin> <envvars> <envvar value="1" name="WANT_AUTOCONF_2_5" /> *************** *** 159,163 **** </codecompletion> <creategettersetter> ! <prefixGet/> <prefixSet>set</prefixSet> <prefixVariable>m_,_</prefixVariable> --- 157,161 ---- </codecompletion> <creategettersetter> ! <prefixGet></prefixGet> <prefixSet>set</prefixSet> <prefixVariable>m_,_</prefixVariable> *************** *** 179,181 **** --- 177,203 ---- <useglobaltypes/> </kdevfilecreate> + <dist> + <custom>false</custom> + <bzip>true</bzip> + <archname>%n-%v</archname> + <appname>kbear</appname> + <version>2.1.2</version> + <release></release> + <vendor></vendor> + <licence></licence> + <summary></summary> + <group></group> + <packager></packager> + <description>KBear is a graphical ftp client for KDE with ability to connect to multiple hosts simultanously.</description> + <changelog></changelog> + <devpackage>false</devpackage> + <docspackage>false</docspackage> + <appicon>false</appicon> + <arch>0</arch> + <genHTML>false</genHTML> + <useRPM>false</useRPM> + <ftpkde>false</ftpkde> + <appskde>false</appskde> + <url></url> + </dist> </kdevelop> |
|
From: <kb...@us...> - 2005-10-22 17:18:54
|
Update of /cvsroot/kbear/kbear/kbear/qextmdi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30437/kbear/qextmdi Modified Files: Tag: KBEAR_2_BRANCH Makefile.am Log Message: Index: Makefile.am =================================================================== RCS file: /cvsroot/kbear/kbear/kbear/qextmdi/Attic/Makefile.am,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -C2 -d -r1.9 -r1.9.2.1 *** Makefile.am 26 May 2002 23:19:30 -0000 1.9 --- Makefile.am 22 Oct 2005 17:18:46 -0000 1.9.2.1 *************** *** 6,14 **** qextmdichildview.cpp qextmdimainfrm.cpp qextmditaskbar.cpp ! #kbearqextmidinclude_HEADERS = qextmdichildarea.h qextmdichildfrm.h qextmdichildfrmcaption.h qextmdichildview.h \ ! # qextmdidefines.h qextmdiiterator.h qextmdilistiterator.h qextmdimainfrm.h \ ! # qextmdinulliterator.h qextmditaskbar.h ! #kbearqextmidincludedir = $(includedir)/kbear/qextmdi noinst_LTLIBRARIES = libkbearqextmdi.la --- 6,14 ---- qextmdichildview.cpp qextmdimainfrm.cpp qextmditaskbar.cpp ! kbearqextmidinclude_HEADERS = qextmdichildarea.h qextmdichildfrm.h qextmdichildfrmcaption.h qextmdichildview.h \ ! qextmdidefines.h qextmdiiterator.h qextmdilistiterator.h qextmdimainfrm.h \ ! qextmdinulliterator.h qextmditaskbar.h ! kbearqextmidincludedir = $(includedir)/kbear/qextmdi noinst_LTLIBRARIES = libkbearqextmdi.la |
|
From: <kb...@us...> - 2005-10-22 17:18:54
|
Update of /cvsroot/kbear/kbear/kbear/qextmdi/pics In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30437/kbear/qextmdi/pics Modified Files: Tag: KBEAR_2_BRANCH Makefile.am Log Message: Index: Makefile.am =================================================================== RCS file: /cvsroot/kbear/kbear/kbear/qextmdi/pics/Attic/Makefile.am,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** Makefile.am 26 May 2002 23:19:30 -0000 1.4 --- Makefile.am 22 Oct 2005 17:18:46 -0000 1.4.2.1 *************** *** 6,18 **** win_closebutton.xpm win_maxbutton.xpm win_minbutton.xpm win_restorebutton.xpm win_undockbutton.xpm ! #qextmdi_pics_DATA = kde2_closebutton.xpm kde2_closebutton_menu.xpm \ ! # kde2_maxbutton.xpm kde2_minbutton.xpm kde2_restorebutton.xpm \ ! # kde2_undockbutton.xpm kde2laptop_closebutton.xpm \ ! # kde2laptop_closebutton_menu.xpm kde2laptop_maxbutton.xpm \ ! # kde2laptop_minbutton.xpm kde2laptop_restorebutton.xpm \ ! # kde2laptop_undockbutton.xpm kde_closebutton.xpm \ ! # kde_maxbutton.xpm kde_minbutton.xpm kde_restorebutton.xpm \ ! # kde_undockbutton.xpm win_closebutton.xpm win_maxbutton.xpm \ ! # win_minbutton.xpm win_restorebutton.xpm win_undockbutton.xpm ! #qextmdi_picsdir = $(includedir)/kbear/qextmdi/pics --- 6,18 ---- win_closebutton.xpm win_maxbutton.xpm win_minbutton.xpm win_restorebutton.xpm win_undockbutton.xpm ! qextmdi_pics_DATA = kde2_closebutton.xpm kde2_closebutton_menu.xpm \ ! kde2_maxbutton.xpm kde2_minbutton.xpm kde2_restorebutton.xpm \ ! kde2_undockbutton.xpm kde2laptop_closebutton.xpm \ ! kde2laptop_closebutton_menu.xpm kde2laptop_maxbutton.xpm \ ! kde2laptop_minbutton.xpm kde2laptop_restorebutton.xpm \ ! kde2laptop_undockbutton.xpm kde_closebutton.xpm \ ! kde_maxbutton.xpm kde_minbutton.xpm kde_restorebutton.xpm \ ! kde_undockbutton.xpm win_closebutton.xpm win_maxbutton.xpm \ ! win_minbutton.xpm win_restorebutton.xpm win_undockbutton.xpm ! qextmdi_picsdir = $(includedir)/kbear/qextmdi/pics |
|
From: <kb...@us...> - 2005-10-22 17:18:54
|
Update of /cvsroot/kbear/kbear/kbear/base In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30437/kbear/base Modified Files: Tag: KBEAR_2_BRANCH kbearconnectionmanager.cpp Log Message: Index: kbearconnectionmanager.cpp =================================================================== RCS file: /cvsroot/kbear/kbear/kbear/base/Attic/kbearconnectionmanager.cpp,v retrieving revision 1.21 retrieving revision 1.21.2.1 diff -C2 -d -r1.21 -r1.21.2.1 *** kbearconnectionmanager.cpp 14 Dec 2002 14:09:25 -0000 1.21 --- kbearconnectionmanager.cpp 22 Oct 2005 17:18:46 -0000 1.21.2.1 *************** *** 44,48 **** //----------------------------------------------- KBearConnectionManager::KBearConnectionManager( const char* name ) ! : QObject( kapp, name ) { } --- 44,48 ---- //----------------------------------------------- KBearConnectionManager::KBearConnectionManager( const char* name ) ! : QObject( kapp->mainWidget(), name ) { } |
|
From: <kb...@us...> - 2005-10-21 19:14:28
|
Update of /cvsroot/kbear/kbear In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1539 Modified Files: Tag: KBEAR_2_BRANCH kbear.kdevelop Log Message: Fixed bug that trashed the system tray Index: kbear.kdevelop =================================================================== RCS file: /cvsroot/kbear/kbear/Attic/kbear.kdevelop,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** kbear.kdevelop 1 Nov 2002 17:31:36 -0000 1.1 --- kbear.kdevelop 21 Oct 2005 19:14:16 -0000 1.1.2.1 *************** *** 1,83 **** <!DOCTYPE kdevelop> <kdevelop> ! <general> ! <author>Björn Sahlström</author> ! <email>kb...@us...</email> ! <projectmanagement>KDevKDEAutoProject</projectmanagement> ! <primarylanguage>C++</primarylanguage> ! <keywords> ! <keyword>Qt</keyword> ! <keyword>KDE</keyword> </keywords> ! <version>2.0.1</version> ! <description>KBear is a graphical ftp client for KDE with ability to connect to multiple hosts simultanously.</description> ! <ignoreparts/> </general> ! <kdevfileview> ! <groups> ! <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> ! <group pattern="*.ui" name="User Interface" /> ! <group pattern="*.png" name="Icons" /> ! <group pattern="*.po;*.ts" name="Translations" /> ! <group pattern="*" name="Others" /> </groups> ! <tree> ! <hidenonprojectfiles>false</hidenonprojectfiles> ! <hidepatterns>*.o,*.lo,CVS</hidepatterns> </tree> </kdevfileview> ! <kdevdoctreeview> ! <ignoretocs> ! <toc>gtk</toc> ! <toc>gnustep</toc> ! <toc>python</toc> ! <toc>php</toc> ! <toc>perl</toc> </ignoretocs> </kdevdoctreeview> ! <kdevdebugger> ! <general> ! <dbgshell>libtool</dbgshell> ! <programargs/> ! <gdbpath/> ! <breakonloadinglibs>true</breakonloadinglibs> ! <separatetty>false</separatetty> ! <floatingtoolbar>false</floatingtoolbar> </general> ! <breakpoints/> ! <display> ! <staticmembers>false</staticmembers> ! <demanglenames>true</demanglenames> </display> </kdevdebugger> ! <workspace> ! <openfiles> ! <file context="ctx_kdelibs" url="file:/usr/lib/qt3/doc/html/" /> ! <file context="ctx_doxygen" url="file:/home/bjorn/kdecvs/kdelibs/apidocs/html/classKApplication.html#d1" /> ! <file url="file:/home/bjorn/programmering/projekt/kbear/kbear/parts/dirsynchpart/kbeardirsynchpart.cpp" /> ! <file url="file:/home/bjorn/programmering/projekt/kbear/kbear/parts/dirsynchpart/dirsynchtreebranch.cpp" /> </openfiles> </workspace> ! <kdevautoproject> ! <run> ! <mainprogram>./kbear/kbear</mainprogram> ! <programargs/> </run> ! <envvars/> ! <make> ! <abortonerror>false</abortonerror> ! <numberofjobs>1</numberofjobs> ! <dontact>false</dontact> ! <makebin/> </make> </kdevautoproject> ! <cppsupportpart> ! <codecompletion> ! <codehinting outputview="1" enablech="1" selectview="0" /> </codecompletion> ! <classstore> ! <enablepcs>false</enablepcs> ! <enablepp>false</enablepp> ! <preparsing/> </classstore> ! <filetemplates> ! <choosefiles>false</choosefiles> ! <interfaceURL/> ! <implementationURL/> ! <interfacesuffix>.h</interfacesuffix> ! <implementationsuffix>.cpp</implementationsuffix> ! <lowercasefilenames>true</lowercasefilenames> </filetemplates> </cppsupportpart> ! <kdevclassview> ! <folderhierarchy>true</folderhierarchy> ! <depthoffolders>2</depthoffolders> </kdevclassview> ! <kdevcvs> ! <cvsoptions>-f</cvsoptions> ! <commitoptions>-z4</commitoptions> ! <updateoptions>-dP -z4</updateoptions> ! <addoptions/> ! <removeoptions>-f</removeoptions> ! <diffoptions>-u3 -p</diffoptions> ! <logoptions/> </kdevcvs></kdevelop> \ No newline at end of file --- 1,181 ---- <!DOCTYPE kdevelop> <kdevelop> ! <general> ! <author>Björn Sahlström</author> ! <email>kb...@us...</email> ! <projectmanagement>KDevKDEAutoProject</projectmanagement> ! <primarylanguage>C++</primarylanguage> ! <keywords> ! <keyword>Qt</keyword> ! <keyword>KDE</keyword> ! </keywords> ! <version>2.0.1</version> ! <description>KBear is a graphical ftp client for KDE with ability to connect to multiple hosts simultanously.</description> ! <ignoreparts/> ! <projectdirectory>.</projectdirectory> ! <absoluteprojectpath>false</absoluteprojectpath> ! <versioncontrol>kdevcvsservice</versioncontrol> ! </general> ! <kdevfileview> ! <groups> ! <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> ! <group pattern="*.ui" name="User Interface" /> ! <group pattern="*.png" name="Icons" /> ! <group pattern="*.po;*.ts" name="Translations" /> ! <group pattern="*" name="Others" /> ! <hidenonprojectfiles>false</hidenonprojectfiles> ! <hidenonlocation>false</hidenonlocation> ! </groups> ! <tree> ! <hidenonprojectfiles>false</hidenonprojectfiles> ! <hidepatterns>*.o,*.lo,CVS</hidepatterns> ! <showvcsfields>false</showvcsfields> ! </tree> ! </kdevfileview> ! <kdevdoctreeview> ! <ignoretocs> ! <toc>gtk</toc> ! <toc>gnustep</toc> ! <toc>python</toc> ! <toc>php</toc> ! <toc>perl</toc> ! </ignoretocs> ! </kdevdoctreeview> ! <kdevdebugger> ! <general> ! <dbgshell>libtool</dbgshell> ! <programargs/> ! <gdbpath/> ! <breakonloadinglibs>true</breakonloadinglibs> ! <separatetty>false</separatetty> ! <floatingtoolbar>false</floatingtoolbar> ! <configGdbScript/> ! <runShellScript/> ! <runGdbScript/> ! </general> ! <breakpoints/> ! <display> ! <staticmembers>false</staticmembers> ! <demanglenames>true</demanglenames> ! <outputradix>10</outputradix> ! </display> ! </kdevdebugger> ! <workspace> ! <openfiles> ! <file context="ctx_kdelibs" url="file:/usr/lib/qt3/doc/html/" /> ! <file context="ctx_doxygen" url="file:/home/bjorn/kdecvs/kdelibs/apidocs/html/classKApplication.html#d1" /> ! <file url="file:/home/bjorn/programmering/projekt/kbear/kbear/parts/dirsynchpart/kbeardirsynchpart.cpp" /> ! <file url="file:/home/bjorn/programmering/projekt/kbear/kbear/parts/dirsynchpart/dirsynchtreebranch.cpp" /> ! </openfiles> ! </workspace> ! <kdevautoproject> ! <run> ! <mainprogram>kbear/kbear</mainprogram> ! <programargs/> ! <directoryradio>executable</directoryradio> ! <customdirectory>/</customdirectory> ! <terminal>false</terminal> ! <autocompile>true</autocompile> ! <envvars/> ! </run> ! <envvars/> ! <make> ! <abortonerror>false</abortonerror> ! <numberofjobs>1</numberofjobs> ! <dontact>false</dontact> ! <makebin/> ! <envvars> ! <envvar value="1" name="WANT_AUTOCONF_2_5" /> ! <envvar value="1" name="WANT_AUTOMAKE_1_6" /> ! </envvars> ! <prio>0</prio> ! </make> ! <general> ! <useconfiguration>default</useconfiguration> ! </general> ! <configurations> ! <default> ! <envvars/> ! <configargs>--enable-final --enable-debug=full</configargs> ! <builddir/> ! <topsourcedir/> ! <cppflags/> ! <ldflags/> ! <ccompiler>kdevgccoptions</ccompiler> ! <cxxcompiler>kdevgppoptions</cxxcompiler> ! <f77compiler>kdevpghpfoptions</f77compiler> ! <ccompilerbinary/> ! <cxxcompilerbinary/> ! <f77compilerbinary/> ! <cflags/> ! <cxxflags/> ! <f77flags/> ! </default> ! </configurations> ! </kdevautoproject> ! <cppsupportpart> ! <codecompletion> ! <codehinting outputview="1" enablech="1" selectview="0" /> ! </codecompletion> ! <classstore> ! <enablepcs>false</enablepcs> ! <enablepp>false</enablepp> ! <preparsing/> ! </classstore> ! <filetemplates> ! <choosefiles>false</choosefiles> ! <interfaceURL/> ! <implementationURL/> ! <interfacesuffix>.h</interfacesuffix> ! <implementationsuffix>.cpp</implementationsuffix> ! <lowercasefilenames>true</lowercasefilenames> ! </filetemplates> ! </cppsupportpart> ! <kdevclassview> ! <folderhierarchy>true</folderhierarchy> ! <depthoffolders>2</depthoffolders> ! </kdevclassview> ! <kdevcvs> ! <cvsoptions>-f</cvsoptions> ! <commitoptions>-z4</commitoptions> ! <updateoptions>-dP -z4</updateoptions> ! <addoptions/> ! <removeoptions>-f</removeoptions> ! <diffoptions>-u3 -p</diffoptions> ! <logoptions/> ! </kdevcvs> ! <kdevcppsupport> ! <codecompletion> ! <includeGlobalFunctions>true</includeGlobalFunctions> ! <includeTypes>true</includeTypes> ! <includeEnums>true</includeEnums> ! <includeTypedefs>true</includeTypedefs> ! <automaticCodeCompletion>true</automaticCodeCompletion> ! <automaticArgumentsHint>true</automaticArgumentsHint> ! <automaticHeaderCompletion>true</automaticHeaderCompletion> ! <codeCompletionDelay>250</codeCompletionDelay> ! <argumentsHintDelay>400</argumentsHintDelay> ! <headerCompletionDelay>250</headerCompletionDelay> ! </codecompletion> ! <creategettersetter> ! <prefixGet/> ! <prefixSet>set</prefixSet> ! <prefixVariable>m_,_</prefixVariable> ! <parameterName>theValue</parameterName> ! <inlineGet>true</inlineGet> ! <inlineSet>true</inlineSet> ! </creategettersetter> ! <references/> ! </kdevcppsupport> ! <kdevdocumentation> ! <projectdoc> ! <docsystem/> ! <docurl/> ! <usermanualurl/> ! </projectdoc> ! </kdevdocumentation> ! <kdevfilecreate> ! <filetypes/> ! <useglobaltypes/> ! </kdevfilecreate> ! </kdevelop> |
|
From: <kb...@us...> - 2005-10-21 19:14:27
|
Update of /cvsroot/kbear/kbear/databasedeamon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1539/databasedeamon Modified Files: Tag: KBEAR_2_BRANCH sitemanagerdb.cpp sitemanagerdbapp.cpp Log Message: Fixed bug that trashed the system tray Index: sitemanagerdb.cpp =================================================================== RCS file: /cvsroot/kbear/kbear/databasedeamon/sitemanagerdb.cpp,v retrieving revision 1.33 retrieving revision 1.33.2.1 diff -C2 -d -r1.33 -r1.33.2.1 *** sitemanagerdb.cpp 4 Nov 2002 00:08:59 -0000 1.33 --- sitemanagerdb.cpp 21 Oct 2005 19:14:15 -0000 1.33.2.1 *************** *** 45,50 **** kapp->dcopClient()->setDefaultObject( objId() ); // create the system tray icon ! m_dockWindow = new KSystemTray( kapp->mainWidget(), "SiteManagerDockWindow" ); ! m_dockWindow->setPixmap( KGlobal::iconLoader()->loadIcon("kbearsitemanager", KIcon::Small ) ); /* --- 45,50 ---- kapp->dcopClient()->setDefaultObject( objId() ); // create the system tray icon ! // m_dockWindow = new KSystemTray( kapp->mainWidget(), "SiteManagerDockWindow" ); ! // m_dockWindow->setPixmap( KGlobal::iconLoader()->loadIcon("kbearsitemanager", KIcon::Small ) ); /* *************** *** 715,718 **** --- 715,719 ---- void SiteManagerDB::showSystemTrayIcon(bool show) { kdDebug()<<"SiteManagerDB::showSystemTrayIcon="<<show<<endl; + /* if( show ) m_dockWindow->show(); *************** *** 724,728 **** stream << show; emitDCOPSignal( signal, data ); ! } //----------------------------------------------- void SiteManagerDB::setPlugInKonq(bool plug ) { --- 725,729 ---- stream << show; emitDCOPSignal( signal, data ); ! */} //----------------------------------------------- void SiteManagerDB::setPlugInKonq(bool plug ) { Index: sitemanagerdbapp.cpp =================================================================== RCS file: /cvsroot/kbear/kbear/databasedeamon/sitemanagerdbapp.cpp,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -C2 -d -r1.11 -r1.11.2.1 *** sitemanagerdbapp.cpp 23 Jul 2002 21:00:28 -0000 1.11 --- sitemanagerdbapp.cpp 21 Oct 2005 19:14:15 -0000 1.11.2.1 *************** *** 35,39 **** //----------------------------------------------- SiteManagerDBApp::SiteManagerDBApp() ! : KUniqueApplication( false, true ), m_siteManagerDB( 0L ) --- 35,39 ---- //----------------------------------------------- SiteManagerDBApp::SiteManagerDBApp() ! : KUniqueApplication( true, true, false ), m_siteManagerDB( 0L ) |
|
From: <kb...@us...> - 2005-10-21 19:14:27
|
Update of /cvsroot/kbear/kbear/kbear In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1539/kbear Modified Files: Tag: KBEAR_2_BRANCH Makefile.am kbearsystemtraydock.cpp Log Message: Fixed bug that trashed the system tray Index: Makefile.am =================================================================== RCS file: /cvsroot/kbear/kbear/kbear/Makefile.am,v retrieving revision 1.54 retrieving revision 1.54.2.1 diff -C2 -d -r1.54 -r1.54.2.1 *** Makefile.am 19 Sep 2002 17:04:38 -0000 1.54 --- Makefile.am 21 Oct 2005 19:14:16 -0000 1.54.2.1 *************** *** 73,77 **** lib_LTLIBRARIES = libkbear.la ! libkbear_la_SOURCES = kbearquickconnect.cpp kbearqueryexit.ui kbearmdichildview.cpp \ kbear.cpp kbear_slots.cpp kbearwizard.cpp windowsettingswidget.cpp \ viewsettingswidget.cpp mixedsettingswidget.cpp transferqueue.cpp \ --- 73,77 ---- lib_LTLIBRARIES = libkbear.la ! libkbear_la_SOURCES = kbearquickconnect.cpp kbearqueryexit.ui kbearmdichildview.cpp \ kbear.cpp kbear_slots.cpp kbearwizard.cpp windowsettingswidget.cpp \ viewsettingswidget.cpp mixedsettingswidget.cpp transferqueue.cpp \ Index: kbearsystemtraydock.cpp =================================================================== RCS file: /cvsroot/kbear/kbear/kbear/Attic/kbearsystemtraydock.cpp,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -d -r1.6 -r1.6.2.1 *** kbearsystemtraydock.cpp 31 Oct 2002 20:12:46 -0000 1.6 --- kbearsystemtraydock.cpp 21 Oct 2005 19:14:16 -0000 1.6.2.1 *************** *** 52,56 **** void KBearSystemTrayDock::show(){ QString oldGroup = kapp->config()->group(); ! kapp->config()->setGroup( "General" ); kapp->config()->writeEntry( "Show System Tray Icon", true ); kapp->config()->setGroup( oldGroup ); --- 52,56 ---- void KBearSystemTrayDock::show(){ QString oldGroup = kapp->config()->group(); ! kapp-> config()->setGroup( "General" ); kapp->config()->writeEntry( "Show System Tray Icon", true ); kapp->config()->setGroup( oldGroup ); |
|
From: <kb...@us...> - 2005-10-21 19:14:27
|
Update of /cvsroot/kbear/kbear/kbear/plugins/sitemanager In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1539/kbear/plugins/sitemanager Modified Files: Tag: KBEAR_2_BRANCH kbearsitemanager.cpp Log Message: Fixed bug that trashed the system tray Index: kbearsitemanager.cpp =================================================================== RCS file: /cvsroot/kbear/kbear/kbear/plugins/sitemanager/kbearsitemanager.cpp,v retrieving revision 1.35 retrieving revision 1.35.2.1 diff -C2 -d -r1.35 -r1.35.2.1 *** kbearsitemanager.cpp 8 Nov 2002 22:30:14 -0000 1.35 --- kbearsitemanager.cpp 21 Oct 2005 19:14:16 -0000 1.35.2.1 *************** *** 66,69 **** --- 66,71 ---- setupProtocolCombo(); p_encodingComboBox->insertStringList( KGlobal::charsets()->descriptiveEncodingNames() ); + + p_showSystemTrayCheckBox->setEnabled(false); } //----------------------------------------------- |
Update of /cvsroot/kbear/kbear/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1539/admin Modified Files: Tag: KBEAR_2_BRANCH Doxyfile.am Doxyfile.global Makefile.common acinclude.m4.in am_edit bcheck.pl compile conf.change.pl config.guess config.pl config.sub configure.in.bot.end configure.in.min cvs-clean.pl cvs.sh debianrules depcomp detect-autoconf.sh install-sh libtool.m4.in ltmain.sh missing mkinstalldirs oldinclude.m4.in ylwrap Added Files: Tag: KBEAR_2_BRANCH detect-autoconf.pl doxygen.sh Log Message: Fixed bug that trashed the system tray --- NEW FILE: detect-autoconf.pl --- #!/usr/bin/env perl # Try to locate best version of auto* # By Michael Pyne <mic...@kd...> # # Copyright (c) 2005. # This code is public domain. You may use it however you like (including # relicensing). # Emulate the 'which' program. sub which { my $prog = shift; my @paths = split(/:/, $ENV{'PATH'}); for $path (@paths) { return "$path/$prog" if -x "$path/$prog"; } return ""; } # Subroutine to determine the highest installed version of the given program, # searching from the given paths. sub findBest { my ($program, @paths) = @_; my $best_version_found = '0'; # Deliberately a string. my %versions; my %minimumVersions = ( 'autoconf' => '2.5', 'automake' => '1.6', ); # Allow user to use environment variable to override search. return $ENV{uc $program} if $ENV{uc $program}; for $prefix (@paths) { @files = glob "$prefix/$program*"; for $file (@files) { # Don't check non-executable scripts. next unless -x $file; ($version) = $file =~ /$prefix\/$program-?(.*)$/; $version =~ s/-|\.//g; # Special case some programs to make sure it has a minimum version. if (not $version and exists $minimumVersions{$program}) { my $min_version = $minimumVersions{$program}; my $versionOutput = `$program --version 2>/dev/null | head -n 1`; # If we can't run the script to get the version it likely won't work later. next unless $versionOutput; # Use number.number for version (we don't need the excess in general). ($versionOutput) = ($versionOutput =~ /(\d\.\d)/); # Use lt to do lexicographical comparison of strings (which should be # equivalent and doesn't involve issues with floating point conversions). if (not $versionOutput or $versionOutput lt $min_version) { next; } } # If no version suffix then use it in favor of a versioned autotool # since the ever-popular WANT_AUTOFOO should then work (in theory). return $file unless $version; # Emulate 'which', and abort if we've already seen this version. next if exists $versions{$version}; # Save filename of program. $versions{$version} = $file; # Use string comparison so that e.g. 253a will be > 253 but < 254. if ($version gt $best_version_found) { $best_version_found = $version; } } } return $versions{$best_version_found}; } # Find an appropriate "which" program for later use by the shell script calling # us. sub findWhich { for $candidate ('type -p', 'which', 'type') { $test = `$candidate sh 2>/dev/null`; chomp $test; return $candidate if -x $test; } } # Uses which() to find a program unless the user provided its path in the # environment (the upper case program name is searched). sub findProgram { $suffix = ""; # For use if @_ has only one param. my ($program, $suffix) = @_; return $ENV{uc $program} if $ENV{uc $program}; return which("$program$suffix"); } # SCRIPT STARTS. # Search in path. @paths = split(/:/, $ENV{'PATH'}); # Make sure at least /usr/bin and /usr/local/bin are in this search. unshift @paths, '/usr/local/bin' unless grep $_ eq '/usr/local/bin', @paths; unshift @paths, '/usr/bin' unless grep $_ eq '/usr/bin', @paths; $autoconf = findBest('autoconf', @paths); ($autoconf_suffix) = $autoconf =~ /.*autoconf(.*)$/; # Find matching autoconf companions. $autoheader = findProgram('autoheader', $autoconf_suffix); $autom4te = findProgram('autom4te', $autoconf_suffix); # Get best automake, and look for unsermake to possibly override it. $automake = findBest('automake', @paths); $unsermake = ""; # backward compatible: if $UNSERMAKE points to a path, use it $unsermake = findProgram('unsermake') if (defined($ENV{'UNSERMAKE'}) and $ENV{'UNSERMAKE'} =~ /\//); # new compatible: if it says 'yes', use the one from path $unsermake = which('unsermake') if ($ENV{'UNSERMAKE'} ne 'no'); ($automake_suffix) = $automake =~ /.*automake(.*)$/; # Use unsermake if we found it. $automake = "$unsermake -c" if $unsermake; # Find matching automake companions. $aclocal = findProgram('aclocal', $automake_suffix); $which = findWhich(); # Make sure we have all of the needed programs. for $i (qw'autoconf autoheader autom4te automake aclocal') { unless(${$i}) { print "# Unable to find $i!!\n"; exit 1; } } # Print results in eval-able form. print <<EOF; AUTOCONF="$autoconf" AUTOHEADER="$autoheader" AUTOM4TE="$autom4te" AUTOMAKE="$automake" ACLOCAL="$aclocal" WHICH="$which" export AUTOCONF AUTOHEADER AUTOM4TE AUTOMAKE ACLOCAL WHICH EOF exit 0; --- NEW FILE: doxygen.sh --- #! /bin/sh # # doxygen.sh Copyright (C) 2005 by Adriaan de Groot # Based on some code from Doxyfile.am, among other things. # License: GPL version 2. # See file COPYING in kdelibs for details. echo "*** doxygen.sh" # Recurse handling is a little complicated, since normally # subdir (given on the command-line) processing doesn't recurse # but you can force it to do so. recurse=1 recurse_given=NO use_modulename=1 cleanup=YES while test -n "$1" ; do case "x$1" in "x--no-cleanup" ) cleanup=NO ;; "x--no-recurse" ) recurse=0 recurse_given=YES ;; "x--recurse" ) recurse=1 recurse_given=YES ;; "x--no-modulename" ) use_modulename=0 ;; "x--modulename" ) use_modulename=1 ;; "x--help" ) echo "doxygen.sh usage:" echo "doxygen.sh [--no-recurse] [--no-modulename] <srcdir> [<subdir>]" exit 2 ;; x--doxdatadir=* ) DOXDATA=`echo $1 | sed -e 's+--doxdatadir=++'` ;; x--installdir=*) PREFIX=`echo $1 | sed -e 's+--installdir=++'` ;; x--* ) echo "Unknown option: $1" exit 1 ;; * ) top_srcdir="$1" break ;; esac shift done ### Sanity check the mandatory "top srcdir" argument. if test -z "$top_srcdir" ; then echo "Usage: doxygen.sh <top_srcdir>" exit 1 fi 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 top_srcdir=`cd "$top_srcdir" 2> /dev/null && pwd` if ! test -d "$top_srcdir" ; then echo "top_srcdir ($top_srcdir) is not a directory." exit 1 fi fi ### Sanity check and guess QTDOCDIR. if test -z "$QTDOCDIR" ; then if test -z "$QTDIR" ; then for i in /usr/X11R6/share/doc/qt/html do QTDOCDIR="$i" test -d "$QTDOCDIR" && break done else for i in share/doc/qt/html doc/html do QTDOCDIR="$QTDIR/$i" test -d "$QTDOCDIR" && break done fi fi if test -z "$QTDOCDIR" || test \! -d "$QTDOCDIR" ; then if test -z "$QTDOCDIR" ; then echo "* QTDOCDIR could not be guessed." else echo "* QTDOCDIR does not name a directory." fi if test -z "$QTDOCTAG" ; then echo "* QTDOCDIR set to \"\"" QTDOCDIR="" else echo "* But I'll use $QTDOCDIR anyway because of QTDOCTAG." fi fi ### Get the "top srcdir", also its name, and handle the case that subdir "." ### is given (which would be top_srcdir then, so it's equal to none-given ### but no recursion either). ### # top_srcdir="$1" # Already set by options processing module_name=`basename "$top_srcdir"` subdir="$2" if test "x." = "x$subdir" ; then subdir="" if test "x$recurse_given" = "xNO" ; then recurse=0 fi fi if test "x" != "x$subdir" ; then # If no recurse option given explicitly, default to # no recurse when processing subdirs given on the command-line. if test "x$recurse_given" = "xNO" ; then recurse=0 fi fi if test -z "$DOXDATA" || test ! -d "$DOXDATA" ; then if test -n "$DOXDATA" ; then echo "* \$DOXDATA is '$DOXDATA' which does not name a directory" fi DOXDATA="$top_srcdir/doc/common" fi if ! test -d "$DOXDATA" ; then echo "* \$DOXDATA does not name a directory ( or is unset ), tried \"$DOXDATA\"" exit 1 fi if test -n "$PREFIX" && test ! -d "$PREFIX" ; then echo "* \$PREFIX does not name a directory, tried \"$PREFIX\"" echo "* \$PREFIX is disabled." PREFIX="" fi ### We need some values from top-level files, which ### are not preserved between invocations of this ### script, so factor it out for easy use. create_doxyfile_in() { eval `grep 'VERSION="' "$top_srcdir/admin/cvs.sh"` echo "PROJECT_NUMBER = $VERSION" > Doxyfile.in grep ^KDE_INIT_DOXYGEN "$top_srcdir/configure.in.in" | \ sed -e 's+[^[]*\[\([^]]*\)+PROJECT_NAME = "\1"+' \ -e 's+].*++' >> Doxyfile.in } apidoxdir="$module_name"-apidocs test "x$use_modulename" = "x0" && apidoxdir="apidocs" ### If we're making the top subdir, create the structure ### 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 mkdir "$apidoxdir" > /dev/null 2>&1 fi if ! cd "$apidoxdir" > /dev/null 2>&1 ; then echo "Cannot create and cd into $apidoxdir" exit 1 fi test -f "Doxyfile.in" || create_doxyfile_in # Copy in logos and the like for i in "favicon.ico" "kde_gear_64.png" do cp "$DOXDATA/$i" . > /dev/null 2> /dev/null done for i in "$top_srcdir/doc/api/Dox-"*.png do T=`basename "$i" | sed -e 's+Dox-++'` test -f "$i" && cp "$i" "./$T" > /dev/null 2> /dev/null done top_builddir="." srcdir="$1" subdir="." else if ! cd "$apidoxdir" > /dev/null 2>&1 ; then 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 echo "* No subdirs.top available in the $apidoxdir." echo "* The --recurse option will be ignored." recurse=0 fi fi fi ### Read a single line (TODO: support \ continuations) from the Makefile.am. ### Used to extract variable assignments from it. extract_line() { file="$2" ; test -z "$file" && file="$srcdir/Makefile.am" pattern=`echo "$1" | tr + .` grep "^$1" "$file" | \ sed -e "s+$pattern.*=\s*++" } ### Handle the COMPILE_{FIRST,LAST,BEFORE,AFTER} part of Makefile.am ### in the toplevel. Copied from admin/cvs.sh. Licence presumed LGPL). create_subdirs() { echo "* Sorting top-level subdirs" dirs= idirs= if test -f "$top_srcdir/inst-apps"; then idirs=`cat "$top_srcdir/"inst-apps` else idirs=`cd "$top_srcdir" && ls -1 | sort` fi compilefirst="" compilelast="" if test -f "$top_srcdir/"Makefile.am.in ; then compilefirst=`sed -ne 's#^COMPILE_FIRST[ ]*=[ ]*##p' "$top_srcdir/"Makefile.am.in | head -n 1` compilelast=`sed -ne 's#^COMPILE_LAST[ ]*=[ ]*##p' "$top_srcdir/"Makefile.am.in | head -n 1` fi for i in $idirs; do if test -f "$top_srcdir/$i"/Makefile.am; then case " $compilefirst $compilelast " in *" $i "*) ;; *) dirs="$dirs $i" esac fi done : > ./_SUBDIRS for d in $compilefirst; do echo $d >> ./_SUBDIRS done (for d in $dirs; do list="" if test -f "$top_srcdir/"Makefile.am.in ; then list=`sed -ne "s#^COMPILE_BEFORE_$d""[ ]*=[ ]*##p" "$top_srcdir/"Makefile.am.in | head -n 1` fi for s in $list; do echo $s $d done list="" if test -f "$top_srcdir/"Makefile.am.in ; then list=`sed -ne "s#^COMPILE_AFTER_$d""[ ]*=[ ]*##p" "$top_srcdir/"Makefile.am.in | head -n 1` fi for s in $list; do echo $d $s done echo $d $d done ) | tsort >> ./_SUBDIRS for d in $compilelast; do echo $d >> ./_SUBDIRS done test -r _SUBDIRS && mv _SUBDIRS subdirs.top || true } ### Add HTML header, footer, CSS tags to Doxyfile. ### Assumes $subdir is set. Argument is a string ### to stick in front of the file if needed. apidox_htmlfiles() { dox_header="$top_srcdir/doc/api/$1header.html" dox_footer="$top_srcdir/doc/api/$1footer.html" dox_css="$top_srcdir/doc/api/doxygen.css" test -f "$dox_header" || dox_header="$DOXDATA/$1header.html" test -f "$dox_footer" || dox_footer="$DOXDATA/$1footer.html" test -f "$dox_css" || dox_css="$DOXDATA/doxygen.css" echo "HTML_HEADER = $dox_header" >> "$subdir/Doxyfile" ; \ echo "HTML_FOOTER = $dox_footer" >> "$subdir/Doxyfile" ; \ echo "HTML_STYLESHEET = $dox_css" >> "$subdir/Doxyfile" } apidox_specials() { line=`extract_line DOXYGEN_PROJECTNAME "$1"` test -n "$line" && echo "PROJECT_NAME = \"$line\"" >> "$2" } apidox_local() { for i in "$top_srcdir/doc/api/Doxyfile.local" do if test -f "$i" ; then cat "$i" >> "$subdir/Doxyfile" break fi done } ### Post-process HTML files by substituting in the menu files # # In non-top directories, both <!-- menu --> and <!-- gmenu --> # are calculated and replaced. Top directories get an empty <!-- menu --> # if any. doxyndex() { # Special case top-level to have an empty MENU. if test "x$subdir" = "x." ; then MENU="" htmldir="." htmltop="$top_builddir" # Just ., presumably echo "* Post-processing top-level files" else MENU="<ul>" htmldir="$subdir/html" htmltop="$top_builddir.." # top_builddir ends with / echo "* Post-processing files in $htmldir" # Build a little PHP file that maps class names to file # names, for the quick-class-picker functionality. # (The quick-class-picker is disabled due to styling # problems in IE & FF). ( echo "<?php \$map = array("; \ for htmlfile in `find $htmldir/ -type f -name "class[A-Z]*.html" | grep -v "\-members.html$"`; do classname=`echo $htmlfile | sed -e "s,.*/class\\(.*\\).html,\1," -e "s,_1_1,::,g" -e "s,_01, ,g" -e "s,_4,>,g" -e "s+_00+,+g" -e "s+_3+<+g" | tr "[A-Z]" "[a-z]"` echo " \"$classname\" => \"$htmlfile\"," done | sort ; \ echo ") ?>" ) > "$subdir/classmap.inc" # This is a list of pairs, with / separators so we can use # basename and dirname (a crude shell hack) to split them # into parts. For each, if the file part exists (as a html # file) tack it onto the MENU variable as a <li> with link. for i in "Main Page/index" \ "Modules/modules" \ "Namespace List/namespaces" \ "Class Hierarchy/hierarchy" \ "Alphabetical List/classes" \ "Class List/annotated" \ "File List/files" \ "Directories/dirs" \ "Namespace Members/namespacemembers" \ "Class Members/functions" \ "Related Pages/pages" do NAME=`dirname "$i"` FILE=`basename "$i"` test -f "$htmldir/$FILE.html" && MENU="$MENU<li><a href=\"$FILE.html\">$NAME</a></li>" done MENU="$MENU</ul>" fi # Get the list of global Menu entries. GMENU=`cat subdirs | tr -d '\n'` PMENU=`grep '<!-- pmenu' "$htmldir/index.html" | sed -e 's+.*pmenu *++' -e 's+ *-->++' | awk '{ c=split($0,a,"/"); for (j=1; j<=c; j++) { printf " / <a href=\""; if (j==c) { printf("."); } for (k=j; k<c; k++) { printf "../"; } if (j<c) { printf("../html/index.html"); } printf "\">%s</a>\n" , a[j]; } }' | tr -d '\n'` # Map the PHP file into HTML options so that # it can be substituted in for the quick-class-picker. CMENU="" # For now, leave the CMENU disabled CMENUBEGIN="<!--" CMENUEND="-->" if test "x$subdir" = "x." ; then # Disable CMENU on toplevel anyway CMENUBEGIN="<!--" CMENUEND="-->" else test -f "$subdir/classmap.inc" && \ CMENU=`grep '=>' "$subdir/classmap.inc" | sed -e 's+"\([^"]*\)" => "'"$subdir/html/"'\([^"]*\)"+<option value="\2">\1<\/option>+' | tr -d '\n'` if ! test -f "$subdir/classmap.inc" || ! grep "=>" "$subdir/classmap.inc" > /dev/null 2>&1 ; then CMENUBEGIN="<!--" CMENUEND="-->" fi fi # Now substitute in the MENU in every file. This depends # on HTML_HEADER (ie. header.html) containing the # <!-- menu --> comment. for i in "$htmldir"/*.html do if test -f "$i" ; then sed -e "s+<!-- menu -->+$MENU+" \ -e "s+<!-- gmenu -->+$GMENU+" \ -e "s+<!-- pmenu.*-->+$PMENU+" \ -e "s+<!-- cmenu.begin -->+$CMENUBEGIN+" \ -e "s+<!-- cmenu.end -->+$CMENUEND+" \ < "$i" | sed -e "s+@topdir@+$htmltop+g" > "$i.new" && mv "$i.new" "$i" sed -e "s+<!-- cmenu -->+$CMENU+" < "$i" > "$i.new" test -s "$i.new" && mv "$i.new" "$i" fi done } ### Handle the Doxygen processing of a toplevel directory. apidox_toplevel() { echo "" echo "*** Creating API documentation main page for $module_name" echo "*" rm -f "Doxyfile" for i in "$top_srcdir/doc/api/Doxyfile.global" \ "$top_srcdir/admin/Doxyfile.global" \ "$DOXDATA/Doxyfile.global" do if test -f "$i" ; then cp "$i" Doxyfile break fi done if test ! -f "Doxyfile" ; then echo "* Cannot create Doxyfile." exit 1 fi cat "$top_builddir/Doxyfile.in" >> Doxyfile echo "INPUT = $top_srcdir" >> Doxyfile echo "OUTPUT_DIRECTORY = $top_builddir" >> Doxyfile ; \ echo "FILE_PATTERNS = *.dox" >> Doxyfile ; \ echo "RECURSIVE = NO" >> Doxyfile ; \ echo "ALPHABETICAL_INDEX = NO" >> Doxyfile ; \ echo "HTML_OUTPUT = ." >> Doxyfile ; \ apidox_htmlfiles "main" # KDevelop has a top-level Makefile.am with settings. for i in "$top_srcdir/Makefile.am.in" "$top_srcdir/Makefile.am" do if test -f "$i" ; then grep '^DOXYGEN_SET_' "$i" | \ sed -e 's+DOXYGEN_SET_++' -e "s+@topdir@+$top_srcdir+" >> Doxyfile apidox_specials "$srcdir/Makefile.am" "$subdir/Doxyfile" break fi done apidox_local doxygen Doxyfile ( cd "$top_srcdir" && grep -l ^include.*Doxyfile.am `find . -name Makefile.am` ) | sed -e 's+/Makefile.am$++' -e 's+^\./++' | sort > subdirs.in for i in `cat subdirs.in` do test "x." = "x$i" && continue; dir=`dirname "$i"` file=`basename "$i"` if test "x." = "x$dir" ; then dir="" else dir="$dir/" fi indent=`echo "$dir" | sed -e 's+[^/]*/+\ \ +g' | sed -e 's+&+\\\&+g'` entryname=`extract_line DOXYGEN_SET_PROJECT_NAME "$top_srcdir/$dir/$file/Makefile.am"` test -z "$entryname" && entryname="$file" if grep DOXYGEN_EMPTY "$top_srcdir/$dir/$file/Makefile.am" > /dev/null 2>&1 ; then echo "<li>$indent$file</li>" else echo "<li>$indent<a href=\"@topdir@/$dir$file/html/index.html\">$entryname</a></li>" fi done > subdirs doxyndex } ### Handle the Doxygen processing of a non-toplevel directory. apidox_subdir() { echo "" echo "*** Creating apidox in $subdir" echo "*" rm -f "$subdir/Doxyfile" if ! test -d "$top_srcdir/$subdir" ; then echo "* No source (sub)directory $subdir" return fi for i in "$top_srcdir/doc/api/Doxyfile.global" \ "$top_srcdir/admin/Doxyfile.global" \ "$DOXDATA/Doxyfile.global" do if test -f "$i" ; then cp "$i" "$subdir/Doxyfile" break fi done test -f "Doxyfile.in" || create_doxyfile_in cat "Doxyfile.in" >> "$subdir/Doxyfile" echo "PROJECT_NAME = \"$subdir\"" >> "$subdir/Doxyfile" echo "INPUT = $srcdir" >> "$subdir/Doxyfile" echo "OUTPUT_DIRECTORY = ." >> "$subdir/Doxyfile" if grep -l "$subdir/" subdirs.in > /dev/null 2>&1 ; then echo "RECURSIVE = NO" >> "$subdir/Doxyfile" fi echo "HTML_OUTPUT = $subdir/html" >> "$subdir/Doxyfile" echo "GENERATE_TAGFILE = $subdir/$subdirname.tag" >> "$subdir/Doxyfile" test -d "$top_srcdir/doc/api" && \ echo "IMAGE_PATH = $top_srcdir/doc/api" >> "$subdir/Doxyfile" apidox_htmlfiles "" # Makefile.ams may contain overrides to our settings, # so copy them in. grep '^DOXYGEN_SET_' "$srcdir/Makefile.am" | \ sed -e 's+DOXYGEN_SET_++' >> "$subdir/Doxyfile" apidox_specials "$srcdir/Makefile.am" "$subdir/Doxyfile" excludes=`extract_line DOXYGEN_EXCLUDE` if test -n "$excludes"; then patterns="" dirs="" for item in `echo "$excludes"`; do if test -d "$top_srcdir/$subdir/$item"; then dirs="$dirs $top_srcdir/$subdir/$item/" else patterns="$patterns $item" fi done echo "EXCLUDE_PATTERNS += $patterns" >> "$subdir/Doxyfile" echo "EXCLUDE += $dirs" >> "$subdir/Doxyfile" fi echo "TAGFILES = \\" >> "$subdir/Doxyfile" ## For now, don't support \ continued references lines tags=`extract_line DOXYGEN_REFERENCES` for i in $tags qt ; do tagsubdir=`dirname $i` ; tag=`basename $i` tagpath="" not_found="" if test "x$tagsubdir" = "x." ; then tagsubdir="" else tagsubdir="$tagsubdir/" fi # Find location of tag file if test -f "$tagsubdir$tag/$tag.tag" ; then file="$tagsubdir$tag/$tag.tag" loc="$tagsubdir$tag/html" else # This checks for dox built with_out_ --no-modulename # in the same build dir as this dox run was started in. file=`ls -1 ../*-apidocs/"$tagsubdir$tag/$tag.tag" 2> /dev/null` if test -n "$file" ; then loc=`echo "$file" | sed -e "s/$tag.tag\$/html/"` else # If the tag file doesn't exist yet, but should # because we have the right dirs here, queue # this directory for re-processing later. if test -d "$top_srcdir/$tagsubdir$tag" ; then echo "* Need to re-process $subdir for tag $i" echo "$subdir" >> "subdirs.later" else # Re-check in $PREFIX if needed. test -n "$PREFIX" && \ file=`cd "$PREFIX" && \ ls -1 *-apidocs/"$tagsubdir$tag/$tag.tag" 2> /dev/null` # If something is found, patch it up. The location must be # relative to the installed location of the dox and the # file must be absolute. if test -n "$file" ; then loc=`echo "../$file" | sed -e "s/$tag.tag\$/html/"` file="$PREFIX/$file" echo "* Tags for $tagsubdir$tag will only work when installed." not_found="YES" fi fi fi fi if test "$tag" = "qt" ; then if test -z "$QTDOCDIR" ; then echo " $file" >> "$subdir/Doxyfile" else if test -z "$file" ; then # Really no Qt tags echo "" >> "$subdir/Doxyfile" else echo " $file=$QTDOCDIR" >> "$subdir/Doxyfile" fi fi else if test -n "$file" ; then test -z "$not_found" && echo "* Found tag $file" echo " $file=../$top_builddir$loc \\" >> "$subdir/Doxyfile" fi fi done apidox_local if ! grep '^DOXYGEN_EMPTY' "$srcdir/Makefile.am" > /dev/null 2>&1 ; then doxygen "$subdir/Doxyfile" doxyndex fi } ### Run a given subdir by setting up global variables first. do_subdir() { subdir=`echo "$1" | sed -e 's+/$++'` srcdir="$top_srcdir/$subdir" subdirname=`basename "$subdir"` mkdir -p "$subdir" 2> /dev/null if ! test -d "$subdir" ; then echo "Can't create dox subdirectory $subdir" return fi top_builddir=`echo "/$subdir" | sed -e 's+/[^/]*+../+g'` apidox_subdir } ### Create installdox-slow in the toplevel create_installdox() { # Fix up the installdox script so it accepts empty args # # This code is copied from the installdox generated by Doxygen, # copyright by Dimitri van Heesch and released under the GPL. # This does a _slow_ update of the dox, because it loops # over the given substitutions instead of assuming all the # needed ones are given. # cat <<\EOF #! /usr/bin/env perl %subst = () ; $quiet = 0; if (open(F,"search.cfg")) { $_=<F> ; s/[ \t\n]*$//g ; $subst{"_doc"} = $_; $_=<F> ; s/[ \t\n]*$//g ; $subst{"_cgi"} = $_; } while ( @ARGV ) { $_ = shift @ARGV; if ( s/^-// ) { if ( /^l(.*)/ ) { $v = ($1 eq "") ? shift @ARGV : $1; ($v =~ /\/$/) || ($v .= "/"); $_ = $v; if ( /(.+)\@(.+)/ ) { $subst{$1} = $2; } else { print STDERR "Argument $_ is invalid for option -l\n"; &usage(); } } elsif ( /^q/ ) { $quiet = 1; } elsif ( /^\?|^h/ ) { &usage(); } else { print STDERR "Illegal option -$_\n"; &usage(); } } else { push (@files, $_ ); } } if ( ! @files ) { if (opendir(D,".")) { foreach $file ( readdir(D) ) { $match = ".html"; next if ( $file =~ /^\.\.?$/ ); ($file =~ /$match/) && (push @files, $file); ($file =~ "tree.js") && (push @files, $file); } closedir(D); } } if ( ! @files ) { print STDERR "Warning: No input files given and none found!\n"; } foreach $f (@files) { if ( ! $quiet ) { print "Editing: $f...\n"; } $oldf = $f; $f .= ".bak"; unless (rename $oldf,$f) { print STDERR "Error: cannot rename file $oldf\n"; exit 1; } if (open(F,"<$f")) { unless (open(G,">$oldf")) { print STDERR "Error: opening file $oldf for writing\n"; exit 1; } if ($oldf ne "tree.js") { while (<F>) { foreach $sub (keys %subst) { s/doxygen\=\"$sub\:([^ \"\t\>\<]*)\" (href|src)=\"\1/doxygen\=\"$sub:$subst{$sub}\" \2=\"$subst{$sub}/g; print G "$_"; } } } else { while (<F>) { foreach $sub (keys %subst) { s/\"$sub\:([^ \"\t\>\<]*)\", \"\1/\"$sub:$subst{$sub}\" ,\"$subst{$sub}/g; print G "$_"; } } } } else { print STDERR "Warning file $f does not exist\n"; } unlink $f; } sub usage { print STDERR "Usage: installdox [options] [html-file [html-file ...]]\n"; print STDERR "Options:\n"; print STDERR " -l tagfile\@linkName tag file + URL or directory \n"; print STDERR " -q Quiet mode\n\n"; exit 1; } EOF } # Do only the subdirs that match the RE passed in as $1 do_subdirs_re() { RE=`echo "$1" | sed -e 's+/$++'` # Here's a queue of dirs to re-process later when # all the rest have been done already. > subdirs.later # subdirs.top lists _all_ subdirs of top in the order they # should be handled; subdirs.in lists those dirs that contain # dox. So the intersection of the two is the ordered list # of top-level subdirs that contain dox. # # subdirs.top also doesn't contain ".", so that special # case can be ignored in the loop. ( for i in `grep "^$RE" subdirs.top` do if test "x$i" = "x." ; then continue fi # Calculate intersection of this element and the # set of dox dirs. if grep "^$i\$" subdirs.in > /dev/null 2>&1 ; then echo "$i" mkdir -p "$i" 2> /dev/null # Handle the subdirs of this one for j in `grep "$i/" subdirs.in` do echo "$j" mkdir -p "$j" 2> /dev/null done fi done # Now we still need to handle whatever is left for i in `cat subdirs.in` do test -d "$i" || echo "$i" mkdir -p "$i" 2> /dev/null done ) > subdirs.sort for i in `cat subdirs.sort` do do_subdir "$i" done if test -s "subdirs.later" ; then sort subdirs.later | uniq > subdirs.sort for i in `cat subdirs.sort` do : > subdirs.later echo "*** Reprocessing $i" do_subdir "$i" test -s "subdirs.later" && echo "* Some tag files were still not found." done fi } if test "x." = "x$top_builddir" ; then apidox_toplevel create_subdirs create_installdox > installdox-slow if test "x$recurse" = "x1" ; then if test "x$module_name" = "xkdelibs" ; then if test -z "$QTDOCTAG" && test -d "$QTDOCDIR" && \ test ! -f "qt/qt.tag" ; then # Special case: create a qt tag file. echo "*** Creating a tag file for the Qt library:" mkdir qt doxytag -t qt/qt.tag "$QTDOCDIR" > /dev/null 2>&1 fi fi if test -n "$QTDOCTAG" && test -r "$QTDOCTAG" ; then echo "*** Copying tag file for the Qt library:" mkdir qt cp "$QTDOCTAG" qt/qt.tag fi do_subdirs_re "." fi else if test "x$recurse" = "x1" ; then do_subdirs_re "$subdir" else do_subdir "$subdir" fi fi # At the end of a run, clean up stuff. if test "YES" = "$cleanup" ; then rm -f subdirs.in subdirs.later subdirs.sort subdirs.top Doxyfile.in rm -f `find . -name Doxyfile` rm -f qt/qt.tag rmdir qt > /dev/null 2>&1 fi exit 0 Index: Doxyfile.am =================================================================== RCS file: /cvsroot/kbear/kbear/admin/Doxyfile.am,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** Doxyfile.am 21 Nov 2002 15:58:42 -0000 1.2 --- Doxyfile.am 21 Oct 2005 19:14:15 -0000 1.2.2.1 *************** *** 1,55 **** ## generate API documentation with doxygen apidox-am-yes: @if test "$(subdir)" != "."; then \ ! $(mkinstalldirs) $(top_builddir)/apidocs/$(subdir) ;\ ! if test ! -x $(top_builddir)/apidocs/common; then \ ! if test -d $(top_srcdir)/doc/common; then \ ! common_dir=`cd $(top_srcdir)/doc/common && pwd` ;\ ! else \ ! common_dir=$(kde_libs_htmldir)/en/common ;\ ! fi ;\ ! $(LN_S) $$common_dir $(top_builddir)/apidocs/common; \ ! fi ;\ ! cp $(top_srcdir)/admin/Doxyfile.global Doxyfile; \ ! echo "PROJECT_NAME = \"$(subdir) Library\"" >> Doxyfile; \ ! echo "INPUT = $(srcdir)" >> Doxyfile; \ ! echo "IMAGE_PATH = $(top_srcdir)/doc/api" >> Doxyfile ;\ ! echo "OUTPUT_DIRECTORY = $(top_builddir)/apidocs" >> Doxyfile; \ ! echo "HTML_OUTPUT = $(subdir)/html" >> Doxyfile; \ ! echo "LATEX_OUTPUT = $(subdir)/latex" >> Doxyfile; \ ! echo "RTF_OUTPUT = $(subdir)/rtf" >> Doxyfile; \ ! echo "MAN_OUTPUT = $(subdir)/man" >> Doxyfile; \ ! echo "GENERATE_HTML = $(GENERATE_FLAG)" >> Doxyfile ;\ ! echo "GENERATE_MAN = $(GENERATE_FLAG)" >> Doxyfile ;\ ! echo "GENERATE_LATEX = $(GENERATE_FLAG)" >> Doxyfile ;\ ! if test -n "$(DOXYGEN_EXCLUDE)"; then \ ! echo "EXCLUDE_PATTERNS += $(DOXYGEN_EXCLUDE)" >> Doxyfile; \ ! fi ;\ ! echo "TAGFILES = \\" >> Doxyfile; \ ! tags='$(DOXYGEN_REFERENCES) qt'; for tag in $$tags; do \ ! tagpath= ;\ ! path="../../$$tag" ;\ ! if test -f $(top_builddir)/apidocs/$$tag/$$tag.tag; then \ ! tagpath="$(top_builddir)/apidocs/$$tag/$$tag.tag" ;\ ! else \ ! tagpath=`ls -1 $(kde_htmldir)/en/*-apidocs/$$tag/$$tag.tag 2> /dev/null` ;\ ! if test -n "$$tagpath"; then \ ! path=`echo $$tagpath | sed -e "s,.*/\([^/]*-apidocs\)/$$tag/$$tag.tag,../../../\1/$$tag,"` ;\ ! fi ;\ ! fi ;\ ! if test "$$tag" = qt; then \ ! echo $$tagpath=$(QTDOCDIR) >> Doxyfile ;\ ! else if test -n "$$tagpath"; then \ ! echo "$$tagpath=$$path/html \\" >> Doxyfile ;\ ! fi ;\ ! fi ;\ ! done ;\ ! echo "GENERATE_TAGFILE = $(top_builddir)/apidocs/$(subdir)/$(subdir).tag" >> Doxyfile ;\ ! echo "IGNORE_PREFIX = K" >> Doxyfile ;\ ! echo "HAVE_DOT = $(KDE_HAVE_DOT)" >> Doxyfile ;\ ! $(DOXYGEN) Doxyfile ;\ fi ! apidox-am-no: install-data-local: install-apidox --- 1,37 ---- ## generate API documentation with doxygen apidox-am-yes: + @if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$ADMIN" ; then \ + export DOXDATA=$(kde_libs_htmldir)/en/common ; \ + fi ; \ + test -d $(top_builddir)/apidocs || \ + ( cd $(top_builddir) && sh $(top_srcdir)/admin/doxygen.sh \ + --no-modulename --installdir=$(kde_libs_htmldir)/en \ + --no-recurse $(top_srcdir) . ) ; \ + cd $(top_builddir) && sh $(top_srcdir)/admin/doxygen.sh \ + --recurse --no-modulename --installdir=$(kde_libs_htmldir)/en \ + $(top_srcdir) $(subdir) + + apidox-am-toplevel-yes: + @if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$ADMIN" ; then \ + export DOXDATA=$(kde_libs_htmldir)/en/common ; \ + fi ; \ + cd $(top_builddir) && sh $(top_srcdir)/admin/doxygen.sh \ + --no-modulename --installdir=$(kde_libs_htmldir)/en \ + $(top_srcdir) + + ## Don't generate API documentation without doxygen + apidox-am-no: + + apidox-am-toplevel-no: + + + apidox: @if test "$(subdir)" != "."; then \ ! $(MAKE) apidox-am-@KDE_HAS_DOXYGEN@ ;\ ! else \ ! $(MAKE) apidox-am-toplevel-@KDE_HAS_DOXYGEN@ ;\ fi ! install-data-local: install-apidox *************** *** 65,82 **** if test -d $(top_builddir)/apidocs/$(subdir)/html; then \ list=`ls $(top_builddir)/apidocs/$(subdir)/html`; \ 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; \ done; \ fi; \ - rm -f $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/common; \ - $(LN_S) $(kde_libs_htmldir)/en/common $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/common; \ else\ if test -d $(top_builddir)/apidocs; then \ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs ;\ list=`cd $(top_builddir)/apidocs && ls -1`; \ for file in $$list; do \ 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; \ fi; \ --- 47,63 ---- if test -d $(top_builddir)/apidocs/$(subdir)/html; then \ list=`ls $(top_builddir)/apidocs/$(subdir)/html`; \ + echo "installing $(top_builddir)/apidocs/$(subdir)/html" ;\ for file in $$list; do \ ! $(INSTALL_DATA) $(top_builddir)/apidocs/$(subdir)/html/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir)/html; \ done; \ fi; \ else\ if test -d $(top_builddir)/apidocs; then \ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs ;\ list=`cd $(top_builddir)/apidocs && ls -1`; \ + echo "installing $(top_builddir)/apidocs/$$file" ;\ + echo "target directory $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs" ; \ for file in $$list; do \ if test -f $(top_builddir)/apidocs/$$file; then \ $(INSTALL_DATA) $(top_builddir)/apidocs/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \ fi; \ *************** *** 98,160 **** fi ! apidox: ! @if test "$(subdir)" != "."; then \ ! $(MAKE) apidox-am-@KDE_HAS_DOXYGEN@ ;\ ! else \ ! $(MAKE) apidox-am-toplevel-@KDE_HAS_DOXYGEN@ ;\ ! fi @set fnord $(MAKEFLAGS); amf=$$2; if test -n '$(SUBDIRS)'; then \ list='$(SUBDIRS)'; \ for subdir in $$list; do \ ! if grep '^include .*Doxyfile.am' $(srcdir)/$$subdir/Makefile.am; then \ ! echo "Making apidox in $$subdir"; \ ! if test "$$subdir" != "."; then \ ! (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) GENERATE_FLAG=no apidox) || exit 1; \ ! fi ; fi ;\ ! done; \ ! for subdir in $$list; do \ ! if grep '^include .*Doxyfile.am' $(srcdir)/$$subdir/Makefile.am; then \ ! echo "Making apidox in $$subdir"; \ if test "$$subdir" != "."; then \ ! (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) GENERATE_FLAG=yes apidox) || exit 1; \ fi ; fi ;\ done; \ fi ! apidox-am-toplevel-no: ! apidox-am-toplevel-yes: ! @echo "*** Creating API documentation main page"; \ ! cp $(top_srcdir)/admin/Doxyfile.global Doxyfile; \ ! echo "PROJECT_NAME = $(DOXYGEN_PROJECT_NAME)" >> Doxyfile ; \ ! echo "PROJECT_NUMBER = $(DOXYGEN_PROJECT_NUMBER)" >> Doxyfile ; \ ! echo "INPUT = $(top_srcdir)" >> Doxyfile ; \ ! echo "OUTPUT_DIRECTORY = $(top_builddir)/apidocs" >> Doxyfile ; \ ! echo "FILE_PATTERNS = *.dox" >> Doxyfile ; \ ! echo "RECURSIVE = NO" >> Doxyfile ; \ ! echo "SOURCE_BROWSER = NO" >> Doxyfile ; \ ! echo "ALPHABETICAL_INDEX = NO" >> Doxyfile ; \ ! echo "HTML_OUTPUT = ." >> Doxyfile ; \ ! echo "HTML_HEADER = apidocs/common/mainheader.html" >> Doxyfile ; \ ! echo "HTML_FOOTER = apidocs/common/mainfooter.html" >> Doxyfile ; \ ! echo "HTML_STYLESHEET = apidocs/common/doxygen.css" >> Doxyfile ; \ ! echo "GENERATE_LATEX = NO" >> Doxyfile ; \ ! echo "GENERATE_RTF = NO" >> Doxyfile ; \ ! echo "GENERATE_MAN = NO" >> Doxyfile ; \ ! echo "GENERATE_XML = NO" >> Doxyfile ; \ ! echo "GENERATE_AUTOGEN_DEF = NO" >> Doxyfile ; \ ! echo "ENABLE_PREPROCESSING = NO" >> Doxyfile ; \ ! echo "CLASS_DIAGRAMS = NO" >> Doxyfile ; \ ! echo "HAVE_DOT = NO" >> Doxyfile ; \ ! echo "GENERATE_HTML = YES" >> Doxyfile ;\ ! $(mkinstalldirs) $(top_builddir)/apidocs ; \ ! rm -f $(top_builddir)/apidocs/common ; \ ! if test -d $(top_srcdir)/doc/common; then \ ! common_dir=`cd $(top_srcdir)/doc/common && pwd` ;\ ! else \ ! common_dir=$(kde_libs_htmldir)/en/common ;\ ! fi ;\ ! $(LN_S) $$common_dir $(top_builddir)/apidocs/common ;\ ! doxygen Doxyfile; \ ! rm -f Doxyfile # Local Variables: --- 79,98 ---- fi ! install-apidox-recurse: install-apidox @set fnord $(MAKEFLAGS); amf=$$2; if test -n '$(SUBDIRS)'; then \ list='$(SUBDIRS)'; \ for subdir in $$list; do \ ! if grep '^include .*Doxyfile.am' $(srcdir)/$$subdir/Makefile.am > /dev/null ; then \ ! echo "Installing apidox from $$subdir"; \ if test "$$subdir" != "."; then \ ! (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) GENERATE_FLAG=no install-apidox-recurse) || exit 1; \ fi ; fi ;\ done; \ fi ! ! ! .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: Index: Doxyfile.global =================================================================== RCS file: /cvsroot/kbear/kbear/admin/Doxyfile.global,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** Doxyfile.global 8 Oct 2002 18:12:24 -0000 1.1 --- Doxyfile.global 21 Oct 2005 19:14:15 -0000 1.1.2.1 *************** *** 1,351 **** - # Doxyfile 1.2.15 - - # This file describes the settings to be used by the documentation system - # doxygen (www.doxygen.org) for a project - # - # All text after a hash (#) is considered a comment and will be ignored - # The format is: - # TAG = value [value, ...] - # For lists items can also be appended using: - # TAG += value [value, ...] [...1114 lines suppressed...] ! HTML_ALIGN_MEMBERS = YES ! REFERENCED_BY_RELATION = NO ! REFERENCES_RELATION = NO ! VERBATIM_HEADERS = NO ! GENERATE_HTML = YES ! SOURCE_BROWSER = YES ! GENERATE_AUTOGEN_DEF = NO ! DETAILS_AT_TOP = YES ! SORT_MEMBER_DOCS = YES ! GENERATE_TODOLIST = YES ! IGNORE_PREFIX = K ! GENERATE_HTML = YES ! CLASS_GRAPH = YES ! COLLABORATION_GRAPH = NO ! MACRO_EXPANSION = YES ! EXPAND_ONLY_PREDEF = YES Index: Makefile.common =================================================================== RCS file: /cvsroot/kbear/kbear/admin/Makefile.common,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -C2 -d -r1.12 -r1.12.2.1 *** Makefile.common 21 Nov 2002 15:58:42 -0000 1.12 --- Makefile.common 21 Oct 2005 19:14:15 -0000 1.12.2.1 *************** *** 7,11 **** SHELL=/bin/sh ! cvs dist cvs-clean configure.in configure.files subdirs package-messages package-merge: @admindir=$(admindir); \ if test "x$$admindir" = x; then \ --- 7,11 ---- SHELL=/bin/sh ! cvs dist configure configure.in configure.files subdirs package-messages package-merge Makefile.am acinclude.m4 extract-messages: @admindir=$(admindir); \ if test "x$$admindir" = x; then \ *************** *** 22,34 **** fi; \ if test "$@" = "package-merge"; then \ ! MAKE=$(MAKE) POFILES="$(POFILES)" PACKAGE="$(PACKAGE)" \ $(SHELL) $$admindir/cvs.sh package-merge ;\ ! else MAKE=$(MAKE) $(SHELL) $$admindir/cvs.sh $@ ;\ fi ! configure.in: configure.files $(shell test -f configure.files && cat configure.files) subdirs configure.files: subdirs .SILENT: ! .PHONY: cvs dist cvs-clean package-merge package-messages --- 22,37 ---- fi; \ if test "$@" = "package-merge"; then \ ! MAKE="$(MAKE)" POFILES="$(POFILES)" PACKAGE="$(PACKAGE)" \ $(SHELL) $$admindir/cvs.sh package-merge ;\ ! else \ ! MAKE="$(MAKE)" $(SHELL) $$admindir/cvs.sh $@ ;\ fi ! configure.in: configure.files subdirs configure.files: subdirs + svn: cvs + .SILENT: ! .PHONY: svn cvs dist package-merge package-messages Index: acinclude.m4.in =================================================================== RCS file: /cvsroot/kbear/kbear/admin/acinclude.m4.in,v retrieving revision 1.15 retrieving revision 1.15.2.1 diff -C2 -d -r1.15 -r1.15.2.1 *** acinclude.m4.in 21 Nov 2002 15:58:42 -0000 1.15 --- acinclude.m4.in 21 Oct 2005 19:14:15 -0000 1.15.2.1 *************** *** 17,22 **** dnl You should have received a copy of the GNU Library General Public License dnl along with this library; see the file COPYING.LIB. If not, write to ! dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ! dnl Boston, MA 02111-1307, USA. dnl IMPORTANT NOTE: --- 17,22 ---- dnl You should have received a copy of the GNU Library General Public License dnl along with this library; see the file COPYING.LIB. If not, write to ! dnl the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, [...5594 lines suppressed...] + [kde_has_pie_support=$enableval], + [kde_has_pie_support=detect]) + + if test "$kde_has_pie_support" = "detect"; then + kde_has_pie_support=$kde_cv_val_pie_support + fi + + AC_MSG_RESULT([$kde_has_pie_support]) + + KDE_USE_FPIE="" + KDE_USE_PIE="" + + AC_SUBST([KDE_USE_FPIE]) + AC_SUBST([KDE_USE_PIE]) + + if test "$kde_has_pie_support" = "yes"; then + KDE_USE_FPIE="-fpie" + KDE_USE_PIE="-pie" + fi + ]) Index: am_edit =================================================================== RCS file: /cvsroot/kbear/kbear/admin/am_edit,v retrieving revision 1.14 retrieving revision 1.14.2.1 diff -C2 -d -r1.14 -r1.14.2.1 *** am_edit 21 Nov 2002 15:58:42 -0000 1.14 --- am_edit 21 Oct 2005 19:14:15 -0000 1.14.2.1 *************** *** 32,35 **** --- 32,36 ---- # David Faure <fa...@kd...> # Stephan Kulow <co...@kd...> + # Dirk Mueller <mu...@kd...> use Cwd; *************** *** 51,54 **** --- 52,56 ---- sub checkMocCandidates (); [...1528 lines suppressed...] *************** *** 2026,2027 **** --- 2429,2445 ---- #----------------------------------------------------------------------------- + + # find the .kcfg file listed in the .kcfgc file + sub findKcfgFile($) + { + my ($kcfgf) = @_; + open (KCFGFIN, $kcfgf) || die "Could not open $kcfgf: $!\n"; + seek(KCFGFIN, 0, 2); + my $kcfgfsize = tell(KCFGFIN); + seek(KCFGFIN, 0, 0); + read KCFGFIN, $kcfgfData, $kcfgfsize; + close KCFGFIN; + if(($kcfgfData =~ m/^File=(.*\.kcfg)/gm)) { + $kcfg = $1; + } + } Index: bcheck.pl =================================================================== RCS file: /cvsroot/kbear/kbear/admin/bcheck.pl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** bcheck.pl 19 Oct 2005 16:31:37 -0000 1.1.2.2 --- bcheck.pl 21 Oct 2005 19:14:15 -0000 1.1.2.3 *************** *** 119,122 **** --- 119,123 ---- s/0x[0-9a-fA-F]+/0x......../g; s/base size=/size=/g; + s/\(\)\s*$//g; s/base align=/align=/g; Index: compile =================================================================== RCS file: /cvsroot/kbear/kbear/admin/compile,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** compile 8 Oct 2002 18:12:24 -0000 1.1 --- compile 21 Oct 2005 19:14:15 -0000 1.1.2.1 *************** *** 1,7 **** #! /bin/sh - # Wrapper for compilers which do not understand `-c -o'. ! # Copyright 1999, 2000 Free Software Foundation, Inc. # Written by Tom Tromey <tr...@cy...>. # --- 1,8 ---- #! /bin/sh # Wrapper for compilers which do not understand `-c -o'. ! scriptversion=2005-05-14.22 ! ! # Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. # Written by Tom Tromey <tr...@cy...>. # *************** *** 18,22 **** # 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. # As a special exception to the GNU General Public License, if you --- 19,23 ---- # 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 Street, Fifth Floor, Boston, MA 02110-1301, USA. # As a special exception to the GNU General Public License, if you *************** *** 25,76 **** # the same distribution terms that you use for the rest of that program. ! # Usage: ! # compile PROGRAM [ARGS]... ! # `-o FOO.o' is removed from the args passed to the actual compile. ! prog=$1 ! shift ofile= cfile= ! args= ! while test $# -gt 0; do ! case "$1" in ! -o) ! # configure might choose to run compile as `compile cc -o foo foo.c'. ! # So we do something ugly here. ! ofile=$2 ! shift ! case "$ofile" in ! *.o | *.obj) ! ;; ! *) ! args="$args -o $ofile" ! ofile= ! ;; ! esac ! ;; ! *.c) ! cfile=$1 ! args="$args $1" ! ;; ! *) ! args="$args $1" ! ;; ! esac ! shift done if test -z "$ofile" || test -z "$cfile"; then ! # If no `-o' option was seen then we might have been invoked from a ! # pattern rule where we don't need one. That is ok -- this is a ! # normal compilation that the losing compiler can handle. If no ! # `.c' file was seen then we are probably linking. That is also ! # ok. ! exec "$prog" $args fi # Name of file we expect compiler to create. ! cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'` # Create the lock directory. --- 26,108 ---- # the same distribution terms that you use for the rest of that program. ! # This file is maintained in Automake, please report ! # bugs to <bug...@gn...> or send patches to ! # <aut...@gn...>. ! case $1 in ! '') ! echo "$0: No command. Try \`$0 --help' for more information." 1>&2 ! exit 1; ! ;; ! -h | --h*) ! cat <<\EOF ! Usage: compile [--help] [--version] PROGRAM [ARGS] ! ! Wrapper for compilers which do not understand `-c -o'. ! Remove `-o dest.o' from ARGS, run PROGRAM with the remaining ! arguments, and rename the output as expected. ! ! If you are trying to build a whole package this is not the ! right script to run: please start by reading the file `INSTALL'. ! ! Report bugs to <bug...@gn...>. ! EOF ! exit $? ! ;; ! -v | --v*) ! echo "compile $scriptversion" ! exit $? ! ;; ! esac ofile= cfile= ! eat= ! ! for arg ! do ! if test -n "$eat"; then ! eat= ! else ! case $1 in ! -o) ! # configure might choose to run compile as `compile cc -o foo foo.c'. ! # So we strip `-o arg' only if arg is an object. ! eat=1 ! case $2 in ! *.o | *.obj) ! ofile=$2 ! ;; ! *) ! set x "$@" -o "$2" ! shift ! ;; ! esac ! ;; ! *.c) ! cfile=$1 ! set x "$@" "$1" ! shift ! ;; ! *) ! set x "$@" "$1" ! shift ! ;; ! esac ! fi ! shift done if test -z "$ofile" || test -z "$cfile"; then ! # If no `-o' option was seen then we might have been invoked from a ! # pattern rule where we don't need one. That is ok -- this is a ! # normal compilation that the losing compiler can handle. If no ! # `.c' file was seen then we are probably linking. That is also ! # ok. ! exec "$@" fi # Name of file we expect compiler to create. ! cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'` # Create the lock directory. *************** *** 78,99 **** # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. ! lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d while true; do ! if mkdir $lockdir > /dev/null 2>&1; then ! break ! fi ! sleep 1 done # FIXME: race condition here if user kills between mkdir and trap. ! trap "rmdir $lockdir; exit 1" 1 2 15 # Run the compile. ! "$prog" $args ! status=$? if test -f "$cofile"; then ! mv "$cofile" "$ofile" fi ! rmdir $lockdir ! exit $status --- 110,142 ---- # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. ! lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d while true; do ! if mkdir "$lockdir" >/dev/null 2>&1; then ! break ! fi ! sleep 1 done # FIXME: race condition here if user kills between mkdir and trap. ! trap "rmdir '$lockdir'; exit 1" 1 2 15 # Run the compile. ! "$@" ! ret=$? if test -f "$cofile"; then ! mv "$cofile" "$ofile" ! elif test -f "${cofile}bj"; then ! mv "${cofile}bj" "$ofile" fi ! rmdir "$lockdir" ! exit $ret ! ! # Local Variables: ! # mode: shell-script ! # sh-indentation: 2 ! # eval: (add-hook 'write-file-hooks 'time-stamp) ! # time-stamp-start: "scriptversion=" ! # time-stamp-format: "%:y-%02m-%02d.%02H" ! # time-stamp-end: "$" ! # End: Index: conf.change.pl =================================================================== RCS file: /cvsroot/kbear/kbear/admin/conf.change.pl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** conf.change.pl 25 Mar 2002 22:08:19 -0000 1.4 --- conf.change.pl 21 Oct 2005 19:14:15 -0000 1.4.2.1 *************** *** 1,3 **** ! #!/usr/bin/perl -w # this script patches a config.status file, to use our own perl script --- 1,3 ---- ! #!/usr/bin/env perl # this script patches a config.status file, to use our own perl script *************** *** 20,25 **** # You should have received a copy of the GNU Library General Public License # along with this library; see the file COPYING.LIB. If not, write to ! # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ! # Boston, MA 02111-1307, USA. # we have to change two places --- 20,25 ---- # You should have received a copy of the GNU Library General Public License # along with this library; see the file COPYING.LIB. If not, write to ! # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ! # Boston, MA 02110-1301, USA. # we have to change two places *************** *** 28,36 **** # 2. the big main loop which patches all Makefile.in's use File::Basename; my $ac_aux_dir = dirname($0); my ($flag); ! local $ac_version = 0; my $vpath_seen = 0; $flag = 0; --- 28,37 ---- # 2. the big main loop which patches all Makefile.in's + use strict; use File::Basename; my $ac_aux_dir = dirname($0); my ($flag); ! my $ac_version = 0; my $vpath_seen = 0; $flag = 0; *************** *** 79,82 **** --- 80,88 ---- # end with: "rm -f conftest.s\*" # on autoconf 250, it ends with '# CONFIG_HEADER section' + # + # gg: if a post-processing commands section is found first, + # stop there and insert a new loop to honor the case/esac. + # (pattern: /^\s+#\sRun the commands associated with the file./) + if (/^\s*for\s+ac_file\s+in\s+.*CONFIG_FILES/ ) { $flag = 3; *************** *** 95,101 **** print STDERR "hmm, don't know autoconf version\n"; } ! } elsif (/^\#\s*CONFIG_HEADER section.*/) { $flag = 4; &insert_main_loop(); if($ac_version != 250) { print STDERR "hmm, something went wrong :-(\n"; --- 101,109 ---- print STDERR "hmm, don't know autoconf version\n"; } ! } elsif (/^\#\s*CONFIG_(HEADER|COMMANDS) section.*|^\s+#\s(Run) the commands associated/) { $flag = 4; + my $commands = defined $2; &insert_main_loop(); + $commands && insert_command_loop(); if($ac_version != 250) { print STDERR "hmm, something went wrong :-(\n"; *************** *** 176,177 **** --- 184,191 ---- return; } + + sub insert_command_loop { + print <<EOF; + for ac_file in .. \$CONFIG_FILES ; do + EOF + } Index: config.guess =================================================================== RCS file: /cvsroot/kbear/kbear/admin/config.guess,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -d -r1.6 -r1.6.2.1 *** config.guess 21 Nov 2002 15:58:42 -0000 1.6 --- config.guess 21 Oct 2005 19:14:15 -0000 1.6.2.1 *************** *** 2,8 **** # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002 Free Software Foundation, Inc. ! timestamp='2002-10-21' # This file is free software; you can redistribute it and/or modify it --- 2,8 ---- # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, [...1865 lines suppressed...] c4*) echo c4-convex-bsd ! exit ;; esac fi *************** *** 1324,1328 **** download the most up to date version of the config scripts from ! ftp://ftp.gnu.org/pub/gnu/config/ If the version you run ($0) is already up to date, please --- 1423,1429 ---- download the most up to date version of the config scripts from ! http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess ! and ! http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub If the version you run ($0) is already up to date, please Index: config.pl =================================================================== RCS file: /cvsroot/kbear/kbear/admin/config.pl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** config.pl 8 Oct 2002 18:12:24 -0000 1.4 --- config.pl 21 Oct 2005 19:14:15 -0000 1.4.2.1 *************** *** 1,3 **** ! #!/usr/bin/perl # a script for use by autoconf to make the Makefiles # from the Makefile.in's --- 1,3 ---- ! #!/usr/bin/env perl # a script for use by autoconf to make the Makefiles # from the Makefile.in's *************** *** 26,31 **** # You should have received a copy of the GNU Library General Public License # along with this library; see the file COPYING.LIB. If not, write to ! # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ! # Boston, MA 02111-1307, USA. my $ac_subs=$ARGV[0]; --- 26,35 ---- # You should have received a copy of the GNU Library General Public License # along with this library; see the file COPYING.LIB. If not, write to ! # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ! # Boston, MA 02110-1301, USA. ! ! use strict; ! ! use File::Path; my $ac_subs=$ARGV[0]; *************** *** 34,37 **** --- 38,44 ---- my $ac_given_INSTALL=$ARGV[3]; + my @comp_match; + my @comp_subs; + #print "ac_subs=$ac_subs\n"; #print "ac_sacfiles=$ac_sacfiles\n"; *************** *** 39,48 **** --- 46,58 ---- #print "ac_given_INSTALL=$ac_given_INSTALL\n"; + my $configure_input; my ($srcdir, $top_srcdir); my $INSTALL; my $bad_perl = ($] < 5.005); + my $created_file_count = 0; open(CF, "< $ac_subs") || die "can't open $ac_subs: $!"; my @subs = <CF>; + my $pat; close(CF); chomp @subs; *************** *** 52,56 **** if ($bad_perl) { print "Using perl older than version 5.005\n"; ! foreach my $pat (@subs) { if ( ($pat =~ m/s%([^%]*)%([^%]*)%g/ ) || ($pat =~ m/s%([^%]*)%([^%]*)%;t/ ) --- 62,66 ---- if ($bad_perl) { print "Using perl older than version 5.005\n"; ! foreach $pat (@subs) { if ( ($pat =~ m/s%([^%]*)%([^%]*)%g/ ) || ($pat =~ m/s%([^%]*)%([^%]*)%;t/ ) *************** *** 77,81 **** } } else { ! foreach my $pat (@subs) { if ( ($pat =~ /s%([^%]*)%([^%]*)%g/ ) || ($pat =~ /s%([^%]*)%([^%]*)%;t/ ) || --- 87,91 ---- } } else { ! foreach $pat (@subs) { if ( ($pat =~ /s%([^%]*)%([^%]*)%g/ ) || ($pat =~ /s%([^%]*)%([^%]*)%;t/ ) || *************** *** 95,99 **** push @comp_subs, ""; } else { ! die "Uhh. Malformed pattern in $ac_cs_root.subs ($pat)" unless ( $pat =~ /^\s*$/ ); # ignore white lines } --- 105,109 ---- push @comp_subs, ""; } else { ! die "Uhh. Malformed pattern in $ac_subs ($pat)" unless ( $pat =~ /^\s*$/ ); # ignore white lines } *************** *** 131,135 **** if ( ($ac_dir ne $ac_file) && ($ac_dir ne ".")) { # The file is in a subdirectory. ! if (! -d "$ac_dir") { mkdir "$ac_dir", 0777; } ($ac_dir_suffix = $ac_dir) =~ s%^./%%; $ac_dir_suffix="/".$ac_dir_suffix; --- 141,145 ---- if ( ($ac_dir ne $ac_file) && ($ac_dir ne ".")) { # The file is in a subdirectory. ! if (! -d "$ac_dir") { mkpath "$ac_dir", 0, 0777; } ($ac_dir_suffix = $ac_dir) =~ s%^./%%; $ac_dir_suffix="/".$ac_dir_suffix; *************** *** 167,174 **** my $fname=$ac_file_in; $fname =~ s%.*/%%; ! my $configure_input="Generated automatically 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; --- 177,181 ---- my $fname=$ac_file_in; $fname =~ s%.*/%%; ! $configure_input="$ac_file. Generated from $fname by config.pl."; my $ac_file_inputs; *************** *** 176,189 **** $ac_file_inputs =~ s%:% $ac_given_srcdir/%g; ! patch_file($ac_file, $ac_file_inputs, $ac_comsub); } sub patch_file { ! my ($outf, $infiles, $identline) = @_; my $filedata; my @infiles=split(' ', $infiles); my $i=0; ! foreach my $name (@infiles) { if (open(CF, "< $name")) { while (<CF>) { --- 183,200 ---- $ac_file_inputs =~ s%:% $ac_given_srcdir/%g; ! patch_file($ac_file, $ac_file_inputs); ! ++$created_file_count; } + print "config.pl: fast created $created_file_count file(s).\n"; + sub patch_file { ! my ($outf, $infiles) = @_; my $filedata; my @infiles=split(' ', $infiles); my $i=0; + my $name; ! foreach $name (@infiles) { if (open(CF, "< $name")) { while (<CF>) { *************** *** 195,202 **** } } - 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; --- 206,209 ---- *************** *** 224,232 **** sub make_closure { my ($pat, $sub) = @_; ! $pat =~ s/\@/\\@/g; # @bla@ -> \@bla\@ ! $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 ($@) { print "can't create CODE: $@\n"; --- 231,235 ---- sub make_closure { my ($pat, $sub) = @_; ! my $ret = eval "return sub { my \$ref=shift; \$\$ref =~ s%\Q$pat\E%\Q$sub\E%g; }"; if ($@) { print "can't create CODE: $@\n"; Index: config.sub =================================================================== RCS file: /cvsroot/kbear/kbear/admin/config.sub,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -d -r1.6 -r1.6.2.1 *** config.sub 21 Nov 2002 15:58:42 -0000 1.6 --- config.sub 21 Oct 2005 19:14:15 -0000 1.6.2.1 *************** *** 2,8 **** # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002 Free Software Foundation, Inc. ! timestamp='2002-09-05' # This file is (in principle) common to ALL GNU software. --- 2,8 ---- # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ! timestamp='2005-07-01' # This file is (in principle) common to ALL GNU software. *************** *** 22,28 **** # 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. ! # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a --- 22,28 ---- # 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 Street - Fifth Floor, Boston, MA ! # 02110-1301, USA. ! # # As a special exception to the GNU Gener... [truncated message content] |
Update of /cvsroot/kbear/kbear/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26231/admin Added Files: Tag: KBEAR_2_BRANCH am_edit.py bcheck.pl deps.am ltcf-c.sh ltcf-cxx.sh ltcf-gcj.sh nmcheck oldinclude.m4.in pkg.m4.in Removed Files: Tag: KBEAR_2_BRANCH ltconfig old-libtool.m4.in old-ltcf-c.sh old-ltcf-cxx.sh old-ltcf-gcj.sh old-ltconfig old-ltmain.sh Log Message: --- NEW FILE: am_edit.py --- import getopt, string, posixpath, sys, os, os.path, re # Some global globals... verbose = 0 thisProg = posixpath.basename(sys.argv[0]) if not thisProg: # happy only when running in xemacs ;/ thisProg = 'am_edit.py' cppsuffixes = ['cpp', 'cc', 'cxx', 'C', 'c++'] hExt = ['h', 'H', 'hh', 'hxx', 'h++'] progId = "KDE tags expanded automatically by " + thisProg use_final = 1 dryrun = 0 pathoption = 0 topdir = os.path.abspath(os.curdir) + "/" foreigndirs = [] class Makefile: def __init__(self, file): # some useful globals for the subroutines called here self.headerdirs = ['.'] self.haveAutomocTag = 0 self.programs = [] # lists the objects compiled into $program self.realobjs = {} # lists the sources used for $program self.sources = {} # lists the objects compiled when final self.finalObjs = {} # the binary name of program variable self.realname = {} # lists the idl files used for $program self.idlfiles = {} # lists all idl generated files for cleantarget self.idl_output = "" self.depedmocs = {} self.dep_files = "" self.dep_finals = "" # the targets to add self.target_adds = {} self.kdelang = "" self.makefile = file self.makefileDir = os.path.dirname(self.makefile) self.options = {} NoMakefileAmFound = "found Makefile.in without Makefile.am" def findLine(self, line): import types if type(line) is types.StringType: regexp = re.compile(line) else: regexp = line for line in self.lines: match = regexp.match(line) if match: return match def substituteLine(self, old, new): import types if type(old) is types.StringType: regexp = re.compile(old) else: regexp = old for index in range(len(self.lines)): line = self.lines[index] match = regexp.match(line) if match: line = '#>- ' + line newlines = string.split(new, '\n') self.lines[index:index+1] = [line, '#>+ %d' % len(newlines)] + newlines return def addTarget(self, target, dependson): if not self.target_adds.has_key(target): self.target_adds[target] = [dependson] else: self.target_adds[target].append(dependson) def appendLines(self, newlines): lines = string.split(newlines, '\n') + ['\n'] self.lines.extend(['#>+ %d' % len(lines)] + lines) def restore(self): index = 0 while index < len(self.lines): line = self.lines[index] if line[0:3] == '#>+': # the +1 is the comment itself linec = string.atoi(line[3:]) + 1 del self.lines[index:index+linec] continue if line[0:3] == '#>-': self.lines[index] = self.lines[index][4:] index = index + 1 def initialize(self): global foreigndirs os.chdir(self.makefileDir) self.printname = string.replace(self.makefile, topdir, "") self.makefile = os.path.basename(self.makefile) if not posixpath.exists("Makefile.am"): raise self.NoMakefileAmFound, self.makefileDir for dir in foreigndirs: if dir.match(self.makefileDir): print 'leaving ' + self.makefileDir return 0 f = open(self.makefile) self.lines = [] while 1: line = f.readline() if not line: break self.lines.append(string.rstrip(line)) f.close() # take out the self.restore() optionline = re.compile('^\s*(\w+)\s*=\s*([^\n]*)$') linecontinued = re.compile('\\\s*\n') lastline = '' index = 0 while index < len(self.lines): line = self.lines[index] if linecontinued.search(line): self.lines[index] = linecontinued.sub(' ', line) + self.lines[index+1] continue else: index = index + 1 match = optionline.search(line) if match: self.options[match.group(1)] = match.group(2) if self.options.has_key('KDE_OPTIONS'): options = string.split(self.options['KDE_OPTIONS']) if 'foreign' in options: foreigndirs.append(re.compile(self.makefileDir + "/.*")) return 0 self.cxxsuffix = "" suffixes = re.compile('^\.SUFFIXES:(.*)$') for line in self.lines: match = suffixes.match(line) if match: existing_suffixes = string.split(match.group(1)) for suffix in existing_suffixes: # leave out the . if suffix[1:] in cppsuffixes: self.cxxsuffix = suffix[1:] break if self.cxxsuffix: break search_real_programs = {} for option in self.options.keys(): if string.rfind(option, '_OBJECTS') > 0: program = option[0:string.find(option, '_OBJECTS')] objs = self.options[option] variable_in_objects = 0 objlist = string.split(objs) variable = re.compile('\$\((\w+)\)') for obj in objlist: match = variable.match(obj) if match and not match.group(1) == 'OBJEXT': variable_in_objects = 1 break if variable_in_objects: continue if len(program) > 3 and program[3] == 'am_': program = program[3:] if verbose: print "found program " + program self.programs.append(program) self.realobjs[program] = objs if self.options.has_key(program + "_SOURCES"): self.sources[program] = self.options[program + "_SOURCES"] else: self.sources[program] = "" sys.stderr.write("found program with no _SOURCES: " + program + '\n') # unmask to regexp realprogram = string.replace(program, '_', '.') search_real_programs[program] = re.compile('.*(' + realprogram + ')(\$\(EXEEXT\)?)?:.*\$\(' + program + '_OBJECTS\).*') self.realname[program] = ""; for line in self.lines: if string.find(line, '_OBJECTS') > 0: # just a random piece to not use at _every_ line for program in self.programs: match = search_real_programs[program].match(line) if match: self.realname[program] = match.group(1) def finalTouch(self): if self.options.has_key('DEPDIR'): sys.stderr.write(self.printname + " defines DEPDIR. This means you're using automake > 1.4 - this is not supported!") else: # taken out a random variable self.substituteLine('bindir\s*=.*', 'DEPDIR = .deps\nbindir = ' + self.options['bindir']) self.appendLines('cvs-clean:\n' + '\t$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean') self.appendLines('kde-rpo-clean:\n'+ '\t-rm -f *.rpo') self.addTarget('clean', 'kde-rpo-clean') self.addAllTargets() def addAllTargets(self): for target in self.target_adds.keys(): match = self.findLine(target + ':\s*(.*)') if match: self.substituteLine(match.re, target + ': ' + string.join(self.target_adds[target]) + ' ' + match.group(1)) def writeback(self): f = open(self.makefile, 'w') for line in self.lines: f.write(line) f.write('\n') f.close() def tag_automake(self): match = self.findLine('^(.*cd \$\(top_srcdir\)\s+&&\s+\$\(AUTOMAKE\).*)$') if not match: return 1 self.substituteLine(match.re, match.group(1) + '\n' + '\tcd $(top_srcdir) && python ' + thisProg + ' ' + self.printname) def main(): global use_final, dryrun, pathoption, thisProg, verbose optlist, makefiles = getopt.getopt(sys.argv[1:], 'vhp:n', [ 'version', 'verbose', 'path=', 'help', 'no-final']) for option, param in optlist: if option == '--version': print "\n" print thisProg + "$Revision: 1.4.2.2 $" print "This is really free software, unencumbered by the GPL." print "You can do anything you like with it except sueing me." print "Copyright 1998 Kalle Dalheimer <kalle\@kde.org>" print "Concept, design and unnecessary questions about perl" print " by Matthias Ettrich <ettrich\@kde.org>" print "" print "Making it useful by Stephan Kulow <coolo\@kde.org> and" print "Harri Porten <porten\@kde.org>" print "Updated (Feb-1999), John Birch <jb.nz\@writeme.com>" print "Current Maintainer Stephan Kulow" sys.exit(0) if option == '--verbose' or option == '-v': verbose = 1 if option == '-p' or option == '--path': thisProg = param + "/" + thisProg if (not posixpath.exists(thisProg)): sys.stderr.write(thisProg + " doesn't exist\n") pathoption=1 if option == '--help' or option == '-h': print "Usage " + thisProg + " [OPTION] ... [dir/Makefile.in]..." print "Patches dir/Makefile.in generated from automake" print "(where dir can be a full or relative directory name)" print " -v, --verbose verbosely list files processed" print " -h, --help print this help, then exit" print " --version print version number, then exit" print " -p, --path= use the path to am_edit if the path" print " --no-final don't patch for --enable-final" print " called from is not the one to be used" sys.exit(0) if option == '--no-final': use_final = 0 if option == '-n': dryrun = 1 if not use_final: thisProg = thisProg + " --no-final" if thisProg[0] == '/' and not pathoption: sys.stderr.write( "Illegal full pathname call performed...\n" "The call to \"" + thisProg + "\"\n" "would be inserted in some Makefile.in.\n" "Please use option --path.\n") sys.exit(1) if len(makefiles) == 0: import find makefiles = find.find('Makefile.in') for index in range(len(makefiles)): if not makefiles[index][0] == '/': makefiles[index] = os.path.normcase(os.path.abspath(makefiles[index])) makefiles.sort() for file in makefiles: makefile = Makefile(file) try: makefile.initialize() makefile.tag_automake() makefile.finalTouch() makefile.writeback() except Makefile.NoMakefileAmFound, param: if verbose: print Makefile.NoMakefileAmFound + ' in ' + param main() --- NEW FILE: bcheck.pl --- #!/usr/bin/perl -w use DB_File; use Fcntl ':flock'; if (!defined($ARGV[0])) { print "usage: requires .class dump as parameter!\n"; exit; } sub bailout { untie %bcheckdb if(defined(%bcheckdb)); if(defined(MYLOCK)) { flock MYLOCK, LOCK_UN; close(MYLOCK); } print @_; exit 5; } sub ask_user { my ($dbkey, $dbchunk) = @_; if (defined($ENV{"BCHECK_UPDATE"})) { $bcheckdb{$dbkey} = $dbchunk; return; } &bailout("BC problem detected") if (! -t STDIN); print "(I)gnore / (Q)uit / (U)pdate: "; my $key; while(defined(read STDIN, $key, 1)) { $key = lc($key); print "got: >$key<\n"; return if ($key eq 'i'); &bailout("BC problem. aborted") if ($key eq 'q'); if ($key eq 'u') { $bcheckdb{$dbkey} = $dbchunk; return; } print "\n(I)gnore / (Q)uit / (U)pdate: "; } } sub diff_chunk($$) { my ($oldl, $newl) = @_; my @old = split /^/m, $oldl; my @new = split /^/m, $newl; my $haschanges = 0; my $max = $#old > $#new ? $#old : $#new; die "whoops. key different" if ($old[0] ne $new[0]); if ($#old != $#new) { warn ("Structural difference.\n"); print @old; print "-----------------------------------------------\n"; print @new; $haschanges = 1; return $haschanges; } print $old[0]; my ($class) = ($old[0] =~ /^(?:Class |Vtable for )(\S+)/); my $c = 1; while ($c < $max) { my ($o, $n) = ($old[$c], $new[$c]); chomp $o; chomp $n; $c++; next if ($o eq $n); if(defined($class) and $n =~ /^(\d+\s+)\w+(::\S+\s*.*)$/) { next if ($n eq "$1$class$2"); } $haschanges = 1; print "-$o\n+$n\n\n"; } return $haschanges; } local $dblock = $ENV{"HOME"} . "/bcheck.lock"; my $dbfile = $ENV{"HOME"} . "/bcheck.db"; my $cdump = $ARGV[0]; die "file $cdump is not readable: $!" if (! -f $cdump); # make sure the advisory lock exists open(MYLOCK, ">$dblock"); print MYLOCK ""; flock MYLOCK, LOCK_EX; tie %bcheckdb, 'DB_File', $dbfile; my $chunk = ""; open (IN, "<$cdump") or die "cannot open $cdump: $!"; while (<IN>) { chop; s/0x[0-9a-fA-F]+/0x......../g; s/base size=/size=/g; s/base align=/align=/g; $chunk .= $_ . "\n"; if(/^\s*$/) { my @lines = split /^/m, $chunk; my $key = $lines[0]; chomp $key; if($key !~ /<anonymous struct>/ && $key !~ /<anonymous union>/) { if(defined($bcheckdb{$key})) { my $dbversion = $bcheckdb{$key}; if($dbversion ne $chunk) { &ask_user($key, $chunk) if(&diff_chunk($dbversion, $chunk)); } } else { $bcheckdb{$key} = $chunk; print "NEW: $key\n"; } } $chunk = ""; next; } } close(IN); untie %bcheckdb; flock MYLOCK, LOCK_UN; close(MYLOCK); exit 0; --- NEW FILE: deps.am --- $(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in $(top_srcdir)/admin/cvs.sh $(top_srcdir)/admin/pkg.m4.in @cd $(top_srcdir) && $(SHELL) admin/cvs.sh acinclude_m4 $(top_srcdir)/configure.in: $(top_srcdir)/subdirs $(top_srcdir)/configure.files $(top_srcdir)/admin/cvs.sh @cd $(top_srcdir) && $(SHELL) admin/cvs.sh configure_in $(top_srcdir)/configure.files: $(top_srcdir)/subdirs $(CONF_FILES) @cd $(top_srcdir) && $(SHELL) admin/cvs.sh configure.files $(top_srcdir)/admin/cvs.sh $(top_srcdir)/Makefile.am: $(top_srcdir)/Makefile.am.in $(top_srcdir)/subdirs $(top_srcdir)/admin/cvs.sh @cd $(top_srcdir) && $(SHELL) admin/cvs.sh Makefile_am $(top_srcdir)/subdirs: $(top_srcdir)/Makefile.am.in $(top_srcdir)/admin/cvs.sh @cd $(top_srcdir) && $(SHELL) admin/cvs.sh subdirs # defining default rules for files that may not be present $(top_srcdir)/Makefile.am.in: $(CONF_FILES): --- NEW FILE: ltcf-c.sh --- #### This script is meant to be sourced by ltconfig. # ltcf-c.sh - Create a C compiler specific configuration # # Copyright (C) 1996-2000, 2001 Free Software Foundation, Inc. # Originally by Gordon Matzigkeit <go...@gn...>, 1996 # # This file 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. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. # Source file extension for C test sources. ac_ext=c # Object file extension for compiled C test sources. objext=o # Code to be used in simple compile tests lt_simple_compile_test_code="int some_variable = 0;" # Code to be used in simple link tests lt_simple_link_test_code='main(){return(0);}' ## Linker Characteristics case $host_os in cygwin* | mingw*) # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. if test "$with_gcc" != yes; then with_gnu_ld=no fi ;; esac ld_shlibs=yes if test "$with_gnu_ld" = yes; then # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' # See if GNU ld supports shared libraries. case $host_os in aix3* | aix4* | aix5*) # On AIX, the GNU linker is very broken ld_shlibs=no cat <<EOF 1>&2 *** Warning: the GNU linker, at least up to release 2.9.1, is reported *** to be unable to reliably create shared libraries on AIX. *** Therefore, libtool is disabling shared libraries support. If you *** really care for shared libraries, you may want to modify your PATH *** so that a non-GNU linker is found, and then restart. EOF ;; amigaos*) archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes # Samuel A. Falvo II <kc...@do...> reports # that the semantics of dynamic libraries on AmigaOS, at least up # to version 4, is to share data among multiple programs linked # with the same dynamic library. Since this doesn't match the # behavior of shared libraries on other platforms, we can use # them. ld_shlibs=no ;; beos*) if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then allow_undefined_flag=unsupported # Joseph Beckenbach <jr...@be...> says some releases of gcc # support --undefined. This deserves some investigation. FIXME archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' else ld_shlibs=no fi ;; cygwin* | mingw*) # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' allow_undefined_flag=unsupported always_export_symbols=yes extract_expsyms_cmds='test -f $output_objdir/impgen.c || \ sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //; p; }" -e d < $0 > $output_objdir/impgen.c~ test -f $output_objdir/impgen.exe || (cd $output_objdir && \ if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \ else $CC -o impgen impgen.c ; fi)~ $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def' old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib' # cygwin and mingw dlls have different entry points and sets of symbols # to exclude. # FIXME: what about values for MSVC? dll_entry=__cygwin_dll_entry@12 dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~ case $host_os in mingw*) # mingw values dll_entry=_DllMainCRTStartup@12 dll_exclude_symbols=DllMain@12,DllMainCRTStartup@12,DllEntryPoint@12~ ;; esac # mingw and cygwin differ, and it's simplest to just exclude the union # of the two symbol sets. dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12,DllMainCRTStartup@12,DllEntryPoint@12 # recent cygwin and mingw systems supply a stub DllMain which the user # can override, but on older systems we have to supply one (in ltdll.c) if test "x$lt_cv_need_dllmain" = "xyes"; then ltdll_obj='$output_objdir/$soname-ltdll.'"$objext " ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $output_objdir/$soname-ltdll.c~ test -f $output_objdir/$soname-ltdll.$objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~' else ltdll_obj= ltdll_cmds= fi # Extract the symbol export list from an `--export-all' def file, # then regenerate the def file from the symbol export list, so that # the compiled dll only exports the symbol export list. # Be careful not to strip the DATA tag left be newer dlltools. export_symbols_cmds="$ltdll_cmds"' $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~ sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is. # If DATA tags from a recent dlltool are present, honour them! archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then cp $export_symbols $output_objdir/$soname-def; else echo EXPORTS > $output_objdir/$soname-def; _lt_hint=1; cat $export_symbols | while read symbol; do set dummy \$symbol; case \[$]# in 2) echo " \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; *) echo " \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;; esac; _lt_hint=`expr 1 + \$_lt_hint`; done; fi~ '"$ltdll_cmds"' $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~ $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~ $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~ $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~ $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags' ;; darwin* | rhapsody*) allow_undefined_flag='-undefined suppress' archive_cmds='$CC `test .$module = .yes && echo -bundle || echo -dynamiclib` $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts -install_name $rpath/$soname `test -n "$verstring" -a x$verstring != x0.0 && echo $verstring`' # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' hardcode_direct=yes hardcode_shlibpath_var=no whole_archive_flag_spec='-all_load $convenience' ;; netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' fi ;; solaris* | sysv5*) if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then ld_shlibs=no cat <<EOF 1>&2 *** Warning: The releases 2.8.* of the GNU linker cannot reliably *** create shared libraries on Solaris systems. Therefore, libtool *** is disabling shared libraries support. We urge you to upgrade GNU *** binutils to release 2.9.1 or newer. Another option is to modify *** your PATH or compiler configuration so that the native linker is *** used, and then restart. EOF elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi ;; sunos4*) archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' wlarc= hardcode_direct=yes hardcode_shlibpath_var=no ;; *) if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi ;; esac case "$host_os" in freebsd*) skip_need_lc_check=yes ;; esac if test "$ld_shlibs" = yes; then runpath_var=LD_RUN_PATH hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' export_dynamic_flag_spec='${wl}--export-dynamic' case $host_os in cygwin* | mingw*) # dlltool doesn't understand --whole-archive et. al. whole_archive_flag_spec= ;; *) # ancient GNU ld didn't support --whole-archive et. al. if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' else whole_archive_flag_spec= fi ;; esac fi else # PORTME fill in a description of your system's linker (not GNU ld) case $host_os in aix3*) allow_undefined_flag=unsupported always_export_symbols=yes archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L=yes if test "$with_gcc" = yes && test -z "$link_static_flag"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. hardcode_direct=unsupported fi ;; aix4* | aix5*) hardcode_direct=yes hardcode_libdir_separator=':' link_all_deplibs=yes # When large executables or shared objects are built, AIX ld can # have problems creating the table of contents. If linking a library # or program results in "error TOC overflow" add -mminimal-toc to # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. if test "$with_gcc" = yes; then case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ collect2name=`${CC} -print-prog-name=collect2` if test -f "$collect2name" && \ strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 hardcode_direct=yes else # We have old collect2 hardcode_direct=unsupported # It fails to find uninstalled libraries when the uninstalled # path is not listed in the libpath. Setting hardcode_minus_L # to unsupported forces relinking hardcode_minus_L=yes hardcode_libdir_flag_spec='-L$libdir' hardcode_libdir_separator= fi esac shared_flag='-shared' else # not using gcc if test "$host_cpu" = ia64; then shared_flag='${wl}-G' else shared_flag='${wl}-bM:SRE' fi fi if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' no_entry_flag="" else # KDE requires run time linking. Make it the default. aix_use_runtimelinking=yes exp_sym_flag='-bexport' no_entry_flag='-bnoentry' fi # Let the compiler handle the export list. always_export_symbols=no if test "$aix_use_runtimelinking" = yes; then # Warning - without using the other run time loading flags (-brtl), -berok will # link without error, but may produce a broken library. allow_undefined_flag=' ${wl}-berok' # The following three lines along with hardcode_into_libs=yes put the correct path into libraries. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir${libdir:+:}/usr/lib:/lib' archive_cmds='$CC '"$shared_flag"' $libobjs $deplibs $compiler_flags ${wl}-G '"$hardcode_libdir_flag_spec"' -o $lib' archive_expsym_cmds='$CC '"$shared_flag"' $libobjs $deplibs $compiler_flags ${wl}-G '"$hardcode_libdir_flag_spec"' ${wl}'"$exp_sym_flag"':$export_symbols -o $lib' else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec='${wl}-R $libdir${libdir:+:}/usr/lib:/lib' allow_undefined_flag="-z nodefs" archive_cmds='$CC '"$shared_flag"' $libobjs $deplibs $compiler_flags '"$hardcode_libdir_flag_spec"' -o $lib' archive_expsym_cmds='$CC '"$shared_flag"' $libobjs $deplibs $compiler_flags '"$hardcode_libdir_flag_spec"' ${wl}'"$exp_sym_flag"':$export_symbols -o $lib' else allow_undefined_flag=' ${wl}-berok' # -bexpall does not export symbols beginning with underscore (_) always_export_symbols=yes # Exported symbols can be pulled into shared objects from archives whole_archive_flag_spec=' ' build_libtool_need_lc=yes hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib' # This is similar to how AIX traditionally builds it's shared libraries. archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; amigaos*) archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes # see comment about different semantics on the GNU ld section ld_shlibs=no ;; cygwin* | mingw*) # When not using gcc, we currently assume that we are using # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. hardcode_libdir_flag_spec=' ' allow_undefined_flag=unsupported # Tell ltmain to make .lib files, not .a files. libext=lib # FIXME: Setting linknames here is a bad hack. archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. old_archive_from_new_cmds='true' # FIXME: Should let the user specify the lib program. old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs' fix_srcfile_path='`cygpath -w "$srcfile"`' ;; freebsd1*) ld_shlibs=no ;; # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little # extra space). freebsd2.2*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. freebsd2*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_minus_L=yes hardcode_shlibpath_var=no ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd*) archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no skip_need_lc_check=yes ;; hpux9* | hpux10* | hpux11*) case $host_os in hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;; *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;; esac hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_minus_L=yes # Not in the search PATH, but as the default # location of the library. export_dynamic_flag_spec='${wl}-E' ;; irix5* | irix6*) if test "$with_gcc" = yes; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' else archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' fi hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: link_all_deplibs=yes ;; netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF fi hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no ;; newsos6) archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' hardcode_direct=yes hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: hardcode_shlibpath_var=no ;; openbsd*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no ;; os2*) hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes allow_undefined_flag=unsupported archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; osf3*) if test "$with_gcc" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' else allow_undefined_flag=' -expect_unresolved \*' archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' fi hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: ;; osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$with_gcc" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' else allow_undefined_flag=' -expect_unresolved \*' archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' fi hardcode_libdir_flag_spec='-rpath $libdir' hardcode_libdir_separator=: ;; sco3.2v5*) archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_shlibpath_var=no runpath_var=LD_RUN_PATH hardcode_runpath_var=yes ;; solaris*) no_undefined_flag=' -z text' # $CC -shared without GNU ld will not create a library from C++ # object files and a static libstdc++, better avoid it by now archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' hardcode_libdir_flag_spec='-R$libdir' hardcode_shlibpath_var=no case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; *) # Supported since Solaris 2.6 (maybe 2.5.1?) whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; esac link_all_deplibs=yes ;; sunos4*) archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' hardcode_libdir_flag_spec='-L$libdir' hardcode_direct=yes hardcode_minus_L=yes hardcode_shlibpath_var=no ;; sysv4) archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' runpath_var='LD_RUN_PATH' hardcode_shlibpath_var=no hardcode_direct=no #Motorola manual says yes, but my tests say they lie ;; sysv4.3*) archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_shlibpath_var=no export_dynamic_flag_spec='-Bexport' ;; sysv5*) no_undefined_flag=' -z text' # $CC -shared without GNU ld will not create a library from C++ # object files and a static libstdc++, better avoid it by now archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' hardcode_libdir_flag_spec= hardcode_shlibpath_var=no runpath_var='LD_RUN_PATH' ;; uts4*) archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_libdir_flag_spec='-L$libdir' hardcode_shlibpath_var=no ;; dgux*) archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_libdir_flag_spec='-L$libdir' hardcode_shlibpath_var=no ;; sysv4*MP*) if test -d /usr/nec; then archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_shlibpath_var=no runpath_var=LD_RUN_PATH hardcode_runpath_var=yes ld_shlibs=yes fi ;; sysv4.2uw2*) archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_minus_L=no hardcode_shlibpath_var=no hardcode_runpath_var=yes runpath_var=LD_RUN_PATH ;; unixware7*) archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' runpath_var='LD_RUN_PATH' hardcode_shlibpath_var=no ;; *) ld_shlibs=no ;; esac fi ## Compiler Characteristics: PIC flags, static flags, etc if test "X${ac_cv_prog_cc_pic+set}" = Xset; then : else ac_cv_prog_cc_pic= ac_cv_prog_cc_shlib= ac_cv_prog_cc_wl= ac_cv_prog_cc_static= ac_cv_prog_cc_no_builtin= ac_cv_prog_cc_can_build_shared=$can_build_shared if test "$with_gcc" = yes; then ac_cv_prog_cc_wl='-Wl,' ac_cv_prog_cc_static='-static' case $host_os in aix*) # All AIX code is PIC. if test "$host_cpu" = ia64; then # AIX 5 now supports IA64 processor lt_cv_prog_cc_static='-Bstatic' else lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp' fi ;; amigaos*) # FIXME: we need at least 68020 code to build shared libraries, but # adding the `-m68020' flag to GCC prevents building anything better, # like `-m68040'. ac_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' ;; beos* | irix5* | irix6* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; cygwin* | mingw* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). ac_cv_prog_cc_pic='-DDLL_EXPORT' ;; darwin* | rhapsody*) # PIC is the default on this platform # Common symbols not allowed in MH_DYLIB files lt_cv_prog_cc_pic='-fno-common' ;; *djgpp*) # DJGPP does not support shared libraries at all ac_cv_prog_cc_pic= ;; sysv4*MP*) if test -d /usr/nec; then ac_cv_prog_cc_pic=-Kconform_pic fi ;; *) ac_cv_prog_cc_pic='-fPIC' ;; esac else # PORTME Check for PIC flags for the system compiler. case $host_os in aix*) # All AIX code is PIC. ac_cv_prog_cc_static="$ac_cv_prog_cc_static ${ac_cv_prog_cc_wl}-lC" ;; hpux9* | hpux10* | hpux11*) # Is there a better ac_cv_prog_cc_static that works with the bundled CC? ac_cv_prog_cc_wl='-Wl,' ac_cv_prog_cc_static="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" ac_cv_prog_cc_pic='+Z' ;; irix5* | irix6*) ac_cv_prog_cc_wl='-Wl,' ac_cv_prog_cc_static='-non_shared' # PIC (with -KPIC) is the default. ;; cygwin* | mingw* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). ac_cv_prog_cc_pic='-DDLL_EXPORT' ;; linux*) case "$CC" in ccc*) # Compaq C # It appears that all Alpha # Linux and Compaq Tru64 Unix objects are PIC. ac_cv_prog_cc_static='-non_shared' ;; KCC*) # KAI C++ ac_cv_prog_cc_pic='-fPIC' ac_cv_prog_cc_wl='--backend -Wl,' ac_cv_prog_cc_static='-Bstatic' ;; *) ;; esac ;; newsos6) ac_cv_prog_cc_pic='-KPIC' ac_cv_prog_cc_static='-Bstatic' ;; osf3* | osf4* | osf5*) # All OSF/1 code is PIC. ac_cv_prog_cc_wl='-Wl,' ac_cv_prog_cc_static='-non_shared' ;; sco3.2v5*) ac_cv_prog_cc_pic='-Kpic' ac_cv_prog_cc_static='-dn' ac_cv_prog_cc_shlib='-belf' ;; solaris*) ac_cv_prog_cc_pic='-KPIC' ac_cv_prog_cc_static='-Bstatic' ac_cv_prog_cc_wl='-Wl,' ;; sunos4*) ac_cv_prog_cc_pic='-PIC' ac_cv_prog_cc_static='-Bstatic' ac_cv_prog_cc_wl='-Qoption ld ' ;; sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ac_cv_prog_cc_pic='-KPIC' ac_cv_prog_cc_static='-Bstatic' ac_cv_prog_cc_wl='-Wl,' ;; uts4*) ac_cv_prog_cc_pic='-pic' ac_cv_prog_cc_static='-Bstatic' ;; sysv4*MP*) if test -d /usr/nec ;then ac_cv_prog_cc_pic='-Kconform_pic' ac_cv_prog_cc_static='-Bstatic' fi ;; *) ac_cv_prog_cc_can_build_shared=no ;; esac fi case "$host_os" in # Platforms which do not suport PIC and -DPIC is meaningless # on them: *djgpp*) ac_cv_prog_cc_pic= ;; *) ac_cv_prog_cc_pic="$ac_cv_prog_cc_pic -DPIC" ;; esac fi need_lc=yes if test "$enable_shared" = yes && test "$with_gcc" = yes; then case $archive_cmds in *'~'*) # FIXME: we may have to deal with multi-command sequences. ;; '$CC '*) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. echo $ac_n "checking whether -lc should be explicitly linked in... $ac_c" 1>&6 if eval "test \"`echo '$''{'ac_cv_archive_cmds_needs_lc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 need_lc=$ac_cv_archive_cmds_needs_lc elif test "x$skip_need_lc_check" = "xyes" ; then echo $ac_n "(skipping, using no) $ac_c" 1>&6 need_lc=no else $rm conftest* echo "static int dummy;" > conftest.$ac_ext if { (eval echo ltcf-c.sh:need_lc: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; }; then # Append any warnings to the config.log. cat conftest.err 1>&5 soname=conftest lib=conftest libobjs=conftest.$ac_objext deplibs= wl=$ac_cv_prog_cc_wl compiler_flags=-v linker_flags=-v verstring= output_objdir=. libname=conftest save_allow_undefined_flag=$allow_undefined_flag allow_undefined_flag= if { (eval echo ltcf-c.sh:need_lc: \"$archive_cmds\") 1>&5; (eval $archive_cmds) 2>&1 | grep " -lc " 1>&5 ; }; then need_lc=no fi allow_undefined_flag=$save_allow_undefined_flag else cat conftest.err 1>&5 fi fi $rm conftest* echo "$ac_t$need_lc" 1>&6 ;; esac fi ac_cv_archive_cmds_needs_lc=$need_lc --- NEW FILE: ltcf-cxx.sh --- #### This script is meant to be sourced by ltconfig. # ltcf-cxx.sh - Create a C++ compiler specific configuration # # Copyright (C) 1996-1999, 2000, 2001 Free Software Foundation, Inc. # Originally by Gordon Matzigkeit <go...@gn...>, 1996 # # Original C++ support by:Gary V. Vaughan <gv...@te...> # Alexandre Oliva <ol...@ls...> # Ossama Othman <os...@de...> # Thomas Thanner <ta...@gm...> # # This file 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 [...1006 lines suppressed...] esac done # Clean up. rm -f a.out else echo "ltcf-cxx.sh: error: problem compiling test program" fi $rm -f confest.$objext if test "x$skip_need_lc_check" = "xyes" ; then need_lc=no else case " $postdeps " in *" -lc "*) need_lc=no ;; *) need_lc=yes ;; esac fi --- NEW FILE: ltcf-gcj.sh --- #### This script is meant to be sourced by ltconfig. # ltcf-gcj.sh - Create a GCJ compiler specific configuration # # Copyright (C) 1996-1999, 2000, 2001 Free Software Foundation, Inc. # Originally by Gordon Matzigkeit <go...@gn...>, 1996 # # Original GCJ support by: # Alexandre Oliva <ol...@ls...> # # This file 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. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. # Source file extension for Java test sources. ac_ext=java # Object file extension for compiled Java test sources. objext=o # Code to be used in simple compile tests lt_simple_compile_test_code="class foo {}" # Code to be used in simple link tests lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }' ## Linker Characteristics case $host_os in cygwin* | mingw*) # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. if test "$with_gcc" != yes; then with_gnu_ld=no fi ;; esac ld_shlibs=yes if test "$with_gnu_ld" = yes; then # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' # See if GNU ld supports shared libraries. case $host_os in aix3* | aix4*) # On AIX, the GNU linker is very broken ld_shlibs=no cat <<EOF 1>&2 *** Warning: the GNU linker, at least up to release 2.9.1, is reported *** to be unable to reliably create shared libraries on AIX. *** Therefore, libtool is disabling shared libraries support. If you *** really care for shared libraries, you may want to modify your PATH *** so that a non-GNU linker is found, and then restart. EOF ;; amigaos*) archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes # Samuel A. Falvo II <kc...@do...> reports # that the semantics of dynamic libraries on AmigaOS, at least up # to version 4, is to share data among multiple programs linked # with the same dynamic library. Since this doesn't match the # behavior of shared libraries on other platforms, we can use # them. ld_shlibs=no ;; beos*) if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then allow_undefined_flag=unsupported # Joseph Beckenbach <jr...@be...> says some releases of gcc # support --undefined. This deserves some investigation. FIXME archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' else ld_shlibs=no fi ;; cygwin* | mingw*) # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' allow_undefined_flag=unsupported always_export_symbols=yes extract_expsyms_cmds='test -f $output_objdir/impgen.c || \ sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //; p; }" -e d < $0 > $output_objdir/impgen.c~ test -f $output_objdir/impgen.exe || (cd $output_objdir && \ if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \ else $CC -o impgen impgen.c ; fi)~ $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def' old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib' # cygwin and mingw dlls have different entry points and sets of symbols # to exclude. # FIXME: what about values for MSVC? dll_entry=__cygwin_dll_entry@12 dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~ case $host_os in mingw*) # mingw values dll_entry=_DllMainCRTStartup@12 dll_exclude_symbols=DllMain@12,DllMainCRTStartup@12,DllEntryPoint@12~ ;; esac # mingw and cygwin differ, and it's simplest to just exclude the union # of the two symbol sets. dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12,DllMainCRTStartup@12,DllEntryPoint@12 # recent cygwin and mingw systems supply a stub DllMain which the user # can override, but on older systems we have to supply one (in ltdll.c) if test "x$lt_cv_need_dllmain" = "xyes"; then ltdll_obj='$output_objdir/$soname-ltdll.'"$objext " ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $output_objdir/$soname-ltdll.c~ test -f $output_objdir/$soname-ltdll.$objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~' else ltdll_obj= ltdll_cmds= fi # Extract the symbol export list from an `--export-all' def file, # then regenerate the def file from the symbol export list, so that # the compiled dll only exports the symbol export list. # Be careful not to strip the DATA tag left be newer dlltools. export_symbols_cmds="$ltdll_cmds"' $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~ sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is. # If DATA tags from a recent dlltool are present, honour them! archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then cp $export_symbols $output_objdir/$soname-def; else echo EXPORTS > $output_objdir/$soname-def; _lt_hint=1; cat $export_symbols | while read symbol; do set dummy \$symbol; case \[$]# in 2) echo " \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; *) echo " \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;; esac; _lt_hint=`expr 1 + \$_lt_hint`; done; fi~ '"$ltdll_cmds"' $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~ $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~ $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~ $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~ $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags' ;; netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' fi ;; solaris* | sysv5*) if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then ld_shlibs=no cat <<EOF 1>&2 *** Warning: The releases 2.8.* of the GNU linker cannot reliably *** create shared libraries on Solaris systems. Therefore, libtool *** is disabling shared libraries support. We urge you to upgrade GNU *** binutils to release 2.9.1 or newer. Another option is to modify *** your PATH or compiler configuration so that the native linker is *** used, and then restart. EOF elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi ;; sunos4*) archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' wlarc= hardcode_direct=yes hardcode_shlibpath_var=no ;; *) if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi ;; esac if test "$ld_shlibs" = yes; then runpath_var=LD_RUN_PATH hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' export_dynamic_flag_spec='${wl}--export-dynamic' case $host_os in cygwin* | mingw*) # dlltool doesn't understand --whole-archive et. al. whole_archive_flag_spec= ;; *) # ancient GNU ld didn't support --whole-archive et. al. if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' else whole_archive_flag_spec= fi ;; esac fi else # PORTME fill in a description of your system's linker (not GNU ld) case $host_os in aix3*) allow_undefined_flag=unsupported always_export_symbols=yes archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L=yes if test "$with_gcc" = yes && test -z "$link_static_flag"; then # Neither direct hardcoding nor static linking is supported... [truncated message content] |
|
From: <kb...@us...> - 2005-04-28 09:06:30
|
Update of /cvsroot/kbear/kbear/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20415/admin Modified Files: Tag: KBEAR_2_BRANCH libtool.m4.in Log Message: fixed bug for 64 bit system Index: libtool.m4.in =================================================================== RCS file: /cvsroot/kbear/kbear/admin/libtool.m4.in,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -d -r1.7 -r1.7.2.1 *** libtool.m4.in 8 Oct 2002 18:12:24 -0000 1.7 --- libtool.m4.in 28 Apr 2005 09:06:18 -0000 1.7.2.1 *************** *** 1271,1275 **** if test "x$LINUX_64_MODE" = x64; then # Some platforms are per default 64-bit, so there's no /lib64 ! if test -d /lib64; then libsuff=64 fi --- 1271,1275 ---- if test "x$LINUX_64_MODE" = x64; then # Some platforms are per default 64-bit, so there's no /lib64 ! if test -d /lib64 && ! test -L /lib64; then libsuff=64 fi |
|
From: <kb...@us...> - 2005-04-12 13:07:46
|
Update of /cvsroot/kbear/kbear/doc/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12700/doc/en Modified Files: index_en.pot Log Message: Index: index_en.pot =================================================================== RCS file: /cvsroot/kbear/kbear/doc/en/index_en.pot,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** index_en.pot 8 Dec 2002 16:43:16 -0000 1.7 --- index_en.pot 12 Apr 2005 13:06:47 -0000 1.8 *************** *** 12,20 **** "Language-Team: LANGUAGE <LL...@li...>\n" "MIME-Version: 1.0\n" ! "Content-Type: application/x-xml2pot; charset=utf-8\n" "Content-Transfer-Encoding: ENCODING\n" #: index.docbook:11 #, no-c-format msgid "The &kbear; Handbook" msgstr "" --- 12,21 ---- [...3273 lines suppressed...] #, no-c-format + #. Tag: screen msgid "" "<prompt>%</prompt><userinput><command>./configure</command></userinput>\n" *************** *** 1526,1531 **** msgstr "" ! #: index.docbook:1707 #, no-c-format msgid "Since &kbear; uses autoconf and automake you should have no trouble compiling it. Should you run into problems please report them to the author at <ulink url=\"mailto:kb...@us...\"> kb...@us...</ulink>" msgstr "" --- 1844,1850 ---- msgstr "" ! #: index.docbook:1691 #, no-c-format + #. Tag: para msgid "Since &kbear; uses autoconf and automake you should have no trouble compiling it. Should you run into problems please report them to the author at <ulink url=\"mailto:kb...@us...\"> kb...@us...</ulink>" msgstr "" |
|
From: <kb...@us...> - 2005-04-12 13:07:36
|
Update of /cvsroot/kbear/kbear/doc/cs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12700/doc/cs Modified Files: index_cs.po Log Message: Index: index_cs.po =================================================================== RCS file: /cvsroot/kbear/kbear/doc/cs/index_cs.po,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** index_cs.po 13 Jan 2003 19:41:57 -0000 1.29 --- index_cs.po 12 Apr 2005 13:06:46 -0000 1.30 *************** *** 15,18 **** --- 15,19 ---- "X-Generator: KBabel 0.9.6\n" + #. Tag: title #: index.docbook:11 #, no-c-format *************** *** 20,43 **** msgstr "PÅÃruÄka pro &kbear;" [...3695 lines suppressed...] "\"mailto:kb...@us...\"> kb...@us...</ulink>" + #~ msgid "" + #~ "<firstname>Björn</firstname> <surname>Sahlström</surname> " + #~ "<affiliation> <address> <email>kb...@us...</email> </" + #~ "address> </affiliation>" + #~ msgstr "" + #~ "<firstname>Björn</firstname> <surname>Sahlström</surname> " + #~ "<affiliation> <address> <email>kb...@us...</email> </" + #~ "address> </affiliation>" + + #~ msgid "" + #~ "<firstname>Peter</firstname> <surname>Swärd</surname> <affiliation> " + #~ "<address> <email>to...@te...</email> </address> </affiliation>" + #~ msgstr "" + #~ "<firstname>Peter</firstname> <surname>Swärd</surname> <affiliation> " + #~ "<address> <email>to...@te...</email> </address> </affiliation>" + #, fuzzy #~ msgid "Here we will describe how to work with the synch tool." |
Update of /cvsroot/kbear/kbear/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12700/admin Modified Files: Doxyfile.am Doxyfile.global Makefile.common acinclude.m4.in am_edit conf.change.pl config.guess config.pl config.sub configure.in.bot.end cvs-clean.pl cvs.sh debianrules depcomp detect-autoconf.sh install-sh libtool.m4.in ltmain.sh Added Files: bcheck.pl deps.am nmcheck oldinclude.m4.in pkg.m4.in Log Message: --- NEW FILE: bcheck.pl --- #!/usr/bin/perl -w use DB_File; use Fcntl ':flock'; if (!defined($ARGV[0])) { print "usage: requires .class dump as parameter!\n"; exit; } sub bailout { untie %bcheckdb if(defined(%bcheckdb)); if(defined(MYLOCK)) { flock MYLOCK, LOCK_UN; close(MYLOCK); } print @_; exit 5; } sub ask_user { my ($dbkey, $dbchunk) = @_; if (defined($ENV{"BCHECK_UPDATE"})) { $bcheckdb{$dbkey} = $dbchunk; return; } &bailout("BC problem detected") if (! -t STDIN); print "(I)gnore / (Q)uit / (U)pdate: "; my $key; while(defined(read STDIN, $key, 1)) { $key = lc($key); print "got: >$key<\n"; return if ($key eq 'i'); &bailout("BC problem. aborted") if ($key eq 'q'); if ($key eq 'u') { $bcheckdb{$dbkey} = $dbchunk; return; } print "\n(I)gnore / (Q)uit / (U)pdate: "; } } sub diff_chunk($$) { my ($oldl, $newl) = @_; my @old = split /^/m, $oldl; my @new = split /^/m, $newl; my $haschanges = 0; my $max = $#old > $#new ? $#old : $#new; die "whoops. key different" if ($old[0] ne $new[0]); if ($#old != $#new) { warn ("Structural difference.\n"); print @old; print "-----------------------------------------------\n"; print @new; $haschanges = 1; return $haschanges; } print $old[0]; my ($class) = ($old[0] =~ /^(?:Class |Vtable for )(\S+)/); my $c = 1; while ($c < $max) { my ($o, $n) = ($old[$c], $new[$c]); chomp $o; chomp $n; $c++; next if ($o eq $n); if(defined($class) and $n =~ /^(\d+\s+)\w+(::\S+\s*.*)$/) { next if ($n eq "$1$class$2"); } $haschanges = 1; print "-$o\n+$n\n\n"; } return $haschanges; } local $dblock = $ENV{"HOME"} . "/bcheck.lock"; my $dbfile = $ENV{"HOME"} . "/bcheck.db"; my $cdump = $ARGV[0]; die "file $cdump is not readable: $!" if (! -f $cdump); # make sure the advisory lock exists open(MYLOCK, ">$dblock"); print MYLOCK ""; flock MYLOCK, LOCK_EX; tie %bcheckdb, 'DB_File', $dbfile; my $chunk = ""; open (IN, "<$cdump") or die "cannot open $cdump: $!"; while (<IN>) { chop; s/0x[0-9a-fA-F]+/0x......../g; s/base size=/size=/g; s/base align=/align=/g; $chunk .= $_ . "\n"; if(/^\s*$/) { my @lines = split /^/m, $chunk; my $key = $lines[0]; chomp $key; if($key !~ /<anonymous struct>/ && $key !~ /<anonymous union>/) { if(defined($bcheckdb{$key})) { my $dbversion = $bcheckdb{$key}; if($dbversion ne $chunk) { &ask_user($key, $chunk) if(&diff_chunk($dbversion, $chunk)); } } else { $bcheckdb{$key} = $chunk; print "NEW: $key\n"; } } $chunk = ""; next; } } close(IN); untie %bcheckdb; flock MYLOCK, LOCK_UN; close(MYLOCK); exit 0; --- NEW FILE: deps.am --- $(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in $(top_srcdir)/admin/cvs.sh $(top_srcdir)/admin/pkg.m4.in @cd $(top_srcdir) && $(SHELL) admin/cvs.sh acinclude_m4 $(top_srcdir)/configure.in: $(top_srcdir)/subdirs $(top_srcdir)/configure.files $(top_srcdir)/admin/cvs.sh @cd $(top_srcdir) && $(SHELL) admin/cvs.sh configure_in $(top_srcdir)/configure.files: $(top_srcdir)/subdirs $(CONF_FILES) @cd $(top_srcdir) && $(SHELL) admin/cvs.sh configure.files $(top_srcdir)/admin/cvs.sh $(top_srcdir)/Makefile.am: $(top_srcdir)/Makefile.am.in $(top_srcdir)/subdirs $(top_srcdir)/admin/cvs.sh @cd $(top_srcdir) && $(SHELL) admin/cvs.sh Makefile_am $(top_srcdir)/subdirs: $(top_srcdir)/Makefile.am.in $(top_srcdir)/admin/cvs.sh @cd $(top_srcdir) && $(SHELL) admin/cvs.sh subdirs # defining default rules for files that may not be present $(top_srcdir)/Makefile.am.in: $(CONF_FILES): --- NEW FILE: nmcheck --- #!/usr/bin/perl -w # Check namespace cleanness of a library. # Allowed symbols are passed as arguments. # They may have trailing * = wildcard. # Wildcards may be also specified as *::* (e.g. K*::* for all KDE classes) # Symbols are listed as full function unmangled names without arguments, # e.g. 'foo bar* nspace::*' allows foo(), foo(int), bar(), barbar() # and all symbols in namespace/class nspace. # If an argument has comma in it, it's a filename of a file containing # allowed symbols, one per line. $thisProg = "$0"; # This programs name $library = ""; $allowed_symbols = ""; $debug = 0; $allowed_weak = ""; $weak_specified = 0; while( defined( $ARGV[ 0 ] )) { $_ = shift; if( /^--verbose$|^-v$/ ) { $debug = 1; } elsif( /^--help$|^-h$/ ) { print STDOUT "Usage $thisProg [OPTION] ... library [allowed symbols] ...\n", "\n", "Check if the given library has only allowed public symbols.\n", "\n", " --allowweak=[symbol] allow only these weak symbols\n", " -v, --verbose verbosely list files processed\n", " -h, --help print this help, then exit\n"; exit 0; } elsif( /^--allowweak=(.*)$/ ) { $allowed_weak .= " " . $1; $weak_specified = 1; } elsif( /^--allowweak$/ ) # simply list all weak { $allowed_weak .= " "; $weak_specified = 1; } elsif( /^--*/ ) { die "Invalid argument!\n"; } else { if( ! $library ) { $library = $_; } else { $allowed_symbols .= " " . $_; } } } if( ! $weak_specified ) { $allowed_weak = "*"; # allow all weak symbols by default # instances of templates and similar stuff - unfortunately includes also things from other libraries, # so it cannot be on by default } print STDERR "library:" . $library . "\n" if $debug; print STDERR "allowed_symbols:" . $allowed_symbols . "\n" if $debug; print STDERR "allowed_weak:" . $allowed_weak . "\n" if $debug; $default_symbols = "_fini _init"; # system symbols # on my system, every .so has : # A _DYNAMIC # A _GLOBAL_OFFSET_TABLE_ # A __bss_start # A _edata # A _end # T _fini # T _init # no need to list A symbols in $default_symbols print STDERR "default_symbols: " . $default_symbols . "\n" if $debug; print STDOUT "Namespace cleanness check for " . $library . " :\n"; $lib_file = ""; if( $library =~ /\.la$/ ) { # get the real library file from .la open( FILEIN, $library ) || die "Couldn't open $! !\n"; while( $line = <FILEIN> ) { if( $line =~ /library_names=\'([^ ]*).*/o ) { $lib_file = $1; } } close( FILEIN ); if( ! $lib_file ) { print STDERR "Library file not found in .la file!\n"; exit 1; } my $libpath = $library; $libpath =~ s%[^/]*$%%; if( -e $libpath . ".libs/" . $lib_file ) { $lib_file = $libpath . ".libs/" . $lib_file; } else { $lib_file = $libpath . $lib_file; } } else { $lib_file = $library; } print STDERR "libfile: ". $lib_file . "\n" if $debug; $allowed_symbols .= " " . $default_symbols; sub process_symbols($\@\%\@); @wildcards = (); %exacts = (); @regwildcards = (); process_symbols( $allowed_symbols, @wildcards, %exacts, @regwildcards ); @weak_wildcards = (); %weak_exacts = (); @weak_regwildcards = (); process_symbols( $allowed_weak, @weak_wildcards, %weak_exacts, @weak_regwildcards ); # grep is for stripping not exported symbols, which don't have address (=first column) $nm_command = "nm -BDCg " . $lib_file . " | grep -v '^ ' |"; # TODO how portable is this nmcheck stuff? print STDERR "nm command:" . $nm_command . "\n" if $debug; open( FILEIN, $nm_command ) || die "nm command failed\n"; my $exit_code = 0; while( $line = <FILEIN> ) { my $type; my $symbol; if( $line =~ /^[^ ]* (.) (.*)$/o ) { $type = $1; $symbol = $2; } else { die "Invalid line: " . $line . "\n"; } print STDERR "Type: " . $type . " , symbol: " . $symbol . "\n" if $debug; if( $type eq "A" ) { # these should be system symbols, so ignore them next; } my $orig_symbol = $symbol; if( $symbol =~ /\(anonymous namespace\)/o ) { # TODO tell to prefer named namespaces? (shorter symbols) next; } # strip prefixes # the :: appending is to make "CLASS::*" work also for "vtable for CLASS" $symbol =~ s/^typeinfo for (.*)$/$1::/o; $symbol =~ s/^typeinfo fn for (.*)$/$1::/o; $symbol =~ s/^typeinfo name for (.*)$/$1::/o; $symbol =~ s/^vtable for (.*)$/$1::/o; $symbol =~ s/^guard variable for (.*)$/$1::/o; $symbol =~ s/^reference temporary for (.*)$/$1::/o; $symbol =~ s/^VTT for (.*)$/$1::/o; $symbol =~ s/^virtual thunk \[[^\]]*\] to (.*)$/$1::/o; $symbol =~ s/^non-virtual thunk \[[^\]]*\] to (.*)$/$1::/o; $symbol =~ s/^covariant return thunk \[[^\]]*\] to (.*)$/$1::/o; $symbol =~ s/^construction vtable thunk for (.*)$/$1::/o; $symbol =~ s/^construction vtable for .*-in-(.*) [0-9]*$/$1::/o; # templates seem to have also return types mangled in their name, and nm prints it too # they have also template arguments in the symbol # get rid of both of those while( $symbol =~ /<.*>/o ) { $symbol =~ s/<[^<>]*>//o; # strip innermost <> } if( $symbol !~ /operator\(\)/o ) { $symbol =~ s/ ?\(.*\).*$//o; # strip () and all after it } else { $symbol =~ s/(^|:| )operator\(\) ?\(.*\).*$//o; # strip () and all after it } $symbol =~ s/\[.*\] *$//o; # strip [in-charge] etc. if( $symbol =~ /(^|:| )operator /o ) { $symbol =~ s/.* ([^\s]*)operator /$1/o; # strip everything before 'X::operator blah' } else { $symbol =~ s/.* ([^\s]+) *$/$1/o; # get last word (strip return type) } # print STDERR "Processed symbol: " . $symbol . "\n" if $debug; my $found = 0; if( $exacts{ $symbol } ) { $found = 1; } if( ! $found ) { for my $wild ( @wildcards ) { if( index( $symbol, $wild ) == 0 ) { $found = 1; last; } } } if( ! $found ) { for my $wild ( @regwildcards ) { if( $symbol =~ /^$wild$/ ) { $found = 1; last; } } } if( ( ! $found ) && ( $type eq "W" || $type eq "V" )) { if( $weak_exacts{ $symbol } ) { $found = 1; } if( ! $found ) { for my $wild ( @weak_wildcards ) { if( index( $symbol, $wild ) == 0 ) { $found = 1; last; } } } if( ! $found ) { for my $wild ( @weak_regwildcards ) { if( $symbol =~ /^$wild$/ ) { $found = 1; last; } } } } if( ! $found ) { print STDERR "Public symbol " . $orig_symbol . " is not allowed!\n"; $exit_code = 1; } } close( FILEIN ); print STDOUT $exit_code == 0 ? "OK\n" : "FAILED\n"; exit $exit_code; sub process_symbols($\@\%\@) { my $allowed_symbols = $_[ 0 ]; my $wildcards_ref = $_[ 1 ]; my $exacts_ref = $_[ 2 ]; my $regwildcards_ref = $_[ 3 ]; $allowed_symbols =~ s/^ *//o; # strip whitespace $allowed_symbols =~ s/ *$//o; if( $allowed_symbols eq "NONE" ) { $allowed_symbols = ""; } my @symbols1 = split( ' ', $allowed_symbols ); my $i = 0; my @symbols2 = (); while( defined( $symbols1[ $i ] )) { my $symbol = $symbols1[ $i ]; if( $symbol =~ /\./ ) # dot in name -> file { open( SYMIN, $symbol ) || die ( "Cannot open file " . $symbol . "!" ); while( $line = <SYMIN> ) { $line =~ s/^\s*//o; # strip whitespace $line =~ s/\s*$//o; if( $line !~ /^$/o # empty line && $line !~ /^\s*#/ ) # comment line starting with # { $symbols2[ $#symbols2 + 1 ] = $line; } } close( SYMIN ); } else { $symbols2[ $#symbols2 + 1 ] = $symbol; } $i++; } $i = 0; while( defined( $symbols2[ $i ] )) { my $symbol = $symbols2[ $i ]; if( $symbol =~ /__/ || $symbol =~ /^_[A-Z]/ ) { # ISO C++ 2.10.2 die "Symbols containing a double underscore or beginning with an underscore and an upper-case letter are reserved!\n"; } elsif( $symbol eq "main" || $symbol eq "main*" ) { die "Symbol main is not allowed!\n"; } if( $symbol =~ /^([^\*]*)\*$/o # trailing * without any * before it && $symbol !~ /operator\*$/o ) { print STDERR "wildcard:" . $symbol . "\n" if $debug; $wildcards_ref->[ $#{$wildcards_ref} + 1 ] = $1; } elsif( $symbol =~ /\*$/o && ( $symbol =~ /\*::/o || $symbol =~ /::\*/o ) && $symbol !~ /^\*/o && $symbol !~ /operator\*$/o ) { print STDERR "regwildcard:" . $symbol . "\n" if $debug; $symbol =~ s/\*/\.\*/go; # change * to .* (regexp) $regwildcards_ref->[ $#{$regwildcards_ref} + 1 ] = $symbol; } else { print STDERR "exact:" . $symbol . "\n" if $debug; $exacts_ref->{ $symbol } = 1; } $i++; } } --- NEW FILE: oldinclude.m4.in --- ### -*- autoconf -*- dnl This file is part of the KDE libraries/packages dnl Copyright (C) 1997 Janos Farkas (ch...@sh...) dnl (C) 1997,98,99 Stephan Kulow (co...@kd...) dnl This file is free software; you can redistribute it and/or dnl modify it under the terms of the GNU Library General Public dnl License as published by the Free Software Foundation; either dnl version 2 of the License, or (at your option) any later version. dnl This library is distributed in the hope that it will be useful, dnl but WITHOUT ANY WARRANTY; without even the implied warranty of dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU dnl Library General Public License for more details. dnl You should have received a copy of the GNU Library General Public License dnl along with this library; see the file COPYING.LIB. If not, write to dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330, dnl Boston, MA 02111-1307, USA. AC_DEFUN([KDE_CHECK_MICO], [ AC_REQUIRE([KDE_CHECK_LIBDL]) AC_REQUIRE([KDE_MISC_TESTS]) AC_MSG_CHECKING(for MICO) if test -z "$MICODIR"; then kde_micodir=/usr/local else kde_micodir="$MICODIR" fi AC_ARG_WITH(micodir, [ --with-micodir=micodir where mico is installed ], kde_micodir=$withval, kde_micodir=$kde_micodir ) AC_CACHE_VAL(kde_cv_mico_incdir, [ mico_incdirs="$kde_micodir/include /usr/include /usr/local/include /usr/local/include /opt/local/include $kde_extra_includes" AC_FIND_FILE(CORBA.h, $mico_incdirs, kde_cv_mico_incdir) ]) kde_micodir=`echo $kde_cv_mico_incdir | sed -e 's#/include##'` if test ! -r $kde_micodir/include/CORBA.h; then AC_MSG_ERROR([No CORBA.h found, specify another micodir]) fi AC_MSG_RESULT($kde_micodir) MICO_INCLUDES=-I$kde_micodir/include AC_SUBST(MICO_INCLUDES) MICO_LDFLAGS=-L$kde_micodir/lib AC_SUBST(MICO_LDFLAGS) micodir=$kde_micodir AC_SUBST(micodir) AC_MSG_CHECKING([for MICO version]) AC_CACHE_VAL(kde_cv_mico_version, [ AC_LANG_C cat >conftest.$ac_ext <<EOF #include <stdio.h> #include <mico/version.h> int main() { printf("MICO_VERSION=%s\n",MICO_VERSION); return (0); } EOF ac_compile='${CC-gcc} $CFLAGS $MICO_INCLUDES conftest.$ac_ext -o conftest' if AC_TRY_EVAL(ac_compile); then if eval `./conftest 2>&5`; then kde_cv_mico_version=$MICO_VERSION else AC_MSG_ERROR([your system is not able to execute a small application to find MICO version! Check $kde_micodir/include/mico/version.h]) fi else AC_MSG_ERROR([your system is not able to compile a small application to find MICO version! Check $kde_micodir/include/mico/version.h]) fi ]) dnl installed MICO version mico_v_maj=`echo $kde_cv_mico_version | sed -e 's/^\(.*\)\..*\..*$/\1/'` mico_v_mid=`echo $kde_cv_mico_version | sed -e 's/^.*\.\(.*\)\..*$/\1/'` mico_v_min=`echo $kde_cv_mico_version | sed -e 's/^.*\..*\.\(.*\)$/\1/'` if test "x$1" = "x"; then req_version="2.3.0" else req_version=$1 fi dnl required MICO version req_v_maj=`echo $req_version | sed -e 's/^\(.*\)\..*\..*$/\1/'` req_v_mid=`echo $req_version | sed -e 's/^.*\.\(.*\)\..*$/\1/'` req_v_min=`echo $req_version | sed -e 's/^.*\..*\.\(.*\)$/\1/'` if test "$mico_v_maj" -lt "$req_v_maj" || \ ( test "$mico_v_maj" -eq "$req_v_maj" && \ test "$mico_v_mid" -lt "$req_v_mid" ) || \ ( test "$mico_v_mid" -eq "$req_v_mid" && \ test "$mico_v_min" -lt "$req_v_min" ) then AC_MSG_ERROR([found MICO version $kde_cv_mico_version but version $req_version \ at least is required. You should upgrade MICO.]) else AC_MSG_RESULT([$kde_cv_mico_version (minimum version $req_version, ok)]) fi LIBMICO="-lmico$kde_cv_mico_version $LIBCRYPT $LIBSOCKET $LIBDL" AC_SUBST(LIBMICO) if test -z "$IDL"; then IDL='$(kde_bindir)/cuteidl' fi AC_SUBST(IDL) IDL_DEPENDENCIES='$(kde_includes)/CUTE.h' AC_SUBST(IDL_DEPENDENCIES) idldir="\$(includedir)/idl" AC_SUBST(idldir) ]) AC_DEFUN([KDE_CHECK_MINI_STL], [ AC_REQUIRE([KDE_CHECK_MICO]) AC_MSG_CHECKING(if we use mico's mini-STL) AC_CACHE_VAL(kde_cv_have_mini_stl, [ AC_LANG_SAVE AC_LANG_CPLUSPLUS kde_save_cxxflags="$CXXFLAGS" CXXFLAGS="$CXXFLAGS $MICO_INCLUDES" AC_TRY_COMPILE( [ #include <mico/config.h> ], [ #ifdef HAVE_MINI_STL #error "nothing" #endif ], kde_cv_have_mini_stl=no, kde_cv_have_mini_stl=yes) CXXFLAGS="$kde_save_cxxflags" AC_LANG_RESTORE ]) if test "x$kde_cv_have_mini_stl" = "xyes"; then AC_MSG_RESULT(yes) $1 else AC_MSG_RESULT(no) $2 fi ]) ]) AC_DEFUN([KDE_CHECK_ANSI], [ ]) AC_DEFUN([KDE_CHECK_INSURE], [ AC_ARG_ENABLE(insure, [ --enable-insure use insure++ for debugging [default=no]], [ if test $enableval = "no"; dnl then ac_use_insure="no" else ac_use_insure="yes" fi ], [ac_use_insure="no"]) AC_MSG_CHECKING(if we will use Insure++ to debug) AC_MSG_RESULT($ac_use_insure) if test "$ac_use_insure" = "yes"; dnl then CC="insure"; CXX="insure"; dnl CFLAGS="$CLAGS -fno-rtti -fno-exceptions "???? fi ]) AC_DEFUN([KDE_CHECK_NEWLIBS], [ ]) --- NEW FILE: pkg.m4.in --- dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page dnl also defines GSTUFF_PKG_ERRORS on error AC_DEFUN([PKG_CHECK_MODULES], [ succeeded=no if test -z "$PKG_CONFIG"; then AC_PATH_PROG(PKG_CONFIG, pkg-config, no) fi if test "$PKG_CONFIG" = "no" ; then echo "*** The pkg-config script could not be found. Make sure it is" echo "*** in your path, or set the PKG_CONFIG environment variable" echo "*** to the full path to pkg-config." echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then AC_MSG_CHECKING(for $2) if $PKG_CONFIG --exists "$2" ; then AC_MSG_RESULT(yes) succeeded=yes AC_MSG_CHECKING($1_CFLAGS) $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` AC_MSG_RESULT($$1_CFLAGS) AC_MSG_CHECKING($1_LIBS) $1_LIBS=`$PKG_CONFIG --libs "$2"` AC_MSG_RESULT($$1_LIBS) else $1_CFLAGS="" $1_LIBS="" ## If we have a custom action on failure, don't print errors, but ## do set a variable so people can do so. $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` ifelse([$4], ,echo $$1_PKG_ERRORS,) fi AC_SUBST($1_CFLAGS) AC_SUBST($1_LIBS) else echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." echo "*** See http://www.freedesktop.org/software/pkgconfig" fi fi if test $succeeded = yes; then ifelse([$3], , :, [$3]) else ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) fi ]) Index: Doxyfile.am =================================================================== RCS file: /cvsroot/kbear/kbear/admin/Doxyfile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Doxyfile.am 1 Feb 2003 23:52:18 -0000 1.3 --- Doxyfile.am 12 Apr 2005 13:06:43 -0000 1.4 *************** *** 18,21 **** --- 18,24 ---- echo "OUTPUT_DIRECTORY = $(top_builddir)/apidocs" >> 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 "RTF_OUTPUT = $(subdir)/rtf" >> Doxyfile; \ *************** *** 25,29 **** echo "GENERATE_LATEX = $(GENERATE_FLAG)" >> Doxyfile ;\ if test -n "$(DOXYGEN_EXCLUDE)"; then \ ! echo "EXCLUDE_PATTERNS += $(DOXYGEN_EXCLUDE)" >> Doxyfile; \ fi ;\ echo "TAGFILES = \\" >> Doxyfile; \ --- 28,42 ---- echo "GENERATE_LATEX = $(GENERATE_FLAG)" >> Doxyfile ;\ if test -n "$(DOXYGEN_EXCLUDE)"; then \ ! 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 ;\ echo "TAGFILES = \\" >> Doxyfile; \ *************** *** 46,50 **** fi ;\ done ;\ ! echo "GENERATE_TAGFILE = $(top_builddir)/apidocs/$(subdir)/$(subdir).tag" >> Doxyfile ;\ echo "IGNORE_PREFIX = K" >> Doxyfile ;\ echo "HAVE_DOT = $(KDE_HAVE_DOT)" >> Doxyfile ;\ --- 59,63 ---- fi ;\ done ;\ ! echo "GENERATE_TAGFILE = $(top_builddir)/apidocs/$(subdir)/`basename $(subdir)`.tag" >> Doxyfile ;\ echo "IGNORE_PREFIX = K" >> Doxyfile ;\ echo "HAVE_DOT = $(KDE_HAVE_DOT)" >> Doxyfile ;\ *************** *** 66,83 **** if test -d $(top_builddir)/apidocs/$(subdir)/html; then \ list=`ls $(top_builddir)/apidocs/$(subdir)/html`; \ 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; \ done; \ fi; \ ! rm -f $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/common; \ ! $(LN_S) $(kde_libs_htmldir)/en/common $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/common; \ else\ if test -d $(top_builddir)/apidocs; then \ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs ;\ list=`cd $(top_builddir)/apidocs && ls -1`; \ for file in $$list; do \ 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; \ fi; \ --- 79,100 ---- if test -d $(top_builddir)/apidocs/$(subdir)/html; then \ list=`ls $(top_builddir)/apidocs/$(subdir)/html`; \ + echo "installing $(top_builddir)/apidocs/$(subdir)/html" ;\ for file in $$list; do \ ! $(INSTALL_DATA) $(top_builddir)/apidocs/$(subdir)/html/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir)/html; \ done; \ fi; \ ! symlink="$(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/common"; \ ! if test ! -L "$symlink" -o `readlink "$symlink" 2>/dev/null` != "$(kde_libs_htmldir)/en/common"; then \ ! echo "Creating symlink $(kde_htmldir)/en/$(PACKAGE)-apidocs/common"; \ ! rm -f $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/common; \ ! $(LN_S) $(kde_libs_htmldir)/en/common $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/common; \ ! fi; \ else\ if test -d $(top_builddir)/apidocs; then \ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs ;\ list=`cd $(top_builddir)/apidocs && ls -1`; \ + echo "installing $(top_builddir)/apidocs/$$file" ;\ for file in $$list; do \ if test -f $(top_builddir)/apidocs/$$file; then \ $(INSTALL_DATA) $(top_builddir)/apidocs/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \ fi; \ *************** *** 127,132 **** @echo "*** Creating API documentation main page"; \ cp $(top_srcdir)/admin/Doxyfile.global Doxyfile; \ ! echo "PROJECT_NAME = $(DOXYGEN_PROJECT_NAME)" >> Doxyfile ; \ ! echo "PROJECT_NUMBER = $(DOXYGEN_PROJECT_NUMBER)" >> Doxyfile ; \ echo "INPUT = $(top_srcdir)" >> Doxyfile ; \ echo "OUTPUT_DIRECTORY = $(top_builddir)/apidocs" >> Doxyfile ; \ --- 144,149 ---- @echo "*** Creating API documentation main page"; \ cp $(top_srcdir)/admin/Doxyfile.global Doxyfile; \ ! echo "PROJECT_NAME = \"$(DOXYGEN_PROJECT_NAME)\"" >> Doxyfile ; \ ! echo "PROJECT_NUMBER = \"$(DOXYGEN_PROJECT_NUMBER)\"" >> Doxyfile ; \ echo "INPUT = $(top_srcdir)" >> Doxyfile ; \ echo "OUTPUT_DIRECTORY = $(top_builddir)/apidocs" >> Doxyfile ; \ *************** *** 159,162 **** --- 176,182 ---- 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: # mode: makefile Index: Doxyfile.global =================================================================== RCS file: /cvsroot/kbear/kbear/admin/Doxyfile.global,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Doxyfile.global 17 Nov 2003 13:48:14 -0000 1.2 --- Doxyfile.global 12 Apr 2005 13:06:44 -0000 1.3 *************** *** 1,3 **** ! # Doxyfile 1.2.15 # This file describes the settings to be used by the documentation system --- 1,3 ---- ! # Doxyfile 1.3.6 # This file describes the settings to be used by the documentation system *************** *** 12,16 **** [...981 lines suppressed...] - - DOC_URL = - - # The DOC_ABSPATH tag should be the absolute path to the directory where the - # documentation is located. If left blank the directory on the local machine - # will be used. - - DOC_ABSPATH = - - # The BIN_ABSPATH tag must point to the directory where the doxysearch binary - # is installed. - - BIN_ABSPATH = - - # The EXT_DOC_PATHS tag can be used to specify one or more paths to - # documentation generated for other projects. This allows doxysearch to search - # the documentation for these projects as well. - - EXT_DOC_PATHS = --- 1132,1133 ---- Index: Makefile.common =================================================================== RCS file: /cvsroot/kbear/kbear/admin/Makefile.common,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Makefile.common 21 Nov 2002 15:58:42 -0000 1.12 --- Makefile.common 12 Apr 2005 13:06:44 -0000 1.13 *************** *** 7,11 **** SHELL=/bin/sh ! cvs dist cvs-clean configure.in configure.files subdirs package-messages package-merge: @admindir=$(admindir); \ if test "x$$admindir" = x; then \ --- 7,11 ---- SHELL=/bin/sh ! cvs dist cvs-clean configure configure.in configure.files subdirs package-messages package-merge Makefile.am acinclude.m4 extract-messages: @admindir=$(admindir); \ if test "x$$admindir" = x; then \ *************** *** 22,31 **** fi; \ if test "$@" = "package-merge"; then \ ! MAKE=$(MAKE) POFILES="$(POFILES)" PACKAGE="$(PACKAGE)" \ $(SHELL) $$admindir/cvs.sh package-merge ;\ ! else MAKE=$(MAKE) $(SHELL) $$admindir/cvs.sh $@ ;\ fi ! configure.in: configure.files $(shell test -f configure.files && cat configure.files) subdirs configure.files: subdirs --- 22,32 ---- fi; \ if test "$@" = "package-merge"; then \ ! MAKE="$(MAKE)" POFILES="$(POFILES)" PACKAGE="$(PACKAGE)" \ $(SHELL) $$admindir/cvs.sh package-merge ;\ ! else \ ! MAKE="$(MAKE)" $(SHELL) $$admindir/cvs.sh $@ ;\ fi ! configure.in: configure.files subdirs configure.files: subdirs Index: acinclude.m4.in =================================================================== RCS file: /cvsroot/kbear/kbear/admin/acinclude.m4.in,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** acinclude.m4.in 8 Oct 2003 20:48:01 -0000 1.18 --- acinclude.m4.in 12 Apr 2005 13:06:44 -0000 1.19 *************** *** 27,44 **** dnl and kdebase or configure.in.in if present. - dnl ------------------------------------------------------------------------ - dnl Forward compatibility macros (make autoconf 2.13 look like 2.50), - dnl thanks to Raja R Harinath. - dnl ------------------------------------------------------------------------ - dnl - ifdef([_AC_PATH_X_XMKMF],[], - [AC_DEFUN([_AC_PATH_X_XMKMF],[AC_PATH_X_XMKMF])]) - ifdef([AC_OUTPUT_SUBDIRS],[], [...5071 lines suppressed...] + fi + + ]) + + dnl A small extension to PKG_CHECK_MODULES (defined in pkg.m4.in) + dnl which allows to search for libs that get installed into the KDE prefix. + dnl + dnl Syntax: KDE_PKG_CHECK_MODULES(KSTUFF, libkexif >= 0.2 glib = 1.3.4, action-if, action-not) + dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page + dnl also defines KSTUFF_PKG_ERRORS on error + AC_DEFUN([KDE_PKG_CHECK_MODULES], [ + + PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$PKG_CONFIG_PATH" + if test "$prefix" != "$kde_libs_prefix"; then + PKG_CONFIG_PATH="$kde_libs_prefix/lib/pkgconfig:$PKG_CONFIG_PATH" + fi + export PKG_CONFIG_PATH + PKG_CHECK_MODULES($1,$2,$3,$4) + ]) + Index: am_edit =================================================================== RCS file: /cvsroot/kbear/kbear/admin/am_edit,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** am_edit 21 Jul 2003 18:06:52 -0000 1.17 --- am_edit 12 Apr 2005 13:06:44 -0000 1.18 *************** *** 32,35 **** --- 32,36 ---- # David Faure <fa...@kd...> # Stephan Kulow <co...@kd...> + # Dirk Mueller <mu...@kd...> use Cwd; *************** *** 51,54 **** --- 52,56 ---- sub checkMocCandidates (); [...1367 lines suppressed...] *************** *** 2036,2037 **** --- 2429,2445 ---- #----------------------------------------------------------------------------- + + # find the .kcfg file listed in the .kcfgc file + sub findKcfgFile($) + { + my ($kcfgf) = @_; + open (KCFGFIN, $kcfgf) || die "Could not open $kcfgf: $!\n"; + seek(KCFGFIN, 0, 2); + my $kcfgfsize = tell(KCFGFIN); + seek(KCFGFIN, 0, 0); + read KCFGFIN, $kcfgfData, $kcfgfsize; + close KCFGFIN; + if(($kcfgfData =~ m/^File=(.*\.kcfg)/gm)) { + $kcfg = $1; + } + } Index: conf.change.pl =================================================================== RCS file: /cvsroot/kbear/kbear/admin/conf.change.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** conf.change.pl 25 Mar 2002 22:08:19 -0000 1.4 --- conf.change.pl 12 Apr 2005 13:06:44 -0000 1.5 *************** *** 1,3 **** ! #!/usr/bin/perl -w # this script patches a config.status file, to use our own perl script --- 1,3 ---- ! #!/usr/bin/env perl # this script patches a config.status file, to use our own perl script *************** *** 28,36 **** # 2. the big main loop which patches all Makefile.in's use File::Basename; my $ac_aux_dir = dirname($0); my ($flag); ! local $ac_version = 0; my $vpath_seen = 0; $flag = 0; --- 28,37 ---- # 2. the big main loop which patches all Makefile.in's + use strict; use File::Basename; my $ac_aux_dir = dirname($0); my ($flag); ! my $ac_version = 0; my $vpath_seen = 0; $flag = 0; *************** *** 79,82 **** --- 80,88 ---- # end with: "rm -f conftest.s\*" # on autoconf 250, it ends with '# CONFIG_HEADER section' + # + # gg: if a post-processing commands section is found first, + # stop there and insert a new loop to honor the case/esac. + # (pattern: /^\s+#\sRun the commands associated with the file./) + if (/^\s*for\s+ac_file\s+in\s+.*CONFIG_FILES/ ) { $flag = 3; *************** *** 95,101 **** print STDERR "hmm, don't know autoconf version\n"; } ! } elsif (/^\#\s*CONFIG_HEADER section.*/) { $flag = 4; &insert_main_loop(); if($ac_version != 250) { print STDERR "hmm, something went wrong :-(\n"; --- 101,109 ---- print STDERR "hmm, don't know autoconf version\n"; } ! } elsif (/^\#\s*CONFIG_(HEADER|COMMANDS) section.*|^\s+#\s(Run) the commands associated/) { $flag = 4; + my $commands = defined $2; &insert_main_loop(); + $commands && insert_command_loop(); if($ac_version != 250) { print STDERR "hmm, something went wrong :-(\n"; *************** *** 176,177 **** --- 184,191 ---- return; } + + sub insert_command_loop { + print <<EOF; + for ac_file in .. \$CONFIG_FILES ; do + EOF + } Index: config.guess =================================================================== RCS file: /cvsroot/kbear/kbear/admin/config.guess,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** config.guess 21 Nov 2002 15:58:42 -0000 1.6 --- config.guess 12 Apr 2005 13:06:44 -0000 1.7 *************** *** 2,8 **** # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002 Free Software Foundation, Inc. ! timestamp='2002-10-21' # This file is free software; you can redistribute it and/or modify it --- 2,8 ---- # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. ! timestamp='2004-06-24' # This file is free software; you can redistribute it and/or modify it *************** *** 54,58 **** Originally written by Per Bothner. ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. --- 54,58 ---- Originally written by Per Bothner. ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. *************** *** 99,110 **** # use `HOST_CC' if defined, but it is deprecated. ! # This shell variable is my proudest work .. or something. --bje ! set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ; ! (old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old) ! || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ; ! dummy=$tmpdir/dummy ; ! files="$dummy.c $dummy.o $dummy.rel $dummy" ; ! trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ; case $CC_FOR_BUILD,$HOST_CC,$CC in ,,) echo "int x;" > $dummy.c ; --- 99,114 ---- # use `HOST_CC' if defined, but it is deprecated. ! # Portable tmp directory creation inspired by the Autoconf team. ! set_cc_for_build=' ! trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; ! trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; ! : ${TMPDIR=/tmp} ; ! { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || ! { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || ! { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || ! { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; ! dummy=$tmp/dummy ; ! tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; case $CC_FOR_BUILD,$HOST_CC,$CC in ,,) echo "int x;" > $dummy.c ; *************** *** 114,118 **** fi ; done ; - rm -f $files ; if test x"$CC_FOR_BUILD" = x ; then CC_FOR_BUILD=no_compiler_found ; --- 118,121 ---- *************** *** 121,126 **** ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; ! esac ; ! unset files' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. --- 124,128 ---- ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; ! esac ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. *************** *** 179,183 **** esac # The OS release ! release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: --- 181,196 ---- esac # The OS release ! # Debian GNU/NetBSD machines have a different userland, and ! # thus, need a distinct triplet. However, they do not need ! # kernel version information, so it can be replaced with a ! # suitable tag, in the style of linux-gnu. ! case "${UNAME_VERSION}" in ! Debian*) ! release='-gnu' ! ;; ! *) ! release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` ! ;; ! esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: *************** *** 185,188 **** --- 198,204 ---- echo "${machine}-${os}${release}" exit 0 ;; + amd64:OpenBSD:*:*) + echo x86_64-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; amiga:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} *************** *** 191,197 **** --- 207,219 ---- echo mipsel-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + cats:OpenBSD:*:*) + echo arm-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; hp300:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + luna88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; mac68k:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} *************** *** 224,292 **** echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} exit 0 ;; alpha:OSF1:*:*) ! if test $UNAME_RELEASE = "V4.0"; then UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ! fi # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. ! eval $set_cc_for_build ! cat <<EOF >$dummy.s ! .data ! \$Lformat: ! .byte 37,100,45,37,120,10,0 # "%d-%x\n" ! ! .text ! .globl main ! .align 4 ! .ent main ! main: ! .frame \$30,16,\$26,0 ! ldgp \$29,0(\$27) ! .prologue 1 ! .long 0x47e03d80 # implver \$0 ! lda \$2,-1 ! .long 0x47e20c21 # amask \$2,\$1 ! lda \$16,\$Lformat ! mov \$0,\$17 ! not \$1,\$18 ! jsr \$26,printf ! ldgp \$29,0(\$26) ! mov 0,\$16 ! jsr \$26,exit ! .end main ! EOF ! $CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null ! if test "$?" = 0 ; then ! case `$dummy` in ! 0-0) ! UNAME_MACHINE="alpha" ! ;; ! 1-0) ! UNAME_MACHINE="alphaev5" ! ;; ! 1-1) ! UNAME_MACHINE="alphaev56" ! ;; ! 1-101) ! UNAME_MACHINE="alphapca56" ! ;; ! 2-303) ! UNAME_MACHINE="alphaev6" ! ;; ! 2-307) ! UNAME_MACHINE="alphaev67" ! ;; ! 2-1307) ! UNAME_MACHINE="alphaev68" ! ;; ! 3-1307) ! UNAME_MACHINE="alphaev7" ! ;; ! esac ! fi ! rm -f $dummy.s $dummy && rmdir $tmpdir ! echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; Alpha\ *:Windows_NT*:*) --- 246,310 ---- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit 0 ;; + macppc:MirBSD:*:*) + echo powerppc-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; alpha:OSF1:*:*) ! case $UNAME_RELEASE in ! *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ! ;; ! *5.*) ! UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ! ;; ! esac ! # According to Compaq, /usr/sbin/psrinfo has been available on ! # OSF/1 and Tru64 systems produced since 1995. I hope that ! # covers most systems running today. This code pipes the CPU ! # types through head -n 1, so we only detect the type of CPU 0. ! ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` ! case "$ALPHA_CPU_TYPE" in ! "EV4 (21064)") ! UNAME_MACHINE="alpha" ;; ! "EV4.5 (21064)") ! UNAME_MACHINE="alpha" ;; ! "LCA4 (21066/21068)") ! UNAME_MACHINE="alpha" ;; ! "EV5 (21164)") ! UNAME_MACHINE="alphaev5" ;; ! "EV5.6 (21164A)") ! UNAME_MACHINE="alphaev56" ;; ! "EV5.6 (21164PC)") ! UNAME_MACHINE="alphapca56" ;; ! "EV5.7 (21164PC)") ! UNAME_MACHINE="alphapca57" ;; ! "EV6 (21264)") ! UNAME_MACHINE="alphaev6" ;; ! "EV6.7 (21264A)") ! UNAME_MACHINE="alphaev67" ;; ! "EV6.8CB (21264C)") ! UNAME_MACHINE="alphaev68" ;; ! "EV6.8AL (21264B)") ! UNAME_MACHINE="alphaev68" ;; ! "EV6.8CX (21264D)") ! UNAME_MACHINE="alphaev68" ;; ! "EV6.9A (21264/EV69A)") ! UNAME_MACHINE="alphaev69" ;; ! "EV7 (21364)") ! UNAME_MACHINE="alphaev7" ;; ! "EV7.9 (21364A)") ! UNAME_MACHINE="alphaev79" ;; ! esac ! # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. ! echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; Alpha\ *:Windows_NT*:*) *************** *** 311,314 **** --- 329,335 ---- echo i370-ibm-openedition exit 0 ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} *************** *** 328,331 **** --- 349,355 ---- echo pyramid-pyramid-svr4 exit 0 ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit 0 ;; DRS?6000:UNIX_SV:4.2*:7*) case `/usr/bin/uname -p` in *************** *** 400,403 **** --- 424,430 ---- echo m68k-unknown-mint${UNAME_RELEASE} exit 0 ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} *************** *** 440,445 **** $CC_FOR_BUILD -o $dummy $dummy.c \ && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ ! && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 ! rm -f $dummy.c $dummy && rmdir $tmpdir echo mips-mips-riscos${UNAME_RELEASE} exit 0 ;; --- 467,471 ---- $CC_FOR_BUILD -o $dummy $dummy.c \ && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ ! && exit 0 echo mips-mips-riscos${UNAME_RELEASE} exit 0 ;; *************** *** 450,454 **** echo powerpc-harris-powermax exit 0 ;; ! Night_Hawk:*:*:PowerMAX_OS) echo powerpc-harris-powermax exit 0 ;; --- 476,480 ---- echo powerpc-harris-powermax exit 0 ;; ! Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) echo powerpc-harris-powermax exit 0 ;; *************** *** 525,530 **** } EOF ! $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 ! rm -f $dummy.c $dummy && rmdir $tmpdir echo rs6000-ibm-aix3.2.5 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then --- 551,555 ---- } EOF ! $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo rs6000-ibm-aix3.2.5 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then *************** *** 625,632 **** EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` ! if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi ! rm -f $dummy.c $dummy && rmdir $tmpdir fi ;; esac echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; --- 650,667 ---- EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` ! test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then + # avoid double evaluation of $set_cc_for_build + test -n "$CC_FOR_BUILD" || eval $set_cc_for_build + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; *************** *** 662,667 **** } EOF ! $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 ! rm -f $dummy.c $dummy && rmdir $tmpdir echo unknown-hitachi-hiuxwe2 exit 0 ;; --- 697,701 ---- } EOF ! $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo unknown-hitachi-hiuxwe2 exit 0 ;; *************** *** 721,727 **** echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; - CRAY*T3D:*:*:*) - echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' --- 755,758 ---- *************** *** 730,733 **** --- 761,767 ---- echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; + *:UNICOS/mp:*:*) + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` *************** *** 736,739 **** --- 770,778 ---- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit 0 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} *************** *** 746,762 **** exit 0 ;; *:FreeBSD:*:*) ! # Determine whether the default compiler uses glibc. ! eval $set_cc_for_build ! sed 's/^ //' << EOF >$dummy.c ! #include <features.h> ! #if __GLIBC__ >= 2 ! LIBC=gnu ! #else ! LIBC= ! #endif ! EOF ! eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` ! rm -f $dummy.c && rmdir $tmpdir ! echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} exit 0 ;; i*:CYGWIN*:*) --- 785,789 ---- exit 0 ;; *:FreeBSD:*:*) ! echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; i*:CYGWIN*:*) *************** *** 769,774 **** echo ${UNAME_MACHINE}-pc-pw32 exit 0 ;; ! x86:Interix*:3*) ! echo i386-pc-interix3 exit 0 ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) --- 796,804 ---- echo ${UNAME_MACHINE}-pc-pw32 exit 0 ;; ! x86:Interix*:[34]*) ! echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' ! exit 0 ;; ! [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) ! echo i${UNAME_MACHINE}-pc-mks exit 0 ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) *************** *** 776,780 **** # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? ! echo i386-pc-interix exit 0 ;; i*:UWIN*:*) --- 806,810 ---- # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? ! echo i586-pc-interix exit 0 ;; i*:UWIN*:*) *************** *** 788,793 **** --- 818,828 ---- exit 0 ;; *:GNU:*:*) + # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit 0 ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + exit 0 ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix *************** *** 796,802 **** --- 831,843 ---- echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; + cris:Linux:*:*) + echo cris-axis-linux-gnu + exit 0 ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu *************** *** 819,824 **** EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` ! rm -f $dummy.c && rmdir $tmpdir ! test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0 ;; ppc:Linux:*:*) --- 860,883 ---- EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` ! test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ! ;; ! mips64:Linux:*:*) ! eval $set_cc_for_build ! sed 's/^ //' << EOF >$dummy.c ! #undef CPU ! #undef mips64 ! #undef mips64el ! #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) ! CPU=mips64el ! #else ! #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) ! CPU=mips64 ! #else ! CPU= ! #endif ! #endif ! EOF ! eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` ! test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ;; ppc:Linux:*:*) *************** *** 856,859 **** --- 915,921 ---- echo ${UNAME_MACHINE}-ibm-linux exit 0 ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu *************** *** 913,919 **** #endif #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - rm -f $dummy.c && rmdir $tmpdir test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 --- 975,983 ---- #endif #endif + #ifdef __dietlibc__ + LIBC=dietlibc + #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 *************** *** 933,936 **** --- 997,1020 ---- echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit 0 ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit 0 ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit 0 ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit 0 ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit 0 ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit 0 ;; i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` *************** *** 967,973 **** fi exit 0 ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; pc:*:*:*) # Left here for compatibility: --- 1051,1054 ---- *************** *** 996,1002 **** echo m68k-convergent-sysv exit 0 ;; ! M68*:*:R3V[567]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; ! 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ --- 1077,1086 ---- echo m68k-convergent-sysv exit 0 ;; ! M680?0:D-NIX:5.3:*) ! echo m68k-diab-dnix ! exit 0 ;; ! M68*:*:R3V[5678]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; ! 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ *************** *** 1015,1021 **** echo m68k-atari-sysv4 exit 0 ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} --- 1099,1102 ---- *************** *** 1099,1103 **** exit 0 ;; *:Darwin:*:*) ! echo `uname -p`-apple-darwin${UNAME_RELEASE} exit 0 ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) --- 1180,1188 ---- exit 0 ;; *:Darwin:*:*) ! case `uname -p` in ! *86) UNAME_PROCESSOR=i686 ;; ! powerpc) UNAME_PROCESSOR=powerpc ;; ! esac ! echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit 0 ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) *************** *** 1112,1116 **** echo i386-pc-qnx exit 0 ;; ! NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; --- 1197,1201 ---- echo i386-pc-qnx exit 0 ;; ! NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; *************** *** 1135,1143 **** echo ${UNAME_MACHINE}-unknown-plan9 exit 0 ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit 0 ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 --- 1220,1223 ---- *************** *** 1158,1167 **** echo pdp10-unknown-its exit 0 ;; ! i*86:XTS-300:*:STOP) ! echo ${UNAME_MACHINE}-unknown-stop exit 0 ;; ! i*86:atheos:*:*) ! echo ${UNAME_MACHINE}-unknown-atheos exit 0 ;; esac --- 1238,1254 ---- echo pdp10-unknown-its exit 0 ;; ! SEI:*:*:SEIUX) ! echo mips-sei-seiux${UNAME_RELEASE} exit 0 ;; ! *:DragonFly:*:*) ! echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms && exit 0 ;; + I*) echo ia64-dec-vms && exit 0 ;; + V*) echo vax-dec-vms && exit 0 ;; + esac esac *************** *** 1284,1289 **** EOF ! $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 ! rm -f $dummy.c $dummy && rmdir $tmpdir # Apollos put the system type in the environment. --- 1371,1375 ---- EOF ! $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 # Apollos put the system type in the environment. Index: config.pl =================================================================== RCS file: /cvsroot/kbear/kbear/admin/config.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** config.pl 8 Oct 2002 18:12:24 -0000 1.4 --- config.pl 12 Apr 2005 13:06:44 -0000 1.5 *************** *** 1,3 **** ! #!/usr/bin/perl # a script for use by autoconf to make the Makefiles # from the Makefile.in's --- 1,3 ---- ! #!/usr/bin/env perl # a script for use by autoconf to make the Makefiles # from the Makefile.in's *************** *** 29,32 **** --- 29,36 ---- # Boston, MA 02111-1307, USA. + use strict; + + use File::Path; + my $ac_subs=$ARGV[0]; my $ac_sacfiles = $ARGV[1]; *************** *** 34,37 **** --- 38,44 ---- my $ac_given_INSTALL=$ARGV[3]; + my @comp_match; + my @comp_subs; + #print "ac_subs=$ac_subs\n"; #print "ac_sacfiles=$ac_sacfiles\n"; *************** *** 39,45 **** --- 46,54 ---- #print "ac_given_INSTALL=$ac_given_INSTALL\n"; + my $configure_input; my ($srcdir, $top_srcdir); my $INSTALL; my $bad_perl = ($] < 5.005); + my $created_file_count = 0; open(CF, "< $ac_subs") || die "can't open $ac_subs: $!"; *************** *** 95,99 **** push @comp_subs, ""; } else { ! die "Uhh. Malformed pattern in $ac_cs_root.subs ($pat)" unless ( $pat =~ /^\s*$/ ); # ignore white lines } --- 104,108 ---- push @comp_subs, ""; } else { ! die "Uhh. Malformed pattern in $ac_subs ($pat)" unless ( $pat =~ /^\s*$/ ); # ignore white lines } *************** *** 131,135 **** if ( ($ac_dir ne $ac_file) && ($ac_dir ne ".")) { # The file is in a subdirectory. ! if (! -d "$ac_dir") { mkdir "$ac_dir", 0777; } ($ac_dir_suffix = $ac_dir) =~ s%^./%%; $ac_dir_suffix="/".$ac_dir_suffix; --- 140,144 ---- if ( ($ac_dir ne $ac_file) && ($ac_dir ne ".")) { # The file is in a subdirectory. ! if (! -d "$ac_dir") { mkpath "$ac_dir", 0, 0777; } ($ac_dir_suffix = $ac_dir) =~ s%^./%%; $ac_dir_suffix="/".$ac_dir_suffix; *************** *** 167,174 **** my $fname=$ac_file_in; $fname =~ s%.*/%%; ! my $configure_input="Generated automatically 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; --- 176,180 ---- my $fname=$ac_file_in; $fname =~ s%.*/%%; ! $configure_input="$ac_file. Generated from $fname by config.pl."; my $ac_file_inputs; *************** *** 176,184 **** $ac_file_inputs =~ s%:% $ac_given_srcdir/%g; ! patch_file($ac_file, $ac_file_inputs, $ac_comsub); } sub patch_file { ! my ($outf, $infiles, $identline) = @_; my $filedata; my @infiles=split(' ', $infiles); --- 182,193 ---- $ac_file_inputs =~ s%:% $ac_given_srcdir/%g; ! patch_file($ac_file, $ac_file_inputs); ! ++$created_file_count; } + print "config.pl: fast created $created_file_count file(s).\n"; + sub patch_file { ! my ($outf, $infiles) = @_; my $filedata; my @infiles=split(' ', $infiles); *************** *** 195,202 **** } } - 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; --- 204,207 ---- *************** *** 224,232 **** sub make_closure { my ($pat, $sub) = @_; ! $pat =~ s/\@/\\@/g; # @bla@ -> \@bla\@ ! $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 ($@) { print "can't create CODE: $@\n"; --- 229,233 ---- sub make_closure { my ($pat, $sub) = @_; ! my $ret = eval "return sub { my \$ref=shift; \$\$ref =~ s%\Q$pat\E%\Q$sub\E%g; }"; if ($@) { print "can't create CODE: $@\n"; Index: config.sub =================================================================== RCS file: /cvsroot/kbear/kbear/admin/config.sub,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** config.sub 21 Nov 2002 15:58:42 -0000 1.6 --- config.sub 12 Apr 2005 13:06:44 -0000 1.7 *************** *** 2,8 **** # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002 Free Software Foundation, Inc. ! timestamp='2002-09-05' # This file is (in principle) common to ALL GNU software. --- 2,8 ---- # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. ! timestamp='2004-06-24' # This file is (in principle) common to ALL GNU software. *************** *** 71,75 **** GNU config.sub ($timestamp... [truncated message content] |
|
From: <kb...@us...> - 2005-04-12 13:07:18
|
Update of /cvsroot/kbear/kbear/doc/fr In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12700/doc/fr Modified Files: index_fr.po Log Message: Index: index_fr.po =================================================================== RCS file: /cvsroot/kbear/kbear/doc/fr/index_fr.po,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** index_fr.po 13 Jan 2003 19:41:47 -0000 1.44 --- index_fr.po 12 Apr 2005 13:06:47 -0000 1.45 *************** *** 15,18 **** --- 15,19 ---- "X-Generator: KBabel 0.9.6\n" + #. Tag: title #: index.docbook:11 #, no-c-format *************** *** 20,43 **** msgstr "Le manuel de &kbear;" [...3731 lines suppressed...] "sourceforge.net\"> kb...@us...</ulink>." + #~ msgid "" + #~ "<firstname>Björn</firstname> <surname>Sahlström</surname> " + #~ "<affiliation> <address> <email>kb...@us...</email> </" + #~ "address> </affiliation>" + #~ msgstr "" + #~ "<firstname>Björn</firstname> <surname>Sahlström</surname> " + #~ "<affiliation> <address> <email>kb...@us...</email> </" + #~ "address> </affiliation>" + + #~ msgid "" + #~ "<firstname>Peter</firstname> <surname>Swärd</surname> <affiliation> " + #~ "<address> <email>to...@te...</email> </address> </affiliation>" + #~ msgstr "" + #~ "<firstname>Peter</firstname> <surname>Swärd</surname> <affiliation> " + #~ "<address> <email>to...@te...</email> </address> </affiliation>" + #, fuzzy #~ msgid "Here we will describe how to work with the synch tool." |
|
From: <kb...@us...> - 2005-04-12 13:07:14
|
Update of /cvsroot/kbear/kbear/po In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12700/po Modified Files: Makefile.am Log Message: Index: Makefile.am =================================================================== RCS file: /cvsroot/kbear/kbear/po/Makefile.am,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** Makefile.am 8 Jul 2003 17:04:20 -0000 1.31 --- Makefile.am 12 Apr 2005 13:06:49 -0000 1.32 *************** *** 1,3 **** ! POFILES = sv.po pt.po nl.po cs.po fr.po ru.po ro.po it.po pt_BR.po ja.po es.po pl.po de.po he.po id.po zh_TW.po #POFILES = AUTO --- 1,3 ---- ! POFILES = sv.po pt.po nl.po cs.po fr.po ru.po ro.po it.po ja.po es.po pl.po de.po he.po id.po zh_TW.po #POFILES = AUTO |
|
From: <kb...@us...> - 2005-04-12 13:06:59
|
Update of /cvsroot/kbear/kbear In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12700 Modified Files: KBear.kdevelop KBear.kdevses Makefile.am kbear.m4.in Log Message: Index: KBear.kdevelop =================================================================== RCS file: /cvsroot/kbear/kbear/KBear.kdevelop,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** KBear.kdevelop 23 Aug 2003 07:47:50 -0000 1.34 --- KBear.kdevelop 12 Apr 2005 13:06:50 -0000 1.35 *************** *** 28,31 **** --- 28,33 ---- <group pattern="*.po;*.ts" name="Translations" /> <group pattern="*" name="Others" /> + <hidenonprojectfiles>false</hidenonprojectfiles> + <hidenonlocation>false</hidenonlocation> </groups> <tree> *************** *** 156,163 **** <commitoptions>-z4</commitoptions> <updateoptions>-dP -z4</updateoptions> ! <addoptions></addoptions> <removeoptions>-f</removeoptions> <diffoptions>-u3 -p</diffoptions> ! <logoptions></logoptions> <rshoptions>ssh</rshoptions> <revertoptions>-C -d -P</revertoptions> --- 158,165 ---- <commitoptions>-z4</commitoptions> <updateoptions>-dP -z4</updateoptions> ! <addoptions/> <removeoptions>-f</removeoptions> <diffoptions>-u3 -p</diffoptions> ! <logoptions/> <rshoptions>ssh</rshoptions> <revertoptions>-C -d -P</revertoptions> *************** *** 205,209 **** --- 207,221 ---- <codeCompletionDelay>250</codeCompletionDelay> <argumentsHintDelay>400</argumentsHintDelay> + <automaticHeaderCompletion>true</automaticHeaderCompletion> + <headerCompletionDelay>250</headerCompletionDelay> </codecompletion> + <references/> </kdevcppsupport> + <kdevcvsservice> + <recursivewhenupdate>true</recursivewhenupdate> + <prunedirswhenupdate>true</prunedirswhenupdate> + <createdirswhenupdate>true</createdirswhenupdate> + <recursivewhencommitremove>true</recursivewhencommitremove> + <revertoptions>-C</revertoptions> + </kdevcvsservice> </kdevelop> Index: KBear.kdevses =================================================================== RCS file: /cvsroot/kbear/kbear/KBear.kdevses,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** KBear.kdevses 23 Aug 2003 07:47:50 -0000 1.49 --- KBear.kdevses 12 Apr 2005 13:06:50 -0000 1.50 *************** *** 2,28 **** <!DOCTYPE KDevPrjSession> <KDevPrjSession> ! <DocsAndViews NumberOfDocuments="4" > ! <Doc0 context="ctx_doxygen" NumberOfViews="1" URL="file:/opt/kde3/share/doc/HTML/en/kdelibs-apidocs/kdeui/html/classKLineEditDlg.html#d1" > ! <View0 Type="???" > ! <AdditionalSettings/> ! </View0> ! </Doc0> ! <Doc1 NumberOfViews="1" URL="file:/home/bjorn/programmering/projekt/kbear-3/kbear/kbear/parts/remotefilesys/kbearremotefilesyspart.cpp" > ! <View0 line="154" Type="???" > ! <AdditionalSettings/> ! </View0> ! </Doc1> ! <Doc2 NumberOfViews="1" URL="file:/home/bjorn/programmering/projekt/kbear-3/kbear/kbear/lib/interfaces/connectionmanager.cpp" > ! <View0 line="151" Type="???" > ! <AdditionalSettings/> ! </View0> ! </Doc2> ! <Doc3 NumberOfViews="1" URL="file:/home/bjorn/programmering/projekt/kbear-3/kbear/kbear/ftp/kbearftp.cpp" > ! <View0 line="32" Type="???" > ! <AdditionalSettings/> ! </View0> ! </Doc3> ! </DocsAndViews> <pluginList> <kdevbookmarks> <bookmarks> --- 2,13 ---- <!DOCTYPE KDevPrjSession> <KDevPrjSession> ! <DocsAndViews NumberOfDocuments="0" /> <pluginList> + <kdevvalgrind> + <executable path="" params="" /> + <valgrind path="" params="" /> + <calltree path="" params="" /> + <kcachegrind path="" /> + </kdevvalgrind> <kdevbookmarks> <bookmarks> *************** *** 58,61 **** --- 43,49 ---- </bookmarks> </kdevbookmarks> + <kdevsubversion> + <subversion recurseresolve="1" recurserelocate="1" recursemerge="1" recursecommit="1" base="" recursepropget="1" recurseswitch="1" recurseupdate="1" recursepropset="1" recursediff="1" recurserevert="1" forcemove="1" recursecheckout="1" forceremove="1" recurseadd="1" recurseproplist="1" forcemerge="1" /> + </kdevsubversion> <kdevdebugger> <breakpointList/> Index: Makefile.am =================================================================== RCS file: /cvsroot/kbear/kbear/Makefile.am,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** Makefile.am 23 Aug 2003 07:47:50 -0000 1.40 --- Makefile.am 12 Apr 2005 13:06:50 -0000 1.41 *************** *** 60,61 **** --- 60,62 ---- + Index: kbear.m4.in =================================================================== RCS file: /cvsroot/kbear/kbear/kbear.m4.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** kbear.m4.in 16 Jul 2003 00:02:58 -0000 1.1 --- kbear.m4.in 12 Apr 2005 13:06:50 -0000 1.2 *************** *** 3,7 **** dnl ********** ! AC_DEFUN(KBEAR_CHECK_KDEVERSION, [ AC_MSG_CHECKING(for KDE >= 3.1) --- 3,7 ---- dnl ********** ! AC_DEFUN([KBEAR_CHECK_KDEVERSION], [ AC_MSG_CHECKING(for KDE >= 3.1) *************** *** 45,49 **** dnl stolen from kdevelop and slightly modified dnl ********** ! AC_DEFUN(KBEAR_CHECK_MDI, [ AC_MSG_CHECKING(whether to use kmdi lib from kdelibs) --- 45,49 ---- dnl stolen from kdevelop and slightly modified dnl ********** ! AC_DEFUN([KBEAR_CHECK_MDI], [ AC_MSG_CHECKING(whether to use kmdi lib from kdelibs) |
|
From: <kb...@us...> - 2005-04-12 13:06:58
|
Update of /cvsroot/kbear/kbear/doc/sv In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12700/doc/sv Modified Files: index_sv.po Log Message: Index: index_sv.po =================================================================== RCS file: /cvsroot/kbear/kbear/doc/sv/index_sv.po,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** index_sv.po 31 Jan 2003 11:18:46 -0000 1.28 --- index_sv.po 12 Apr 2005 13:06:48 -0000 1.29 *************** *** 15,18 **** --- 15,19 ---- "X-Generator: KBabel 1.0beta2\n" + #. Tag: title #: index.docbook:11 #, no-c-format *************** *** 20,44 **** msgstr "&kbear; handboken" [...3697 lines suppressed...] + #~ msgid "" + #~ "<firstname>Björn</firstname> <surname>Sahlström</surname> " + #~ "<affiliation> <address> <email>kb...@us...</email> </" + #~ "address> </affiliation>" + #~ msgstr "" + #~ "<firstname>Björn</firstname> <surname>Sahlström</surname> <affiliation> " + #~ "<address> <email>kb...@us...</email> </address> </" + #~ "affiliation>" + + #~ msgid "" + #~ "<firstname>Peter</firstname> <surname>Swärd</surname> <affiliation> " + #~ "<address> <email>to...@te...</email> </address> </affiliation>" + #~ msgstr "" + #~ "<firstname>Björn</firstname> <surname>Sahlström</surname> <affiliation> " + #~ "<address> <email>kb...@us...</email> </address> </" + #~ "affiliation>" + #, fuzzy #~ msgid "" |
|
From: <kb...@us...> - 2005-04-12 13:06:58
|
Update of /cvsroot/kbear/kbear/kbear In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12700/kbear Removed Files: KBear.kdevelop KBear.kdevses Log Message: --- KBear.kdevelop DELETED --- --- KBear.kdevses DELETED --- |
|
From: <kb...@us...> - 2005-04-12 13:06:57
|
Update of /cvsroot/kbear/kbear/kbear/plugins/ftpfind In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12700/kbear/plugins/ftpfind Modified Files: scandomainworker.h Log Message: Index: scandomainworker.h =================================================================== RCS file: /cvsroot/kbear/kbear/kbear/plugins/ftpfind/scandomainworker.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** scandomainworker.h 23 Aug 2003 07:47:50 -0000 1.3 --- scandomainworker.h 12 Apr 2005 13:06:48 -0000 1.4 *************** *** 13,16 **** --- 13,17 ---- ////////////////////////////////////////////////////////////////////// // Qt specific include files + #include <qobject.h> #include <qthread.h> #include <qevent.h> |
|
From: <kb...@us...> - 2005-04-12 12:14:36
|
=2D-=20 MVH Bj=F6rn Sahlstr=F6m kb...@us... |
|
From: <kb...@us...> - 2004-03-03 21:07:48
|
Update of /cvsroot/kbear/kbear/kbear/plugins/ftpfind In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18131/kbear/plugins/ftpfind Modified Files: scandomainworker.cpp Log Message: Fixed bug that caused login always failed Index: scandomainworker.cpp =================================================================== RCS file: /cvsroot/kbear/kbear/kbear/plugins/ftpfind/scandomainworker.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** scandomainworker.cpp 23 Aug 2003 07:47:50 -0000 1.5 --- scandomainworker.cpp 3 Mar 2004 20:55:00 -0000 1.6 *************** *** 297,304 **** int retval = readBlock( buffer, 1024 ); - regExp.setPattern( QString::fromLatin1("login ok") ); - regExp.setCaseSensitive( false ); ! if( retval > 0 && regExp.search( QString::fromLatin1( buffer ) ) < 0 ) { msg = i18n("Anonymous login denied!"); ScanDomainEvent* event = new ScanDomainEvent( this, ScanDomainEvent::LoginDenied, msg ); --- 297,306 ---- int retval = readBlock( buffer, 1024 ); ! /* ! regExp.setPattern( QString::fromLatin1("23") ); ! regExp.setCaseSensitive( false ); ! */ ! if( retval > 0 && strncmp( buffer, "331", 3) != 0 ) { msg = i18n("Anonymous login denied!"); ScanDomainEvent* event = new ScanDomainEvent( this, ScanDomainEvent::LoginDenied, msg ); *************** *** 314,317 **** --- 316,320 ---- // Check for a positive return code to see if the login really went through okay. + kdDebug() << k_funcinfo << QString(" Return message = %1").arg(buffer) << endl; if( retval > 0 && strncmp( buffer, "230", 3) == 0) { msg = i18n("Anonymous login accepted."); |
|
From: <fri...@us...> - 2003-11-29 20:32:35
|
Update of /cvsroot/kbear/kbear/kbear/plugins/sitemanager In directory sc8-pr-cvs1:/tmp/cvs-serv20949/kbear/plugins/sitemanager Modified Files: kbearsitemanager.cpp Log Message: Fixed bug: Save button is now enabled when changing the username combobox. Index: kbearsitemanager.cpp =================================================================== RCS file: /cvsroot/kbear/kbear/kbear/plugins/sitemanager/kbearsitemanager.cpp,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** kbearsitemanager.cpp 29 Nov 2003 14:29:11 -0000 1.60 --- kbearsitemanager.cpp 29 Nov 2003 20:32:32 -0000 1.61 *************** *** 413,416 **** --- 413,417 ---- connect( m_remotedirEdit, SIGNAL( textChanged(const QString&) ), this, SLOT( slotSetEdited() ) ); connect( m_descriptionEdit, SIGNAL( textChanged() ), this, SLOT( slotSetEdited() ) ); + connect( m_usernameComboBox, SIGNAL( textChanged(const QString&) ), this, SLOT( slotSetEdited() ) ); connect( m_newgroupButton, SIGNAL( clicked() ), this, SLOT( slotNewGroup() ) ); connect( m_removeButton, SIGNAL( clicked() ), this, SLOT( slotRemove() ) ); |
|
From: <fri...@us...> - 2003-11-29 14:29:14
|
Update of /cvsroot/kbear/kbear/kbear/plugins/sitemanager
In directory sc8-pr-cvs1:/tmp/cvs-serv27885/kbear/plugins/sitemanager
Modified Files:
kbearsitemanager.cpp
Log Message:
Fixed bug that Sitemanager did not disable certain widgets for groups.
Index: kbearsitemanager.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/plugins/sitemanager/kbearsitemanager.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** kbearsitemanager.cpp 27 Nov 2003 16:10:22 -0000 1.59
--- kbearsitemanager.cpp 29 Nov 2003 14:29:11 -0000 1.60
***************
*** 682,706 ****
QString label = item->text( 0 );
m_removeButton->setEnabled( true );
!
! bool b = item->isExpandable();
! // Enable/Disable the groupBox items depending on the item (group or not)
! m_siteEdit->setEnabled( true );
! m_hostnameEdit->setEnabled( !b );
! m_portSpinBox->setEnabled( !b );
! m_protocolComboBox->setEnabled( !b );
! m_anonymousCheckBox->setEnabled( !b );
! m_usernameComboBox->setEnabled( !b );
! m_passwordEdit->setEnabled( !b );
! m_localdirEdit->setEnabled( !b );
! m_remotedirEdit->setEnabled( !b );
! m_advancedWidget->setEnabled( !b );
!
if( item->isExpandable() ) {// a group was selected
clear();
m_selectedItem.setParent( parent );
m_selectedItem.setLabel( label );
m_siteEdit->setText( label );
emit selectionCleared();
- m_groupSelected = true;
m_isModified = modified;
enableButton( User1, modified );
--- 682,693 ----
QString label = item->text( 0 );
m_removeButton->setEnabled( true );
!
if( item->isExpandable() ) {// a group was selected
clear();
+ m_groupSelected = true;
m_selectedItem.setParent( parent );
m_selectedItem.setLabel( label );
m_siteEdit->setText( label );
emit selectionCleared();
m_isModified = modified;
enableButton( User1, modified );
***************
*** 709,713 ****
m_selectedItem.setParent( parent );
m_selectedItem.setLabel( label );
- m_groupSelected = false;
}
else {
--- 696,699 ----
***************
*** 721,724 ****
--- 707,711 ----
return;
}
+ m_groupSelected = false;
m_groupBox->setEnabled( true );
m_isModified = modified;
***************
*** 937,951 ****
//-----------------------------------------------
void KBearSiteManager::slotSiteLabelChanged() {
! if( m_groupSelected ) {
! m_hostnameEdit->setEnabled( true );
! m_portSpinBox->setEnabled( true );
! m_protocolComboBox->setEnabled( true );
! m_anonymousCheckBox->setEnabled( true );
! m_usernameComboBox->setEnabled( true );
! m_passwordEdit->setEnabled( true );
! m_localdirEdit->setEnabled( true );
! m_remotedirEdit->setEnabled( true );
! m_advancedWidget->setEnabled( true );
! }
}
//-----------------------------------------------
--- 924,938 ----
//-----------------------------------------------
void KBearSiteManager::slotSiteLabelChanged() {
! // enable/disable widgets depending on the item's type (group or site)
! bool b = !m_groupSelected;
! m_hostnameEdit->setEnabled( b );
! m_portSpinBox->setEnabled( b );
! m_protocolComboBox->setEnabled( b );
! m_anonymousCheckBox->setEnabled( b );
! m_usernameComboBox->setEnabled( b );
! m_passwordEdit->setEnabled( b );
! m_localdirEdit->setEnabled( b );
! m_remotedirEdit->setEnabled( b );
! m_advancedWidget->setEnabled( b );
}
//-----------------------------------------------
|
1 message has been excluded from this view by a project administrator.
