Hello community,
here is the log from the commit of package icecream-monitor
checked in at Thu Jul 13 11:15:53 CEST 2006.
--------
--- icecream-monitor/icecream-monitor.changes 2006-06-02 02:00:43.000000000 +0200
+++ icecream-monitor/icecream-monitor.changes 2006-07-13 09:51:52.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Jul 13 09:51:40 CEST 2006 - coolo@suse.de
+
+- adapt to the new API
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ icecream-monitor.spec ++++++
--- /var/tmp/diff_new_pack.4clHjT/_old 2006-07-13 11:15:45.000000000 +0200
+++ /var/tmp/diff_new_pack.4clHjT/_new 2006-07-13 11:15:45.000000000 +0200
@@ -16,7 +16,7 @@
Group: Development/Tools/Building
Summary: Monitor Program for the icecream Compile Farm
Version: 1.0
-Release: 1
+Release: 2
# svn2dist playground-devtools icemon-kde3
Source0: icemon-kde3.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -64,6 +64,8 @@
%doc /opt/kde3/share/doc/HTML/en
%changelog -n icecream-monitor
+* Thu Jul 13 2006 - coolo@suse.de
+- adapt to the new API
* Fri Jun 02 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
* Thu Jun 01 2006 - coolo@suse.de
++++++ icemon-kde3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/icemon-kde3/.autoconf_trace new/icemon-kde3/.autoconf_trace
--- old/icemon-kde3/.autoconf_trace 2006-06-06 20:29:58.000000000 +0200
+++ new/icemon-kde3/.autoconf_trace 2006-07-13 09:34:27.000000000 +0200
@@ -288,9 +288,9 @@
configure.in:94:AC_SUBST:DOXYGEN_PROJECT_NAME
configure.in:94:AC_SUBST:DOXYGEN_PROJECT_NUMBER
configure.in:94:AC_SUBST:KDE_HAS_DOXYGEN
-configure.in:110:AC_SUBST:ICECREAM_LDADD
-configure.in:111:AC_SUBST:ICECREAM_LDFLAGS
-configure.in:112:AC_SUBST:ICECREAM_CFLAGS
+configure.in:110:AC_SUBST:ICECC_LDADD
+configure.in:111:AC_SUBST:ICECC_LDFLAGS
+configure.in:112:AC_SUBST:ICECC_CFLAGS
configure.in:117:AC_SUBST:KDECONFIG
configure.in:117:AC_SUBST:kde_libs_prefix
configure.in:117:AC_SUBST:kde_libs_htmldir
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/icemon-kde3/Makefile.in new/icemon-kde3/Makefile.in
--- old/icemon-kde3/Makefile.in 2006-06-06 20:29:58.000000000 +0200
+++ new/icemon-kde3/Makefile.in 2006-07-13 09:34:27.000000000 +0200
@@ -46,9 +46,9 @@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
GMSGFMT = @GMSGFMT@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
-ICECREAM_CFLAGS = @ICECREAM_CFLAGS@
-ICECREAM_LDADD = @ICECREAM_LDADD@
-ICECREAM_LDFLAGS = @ICECREAM_LDFLAGS@
+ICECC_CFLAGS = @ICECC_CFLAGS@
+ICECC_LDADD = @ICECC_LDADD@
+ICECC_LDFLAGS = @ICECC_LDFLAGS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/icemon-kde3/acinclude.m4 new/icemon-kde3/acinclude.m4
--- old/icemon-kde3/acinclude.m4 2006-06-06 20:29:41.000000000 +0200
+++ new/icemon-kde3/acinclude.m4 2006-07-13 09:34:07.000000000 +0200
@@ -2747,7 +2747,7 @@
EXRSTATUS=old
else
kde_save_LIBS="$LIBS"
- LIBS="$LIBS $all_libraries $USER_LDFLAGS $LIBZ `pkg-config --libs OpenEXR`"
+ LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ"
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
kde_save_CXXFLAGS="$CXXFLAGS"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/icemon-kde3/admin/acinclude.m4.in new/icemon-kde3/admin/acinclude.m4.in
--- old/icemon-kde3/admin/acinclude.m4.in 2006-06-06 13:59:44.000000000 +0200
+++ new/icemon-kde3/admin/acinclude.m4.in 2006-06-26 12:48:14.000000000 +0200
@@ -2747,7 +2747,7 @@
EXRSTATUS=old
else
kde_save_LIBS="$LIBS"
- LIBS="$LIBS $all_libraries $USER_LDFLAGS $LIBZ `pkg-config --libs OpenEXR`"
+ LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ"
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
kde_save_CXXFLAGS="$CXXFLAGS"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/icemon-kde3/admin/cvs.sh new/icemon-kde3/admin/cvs.sh
--- old/icemon-kde3/admin/cvs.sh 2006-06-06 13:59:44.000000000 +0200
+++ new/icemon-kde3/admin/cvs.sh 2006-07-08 20:32:44.000000000 +0200
@@ -32,7 +32,7 @@
required_autoconf_version="2.53 or newer"
AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
case $AUTOCONF_VERSION in
- Autoconf*2.5* | autoconf*2.5* ) : ;;
+ Autoconf*2.5* | autoconf*2.5* | autoconf*2.6* ) : ;;
"" )
echo "*** AUTOCONF NOT FOUND!."
echo "*** KDE requires autoconf $required_autoconf_version"
@@ -47,7 +47,7 @@
AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
case $AUTOHEADER_VERSION in
- Autoconf*2.5* | autoheader*2.5* ) : ;;
+ Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;;
"" )
echo "*** AUTOHEADER NOT FOUND!."
echo "*** KDE requires autoheader $required_autoconf_version"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/icemon-kde3/configure new/icemon-kde3/configure
--- old/icemon-kde3/configure 2006-06-06 20:29:57.000000000 +0200
+++ new/icemon-kde3/configure 2006-07-13 09:34:25.000000000 +0200
@@ -465,7 +465,7 @@
#endif"
ac_default_prefix=${KDEDIR:-the kde prefix}
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVE
RLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includ
es KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM KDE_INSTALLED_TRUE KDE_INSTALLED_FALSE LEX LEXLIB LEX_OUTPUT_ROOT LFLAGS QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN ICECREAM_LDADD ICECREAM_LDFLAGS ICECREAM_CFLAGS TOPSUBDIRS LIBOBJS L
TLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVE
RLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includ
es KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM KDE_INSTALLED_TRUE KDE_INSTALLED_FALSE LEX LEXLIB LEX_OUTPUT_ROOT LFLAGS QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN ICECC_LDADD ICECC_LDFLAGS ICECC_CFLAGS TOPSUBDIRS LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -35452,11 +35452,11 @@
-pkg-config --silence-errors --exists icecream
+pkg-config --silence-errors --exists icecc
if test "$?" = 0; then
- ICECREAM_LDADD=`pkg-config --libs-only-l icecream`
- ICECREAM_LDFLAGS=`pkg-config --libs-only-L icecream`
- ICECREAM_CFLAGS=`pkg-config --cflags icecream`
+ ICECC_LDADD=`pkg-config --libs-only-l icecc`
+ ICECC_LDFLAGS=`pkg-config --libs-only-L icecc`
+ ICECC_CFLAGS=`pkg-config --cflags icecc`
else
DO_NOT_COMPILE="$DO_NOT_COMPILE icemon-kde3"
fi
@@ -38463,9 +38463,9 @@
s,@DOXYGEN_PROJECT_NAME@,$DOXYGEN_PROJECT_NAME,;t t
s,@DOXYGEN_PROJECT_NUMBER@,$DOXYGEN_PROJECT_NUMBER,;t t
s,@KDE_HAS_DOXYGEN@,$KDE_HAS_DOXYGEN,;t t
-s,@ICECREAM_LDADD@,$ICECREAM_LDADD,;t t
-s,@ICECREAM_LDFLAGS@,$ICECREAM_LDFLAGS,;t t
-s,@ICECREAM_CFLAGS@,$ICECREAM_CFLAGS,;t t
+s,@ICECC_LDADD@,$ICECC_LDADD,;t t
+s,@ICECC_LDFLAGS@,$ICECC_LDFLAGS,;t t
+s,@ICECC_CFLAGS@,$ICECC_CFLAGS,;t t
s,@TOPSUBDIRS@,$TOPSUBDIRS,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
@@ -39190,8 +39190,8 @@
fi
-if test -z "$ICECREAM_LDADD"; then
- pkg-config --print-errors --exists icecream
+if test -z "$ICECC_LDADD"; then
+ pkg-config --print-errors --exists icecc
fi
# Check if KDE_SET_PREFIX was called, and --prefix was passed to configure
if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/icemon-kde3/configure.in new/icemon-kde3/configure.in
--- old/icemon-kde3/configure.in 2006-06-06 20:29:41.000000000 +0200
+++ new/icemon-kde3/configure.in 2006-07-13 09:34:07.000000000 +0200
@@ -98,18 +98,18 @@
dnl =======================================================
-pkg-config --silence-errors --exists icecream
+pkg-config --silence-errors --exists icecc
if test "$?" = 0; then
- ICECREAM_LDADD=`pkg-config --libs-only-l icecream`
- ICECREAM_LDFLAGS=`pkg-config --libs-only-L icecream`
- ICECREAM_CFLAGS=`pkg-config --cflags icecream`
+ ICECC_LDADD=`pkg-config --libs-only-l icecc`
+ ICECC_LDFLAGS=`pkg-config --libs-only-L icecc`
+ ICECC_CFLAGS=`pkg-config --cflags icecc`
else
DO_NOT_COMPILE="$DO_NOT_COMPILE icemon-kde3"
fi
-AC_SUBST(ICECREAM_LDADD)
-AC_SUBST(ICECREAM_LDFLAGS)
-AC_SUBST(ICECREAM_CFLAGS)
+AC_SUBST(ICECC_LDADD)
+AC_SUBST(ICECC_LDFLAGS)
+AC_SUBST(ICECC_CFLAGS)
dnl =======================================================
dnl FILE: ./icemon-kde3/src/configure.in.in
dnl =======================================================
@@ -125,8 +125,8 @@
AC_CONFIG_FILES([ icemon-kde3/src/doc/icemon/Makefile ])
AC_OUTPUT
-if test -z "$ICECREAM_LDADD"; then
- pkg-config --print-errors --exists icecream
+if test -z "$ICECC_LDADD"; then
+ pkg-config --print-errors --exists icecc
fi
# Check if KDE_SET_PREFIX was called, and --prefix was passed to configure
if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/icemon-kde3/icemon-kde3/Makefile.am new/icemon-kde3/icemon-kde3/Makefile.am
--- old/icemon-kde3/icemon-kde3/Makefile.am 2006-06-06 20:29:35.000000000 +0200
+++ new/icemon-kde3/icemon-kde3/Makefile.am 2006-07-13 09:34:03.000000000 +0200
@@ -1 +1 @@
-SUBDIRS = src
+SUBDIRS=src
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/icemon-kde3/icemon-kde3/configure.in.bot new/icemon-kde3/icemon-kde3/configure.in.bot
--- old/icemon-kde3/icemon-kde3/configure.in.bot 2006-06-06 20:29:35.000000000 +0200
+++ new/icemon-kde3/icemon-kde3/configure.in.bot 2006-07-13 09:34:03.000000000 +0200
@@ -1,4 +1,4 @@
-if test -z "$ICECREAM_LDADD"; then
- pkg-config --print-errors --exists icecream
+if test -z "$ICECC_LDADD"; then
+ pkg-config --print-errors --exists icecc
fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/icemon-kde3/icemon-kde3/configure.in.in new/icemon-kde3/icemon-kde3/configure.in.in
--- old/icemon-kde3/icemon-kde3/configure.in.in 2006-06-06 20:29:35.000000000 +0200
+++ new/icemon-kde3/icemon-kde3/configure.in.in 2006-07-13 09:34:03.000000000 +0200
@@ -1,13 +1,13 @@
-pkg-config --silence-errors --exists icecream
+pkg-config --silence-errors --exists icecc
if test "$?" = 0; then
- ICECREAM_LDADD=`pkg-config --libs-only-l icecream`
- ICECREAM_LDFLAGS=`pkg-config --libs-only-L icecream`
- ICECREAM_CFLAGS=`pkg-config --cflags icecream`
+ ICECC_LDADD=`pkg-config --libs-only-l icecc`
+ ICECC_LDFLAGS=`pkg-config --libs-only-L icecc`
+ ICECC_CFLAGS=`pkg-config --cflags icecc`
else
DO_NOT_COMPILE="$DO_NOT_COMPILE icemon-kde3"
fi
-AC_SUBST(ICECREAM_LDADD)
-AC_SUBST(ICECREAM_LDFLAGS)
-AC_SUBST(ICECREAM_CFLAGS)
+AC_SUBST(ICECC_LDADD)
+AC_SUBST(ICECC_LDFLAGS)
+AC_SUBST(ICECC_CFLAGS)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/icemon-kde3/icemon-kde3/debian/changelog new/icemon-kde3/icemon-kde3/debian/changelog
--- old/icemon-kde3/icemon-kde3/debian/changelog 1970-01-01 01:00:00.000000000 +0100
+++ new/icemon-kde3/icemon-kde3/debian/changelog 2006-07-13 09:34:03.000000000 +0200
@@ -0,0 +1,11 @@
+icemon-kde3 (0.0release20060626-1ubuntu1) edgy; urgency=low
+
+ * Initial Kubuntu release
+
+ -- Jonathan Riddell Fri, 7 Jul 2006 12:03:37 +0000
+
+icemon-kde3 (0.0release20060626-1) unstable; urgency=low
+
+ * Initial Release after the split of icecc-monitor from icecc.
+
+ -- Andre Woebbeking Tue, 04 Jul 2006 23:36:15 +0200
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/icemon-kde3/icemon-kde3/debian/compat new/icemon-kde3/icemon-kde3/debian/compat
--- old/icemon-kde3/icemon-kde3/debian/compat 1970-01-01 01:00:00.000000000 +0100
+++ new/icemon-kde3/icemon-kde3/debian/compat 2006-07-13 09:34:03.000000000 +0200
@@ -0,0 +1 @@
+5
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/icemon-kde3/icemon-kde3/debian/control new/icemon-kde3/icemon-kde3/debian/control
--- old/icemon-kde3/icemon-kde3/debian/control 1970-01-01 01:00:00.000000000 +0100
+++ new/icemon-kde3/icemon-kde3/debian/control 2006-07-13 09:34:03.000000000 +0200
@@ -0,0 +1,25 @@
+Source: icemon-kde3
+Section: kde
+Priority: optional
+Maintainer: Andre Woebbeking
+Uploaders:
+Build-Depends: automake1.9, debhelper (>> 5.0.0), kdelibs4-dev (>= 4:3.5.0)
+Standards-Version: 3.7.2
+
+Package: icecc-monitor
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}
+Suggests: icecc
+Description: KDE monitor for icecc a distributed client and server
+ icecc is a program to distribute compilation of C or C++ code across
+ several machines on a network. icecc should always generate the same
+ results as a local compile, is simple to install and use, and is often
+ significantly faster than a local compile. icecc does not require all
+ machines to share a filesystem, have synchronized clocks, or to have
+ the same libraries or header files installed.
+ .
+ This package provides a GUI montior so you can see what is happening on
+ your icecream compile cluster.
+ .
+ Homepage: http://wiki.kde.org/icecream
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/icemon-kde3/icemon-kde3/debian/copyright new/icemon-kde3/icemon-kde3/debian/copyright
--- old/icemon-kde3/icemon-kde3/debian/copyright 1970-01-01 01:00:00.000000000 +0100
+++ new/icemon-kde3/icemon-kde3/debian/copyright 2006-07-13 09:34:03.000000000 +0200
@@ -0,0 +1,17 @@
+This package was debianized by Andre Woebbeking on
+Sat, 27 Nov 2004 15:36:15 +0200.
+
+It was downloaded via Subversion from
+svn://anonsvn.kde.org/home/kde/trunk/playground/devtools/icemon-kde3/debian/
+
+Upstream Authors: Stephan Kulow
+ many others...
+
+Copyright:
+
+All programs are either under the GPL. On Debian systems,
+the complete text of the GPL and LGPL licenses can be found in the
+/usr/share/common-licenses/GPL and /usr/share/common-licenses/LGPL files.
+
+When in doubt, check the individual file, they should all have license
+headings and other identifying marks.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/icemon-kde3/icemon-kde3/debian/icecc-monitor.install new/icemon-kde3/icemon-kde3/debian/icecc-monitor.install
--- old/icemon-kde3/icemon-kde3/debian/icecc-monitor.install 1970-01-01 01:00:00.000000000 +0100
+++ new/icemon-kde3/icemon-kde3/debian/icecc-monitor.install 2006-07-13 09:34:03.000000000 +0200
@@ -0,0 +1,10 @@
+debian/tmp/usr/bin/icemon
+debian/tmp/usr/lib/kde3/icemon_panelapplet.la
+debian/tmp/usr/lib/kde3/icemon_panelapplet.so
+debian/tmp/usr/share/applications/kde/icemon.desktop
+debian/tmp/usr/share/apps/icemon/icemonui.rc
+debian/tmp/usr/share/apps/icemon/pics/icemonnode.png
+debian/tmp/usr/share/apps/kicker/applets/icemonapplet.desktop
+debian/tmp/usr/share/doc/kde/HTML/en/icemon/common
+debian/tmp/usr/share/doc/kde/HTML/en/icemon/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/icemon/index.docbook
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/icemon-kde3/icemon-kde3/debian/patches/icecream2icecc.diff new/icemon-kde3/icemon-kde3/debian/patches/icecream2icecc.diff
--- old/icemon-kde3/icemon-kde3/debian/patches/icecream2icecc.diff 1970-01-01 01:00:00.000000000 +0100
+++ new/icemon-kde3/icemon-kde3/debian/patches/icecream2icecc.diff 2006-07-13 09:34:03.000000000 +0200
@@ -0,0 +1,80 @@
+Index: icemon-kde3/configure.in.bot
+===================================================================
+--- icemon-kde3/configure.in.bot (revision 558222)
++++ icemon-kde3/configure.in.bot (working copy)
+@@ -1,4 +1,4 @@
+
+-if test -z "$ICECREAM_LDADD"; then
+- pkg-config --print-errors --exists icecream
++if test -z "$ICECC_LDADD"; then
++ pkg-config --print-errors --exists icecc
+ fi
+Index: icemon-kde3/configure.in.in
+===================================================================
+--- icemon-kde3/configure.in.in (revision 558222)
++++ icemon-kde3/configure.in.in (working copy)
+@@ -1,13 +1,13 @@
+
+-pkg-config --silence-errors --exists icecream
++pkg-config --silence-errors --exists icecc
+ if test "$?" = 0; then
+- ICECREAM_LDADD=`pkg-config --libs-only-l icecream`
+- ICECREAM_LDFLAGS=`pkg-config --libs-only-L icecream`
+- ICECREAM_CFLAGS=`pkg-config --cflags icecream`
++ ICECC_LDADD=`pkg-config --libs-only-l icecc`
++ ICECC_LDFLAGS=`pkg-config --libs-only-L icecc`
++ ICECC_CFLAGS=`pkg-config --cflags icecc`
+ else
+ DO_NOT_COMPILE="$DO_NOT_COMPILE icemon-kde3"
+ fi
+
+-AC_SUBST(ICECREAM_LDADD)
+-AC_SUBST(ICECREAM_LDFLAGS)
+-AC_SUBST(ICECREAM_CFLAGS)
++AC_SUBST(ICECC_LDADD)
++AC_SUBST(ICECC_LDFLAGS)
++AC_SUBST(ICECC_CFLAGS)
+Index: icemon-kde3/src/Makefile.am
+===================================================================
+--- icemon-kde3/src/Makefile.am (revision 558222)
++++ icemon-kde3/src/Makefile.am (working copy)
+@@ -1,12 +1,12 @@
+ SUBDIRS = doc
+
+-INCLUDES = $(ICECREAM_CFLAGS) $(all_includes)
++INCLUDES = $(ICECC_CFLAGS) $(all_includes)
+
+ bin_PROGRAMS = icemon
+ icemon_SOURCES = mon-kde.cc listview.cc ganttstatusview.cc \
+ summaryview.cc starview.cc
+-icemon_LDADD = libicemon_common.la -licecream $(LIB_KDEUI)
+-icemon_LDFLAGS = $(all_libraries) $(ICECREAM_LDFLAGS)
++icemon_LDADD = libicemon_common.la -licecc $(LIB_KDEUI)
++icemon_LDFLAGS = $(all_libraries) $(ICECC_LDFLAGS)
+
+ noinst_LTLIBRARIES = libicemon_common.la
+ libicemon_common_la_SOURCES = job.cc monitor.cc hostinfo.cc statusview.cc \
+@@ -23,8 +23,8 @@
+
+ kde_module_LTLIBRARIES = icemon_panelapplet.la
+
+-icemon_panelapplet_la_LDFLAGS = -avoid-version -module $(all_libraries) $(ICECREAM_LDFLAGS)
+-icemon_panelapplet_la_LIBADD = libicemon_common.la $(ICECREAM_LDADD) $(LIB_KDEUI)
++icemon_panelapplet_la_LDFLAGS = -avoid-version -module $(all_libraries) $(ICECC_LDFLAGS)
++icemon_panelapplet_la_LIBADD = libicemon_common.la $(ICECC_LDADD) $(LIB_KDEUI)
+ icemon_panelapplet_la_SOURCES = icemonapplet.cpp
+
+ lnkdir = $(kde_datadir)/kicker/applets
+Index: icemon-kde3/src/monitor.cc
+===================================================================
+--- icemon-kde3/src/monitor.cc (revision 559460)
++++ icemon-kde3/src/monitor.cc (working copy)
+@@ -25,7 +25,7 @@
+ #include "hostinfo.h"
+ #include "statusview.h"
+
+-#include
++#include
+
+ #include
+ #include
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/icemon-kde3/icemon-kde3/debian/rules new/icemon-kde3/icemon-kde3/debian/rules
--- old/icemon-kde3/icemon-kde3/debian/rules 1970-01-01 01:00:00.000000000 +0100
+++ new/icemon-kde3/icemon-kde3/debian/rules 2006-07-13 09:34:03.000000000 +0200
@@ -0,0 +1,210 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+#
+# Modified to make a template file for a multi-binary package with separated
+# build-arch and build-indep targets by Bill Allombert 2001
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+objdir = $(CURDIR)/obj
+
+-include debian/debiandirs
+
+debian/debiandirs: admin configure
+ perl -w admin/debianrules echodirs > debian/debiandirs
+
+admin:
+ if test ! -f admin; then \
+ ln -s ../admin . ;\
+ fi
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+
+ # Apply Debian specific patches
+ if test -d $(CURDIR)/debian/patches ;\
+ then \
+ for i in $(CURDIR)/debian/patches/*.diff.uu ;\
+ do \
+ cd $(CURDIR)/debian/patches ;\
+ uudecode "$$i" ;\
+ cd $(CURDIR) ;\
+ done ;\
+ patches=$$(find $(CURDIR)/debian/patches -name *.diff | sort);\
+ fi ;\
+ if test ! -f patch-stamp; then \
+ for patch in $$patches ;\
+ do \
+ echo APPLYING PATCH\: "$${patch##*/}" ;\
+ patch -p0 < "$$patch" ;\
+ done ;\
+ touch patch-stamp ;\
+ fi
+
+ # KDE CVS does not have aclocal.m4 or configure
+ $(MAKE) -f admin/Makefile.common cvs ;\
+
+ # ensure configure is executable
+ chmod +x configure
+
+ # make build directory
+ mkdir $(objdir)
+
+ # run configure with build tree $(objdir)
+ cd $(objdir) && \
+ ../configure $(configkde) --enable-final
+
+ touch configure-stamp
+
+#Architecture
+build: build-arch build-indep
+
+build-arch: build-arch-stamp
+build-arch-stamp: configure-stamp
+ dh_testdir
+
+ cd $(objdir) && \
+ $(MAKE)
+
+ # generate manpages
+ for i in debian/man/*.docbook; do \
+ docbook2x-man $$i; \
+ done
+
+ touch build-arch-stamp
+
+build-indep: build-indep-stamp
+build-indep-stamp: configure-stamp
+ dh_testdir
+
+ #cd $(objdir) && \
+ #$(MAKE)
+
+ #cd $(objdir) && \
+ #$(MAKE) apidox
+
+ touch build-indep-stamp
+
+debian-clean:
+ dh_testdir
+ dh_testroot
+
+ dh_clean
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-arch-stamp build-indep-stamp configure-stamp \
+ debian/debiandirs debian/man/*.1
+
+ # Remove Debian specific patches
+ if test -d $(CURDIR)/debian/patches ;\
+ then \
+ patches=$$(find $(CURDIR)/debian/patches -name *.diff | sort -r);\
+ fi ;\
+ if test -f patch-stamp; then \
+ for patch in $$patches ;\
+ do \
+ echo REMOVING PATCH\: "$${patch##*/}" ;\
+ patch -p0 -R < "$$patch" ;\
+ done ;\
+ for i in $(CURDIR)/debian/patches/*.diff.uu ;\
+ do \
+ rm -f "$${i%%.uu}" ;\
+ done ;\
+ rm -f patch-stamp ;\
+ fi
+
+ # Remove build tree
+ rm -rf $(objdir)
+
+ # if Makefile exists run distclean
+ if test -f Makefile; then \
+ $(MAKE) distclean; \
+ fi
+
+ #if test -d CVS; then \
+ # $(MAKE) -f ../admin/Makefile.common cvs-clean ;\
+ #fi
+
+ dh_clean
+
+install: install-arch install-indep
+
+install-arch:
+ dh_testdir
+ dh_testroot
+ dh_clean -k -s
+ dh_installdirs -s
+
+ cd $(objdir) && \
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+
+ mkdir -p debian/tmp/usr/share/doc/kde
+ mv debian/tmp/usr/share/doc/HTML debian/tmp/usr/share/doc/kde
+
+ dh_install
+
+install-indep:
+ dh_testdir
+ dh_testroot
+ dh_clean -k -i
+ dh_installdirs -i
+
+ #cd $(objdir) && \
+ #$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+
+ #cd $(objdir) && \
+ #$(MAKE) install-apidox DESTDIR=$(CURDIR)/debian/tmp
+
+ #dh_install -i
+
+# Must not depend on anything. This is to be called by
+# binary-arch/binary-indep
+# in another 'make' thread.
+binary-common:
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs
+ dh_installdocs
+# dh_installexamples
+ dh_installmenu
+ dh_installdebconf
+ dh_installlogrotate
+# dh_installemacsen
+# dh_installpam
+# dh_installmime
+ dh_installinit
+# dh_installcron
+# dh_installinfo
+ dh_installman
+ dh_link
+ dh_strip
+ dh_compress -X.bz2 -X.css -X.dcl -X.docbook -X-license -X.tag
+ dh_fixperms
+ dh_perl
+# dh_python
+ dh_makeshlibs -V
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+# Build architecture independant packages using the common target.
+binary-indep: build-indep install-indep
+ $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependant packages using the common target.
+binary-arch: build-arch install-arch
+ $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
+
+binary: binary-arch
+.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/icemon-kde3/icemon-kde3/src/Makefile.am new/icemon-kde3/icemon-kde3/src/Makefile.am
--- old/icemon-kde3/icemon-kde3/src/Makefile.am 2006-06-06 20:29:34.000000000 +0200
+++ new/icemon-kde3/icemon-kde3/src/Makefile.am 2006-07-13 09:34:02.000000000 +0200
@@ -1,12 +1,12 @@
SUBDIRS = doc
-INCLUDES = $(ICECREAM_CFLAGS) $(all_includes)
+INCLUDES = $(ICECC_CFLAGS) $(all_includes)
bin_PROGRAMS = icemon
icemon_SOURCES = mon-kde.cc listview.cc ganttstatusview.cc \
summaryview.cc starview.cc
-icemon_LDADD = libicemon_common.la -licecream $(LIB_KDEUI)
-icemon_LDFLAGS = $(all_libraries) $(ICECREAM_LDFLAGS)
+icemon_LDADD = libicemon_common.la -licecc $(LIB_KDEUI)
+icemon_LDFLAGS = $(all_libraries) $(ICECC_LDFLAGS)
noinst_LTLIBRARIES = libicemon_common.la
libicemon_common_la_SOURCES = job.cc monitor.cc hostinfo.cc statusview.cc \
@@ -23,8 +23,8 @@
kde_module_LTLIBRARIES = icemon_panelapplet.la
-icemon_panelapplet_la_LDFLAGS = -avoid-version -module $(all_libraries) $(ICECREAM_LDFLAGS)
-icemon_panelapplet_la_LIBADD = libicemon_common.la $(ICECREAM_LDADD) $(LIB_KDEUI)
+icemon_panelapplet_la_LDFLAGS = -avoid-version -module $(all_libraries) $(ICECC_LDFLAGS)
+icemon_panelapplet_la_LIBADD = libicemon_common.la $(ICECC_LDADD) $(LIB_KDEUI)
icemon_panelapplet_la_SOURCES = icemonapplet.cpp
lnkdir = $(kde_datadir)/kicker/applets
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/icemon-kde3/icemon-kde3/src/joblistview.cc new/icemon-kde3/icemon-kde3/src/joblistview.cc
--- old/icemon-kde3/icemon-kde3/src/joblistview.cc 2006-06-06 20:29:34.000000000 +0200
+++ new/icemon-kde3/icemon-kde3/src/joblistview.cc 2006-07-13 09:34:02.000000000 +0200
@@ -329,7 +329,7 @@
FinishedJobs::iterator it = mFinishedJobs.begin();
for ( const FinishedJobs::iterator itEnd = mFinishedJobs.end(); it != itEnd; ++it )
{
- if ( currentTime - ( *it ).first < mExpireDuration )
+ if ( currentTime - ( *it ).first < (uint)mExpireDuration )
break;
removeItem( ( *it ).second );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/icemon-kde3/icemon-kde3/src/monitor.cc new/icemon-kde3/icemon-kde3/src/monitor.cc
--- old/icemon-kde3/icemon-kde3/src/monitor.cc 2006-06-06 20:29:34.000000000 +0200
+++ new/icemon-kde3/icemon-kde3/src/monitor.cc 2006-07-13 09:34:02.000000000 +0200
@@ -25,7 +25,7 @@
#include "hostinfo.h"
#include "statusview.h"
-#include
+#include
#include
#include
@@ -40,259 +40,287 @@
Monitor::Monitor( HostInfoManager *m, QObject *parent, const char *name )
: QObject( parent, name ), m_hostInfoManager( m ), m_view( 0 ),
- m_scheduler( 0 ), m_scheduler_read( 0 ), mSchedulerOnline( false )
+ m_scheduler( 0 ), m_scheduler_read( 0 ), mSchedulerOnline( false ),
+ m_discover( 0 ), m_discover_read( 0 )
{
checkScheduler();
}
Monitor::~Monitor()
{
+ delete m_scheduler;
+ delete m_discover;
}
void Monitor::checkScheduler(bool deleteit)
{
- if ( deleteit ) {
- m_rememberedJobs.clear();
- delete m_scheduler;
- m_scheduler = 0;
- delete m_scheduler_read;
- m_scheduler_read = 0;
- } else if ( m_scheduler )
- return;
- QTimer::singleShot( 1800, this, SLOT( slotCheckScheduler() ) );
+ if ( deleteit ) {
+ m_rememberedJobs.clear();
+ delete m_scheduler;
+ m_scheduler = 0;
+ delete m_scheduler_read;
+ m_scheduler_read = 0;
+ delete m_discover;
+ m_discover = 0;
+ delete m_discover_read;
+ m_discover_read = 0;
+ } else if ( m_scheduler )
+ return;
+ QTimer::singleShot( 1800, this, SLOT( slotCheckScheduler() ) );
}
void Monitor::slotCheckScheduler()
{
- list<string> names;
+ if ( m_scheduler )
+ return;
- if ( !m_current_netname.isEmpty() ) {
- names.push_front( m_current_netname.latin1() );
- } else {
- names = get_netnames( 60 );
- }
+ kdDebug() << "slotCheckScheduler\n";
+ list<string> names;
- if (getenv("USE_SCHEDULER"))
- names.push_front(""); // try $USE_SCHEDULER
+ if ( !m_current_netname.isEmpty() ) {
+ names.push_front( m_current_netname.latin1() );
+ } else {
+ names = get_netnames( 60 );
+ }
- if ( names.empty() ) {
- checkScheduler( true );
- setSchedulerState( false );
- return;
- }
+ if (getenv("USE_SCHEDULER"))
+ names.push_front(""); // try $USE_SCHEDULER
- for ( list<string>::const_iterator it = names.begin(); it != names.end();
- ++it ) {
- m_current_netname = it->c_str();
- m_scheduler = connect_scheduler ( m_current_netname.latin1() );
- if ( m_scheduler ) {
- if ( !m_scheduler->send_msg ( MonLoginMsg() ) ) {
- delete m_scheduler;
- } else {
- m_scheduler_read = new QSocketNotifier( m_scheduler->fd,
- QSocketNotifier::Read,
- this );
- QObject::connect( m_scheduler_read, SIGNAL( activated( int ) ),
- SLOT( msgReceived() ) );
- setSchedulerState( true );
+ if ( names.empty() ) {
+ checkScheduler( true );
+ setSchedulerState( false );
return;
- }
}
- }
- checkScheduler( true );
- setSchedulerState( false );
+
+ for ( list<string>::const_iterator it = names.begin(); it != names.end();
+ ++it ) {
+ m_current_netname = it->c_str();
+ if (!m_discover
+ || m_discover->timed_out()) {
+ delete m_discover;
+ m_discover = new DiscoverSched ( m_current_netname.latin1() );
+ m_discover_read = new QSocketNotifier( m_discover->get_fd(),
+ QSocketNotifier::Read,
+ this );
+ QObject::connect( m_discover_read, SIGNAL( activated( int ) ),
+ SLOT( slotCheckScheduler() ) );
+ }
+
+ m_scheduler = m_discover->try_get_scheduler ();
+
+ if ( m_scheduler ) {
+ delete m_discover;
+ m_discover = 0;
+ delete m_discover_read;
+ m_discover_read = 0;
+
+ if ( !m_scheduler->send_msg ( MonLoginMsg() ) ) {
+ delete m_scheduler;
+ } else {
+ m_scheduler_read = new QSocketNotifier( m_scheduler->fd,
+ QSocketNotifier::Read,
+ this );
+ QObject::connect( m_scheduler_read, SIGNAL( activated( int ) ),
+ SLOT( msgReceived() ) );
+ setSchedulerState( true );
+ return;
+ }
+ }
+ }
+ checkScheduler( true );
+ setSchedulerState( false );
}
void Monitor::msgReceived()
{
- Msg *m = m_scheduler->get_msg ();
- if ( !m ) {
- kdDebug() << "lost connection to scheduler\n";
- checkScheduler( true );
- setSchedulerState( false );
- return;
- }
+ Msg *m = m_scheduler->get_msg ();
+ if ( !m ) {
+ kdDebug() << "lost connection to scheduler\n";
+ checkScheduler( true );
+ setSchedulerState( false );
+ return;
+ }
- switch ( m->type ) {
+ switch ( m->type ) {
case M_MON_GET_CS:
- handle_getcs( m );
- break;
+ handle_getcs( m );
+ break;
case M_MON_JOB_BEGIN:
- handle_job_begin( m );
- break;
+ handle_job_begin( m );
+ break;
case M_MON_JOB_DONE:
- handle_job_done( m );
- break;
+ handle_job_done( m );
+ break;
case M_END:
- cout << "END" << endl;
- checkScheduler( true );
- break;
+ cout << "END" << endl;
+ checkScheduler( true );
+ break;
case M_MON_STATS:
- handle_stats( m );
- break;
+ handle_stats( m );
+ break;
case M_MON_LOCAL_JOB_BEGIN:
- handle_local_begin( m );
- break;
+ handle_local_begin( m );
+ break;
case M_JOB_LOCAL_DONE:
- handle_local_done( m );
- break;
+ handle_local_done( m );
+ break;
default:
- cout << "UNKNOWN" << endl;
- break;
- }
- delete m;
+ cout << "UNKNOWN" << endl;
+ break;
+ }
+ delete m;
}
void Monitor::handle_getcs( Msg *_m )
{
- MonGetCSMsg *m = dynamic_cast( _m );
- if ( !m ) return;
- m_rememberedJobs[m->job_id] = Job( m->job_id, m->clientid,
- m->filename.c_str(),
- m->lang == CompileJob::Lang_C ? "C" :
- "C++" );
- m_view->update( m_rememberedJobs[m->job_id] );
+ MonGetCSMsg *m = dynamic_cast( _m );
+ if ( !m ) return;
+ m_rememberedJobs[m->job_id] = Job( m->job_id, m->clientid,
+ m->filename.c_str(),
+ m->lang == CompileJob::Lang_C ? "C" :
+ "C++" );
+ m_view->update( m_rememberedJobs[m->job_id] );
}
void Monitor::handle_local_begin( Msg *_m )
{
- MonLocalJobBeginMsg *m = dynamic_cast( _m );
- if ( !m ) return;
+ MonLocalJobBeginMsg *m = dynamic_cast( _m );
+ if ( !m ) return;
- m_rememberedJobs[m->job_id] = Job( m->job_id, m->hostid,
- m->file.c_str(),
- "C++" );
- m_rememberedJobs[m->job_id].setState( Job::LocalOnly );
- m_view->update( m_rememberedJobs[m->job_id] );
+ m_rememberedJobs[m->job_id] = Job( m->job_id, m->hostid,
+ m->file.c_str(),
+ "C++" );
+ m_rememberedJobs[m->job_id].setState( Job::LocalOnly );
+ m_view->update( m_rememberedJobs[m->job_id] );
}
void Monitor::handle_local_done( Msg *_m )
{
- JobLocalDoneMsg *m = dynamic_cast( _m );
- if ( !m ) return;
+ JobLocalDoneMsg *m = dynamic_cast( _m );
+ if ( !m ) return;
+
+ JobList::iterator it = m_rememberedJobs.find( m->job_id );
+ if ( it == m_rememberedJobs.end() ) {
+ // we started in between
+ return;
+ }
+
+ ( *it ).setState( Job::Finished );
+ m_view->update( *it );
+
+ if ( m_rememberedJobs.size() > 3000 ) { // now remove 1000
+ uint count = 1000;
- JobList::iterator it = m_rememberedJobs.find( m->job_id );
- if ( it == m_rememberedJobs.end() ) {
- // we started in between
- return;
- }
-
- ( *it ).setState( Job::Finished );
- m_view->update( *it );
-
- if ( m_rememberedJobs.size() > 3000 ) { // now remove 1000
- uint count = 1000;
-
- while ( --count )
- m_rememberedJobs.erase( m_rememberedJobs.begin() );
- }
+ while ( --count )
+ m_rememberedJobs.erase( m_rememberedJobs.begin() );
+ }
}
void Monitor::handle_stats( Msg *_m )
{
- MonStatsMsg *m = dynamic_cast( _m );
- if ( !m ) return;
+ MonStatsMsg *m = dynamic_cast( _m );
+ if ( !m ) return;
+
+ QStringList statmsg = QStringList::split( '\n', m->statmsg.c_str() );
+ HostInfo::StatsMap stats;
+ for ( QStringList::ConstIterator it = statmsg.begin(); it != statmsg.end();
+ ++it ) {
+ QString key = *it;
+ key = key.left( key.find( ':' ) );
+ QString value = *it;
+ value = value.mid( value.find( ':' ) + 1 );
+ stats[key] = value;
+ }
- QStringList statmsg = QStringList::split( '\n', m->statmsg.c_str() );
- HostInfo::StatsMap stats;
- for ( QStringList::ConstIterator it = statmsg.begin(); it != statmsg.end();
- ++it ) {
- QString key = *it;
- key = key.left( key.find( ':' ) );
- QString value = *it;
- value = value.mid( value.find( ':' ) + 1 );
- stats[key] = value;
- }
-
- HostInfo *hostInfo = m_hostInfoManager->checkNode( m->hostid, stats );
-
- if ( hostInfo->isOffline() ) {
- m_view->removeNode( m->hostid );
- } else {
- m_view->checkNode( m->hostid );
- }
+ HostInfo *hostInfo = m_hostInfoManager->checkNode( m->hostid, stats );
+
+ if ( hostInfo->isOffline() ) {
+ m_view->removeNode( m->hostid );
+ } else {
+ m_view->checkNode( m->hostid );
+ }
}
void Monitor::handle_job_begin( Msg *_m )
{
- MonJobBeginMsg *m = dynamic_cast( _m );
- if ( !m ) return;
+ MonJobBeginMsg *m = dynamic_cast( _m );
+ if ( !m ) return;
- JobList::iterator it = m_rememberedJobs.find( m->job_id );
- if ( it == m_rememberedJobs.end() ) {
- // we started in between
- return;
- }
-
- ( *it ).setServer( m->hostid );
- ( *it ).setStartTime( m->stime );
- ( *it ).setState( Job::Compiling );
+ JobList::iterator it = m_rememberedJobs.find( m->job_id );
+ if ( it == m_rememberedJobs.end() ) {
+ // we started in between
+ return;
+ }
+
+ ( *it ).setServer( m->hostid );
+ ( *it ).setStartTime( m->stime );
+ ( *it ).setState( Job::Compiling );
#if 0
- kdDebug() << "BEGIN: " << (*it).fileName() << " (" << (*it).jobId()
- << ")" << endl;
+ kdDebug() << "BEGIN: " << (*it).fileName() << " (" << (*it).jobId()
+ << ")" << endl;
#endif
- m_view->update( *it );
+ m_view->update( *it );
}
void Monitor::handle_job_done( Msg *_m )
{
- MonJobDoneMsg *m = dynamic_cast( _m );
- if ( !m ) return;
+ MonJobDoneMsg *m = dynamic_cast( _m );
+ if ( !m ) return;
- JobList::iterator it = m_rememberedJobs.find( m->job_id );
- if ( it == m_rememberedJobs.end() ) {
- // we started in between
- return;
- }
-
- ( *it ).exitcode = m->exitcode;
- if ( m->exitcode ) {
- ( *it ).setState( Job::Failed );
- } else {
- ( *it ).setState( Job::Finished );
- ( *it ).real_msec = m->real_msec;
- ( *it ).user_msec = m->user_msec;
- ( *it ).sys_msec = m->sys_msec; /* system time used */
- ( *it ).pfaults = m->pfaults; /* page faults */
-
- ( *it ).in_compressed = m->in_compressed;
- ( *it ).in_uncompressed = m->in_uncompressed;
- ( *it ).out_compressed = m->out_compressed;
- ( *it ).out_uncompressed = m->out_uncompressed;
- }
+ JobList::iterator it = m_rememberedJobs.find( m->job_id );
+ if ( it == m_rememberedJobs.end() ) {
+ // we started in between
+ return;
+ }
+
+ ( *it ).exitcode = m->exitcode;
+ if ( m->exitcode ) {
+ ( *it ).setState( Job::Failed );
+ } else {
+ ( *it ).setState( Job::Finished );
+ ( *it ).real_msec = m->real_msec;
+ ( *it ).user_msec = m->user_msec;
+ ( *it ).sys_msec = m->sys_msec; /* system time used */
+ ( *it ).pfaults = m->pfaults; /* page faults */
+
+ ( *it ).in_compressed = m->in_compressed;
+ ( *it ).in_uncompressed = m->in_uncompressed;
+ ( *it ).out_compressed = m->out_compressed;
+ ( *it ).out_uncompressed = m->out_uncompressed;
+ }
#if 0
- kdDebug() << "DONE: " << (*it).fileName() << " (" << (*it).jobId()
- << ")" << endl;
+ kdDebug() << "DONE: " << (*it).fileName() << " (" << (*it).jobId()
+ << ")" << endl;
#endif
- m_view->update( *it );
+ m_view->update( *it );
}
void Monitor::setCurrentView( StatusView *view, bool rememberJobs )
{
- m_view = view;
+ m_view = view;
- m_view->updateSchedulerState( mSchedulerOnline );
+ m_view->updateSchedulerState( mSchedulerOnline );
- if ( rememberJobs ) {
- JobList::ConstIterator it = m_rememberedJobs.begin();
- for ( ; it != m_rememberedJobs.end(); ++it )
- m_view->update( *it );
- }
+ if ( rememberJobs ) {
+ JobList::ConstIterator it = m_rememberedJobs.begin();
+ for ( ; it != m_rememberedJobs.end(); ++it )
+ m_view->update( *it );
+ }
}
void Monitor::setCurrentNet( const QString &netName )
{
- m_current_netname = netName;
+ m_current_netname = netName;
}
void Monitor::setSchedulerState( bool online )
{
- mSchedulerOnline = online;
- m_view->updateSchedulerState( online );
+ mSchedulerOnline = online;
+ m_view->updateSchedulerState( online );
}
#include "monitor.moc"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/icemon-kde3/icemon-kde3/src/monitor.h new/icemon-kde3/icemon-kde3/src/monitor.h
--- old/icemon-kde3/icemon-kde3/src/monitor.h 2006-06-06 20:29:34.000000000 +0200
+++ new/icemon-kde3/icemon-kde3/src/monitor.h 2006-07-13 09:34:02.000000000 +0200
@@ -30,7 +30,7 @@
class Msg;
class MsgChannel;
class StatusView;
-
+class DiscoverSched;
class QSocketNotifier;
class Monitor : public QObject
@@ -65,8 +65,11 @@
MsgChannel *m_scheduler;
QSocketNotifier *m_scheduler_read;
QString m_current_netname;
-
bool mSchedulerOnline;
+
+ DiscoverSched *m_discover;
+ QSocketNotifier *m_discover_read;
+
};
#endif // MON_KDE_H
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/icemon-kde3/icemon-kde3/src/starview.cc new/icemon-kde3/icemon-kde3/src/starview.cc
--- old/icemon-kde3/icemon-kde3/src/starview.cc 2006-06-06 20:29:34.000000000 +0200
+++ new/icemon-kde3/icemon-kde3/src/starview.cc 2006-07-13 09:34:02.000000000 +0200
@@ -402,10 +402,8 @@
}
unsigned int hostid = processor( job );
- if ( !hostid ) {
- kdDebug() << "Empty host" << endl;
+ if ( !hostid )
return;
- }
HostItem *hostItem = findHostItem( hostid );
if ( !hostItem ) return;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...