ebdl-commits Mailing List for Extension Beans Data Library
Status: Beta
Brought to you by:
inean
You can subscribe to this list here.
2007 |
Jan
|
Feb
|
Mar
(120) |
Apr
(49) |
May
(138) |
Jun
(68) |
Jul
(23) |
Aug
(6) |
Sep
(1) |
Oct
(31) |
Nov
(8) |
Dec
|
---|---|---|---|---|---|---|---|---|---|---|---|---|
2008 |
Jan
|
Feb
|
Mar
(3) |
Apr
(8) |
May
(5) |
Jun
|
Jul
(1) |
Aug
(6) |
Sep
(18) |
Oct
|
Nov
|
Dec
|
From: <in...@us...> - 2008-09-15 17:33:00
|
Revision: 818 http://ebdl.svn.sourceforge.net/ebdl/?rev=818&view=rev Author: inean Date: 2008-09-15 17:32:47 +0000 (Mon, 15 Sep 2008) Log Message: ----------- Update ebdl version requirement Modified Paths: -------------- trunk/ebdl-bonobo/packing/rpm/fedora/ebdl-bonobo.spec.in.in Modified: trunk/ebdl-bonobo/packing/rpm/fedora/ebdl-bonobo.spec.in.in =================================================================== --- trunk/ebdl-bonobo/packing/rpm/fedora/ebdl-bonobo.spec.in.in 2008-09-15 16:10:53 UTC (rev 817) +++ trunk/ebdl-bonobo/packing/rpm/fedora/ebdl-bonobo.spec.in.in 2008-09-15 17:32:47 UTC (rev 818) @@ -19,11 +19,14 @@ Summary: Bonobo components for the Elf Beans Data Library (EBDL) Group: Development/Libraries +Requires: gettext Requires: glib2 >= @LIBGOBJECT_REQUIRED@ Requires: ORBit2 >= @LIBORBIT2_REQUIRED@ Requires: libbonobo >= @LIBBONOBO_REQUIRED@ Requires: ebdl >= @LIBEBDL_REQUIRED@ +BuildRequires: intltool +BuildRequires: gettext-devel BuildRequires: glib2-devel >= @LIBGOBJECT_REQUIRED@ BuildRequires: ORBit2-devel >= @LIBORBIT2_REQUIRED@ BuildRequires: libbonobo-devel >= @LIBBONOBO_REQUIRED@ @@ -80,7 +83,7 @@ clients could obtain CORBA references to bonobo activated objects. %files ebas -%{_sysconfdir}/init.d/ebas +%{_sysconfdir}/rc.d/init.d/ebas %{_libexecdir}/ebdl-bonobo-activation-server %{_mandir}/man?/* %endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <in...@us...> - 2008-09-15 16:11:06
|
Revision: 817 http://ebdl.svn.sourceforge.net/ebdl/?rev=817&view=rev Author: inean Date: 2008-09-15 16:10:53 +0000 (Mon, 15 Sep 2008) Log Message: ----------- Update ebdl version requirement Modified Paths: -------------- trunk/ebdl-bonobo/packing/rpm/fedora/ebdl-bonobo.spec.in.in Modified: trunk/ebdl-bonobo/packing/rpm/fedora/ebdl-bonobo.spec.in.in =================================================================== --- trunk/ebdl-bonobo/packing/rpm/fedora/ebdl-bonobo.spec.in.in 2008-09-15 15:33:25 UTC (rev 816) +++ trunk/ebdl-bonobo/packing/rpm/fedora/ebdl-bonobo.spec.in.in 2008-09-15 16:10:53 UTC (rev 817) @@ -22,7 +22,7 @@ Requires: glib2 >= @LIBGOBJECT_REQUIRED@ Requires: ORBit2 >= @LIBORBIT2_REQUIRED@ Requires: libbonobo >= @LIBBONOBO_REQUIRED@ -Requires: ebdl = @LIBEBDL_REQUIRED@ +Requires: ebdl >= @LIBEBDL_REQUIRED@ BuildRequires: glib2-devel >= @LIBGOBJECT_REQUIRED@ BuildRequires: ORBit2-devel >= @LIBORBIT2_REQUIRED@ @@ -49,8 +49,8 @@ Requires: glib2 >= @LIBGOBJECT_REQUIRED@ Requires: ORBit2 >= @LIBORBIT2_REQUIRED@ Requires: libbonobo >= @LIBBONOBO_REQUIRED@ -Requires: ebdl = @LIBEBDL_REQUIRED@ -Requires: ebdl-shlib-loader = @LIBEBDL_REQUIRED@ +Requires: ebdl >= @LIBEBDL_REQUIRED@ +Requires: ebdl-shlib-loader >= @LIBEBDL_REQUIRED@ %description module Module to operate into remote systems as they will be local. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <in...@us...> - 2008-09-15 15:33:46
|
Revision: 816 http://ebdl.svn.sourceforge.net/ebdl/?rev=816&view=rev Author: inean Date: 2008-09-15 15:33:25 +0000 (Mon, 15 Sep 2008) Log Message: ----------- sync all ebdl conf files Modified Paths: -------------- trunk/ebdl-python/acinclude.m4 trunk/ebdl-python/autogen.sh Modified: trunk/ebdl-python/acinclude.m4 =================================================================== --- trunk/ebdl-python/acinclude.m4 2008-09-15 15:29:07 UTC (rev 815) +++ trunk/ebdl-python/acinclude.m4 2008-09-15 15:33:25 UTC (rev 816) @@ -81,14 +81,14 @@ CUSTOM_LIBS= if test "$enable_$3" != "no"; then - ifelse([$5], [], [have_$3=yes], [ + ifelse([$5], [], [have_$3=yes], [ PKG_CHECK_EXISTS([$5], [have_$3=yes],[have_$3=no]) if test "x$enable_$3" != "xauto" -a "$have_$3" = "no"; then AC_MSG_ERROR([$1 support requested but headers not found]) elif test "$have_$3" = "no"; then AC_MSG_WARN([$1 headers not found; disabling $1 support]) fi - ]) + ]) ifelse([$9], [],, [$9 ])dnl if test "$enable_$3" != "no"; then @@ -108,7 +108,7 @@ $6_CFLAGS="$WARN_CFLAGS $$6_CFLAGS $ASX_CFLAGS $CUSTOM_CFLAGS" $6_LIBS="$$6_LIBS $ASX_LIBS $CUSTOM_LIBS" - ]) + ]) AM_CONDITIONAL([ENABLE_$7],[test "x$enable_$3" = "xyes"]) ]) @@ -184,7 +184,7 @@ AC_REQUIRE([AS_CHECK_ELF_CLASS]) AC_REQUIRE([AS_CHECK_ELF_ENCODING]) AC_REQUIRE([AS_CHECK_ELF_MODULE_SEPARATOR]) - + AH_VERBATIM([_ELF_BYTES], [/* Macros required by elf header */ #if ELF_EI_CLASS == 2 @@ -332,7 +332,7 @@ AC_CACHE_VAL(ELF_CLASS, [AC_TRY_RUN( [ - #include <stdio.h> + #include <stdio.h> #include <sys/mman.h> #include <elf.h> #include <fcntl.h> @@ -340,7 +340,7 @@ int main() { int fd; - int class; + int class; void *hdr; if ((fd = open("conftest$ac_exeext", O_RDONLY)) < 0) @@ -349,7 +349,7 @@ hdr = mmap (0, EI_NIDENT, PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0); close (fd); - if (! hdr) + if (! hdr) exit (0); class = ((unsigned char *)hdr)[EI_CLASS]; @@ -379,7 +379,7 @@ AC_CACHE_VAL(ELF_DATA, [AC_TRY_RUN( [ - #include <stdio.h> + #include <stdio.h> #include <sys/mman.h> #include <elf.h> #include <fcntl.h> @@ -387,21 +387,21 @@ int main() { int fd; - int class; + int class; void *hdr; if ((fd = open("conftest$ac_exeext", O_RDONLY)) < 0) exit (0); - + hdr = mmap (0, EI_NIDENT, PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0); close (fd); - - if (! hdr) + + if (! hdr) exit (0); class = ((unsigned char *)hdr)[EI_DATA]; munmap (hdr, EI_NIDENT); - + exit (class); }], ELF_DATA=$?, ELF_DATA=$?) @@ -414,21 +414,21 @@ AC_MSG_ERROR([Failed to find Elf data encoding. Check config.log for details.]) fi fi - + AC_SUBST([ELF_DATA]) AC_DEFINE_UNQUOTED([ELF_EI_DATA],$ELF_DATA,[Memory alignent of ELF EI_CLASS bit]) ]) AC_DEFUN([AS_CHECK_ELF_MODULE_SEPARATOR],[ AC_REQUIRE([AC_CANONICAL_TARGET]) - + AC_MSG_CHECKING([Elf Kernel module separator]) separator='""' case "$target_cpu" in *v850* | *h8300*) separator='"\"' ;; esac -AC_MSG_RESULT([$separator]) +AC_MSG_RESULT([$separator]) AC_DEFINE_UNQUOTED([ELF_MODULE_SEPARATOR],$separator,[Separator for symbol modules]) ]) @@ -539,7 +539,7 @@ as_check_error=none as_check_error=`$PKG_CONFIG --errors-to-stdout --print-errors "$1"` - dnl AC_MSG_CHECKING([$1]) + dnl AC_MSG_CHECKING([$1]) PKG_CHECK_EXISTS([$1],[], AC_MSG_ERROR(dnl [Package requirements ($1) were not met: Modified: trunk/ebdl-python/autogen.sh =================================================================== --- trunk/ebdl-python/autogen.sh 2008-09-15 15:29:07 UTC (rev 815) +++ trunk/ebdl-python/autogen.sh 2008-09-15 15:33:25 UTC (rev 816) @@ -4,170 +4,20 @@ srcdir=`dirname $0` test -z "$srcdir" && srcdir=. -ORIGDIR=`pwd` -cd $srcdir -PROJECT=ebdl-python -TEST_TYPE=-d -FILE=src +PKG_NAME="ebdl-python" -#variables -AUTOHEADER=autoheader -AUTOCONF=autoconf -AUTOMAKE=automake -ACLOCAL=aclocal - -#[ ! -z `which autoconf-2.13 2>/dev/null` ] && AUTOCONF=autoconf-2.13 && AUTOHEADER=autoheader-2.13 -#[ ! -z `which automake-1.6 2>/dev/null` ] && AUTOMAKE=automake-1.6 && ACLOCAL=aclocal-1.6 - -DIE=0 - -# Determine whether to use configure.in or configure.ac - -if [ -f $srcdir/configure.ac ]; then - CONFIGURE="$srcdir/configure.ac" - -else - CONFIGURE="$srcdir/configure.in" -fi - -($AUTOCONF --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have autoconf installed to compile $PROJECT." - echo "Download the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" - DIE=1 +(test -f $srcdir/configure.ac) || { + echo "***Error***: Directory \`$srcdir\' does not look like the" + echo "top-level $PKG_NAME directory" + exit 1 } - -($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have automake installed to compile $PROJECT." - echo "Get ftp://ftp.cygnus.com/pub/home/tromey/automake-1.4.tar.gz" - echo "(or a newer version if it is available)" - DIE=1 +which gnome-autogen.sh || { + echo "You need to install gnome-common from the GNOME SVN" + exit 1 } -(grep "^AC_PROG_LIBTOOL" "$CONFIGURE" >/dev/null) && { - (libtool --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have libtool installed to compile $PROJECT." - echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz" - echo "(or a newer version if it is available)" - DIE=1 - } -} +REQUIRED_GTK_DOC_VERSION=1.9 +GTKDOCIZE="gtkdocize --docdir docs/reference --flavour no-tmpl" -if test "$DIE" -eq 1; then - exit 1 -fi - -test $TEST_TYPE $FILE || { - echo "You must run this script in the top-level $PROJECT directory" - exit 1 -} - -if test -z "$*"; then - echo "I am going to run ./configure with no arguments - if you wish " - echo "to pass any to it, please specify them on the "\`$0\'" command line." -fi - -case $CC in - *xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;; -esac - -for coin in `find $srcdir -name configure.in -print -o -name configure.ac -print` - do - dr=`dirname $coin` - bn=`basename $coin` - if test -f $dr/NO-AUTO-GEN; then - echo skipping $dr -- flagged as no auto-gen - else - echo processing $dr - ( cd $dr - - aclocalinclude="$ACLOCAL_FLAGS" - - if grep "^GTK_DOC_CHECK" $bn >/dev/null; then - if test -z "$NO_GTKDOCIZE" ; then - echo "Running gtkdocize..." - gtkdocize --docdir docs/reference - fi - fi - - if test "$DIE" -eq 1; then - exit 1 - fi - - if grep "^AC_PROG_LIBTOOL" $bn >/dev/null; then - if test -z "$NO_LIBTOOLIZE" ; then - echo "Running libtoolize..." - libtoolize --force --copy - fi - fi - - if grep "^AM_INIT_AUTOMAKE" $bn >/dev/null; then - echo "Running aclocal $aclocalinclude ..." - $ACLOCAL $aclocalinclude || { - echo - echo "**Error**: \`aclocal' failed. Please fix the warnings" - echo "(probably missing development files) and try again." - DIE=1 - } - fi - - if test "$DIE" -eq 1; then - exit 1 - fi - - if grep "^AM_CONFIG_HEADER" $bn >/dev/null; then - echo "Running autoheader..." - $AUTOHEADER || { - echo - echo "**Error**: \`autoheader' failed. Please fix the warnings" - echo "(probably missing development files) and try again." - DIE=1 - } - - if test "$DIE" -eq 1; then - exit 1 - fi - - fi - - if grep "^AM_INIT_AUTOMAKE" $bn >/dev/null; then - echo "Running automake --gnu $am_opt ..." - $AUTOMAKE --add-missing --gnu $am_opt || { - echo - echo "**Error**: \`automake' failed. Please fix the warnings" - echo "(probably missing development files) and try again." - DIE=1 - } - fi - - if test "$DIE" -eq 1; then - exit 1 - fi - - echo "Running autoconf ..." - $AUTOCONF || { - echo - echo "**Error**: \`autoconf' failed. Please fix the warnings" - echo "(probably missing development files) and try again." - DIE=1 - } - - if test "$DIE" -eq 1; then - exit 1 - fi - ) - fi -done - -cd $ORIGDIR - -conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c - -if [ -f $srcdir/configure ]; then - $srcdir/configure $conf_flags "$@" - echo - echo "Now type 'make' to compile $PROJECT." -fi +# common autogen +. gnome-autogen.sh This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <in...@us...> - 2008-09-15 15:29:21
|
Revision: 815 http://ebdl.svn.sourceforge.net/ebdl/?rev=815&view=rev Author: inean Date: 2008-09-15 15:29:07 +0000 (Mon, 15 Sep 2008) Log Message: ----------- Fix deb packages Modified Paths: -------------- trunk/ebdl-bonobo/configure.ac trunk/ebdl-bonobo/packing/deb/debian/changelog trunk/ebdl-bonobo/packing/deb/debian/control trunk/ebdl-bonobo/packing/deb/debian/rules Modified: trunk/ebdl-bonobo/configure.ac =================================================================== --- trunk/ebdl-bonobo/configure.ac 2008-09-15 15:26:06 UTC (rev 814) +++ trunk/ebdl-bonobo/configure.ac 2008-09-15 15:29:07 UTC (rev 815) @@ -2,9 +2,9 @@ AC_PREREQ(2.52) dnl the ebdl-bonobo version number -m4_define([ebdl_bonobo_major_version],[0]) -m4_define([ebdl_bonobo_minor_version],[1]) -m4_define([ebdl_bonobo_micro_version],[2]) +m4_define([ebdl_bonobo_major_version], [0]) +m4_define([ebdl_bonobo_minor_version], [1]) +m4_define([ebdl_bonobo_micro_version], [2]) m4_define([ebdl_bonobo_version],[ebdl_bonobo_major_version.ebdl_bonobo_minor_version.ebdl_bonobo_micro_version]) AC_INIT([ebdl-bonobo],[ebdl_bonobo_version], [http://ebdl.sf.net/bugs.php?package=ebdl-bonobo]) Modified: trunk/ebdl-bonobo/packing/deb/debian/changelog =================================================================== --- trunk/ebdl-bonobo/packing/deb/debian/changelog 2008-09-15 15:26:06 UTC (rev 814) +++ trunk/ebdl-bonobo/packing/deb/debian/changelog 2008-09-15 15:29:07 UTC (rev 815) @@ -1,21 +1,9 @@ -ebdl-bonobo (0.0.99+cvs20060909-2) unstable; urgency=low +ebdl-bonobo (0.1.2-1) intrepid; urgency=low - * New Snapshop build + * NMU: New release + + -- Carlos Martín <in...@us...> Mon, 15 Sep 2008 16:56:49 +0200 - -- Carlos Martin <in...@us...> Sat, 9 Sep 2006 23:15:07 +0200 - -ebdl-bonobo (0.0.99+cvs20060909-1) unstable; urgency=low - - * New Snapshop build - - -- Carlos Martin <in...@us...> Sat, 9 Sep 2006 23:03:10 +0200 - -ebdl-bonobo (0.0.99-1) unstable; urgency=low - - * Initial Release. - - -- Carlos Martin <in...@us...> Tue, 02 Sep 2006 18:19:07 +0200 - Local variables: mode:debian-changelog End: Modified: trunk/ebdl-bonobo/packing/deb/debian/control =================================================================== --- trunk/ebdl-bonobo/packing/deb/debian/control 2008-09-15 15:26:06 UTC (rev 814) +++ trunk/ebdl-bonobo/packing/deb/debian/control 2008-09-15 15:29:07 UTC (rev 815) @@ -4,17 +4,15 @@ Maintainer: Ubuntu MOTU Developers <ubu...@li...> XSBC-Original-Maintainer: Carlos Martin <in...@us...> Homepage: http://ebdl.sf.net/ebdl-bonobo -Build-Depends: debhelper (>= 4.0.0), autotools-dev, libbonobo2-dev, libavahi-glib-dev, libavahi-client-dev, liborbit2-dev, flex, libebdl1-dev, bison -Standards-Version: 3.7.3 +Build-Depends: debhelper (>= 4.0.0), autotools-dev, libbonobo2-dev, libavahi-glib-dev, libavahi-client-dev, liborbit2-dev, flex, libebdl1-dev (>= 0.10.3), bison +Standards-Version: 3.8.0 - Package: ebdl-bonobo1-dev Section: libdevel Architecture: any Depends: libebdl1-dev, ebdl-bonobo1 (= ${Source-Version}) Description: Bonobo components to handle remote extensions - devel files - Package: ebdl-bonobo1 Section: libs Architecture: any @@ -22,20 +20,18 @@ Recommends: ebdl-bonobo1-ebas Description: Ebdl Bonobo complement - Remote components Bonobo components to handle remote ebdl based requests to localhost - Package: ebdl-bonobo1-ebas -Section: daemons +Section: libs Architecture: any Depends: ${shlibs:Depends} Description: Ebdl Bonobo Activation Server This daemon runs as privilege user to serve request made by remote bonobo clients, and activate servers as requested. In fact, this is a clone of b-a-s, but focused in remote activation. - Package: libebdl1-bonobo-module Section: libs Architecture: any -Depends: libebdl1, libebdl1-shlib-loader, ${shlibs:Depends} +Depends: libebdl1-shlib-loader, ${shlibs:Depends} Description: Ebdl Bonobo complement - Bonobo Agent This complement proxies local request to remote host from ebdl library. It iterat with remote ebdl-bonobo1 deployment Modified: trunk/ebdl-bonobo/packing/deb/debian/rules =================================================================== --- trunk/ebdl-bonobo/packing/deb/debian/rules 2008-09-15 15:26:06 UTC (rev 814) +++ trunk/ebdl-bonobo/packing/deb/debian/rules 2008-09-15 15:29:07 UTC (rev 815) @@ -71,16 +71,16 @@ clean: dh_testdir dh_testroot - rm -f build-arch-stamp build-indep-stamp debian/*substvars debian/$(PACKAGE).ebas.init debian/*~ + rm -f build-arch-stamp build-indep-stamp debian/*substvars debian/$(PACKAGE).ebas.init debian/*~ # Add here commands to clean up after the build process. -$(MAKE) distclean ifneq "$(wildcard /usr/share/misc/config.sub)" "" - cp -f /usr/share/misc/config.sub config.sub + -cp -f /usr/share/misc/config.sub config.sub endif ifneq "$(wildcard /usr/share/misc/config.guess)" "" - cp -f /usr/share/misc/config.guess config.guess + -cp -f /usr/share/misc/config.guess config.guess endif dh_clean; @@ -98,10 +98,10 @@ # Add here commands to install the package into debian/gmodulo-provider. $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp - # Copy init script to $(PACKAGE).init - mv $(CURDIR)/debian/tmp/etc/init.d/ebas $(CURDIR)/debian/$(PACKAGE)-ebas.ebas.init + # Copy init script to $(PACKAGE).init + mv $(CURDIR)/debian/tmp/etc/rc.d/init.d/ebas $(CURDIR)/debian/$(PACKAGE)-ebas.init - # remove *.la + # remove *.la files from find $(CURDIR)/debian/tmp -name '*.a' -or -name '*.la' | xargs rm -f # mofe file according to *.files rules @@ -137,6 +137,7 @@ dh_makeshlibs -a dh_installdeb -a # dh_perl -a +# dh_python -a dh_shlibdeps -a dh_gencontrol -a dh_md5sums -a This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <in...@us...> - 2008-09-15 15:26:25
|
Revision: 814 http://ebdl.svn.sourceforge.net/ebdl/?rev=814&view=rev Author: inean Date: 2008-09-15 15:26:06 +0000 (Mon, 15 Sep 2008) Log Message: ----------- Sync ebdl config files Modified Paths: -------------- trunk/ebdl/acinclude.m4 trunk/ebdl/configure.ac trunk/ebdl/packing/deb/debian/control trunk/ebdl/packing/deb/debian/rules Modified: trunk/ebdl/acinclude.m4 =================================================================== --- trunk/ebdl/acinclude.m4 2008-09-15 14:15:28 UTC (rev 813) +++ trunk/ebdl/acinclude.m4 2008-09-15 15:26:06 UTC (rev 814) @@ -81,14 +81,14 @@ CUSTOM_LIBS= if test "$enable_$3" != "no"; then - ifelse([$5], [], [have_$3=yes], [ + ifelse([$5], [], [have_$3=yes], [ PKG_CHECK_EXISTS([$5], [have_$3=yes],[have_$3=no]) if test "x$enable_$3" != "xauto" -a "$have_$3" = "no"; then AC_MSG_ERROR([$1 support requested but headers not found]) elif test "$have_$3" = "no"; then AC_MSG_WARN([$1 headers not found; disabling $1 support]) fi - ]) + ]) ifelse([$9], [],, [$9 ])dnl if test "$enable_$3" != "no"; then @@ -108,7 +108,7 @@ $6_CFLAGS="$WARN_CFLAGS $$6_CFLAGS $ASX_CFLAGS $CUSTOM_CFLAGS" $6_LIBS="$$6_LIBS $ASX_LIBS $CUSTOM_LIBS" - ]) + ]) AM_CONDITIONAL([ENABLE_$7],[test "x$enable_$3" = "xyes"]) ]) @@ -290,7 +290,7 @@ AC_REQUIRE([AS_CHECK_ELF_CLASS]) AC_REQUIRE([AS_CHECK_ELF_ENCODING]) AC_REQUIRE([AS_CHECK_ELF_MODULE_SEPARATOR]) - + AH_VERBATIM([_ELF_BYTES], [/* Macros required by elf header */ #if ELF_EI_CLASS == 2 @@ -438,7 +438,7 @@ AC_CACHE_VAL(ELF_CLASS, [AC_TRY_RUN( [ - #include <stdio.h> + #include <stdio.h> #include <sys/mman.h> #include <elf.h> #include <fcntl.h> @@ -446,7 +446,7 @@ int main() { int fd; - int class; + int class; void *hdr; if ((fd = open("conftest$ac_exeext", O_RDONLY)) < 0) @@ -455,7 +455,7 @@ hdr = mmap (0, EI_NIDENT, PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0); close (fd); - if (! hdr) + if (! hdr) exit (0); class = ((unsigned char *)hdr)[EI_CLASS]; @@ -485,7 +485,7 @@ AC_CACHE_VAL(ELF_DATA, [AC_TRY_RUN( [ - #include <stdio.h> + #include <stdio.h> #include <sys/mman.h> #include <elf.h> #include <fcntl.h> @@ -493,21 +493,21 @@ int main() { int fd; - int class; + int class; void *hdr; if ((fd = open("conftest$ac_exeext", O_RDONLY)) < 0) exit (0); - + hdr = mmap (0, EI_NIDENT, PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0); close (fd); - - if (! hdr) + + if (! hdr) exit (0); class = ((unsigned char *)hdr)[EI_DATA]; munmap (hdr, EI_NIDENT); - + exit (class); }], ELF_DATA=$?, ELF_DATA=$?) @@ -520,21 +520,21 @@ AC_MSG_ERROR([Failed to find Elf data encoding. Check config.log for details.]) fi fi - + AC_SUBST([ELF_DATA]) AC_DEFINE_UNQUOTED([ELF_EI_DATA],$ELF_DATA,[Memory alignent of ELF EI_CLASS bit]) ]) AC_DEFUN([AS_CHECK_ELF_MODULE_SEPARATOR],[ AC_REQUIRE([AC_CANONICAL_TARGET]) - + AC_MSG_CHECKING([Elf Kernel module separator]) separator='""' case "$target_cpu" in *v850* | *h8300*) separator='"\"' ;; esac -AC_MSG_RESULT([$separator]) +AC_MSG_RESULT([$separator]) AC_DEFINE_UNQUOTED([ELF_MODULE_SEPARATOR],$separator,[Separator for symbol modules]) ]) @@ -682,7 +682,7 @@ as_check_error=none as_check_error=`$PKG_CONFIG --errors-to-stdout --print-errors "$1"` - dnl AC_MSG_CHECKING([$1]) + dnl AC_MSG_CHECKING([$1]) PKG_CHECK_EXISTS([$1],[], AC_MSG_ERROR(dnl [Package requirements ($1) were not met: Modified: trunk/ebdl/configure.ac =================================================================== --- trunk/ebdl/configure.ac 2008-09-15 14:15:28 UTC (rev 813) +++ trunk/ebdl/configure.ac 2008-09-15 15:26:06 UTC (rev 814) @@ -2,9 +2,9 @@ AC_PREREQ(2.52) dnl the ebdl version number -m4_define([ebdl_major_version],[0]) +m4_define([ebdl_major_version], [0]) m4_define([ebdl_minor_version],[10]) -m4_define([ebdl_micro_version],[3]) +m4_define([ebdl_micro_version], [3]) m4_define([ebdl_version],[ebdl_major_version.ebdl_minor_version.ebdl_micro_version]) m4_define([ebdl_core_packages],[gobject-2.0 ebdl-plugin-1]) Modified: trunk/ebdl/packing/deb/debian/control =================================================================== --- trunk/ebdl/packing/deb/debian/control 2008-09-15 14:15:28 UTC (rev 813) +++ trunk/ebdl/packing/deb/debian/control 2008-09-15 15:26:06 UTC (rev 814) @@ -1,6 +1,6 @@ Source: ebdl Priority: optional -Section:libs +Section: libs Maintainer: Ubuntu MOTU Developers <ubu...@li...> XSBC-Original-Maintainer: Carlos Martin <in...@us...> Homepage: http://ebdl.sf.net/ebdl @@ -43,7 +43,6 @@ Description: Ebdl DBUS complement - DBUS source Agent A DBUS based plugin to handle local ebdl request from non privilege users. - Package: libebdl1-linux-module Section: libs Architecture: any Modified: trunk/ebdl/packing/deb/debian/rules =================================================================== --- trunk/ebdl/packing/deb/debian/rules 2008-09-15 14:15:28 UTC (rev 813) +++ trunk/ebdl/packing/deb/debian/rules 2008-09-15 15:26:06 UTC (rev 814) @@ -70,7 +70,7 @@ build: build-arch build-indep -clean: +clean: dh_testdir dh_testroot rm -f build-arch-stamp build-indep-stamp debian/*substvars debian/$(PACKAGE)-dbus1.init debian/*~ @@ -79,10 +79,10 @@ -$(MAKE) distclean ifneq "$(wildcard /usr/share/misc/config.sub)" "" - cp -f /usr/share/misc/config.sub config.sub + -cp -f /usr/share/misc/config.sub config.sub endif ifneq "$(wildcard /usr/share/misc/config.guess)" "" - cp -f /usr/share/misc/config.guess config.guess + -cp -f /usr/share/misc/config.guess config.guess endif dh_clean; @@ -100,10 +100,10 @@ # Add here commands to install the package into debian/gmodulo-provider. $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp - # Copy init script to $(PACKAGE).init + # Copy init script to $(PACKAGE).init mv $(CURDIR)/debian/tmp/etc/rc.d/init.d/ebdl-dbus1 $(CURDIR)/debian/$(PACKAGE)-dbus1.init - # remove *.la files from + # remove *.la files from find $(CURDIR)/debian/tmp -name '*.a' -or -name '*.la' | xargs rm -f # mofe file according to *.files rules @@ -139,6 +139,7 @@ dh_makeshlibs -a dh_installdeb -a # dh_perl -a +# dh_python -a dh_shlibdeps -a dh_gencontrol -a dh_md5sums -a This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <in...@us...> - 2008-09-13 18:12:40
|
Revision: 810 http://ebdl.svn.sourceforge.net/ebdl/?rev=810&view=rev Author: inean Date: 2008-09-13 18:12:36 +0000 (Sat, 13 Sep 2008) Log Message: ----------- Forces all 127.x.x.x to be considered as local nets Modified Paths: -------------- trunk/ebdl/ebdl/e-url.c Modified: trunk/ebdl/ebdl/e-url.c =================================================================== --- trunk/ebdl/ebdl/e-url.c 2008-09-11 18:43:52 UTC (rev 809) +++ trunk/ebdl/ebdl/e-url.c 2008-09-13 18:12:36 UTC (rev 810) @@ -910,6 +910,16 @@ return FALSE; } +#define _IS_LOOPBACK_NET(a) ((htonl( (*(uint32_t*)(& (((struct sockaddr_in*)a)->sin_addr)))) & \ + IN_CLASSA_NET) == IN_LOOPBACKNET << 24) + + g_assert (ailist && ailist->ai_addr); + if (ailist->ai_addr->sa_family == AF_INET && _IS_LOOPBACK_NET (ailist->ai_addr)) { + return TRUE; + } + +#undef _IS_LOOPBACK_NET + for (ifp = ifplist; ifp; ifp = ifp->ifa_next) { if ((retval = addr_eq (ifp->ifa_addr, ailist->ai_addr))) { break; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <in...@us...> - 2008-09-11 18:43:56
|
Revision: 809 http://ebdl.svn.sourceforge.net/ebdl/?rev=809&view=rev Author: inean Date: 2008-09-11 18:43:52 +0000 (Thu, 11 Sep 2008) Log Message: ----------- Update Modified Paths: -------------- trunk/ebdl/acinclude.m4 Modified: trunk/ebdl/acinclude.m4 =================================================================== --- trunk/ebdl/acinclude.m4 2008-09-11 18:29:46 UTC (rev 808) +++ trunk/ebdl/acinclude.m4 2008-09-11 18:43:52 UTC (rev 809) @@ -70,6 +70,8 @@ AC_DEFUN([AS_ENABLE_FEATURE],[ AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + ifelse([$8], [],, [$8 + ])dnl AC_ARG_ENABLE([$1], AS_HELP_STRING([--enable-$1=[no/auto/yes]], [$2 (default: $4)]),, @@ -79,32 +81,34 @@ CUSTOM_LIBS= if test "$enable_$3" != "no"; then - PKG_CHECK_EXISTS([$5], [have_$3=yes],[have_$3=no]) - if test "x$enable_$3" != "xauto" -a "$have_$3" = "no"; then + ifelse([$5], [], [have_$3=yes], [ + PKG_CHECK_EXISTS([$5], [have_$3=yes],[have_$3=no]) + if test "x$enable_$3" != "xauto" -a "$have_$3" = "no"; then AC_MSG_ERROR([$1 support requested but headers not found]) - elif test "$have_$3" = "no"; then + elif test "$have_$3" = "no"; then AC_MSG_WARN([$1 headers not found; disabling $1 support]) - fi - ifelse([$8], [],, [$8 + fi + ]) + ifelse([$9], [],, [$9 ])dnl if test "$enable_$3" != "no"; then enable_$3=$have_$3 fi fi + ifelse([$5], [],, [ + if test "x$enable_$3" = "xyes"; then + PKG_CHECK_MODULES([$6],[$5]) + AC_DEFINE_UNQUOTED([ENABLE_$7],[1],[Define for $1 support]) + fi - if test "x$enable_$3" = "xyes"; then - PKG_CHECK_MODULES([$6],[$5]) - AC_DEFINE_UNQUOTED([ENABLE_$7],[1],[Define for $1 support]) - fi + $6_SIMPLE_CFLAGS="$$6_CFLAGS $CUSTOM_CFLAGS" + AC_SUBST([$6_SIMPLE_CFLAGS]) + $6_SIMPLE_LIBS="$$6_LIBS $CUSTOM_LIBS" + AC_SUBST([$6_SIMPLE_LIBS]) - $6_SIMPLE_CFLAGS="$$6_CFLAGS $CUSTOM_CFLAGS" - AC_SUBST([$6_SIMPLE_CFLAGS]) - $6_SIMPLE_LIBS="$$6_LIBS $CUSTOM_LIBS" - AC_SUBST([$6_SIMPLE_LIBS]) - - $6_CFLAGS="$WARN_CFLAGS $$6_CFLAGS $ASX_CFLAGS $CUSTOM_CFLAGS" - $6_LIBS="$$6_LIBS $ASX_LIBS $CUSTOM_LIBS" - + $6_CFLAGS="$WARN_CFLAGS $$6_CFLAGS $ASX_CFLAGS $CUSTOM_CFLAGS" + $6_LIBS="$$6_LIBS $ASX_LIBS $CUSTOM_LIBS" + ]) AM_CONDITIONAL([ENABLE_$7],[test "x$enable_$3" = "xyes"]) ]) @@ -112,7 +116,7 @@ AC_DEFUN([AS_ENABLE_TESTS],[ AC_REQUIRE([AS_CONFIGURE_KERNEL]) AS_ENABLE_FEATURE([tests],[Build satity test cases], - [tests],$1,[gobject-2.0 check],EBDL_TEST,TESTS, [ + [tests],$1,[gobject-2.0 check],EBDL_TEST,TESTS,, [ if test "x$enable_kernel_test_modules" != "xyes"; then if test "x$enable_tests" = "xyes"; then @@ -142,7 +146,7 @@ # DBUS Support AC_DEFUN([AS_ENABLE_DBUS],[ AS_ENABLE_FEATURE([dbus],[DBUS support], - [dbus],$1, [dbus-glib-1 > $2 ], EBDL_DBUS, DBUS, [ + [dbus],$1, [dbus-glib-1 > $2 ], EBDL_DBUS, DBUS,, [ if test "x$have_dbus" = "xyes"; then dbus_systemdir=${sysconfdir}/dbus-1/system.d This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <in...@us...> - 2008-09-11 18:29:51
|
Revision: 808 http://ebdl.svn.sourceforge.net/ebdl/?rev=808&view=rev Author: inean Date: 2008-09-11 18:29:46 +0000 (Thu, 11 Sep 2008) Log Message: ----------- Merge branch 'master' into master2 Conflicts: acinclude.m4 docs/reference/ebdl/ebdl-sections.txt ebdl/e-debug.c ebdl/e-progress-bar.c Modified Paths: -------------- trunk/ebdl/acinclude.m4 trunk/ebdl/docs/reference/ebdl/ebdl-sections.txt trunk/ebdl/ebdl/e-debug.c trunk/ebdl/ebdl/e-progress-bar.c Modified: trunk/ebdl/acinclude.m4 =================================================================== --- trunk/ebdl/acinclude.m4 2008-09-11 17:18:32 UTC (rev 807) +++ trunk/ebdl/acinclude.m4 2008-09-11 18:29:46 UTC (rev 808) @@ -55,11 +55,12 @@ AC_REQUIRE([AM_GLIB_GNU_GETTEXT]) AC_REQUIRE([IT_PROG_INTLTOOL]) - INTLTOOL_VERSION=`$INTLTOOL_MERGE --version | sed -n '/^intltool/p' | awk '{print $[]3}'` + INTLTOOL_COMMAND=`echo $INTLTOOL_MERGE | sed -s 's/$(.*)/./'` + INTLTOOL_VERSION=`$INTLTOOL_COMMAND --version | sed -n '/^intltool/p' | awk '{print $[]3}'` INTLTOOL_VERSION=`echo $INTLTOOL_VERSION | awk -F. '{print $[]1*10000 + $[]2*1000 + $[]3}'` AC_SUBST(INTLTOOL_VERSION) - AM_CONDITIONAL([INTLTOOL_LOCAL],[test "$INTLTOOL_VERSION" -lt 4001]) + AM_CONDITIONAL([INTLTOOL_LOCAL],[test "$INTLTOOL_VERSION" -lt 40001]) ]) dnl AS_ENABLE_FEATURE(NAME, VAR_NAME, DEFAULT, PKG_CONFIG_NAME, FLAGS_PREFIX, CONDITIONAL_SUFFIX) Modified: trunk/ebdl/docs/reference/ebdl/ebdl-sections.txt =================================================================== --- trunk/ebdl/docs/reference/ebdl/ebdl-sections.txt 2008-09-11 17:18:32 UTC (rev 807) +++ trunk/ebdl/docs/reference/ebdl/ebdl-sections.txt 2008-09-11 18:29:46 UTC (rev 808) @@ -118,7 +118,6 @@ e_dag_get_nodes_from_list e_dag_get_nodes_typed e_dag_get_nodes_typed_from_list -e_dag_get_type e_dag_has_cycles e_dag_has_node e_dag_is_node_floating @@ -447,10 +446,6 @@ e_debug -e_log_critical -e_log_critical_cat -e_log_critical_cat_object -e_log_critical_object e_log_debug e_log_debug_cat e_log_debug_cat_object Modified: trunk/ebdl/ebdl/e-debug.c =================================================================== --- trunk/ebdl/ebdl/e-debug.c 2008-09-11 17:18:32 UTC (rev 807) +++ trunk/ebdl/ebdl/e-debug.c 2008-09-11 18:29:46 UTC (rev 808) @@ -1948,7 +1948,7 @@ /** * e_debug_handler_copy: - * @handler: + * @handler: a #EdlHandler handler * * Clones @handler contents into a new one. * @@ -2313,7 +2313,7 @@ /** * e_debug_category_copy: - * @category: + * @category: An #EdlCategory category instance * * Clones @category contents into a new one. * @@ -2483,7 +2483,7 @@ /** * e_debug_message_copy: - * @message: + * @message: A #EdlMessage * * Clones @message contents into a new one. * Modified: trunk/ebdl/ebdl/e-progress-bar.c =================================================================== --- trunk/ebdl/ebdl/e-progress-bar.c 2008-09-11 17:18:32 UTC (rev 807) +++ trunk/ebdl/ebdl/e-progress-bar.c 2008-09-11 18:29:46 UTC (rev 808) @@ -124,14 +124,6 @@ } -/** - * legible_1: - * @repr: - * - * Engine for legible and legible_very_long; this function works on strings. - * - * Return value: - **/ static char * legible_1 (const char *repr) { @@ -167,14 +159,6 @@ return outbuf; } -/** - * legible: - * @l: - * - * Legible -- return a static pointer to the legibly printed long. - * - * Return value: - **/ static char * legible (long l) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <in...@us...> - 2008-09-11 17:18:37
|
Revision: 807 http://ebdl.svn.sourceforge.net/ebdl/?rev=807&view=rev Author: inean Date: 2008-09-11 17:18:32 +0000 (Thu, 11 Sep 2008) Log Message: ----------- Fix gcc 4.3 warnings Modified Paths: -------------- trunk/ebdl/acinclude.m4 trunk/ebdl/ebdl/ds-factory-backend.c trunk/ebdl/ebdl/e-app.c trunk/ebdl/ebdl/e-conf.c trunk/ebdl/ebdl/e-data-factory.c trunk/ebdl/ebdl/e-debug.h trunk/ebdl/ebdl/e-elf.c trunk/ebdl/ebdl/e-part-factory.c trunk/ebdl/ebdl/e-pickler-backend-xml.c trunk/ebdl/ebdl/e-progress-bar.c trunk/ebdl/ebdl/e-scanner-shell.c trunk/ebdl/ebdl/e-source.h trunk/ebdl/ebdl/e-stream-terminal.c trunk/ebdl/ebdl/e-table-view-console.c trunk/ebdl/ebdl/e-url.c trunk/ebdl/ebdl/ed-app.c trunk/ebdl/ebdl/lk-data-kernel.c trunk/ebdl/ebdl/lk-kernel.c trunk/ebdl/ebdl/lk-module.c trunk/ebdl/ebdl/lk-table-view26.c trunk/ebdl/ebdl/lkfss-source-extension.c trunk/ebdl/ebdl-plugin/e-plugins-manager.c trunk/ebdl/packing/rpm/fedora/ebdl.spec.in.in trunk/ebdl/tests/Linux/modutils/e-modinfo.c trunk/ebdl/tests/Linux/modutils/e-modprobe.c trunk/ebdl/tests/tc-kernel.c trunk/ebdl/tests/ts-ebdl.c trunk/ebdl/tests/ts-plugin.c Modified: trunk/ebdl/acinclude.m4 =================================================================== --- trunk/ebdl/acinclude.m4 2008-09-11 17:12:30 UTC (rev 806) +++ trunk/ebdl/acinclude.m4 2008-09-11 17:18:32 UTC (rev 807) @@ -217,7 +217,7 @@ AC_DEFUN([AS_ENABLE_LINUX_KERNEL_BACKEND],[ AS_ENABLE_BACKEND([linux-backend],[linux_kernel],$1, LINUX_KERNEL, [ AC_REQUIRE([AC_CANONICAL_TARGET]) - AC_REQUIRE([EBDL_CHECK_ELF_BYTES]) + AC_REQUIRE([AS_CHECK_ELF_BYTES]) AC_REQUIRE([AS_ENABLE_BACKENDS])], [ default=no @@ -281,10 +281,10 @@ ]) ]) -AC_DEFUN([EBDL_CHECK_ELF_BYTES],[ - AC_REQUIRE([EBDL_CHECK_ELF_CLASS]) - AC_REQUIRE([EBDL_CHECK_ELF_ENCODING]) - AC_REQUIRE([EBDL_CHECK_ELF_MODULE_SEPARATOR]) +AC_DEFUN([AS_CHECK_ELF_BYTES],[ + AC_REQUIRE([AS_CHECK_ELF_CLASS]) + AC_REQUIRE([AS_CHECK_ELF_ENCODING]) + AC_REQUIRE([AS_CHECK_ELF_MODULE_SEPARATOR]) AH_VERBATIM([_ELF_BYTES], [/* Macros required by elf header */ @@ -309,8 +309,6 @@ # define ELFINDEX(val, limit) ((int16_t)val >= 0 ? val : (limit - (EUINT16_MAX -((uint16_t)(val) - 1))))]) ]) - - #EBDL_ARG_KERNEL_PATH # let the user over-ride the kernel source path AC_DEFUN([AS_CONFIGURE_KERNEL],[ @@ -429,7 +427,7 @@ ]) -AC_DEFUN([EBDL_CHECK_ELF_CLASS], +AC_DEFUN([AS_CHECK_ELF_CLASS], [ AC_MSG_CHECKING([Elf class type]) AC_CACHE_VAL(ELF_CLASS, @@ -476,7 +474,7 @@ AC_DEFINE_UNQUOTED([ELF_EI_CLASS],$ELF_CLASS,[Memory alignent of ELF EI_CLASS bit]) ]) -AC_DEFUN([EBDL_CHECK_ELF_ENCODING], +AC_DEFUN([AS_CHECK_ELF_ENCODING], [ AC_MSG_CHECKING([Elf data encoding type]) AC_CACHE_VAL(ELF_DATA, @@ -522,7 +520,7 @@ AC_DEFINE_UNQUOTED([ELF_EI_DATA],$ELF_DATA,[Memory alignent of ELF EI_CLASS bit]) ]) -AC_DEFUN([EBDL_CHECK_ELF_MODULE_SEPARATOR],[ +AC_DEFUN([AS_CHECK_ELF_MODULE_SEPARATOR],[ AC_REQUIRE([AC_CANONICAL_TARGET]) AC_MSG_CHECKING([Elf Kernel module separator]) @@ -623,10 +621,6 @@ LCOV=no GCOV=no - #for now, ccache doesn't work well wich coverage stuff - if test "x$enable_ccache" = "xyes"; then - enable_coverage=no - fi if test "x$enable_tests" != "xyes"; then enable_coverage=no fi @@ -656,15 +650,6 @@ ]) dnl as-compiler-flag.m4 0.1.0 -dnl autostars m4 macro for detection of compiler flags -dnl David Schleef <ds...@sc...> -dnl $Id$ - -dnl AS_COMPILER_FLAG(CFLAGS, ACTION-IF-ACCEPTED, [ACTION-IF-NOT-ACCEPTED]) -dnl Tries to compile with the given CFLAGS. -dnl Runs ACTION-IF-ACCEPTED if the compiler can compile with the flags, -dnl and ACTION-IF-NOT-ACCEPTED otherwise. - AC_DEFUN([AS_COMPILER_FLAG], [ AC_MSG_CHECKING([to see if compiler understands $1]) @@ -692,7 +677,7 @@ as_check_error=none as_check_error=`$PKG_CONFIG --errors-to-stdout --print-errors "$1"` - dnl AC_MSG_CHECKING([$1])s + dnl AC_MSG_CHECKING([$1]) PKG_CHECK_EXISTS([$1],[], AC_MSG_ERROR(dnl [Package requirements ($1) were not met: @@ -763,4 +748,3 @@ AS_EXPAND(DATADIR,[${prefix}/share]) AC_DEFINE_UNQUOTED([DATADIR],"$DATADIR", ebdl data dir) ]) - Modified: trunk/ebdl/ebdl/ds-factory-backend.c =================================================================== --- trunk/ebdl/ebdl/ds-factory-backend.c 2008-09-11 17:12:30 UTC (rev 806) +++ trunk/ebdl/ebdl/ds-factory-backend.c 2008-09-11 17:18:32 UTC (rev 807) @@ -134,7 +134,7 @@ /* FIXME: We shoult try to open firstly SYSTEM bus and if failed, open session. We also seet apporpiately filters */ if (! (connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error))) { - e_debug (E_DEBUG_LEVEL_CRITICAL, "could not open connection: %s\n", error->message); + e_log_warning ("could not open connection: %s\n", error->message); return NULL; } instance = G_OBJECT_CLASS (ds_factory_connection_parent_class)->constructor (type, n_props, props); Modified: trunk/ebdl/ebdl/e-app.c =================================================================== --- trunk/ebdl/ebdl/e-app.c 2008-09-11 17:12:30 UTC (rev 806) +++ trunk/ebdl/ebdl/e-app.c 2008-09-11 17:18:32 UTC (rev 807) @@ -923,9 +923,7 @@ (void *(*)()) e_app_do_threaded_run, app) != 0) { - e_debug (E_DEBUG_LEVEL_CRITICAL, - "Unable to create glib running thread"); - + e_log_warning ("Unable to create glib running thread"); pthread_mutex_unlock (&priv->thread_running_lock); return FALSE; }; @@ -1024,7 +1022,7 @@ pthread_mutex_lock (&priv->run_lock); if (e_app_has_child (app)) { - e_debug (E_DEBUG_LEVEL_CRITICAL,"There is a children app running now!"); + e_log_warning ("There is a children app running now!"); pthread_mutex_unlock (&priv->run_lock); /* return child state which should be TRUE, except if @@ -1037,8 +1035,7 @@ ! e_app_is_parent (app)) { g_assert (priv->forked); - e_debug (E_DEBUG_LEVEL_CRITICAL,"Forked isn't allowed " - "for child app objects"); + e_log_warning ("Forked isn't allowed for child app objects"); pthread_mutex_unlock (&priv->run_lock); return FALSE; } @@ -1110,7 +1107,7 @@ if (s_errno != EAGAIN) { gchar *str_error = strerror (s_errno); - e_debug (E_DEBUG_LEVEL_CRITICAL, "%s", str_error); + e_log_warning ("%s", str_error); } else { /* EAGAIN */ e_debug (E_DEBUG_LEVEL_DEBUG, Modified: trunk/ebdl/ebdl/e-conf.c =================================================================== --- trunk/ebdl/ebdl/e-conf.c 2008-09-11 17:12:30 UTC (rev 806) +++ trunk/ebdl/ebdl/e-conf.c 2008-09-11 17:18:32 UTC (rev 807) @@ -123,9 +123,8 @@ if ((! g_file_test (file, G_FILE_TEST_IS_REGULAR)) && (! access (file, R_OK | W_OK))) { - e_debug (E_DEBUG_LEVEL_CRITICAL,"Insuficient " - "privileges to access %s configuration file.",file); - + e_log_warning ("Insuficient privileges to " + "access %s configuration file.", file); return NULL; } Modified: trunk/ebdl/ebdl/e-data-factory.c =================================================================== --- trunk/ebdl/ebdl/e-data-factory.c 2008-09-11 17:12:30 UTC (rev 806) +++ trunk/ebdl/ebdl/e-data-factory.c 2008-09-11 17:18:32 UTC (rev 807) @@ -184,8 +184,6 @@ _CREATE_INSTANCE (source, SOURCE); _CREATE_INSTANCE (extension, EXTENSION); - e_debug (E_DEBUG_LEVEL_CRITICAL, "Unsupported Data " - "type, '%s'", g_type_name (type)); - + e_log_warning ("Unsupported Data type, '%s'", g_type_name (type)); return NULL; } Modified: trunk/ebdl/ebdl/e-debug.h =================================================================== --- trunk/ebdl/ebdl/e-debug.h 2008-09-11 17:12:30 UTC (rev 806) +++ trunk/ebdl/ebdl/e-debug.h 2008-09-11 17:18:32 UTC (rev 807) @@ -622,7 +622,6 @@ #define E_DEBUG_LEVEL_ERROR E_DEBUG_LOG_LEVEL_ERROR #define E_DEBUG_LEVEL_WARNING E_DEBUG_LOG_LEVEL_WARNING #define E_DEBUG_LEVEL_DEBUG E_DEBUG_LOG_LEVEL_DEBUG -#define E_DEBUG_LEVEL_CRITICAL E_DEBUG_LOG_LEVEL_WARNING #endif @@ -731,14 +730,13 @@ * * Since: 1.0 */ -#define e_log_world_cat_object(cat, object, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_WORLD, object, ##format); -#define e_log_error_cat_object(cat, object, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_ERROR, object, ##format); -#define e_log_critical_cat_object(cat, object, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_CRITICAL, object, ##format); -#define e_log_warning_cat_object(cat, object, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_WARNING, object, ##format); -#define e_log_usage_cat_object(cat, object, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_USAGE, object, ##format); -#define e_log_event_cat_object(cat, object, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_EVENT, object, ##format); -#define e_log_debug_cat_object(cat, object, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_DEBUG, object, ##format); -#define e_log_log_cat_object(cat, object, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_LOG, object, ##format); +#define e_log_world_cat_object(cat, object, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_WORLD, object, ##format); +#define e_log_error_cat_object(cat, object, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_ERROR, object, ##format); +#define e_log_warning_cat_object(cat, object, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_WARNING, object, ##format); +#define e_log_usage_cat_object(cat, object, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_USAGE, object, ##format); +#define e_log_event_cat_object(cat, object, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_EVENT, object, ##format); +#define e_log_debug_cat_object(cat, object, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_DEBUG, object, ##format); +#define e_log_log_cat_object(cat, object, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_LOG, object, ##format); /** * e_log_world_object: @@ -803,14 +801,13 @@ * * Since: 1.0 */ -#define e_log_world_object(object, format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_WORLD, object, ##format); -#define e_log_error_object(object, format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_ERROR, object, ##format); -#define e_log_critical_object(object, format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_CRITICAL, object, ##format); -#define e_log_warning_object(object, format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_WARNING, object, ##format); -#define e_log_usage_object(object, format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_USAGE, object, ##format); -#define e_log_event_object(object, format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_EVENT, object, ##format); -#define e_log_debug_object(object, format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_DEBUG, object, ##format); -#define e_log_log_object(object, format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_LOG, object, ##format); +#define e_log_world_object(object, format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_WORLD, object, ##format); +#define e_log_error_object(object, format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_ERROR, object, ##format); +#define e_log_warning_object(object, format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_WARNING, object, ##format); +#define e_log_usage_object(object, format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_USAGE, object, ##format); +#define e_log_event_object(object, format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_EVENT, object, ##format); +#define e_log_debug_object(object, format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_DEBUG, object, ##format); +#define e_log_log_object(object, format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_LOG, object, ##format); /** * e_log_world_cat: @@ -875,14 +872,13 @@ * * Since: 1.0 */ -#define e_log_world_cat(cat, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_WORLD, NULL, ##format); -#define e_log_error_cat(cat, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_ERROR, NULL, ##format); -#define e_log_critical_cat(cat, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_CRITICAL, NULL, ##format); -#define e_log_warning_cat(cat, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_WARNING, NULL, ##format); -#define e_log_usage_cat(cat, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_USAGE, NULL, ##format); -#define e_log_event_cat(cat, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_EVENT, NULL, ##format); -#define e_log_debug_cat(cat, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_DEBUG, NULL, ##format); -#define e_log_log_cat(cat, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_LOG, NULL, ##format); +#define e_log_world_cat(cat, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_WORLD, NULL, ##format); +#define e_log_error_cat(cat, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_ERROR, NULL, ##format); +#define e_log_warning_cat(cat, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_WARNING, NULL, ##format); +#define e_log_usage_cat(cat, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_USAGE, NULL, ##format); +#define e_log_event_cat(cat, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_EVENT, NULL, ##format); +#define e_log_debug_cat(cat, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_DEBUG, NULL, ##format); +#define e_log_log_cat(cat, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_LOG, NULL, ##format); /** * e_log_world: @@ -940,16 +936,14 @@ * * Since: 1.0 */ -#define e_log_world(format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_WORLD, NULL, ##format); -#define e_log_error(format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_ERROR, NULL, ##format); -#define e_log_critical(format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_CRITICAL, NULL, ##format); -#define e_log_warning(format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_WARNING, NULL, ##format); -#define e_log_usage(format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_USAGE, NULL, ##format); -#define e_log_event(format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_EVENT, NULL, ##format); -#define e_log_debug(format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_DEBUG, NULL, ##format); -#define e_log_log(format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_LOG, NULL, ##format); +#define e_log_world(format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_WORLD, NULL, ##format); +#define e_log_error(format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_ERROR, NULL, ##format); +#define e_log_warning(format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_WARNING, NULL, ##format); +#define e_log_usage(format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_USAGE, NULL, ##format); +#define e_log_event(format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_EVENT, NULL, ##format); +#define e_log_debug(format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_DEBUG, NULL, ##format); +#define e_log_log(format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_LOG, NULL, ##format); - G_END_DECLS #endif /* ! _E_DEBUG_LOG_H_ */ Modified: trunk/ebdl/ebdl/e-elf.c =================================================================== --- trunk/ebdl/ebdl/e-elf.c 2008-09-11 17:12:30 UTC (rev 806) +++ trunk/ebdl/ebdl/e-elf.c 2008-09-11 17:18:32 UTC (rev 807) @@ -683,10 +683,10 @@ /* log error */ if (G_UNLIKELY (error != NULL)) { - e_debug (E_DEBUG_LEVEL_CRITICAL, - "Unable to allocate resources for %p. " - "Error message %s", dispose, error->message); - + e_log_warning ( + "Unable to allocate resources for %p. " + "Error message %s", dispose, error->message); + g_clear_error (&error); return; } @@ -708,9 +708,9 @@ e_elf_close ((EElf *)dispose, &error); /* log error */ if (G_UNLIKELY (error != NULL)) { - e_debug (E_DEBUG_LEVEL_CRITICAL, - "Unable to dispose resources for %p. " - "Error message %s", dispose, error->message); + e_log_warning ( + "Unable to dispose resources for %p. " + "Error message %s", dispose, error->message); g_clear_error (&error); return TRUE; @@ -2658,7 +2658,7 @@ if (tmp_err) { g_propagate_error (error, tmp_err); - g_print (tmp_err->message); + g_print ("%s", tmp_err->message); g_assert_not_reached (); } else { Modified: trunk/ebdl/ebdl/e-part-factory.c =================================================================== --- trunk/ebdl/ebdl/e-part-factory.c 2008-09-11 17:12:30 UTC (rev 806) +++ trunk/ebdl/ebdl/e-part-factory.c 2008-09-11 17:18:32 UTC (rev 807) @@ -165,7 +165,7 @@ _CREATE_INSTANCE (kernel, KERNEL); _CREATE_INSTANCE (extension, EXTENSION); - e_debug (E_DEBUG_LEVEL_CRITICAL, "Unsupported Part " + e_log_warning ("Unsupported Part " "type, '%s'", g_type_name (type)); return NULL; Modified: trunk/ebdl/ebdl/e-pickler-backend-xml.c =================================================================== --- trunk/ebdl/ebdl/e-pickler-backend-xml.c 2008-09-11 17:12:30 UTC (rev 806) +++ trunk/ebdl/ebdl/e-pickler-backend-xml.c 2008-09-11 17:18:32 UTC (rev 807) @@ -249,7 +249,7 @@ /* print error */ if ((cr = strrchr(str, '\n'))) cr[0] = '\0'; - e_debug (E_DEBUG_LEVEL_CRITICAL, str); + e_log_warning ("%s", str); g_free (str); } @@ -265,7 +265,7 @@ /* print error */ if ((cr = strrchr(str, '\n'))) cr[0] = '\0'; - e_debug (E_DEBUG_LEVEL_WARNING, str); + e_log_warning ("%s", str); g_free (str); } Modified: trunk/ebdl/ebdl/e-progress-bar.c =================================================================== --- trunk/ebdl/ebdl/e-progress-bar.c 2008-09-11 17:12:30 UTC (rev 806) +++ trunk/ebdl/ebdl/e-progress-bar.c 2008-09-11 17:18:32 UTC (rev 807) @@ -860,7 +860,7 @@ /* create_image */ e_stream_printf (bar->stream, "\r"); - e_stream_printf (bar->stream, bar->buffer); + e_stream_printf (bar->stream, "%s", bar->buffer); /* dump '\n' if it' seems like the last element */ if (G_UNLIKELY (bar->total == bar->amount)) { Modified: trunk/ebdl/ebdl/e-scanner-shell.c =================================================================== --- trunk/ebdl/ebdl/e-scanner-shell.c 2008-09-11 17:12:30 UTC (rev 806) +++ trunk/ebdl/ebdl/e-scanner-shell.c 2008-09-11 17:18:32 UTC (rev 807) @@ -279,7 +279,7 @@ #define _IMPL_CASE(_X, _x) \ case E_SCANNER_SHELL_INFO_##_X: \ - g_snprintf (buffer, len, priv->shell->_x); \ + g_snprintf (buffer, len, "%s", priv->shell->_x); \ return buffer; \ break; \ /** @@ -313,7 +313,7 @@ case E_SCANNER_SHELL_INFO_COMMAND_LINE: if ((s = g_find_program_in_path (priv->shell->executable))) { - g_snprintf (buffer, len, s); + g_snprintf (buffer, len, "%s", s); g_free (s); } return buffer; Modified: trunk/ebdl/ebdl/e-source.h =================================================================== --- trunk/ebdl/ebdl/e-source.h 2008-09-11 17:12:30 UTC (rev 806) +++ trunk/ebdl/ebdl/e-source.h 2008-09-11 17:18:32 UTC (rev 807) @@ -123,13 +123,13 @@ #define E_SOURCE_ERROR e_source_error_quark () -#define E_SOURCE_ADD_DEFAULTS(_s, _t, _e) G_STMT_START { \ - gchar **_u = NULL; \ - e_source_get_uriv (_s, _t##_DEFAULT, &_u, _e); \ - if (_u && _u[0] != NULL && ((!_e) || (! (*(GError **)_e)))) { \ - e_source_set_uriv (_s, _t, (const gchar **)_u, _e); \ - } \ - g_strfreev (_u); \ +#define E_SOURCE_ADD_DEFAULTS(_s, _t, _e) G_STMT_START { \ + gchar **_u = NULL; \ + e_source_get_uriv (_s, _t##_DEFAULT, &_u, _e); \ + if (_u && _u[0] != NULL && ((_e == NULL) || (! (*(GError **)_e)))) { \ + e_source_set_uriv (_s, _t, (const gchar **)_u, _e); \ + } \ + g_strfreev (_u); \ }G_STMT_END G_END_DECLS Modified: trunk/ebdl/ebdl/e-stream-terminal.c =================================================================== --- trunk/ebdl/ebdl/e-stream-terminal.c 2008-09-11 17:12:30 UTC (rev 806) +++ trunk/ebdl/ebdl/e-stream-terminal.c 2008-09-11 17:18:32 UTC (rev 807) @@ -74,7 +74,7 @@ #if 1/* CONFIG_FEATURE_AUTOWIDTH */ if (ioctl(((EStreamFs *)terminal)->fd, TIOCGWINSZ, &win) != 0) { - g_print (strerror (errno)); + g_print ("%s", strerror (errno)); win.ws_row = 24; win.ws_col = 80; } Modified: trunk/ebdl/ebdl/e-table-view-console.c =================================================================== --- trunk/ebdl/ebdl/e-table-view-console.c 2008-09-11 17:12:30 UTC (rev 806) +++ trunk/ebdl/ebdl/e-table-view-console.c 2008-09-11 17:18:32 UTC (rev 807) @@ -102,8 +102,9 @@ static gchar e_stream_keypress() { + gint ret; + gchar _foo = '\0'; struct termio savetty, settty; - gchar _foo = '\0'; ioctl(STDIN_FILENO, TCGETA, &savetty); ioctl(STDIN_FILENO, TCGETA, &settty); @@ -112,7 +113,7 @@ ioctl(STDIN_FILENO, TCSETAF, &settty); /* reak key; */ - read (STDIN_FILENO, &_foo, 1); + ret = read (STDIN_FILENO, &_foo, 1); ioctl(STDIN_FILENO, TCSETAF, &savetty); return _foo; } Modified: trunk/ebdl/ebdl/e-url.c =================================================================== --- trunk/ebdl/ebdl/e-url.c 2008-09-11 17:12:30 UTC (rev 806) +++ trunk/ebdl/ebdl/e-url.c 2008-09-11 17:18:32 UTC (rev 807) @@ -37,6 +37,8 @@ #include <stdlib.h> #include <errno.h> #include <string.h> +#include <limits.h> +#include <stdlib.h> /* native headers */ #include <netdb.h> @@ -367,7 +369,7 @@ last = strrchr (base->path, '/'); if (last) { newpath = g_strdup_printf ("%.*s/%s", - last - base->path, + (gint)(last - base->path), base->path, url->path); } else Modified: trunk/ebdl/ebdl/ed-app.c =================================================================== --- trunk/ebdl/ebdl/ed-app.c 2008-09-11 17:12:30 UTC (rev 806) +++ trunk/ebdl/ebdl/ed-app.c 2008-09-11 17:18:32 UTC (rev 807) @@ -634,7 +634,7 @@ return TRUE; if (G_UNLIKELY (! priv->kernel)) { - e_debug (E_DEBUG_LEVEL_CRITICAL, "Unable to create a valid handler for active kernel."); + e_log_warning ("Unable to create a valid handler for active kernel."); return FALSE; } @@ -647,7 +647,7 @@ E_PART_SET_MODE_REFERENCE, &error); if (e_monitor_start ((EMonitor *) priv->kernel, &error) < 0) { - e_debug (E_DEBUG_LEVEL_CRITICAL, "Unable to open monitor for " + e_log_warning ("Unable to open monitor for " "active kernel. '%s'.", error->message); g_object_unref (priv->kernel); @@ -661,7 +661,7 @@ return TRUE; } - e_debug (E_DEBUG_LEVEL_CRITICAL, "Unable to create a valid handler for active kernel."); + e_log_warning ("Unable to create a valid handler for active kernel."); return FALSE; } @@ -713,7 +713,7 @@ if (priv->connection == NULL) { if (! (priv->connection = dbus_g_bus_get (type, error))) { if (error != NULL) { - e_debug (E_DEBUG_LEVEL_CRITICAL, "Error '%d'. Could not get " + e_log_warning ("Error '%d'. Could not get " "the system bus.'%s'", (*error)->code, (*error)->message); } return E_ERROR; @@ -729,11 +729,11 @@ g_object_unref (bus_proxy); if (adquisition == DBUS_REQUEST_NAME_REPLY_EXISTS) { - e_debug (E_DEBUG_LEVEL_CRITICAL, "A previous instance is running"); + e_log_warning ("A previous instance is running"); return E_ERROR; } if (! ret || *error) { - e_debug (E_DEBUG_LEVEL_CRITICAL, "Error %d. Could not acquire service. '%s'", (*error)->code, (*error)->message); + e_log_warning ("Error %d. Could not acquire service. '%s'", (*error)->code, (*error)->message); return E_ERROR; } Modified: trunk/ebdl/ebdl/lk-data-kernel.c =================================================================== --- trunk/ebdl/ebdl/lk-data-kernel.c 2008-09-11 17:12:30 UTC (rev 806) +++ trunk/ebdl/ebdl/lk-data-kernel.c 2008-09-11 17:18:32 UTC (rev 807) @@ -170,7 +170,7 @@ } else { memset (&u, '\0', sizeof (struct utsname)); - g_snprintf (version, sizeof (version), u.version); + g_snprintf (version, sizeof (version), "%s", u.version); } return_value = g_new0 (GValue, 1); Modified: trunk/ebdl/ebdl/lk-kernel.c =================================================================== --- trunk/ebdl/ebdl/lk-kernel.c 2008-09-11 17:12:30 UTC (rev 806) +++ trunk/ebdl/ebdl/lk-kernel.c 2008-09-11 17:18:32 UTC (rev 807) @@ -91,7 +91,7 @@ version = e_data_client_peek_string (data, E_DATA_KERNEL_VERSION, NULL); g_assert (version); - g_snprintf (buffer, sizeof (buffer), version); + g_snprintf (buffer, sizeof (buffer), "%s", version); g_object_unref (data); return (strcmp (buffer, u.release) == 0); Modified: trunk/ebdl/ebdl/lk-module.c =================================================================== --- trunk/ebdl/ebdl/lk-module.c 2008-09-11 17:12:30 UTC (rev 806) +++ trunk/ebdl/ebdl/lk-module.c 2008-09-11 17:18:32 UTC (rev 807) @@ -193,7 +193,7 @@ url_string = e_handler_peek_url_string ((EHandler *)module); if (G_LIKELY (url_string)) { modname = strrchr (url_string, G_DIR_SEPARATOR); - modname = g_strdup_printf (modname ? modname + 1 : url_string); + modname = g_strdup_printf ("%s", modname ? modname + 1 : url_string); g_strdelimit (modname, ".;", '\0'); normalize (modname); } Modified: trunk/ebdl/ebdl/lk-table-view26.c =================================================================== --- trunk/ebdl/ebdl/lk-table-view26.c 2008-09-11 17:12:30 UTC (rev 806) +++ trunk/ebdl/ebdl/lk-table-view26.c 2008-09-11 17:18:32 UTC (rev 807) @@ -257,8 +257,8 @@ G_DEFINE_TYPE_WITH_CODE (LkTableUSBStream, lk_table_usb_stream, E_TYPE_TABLE_VIEW_STREAM, G_IMPLEMENT_INTERFACE (E_TYPE_TABLE_VIEW , NULL)); -#if ELF_EI_CLASS == ELFCLASS64 -# define INPUT_FORMAT_STRING "0x%llx" +#if ELF_EI_CLASS == 2 +# define INPUT_FORMAT_STRING "0x%lux" # define INPUT_FORMAT_ARRAY "%lx" #else # define INPUT_FORMAT_STRING "0x%x" Modified: trunk/ebdl/ebdl/lkfss-source-extension.c =================================================================== --- trunk/ebdl/ebdl/lkfss-source-extension.c 2008-09-11 17:12:30 UTC (rev 806) +++ trunk/ebdl/ebdl/lkfss-source-extension.c 2008-09-11 17:18:32 UTC (rev 807) @@ -146,7 +146,7 @@ /* check if well formed */ if (strstr (uri, "://")) { - g_snprintf (buffer, len, uri); + g_snprintf (buffer, len, "%s", uri); return; } /* return well formed path */ @@ -367,7 +367,7 @@ g_assert (regex); /* get dirname path */ - g_snprintf (candidate, PATH_MAX, paths[i]); + g_snprintf (candidate, PATH_MAX, "%s", paths[i]); len = strcspn (candidate, "{*!?+[("); if (len < strlen (candidate)) { Modified: trunk/ebdl/ebdl-plugin/e-plugins-manager.c =================================================================== --- trunk/ebdl/ebdl-plugin/e-plugins-manager.c 2008-09-11 17:12:30 UTC (rev 806) +++ trunk/ebdl/ebdl-plugin/e-plugins-manager.c 2008-09-11 17:18:32 UTC (rev 807) @@ -569,7 +569,7 @@ e_plugins_manager_constructor (GType type, guint n_props, GObjectConstructParam *props) { - gint i, fd; + gint i, fd, ret; gchar buffer[1024]; gchar **dirs = NULL; EPluginsManagerPrivate *priv; @@ -607,7 +607,7 @@ priv->session_id = g_strdup_printf (EBDL_SESSION_CONF_FILE, g_get_user_config_dir ()); if (G_UNLIKELY (! g_file_test (priv->session_id, G_FILE_TEST_IS_REGULAR))) { if ((fd = creat (priv->session_id, S_IRUSR | S_IWUSR))) { - write (fd, TEMPLATE_FILE, strlen (TEMPLATE_FILE)); + ret = write (fd, TEMPLATE_FILE, strlen (TEMPLATE_FILE)); close (fd); } } Modified: trunk/ebdl/packing/rpm/fedora/ebdl.spec.in.in =================================================================== --- trunk/ebdl/packing/rpm/fedora/ebdl.spec.in.in 2008-09-11 17:12:30 UTC (rev 806) +++ trunk/ebdl/packing/rpm/fedora/ebdl.spec.in.in 2008-09-11 17:18:32 UTC (rev 807) @@ -16,7 +16,7 @@ Version: %{ver} License: LGPL URL: http://gmodulo.sourceforge.net/ebdl/ -Release: 1%{?dist} +Release: 2%{?dist} Source: %{nam}-%{ver}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{ver}-root Docdir: %{_prefix}/share/doc Modified: trunk/ebdl/tests/Linux/modutils/e-modinfo.c =================================================================== --- trunk/ebdl/tests/Linux/modutils/e-modinfo.c 2008-09-11 17:12:30 UTC (rev 806) +++ trunk/ebdl/tests/Linux/modutils/e-modinfo.c 2008-09-11 17:18:32 UTC (rev 807) @@ -204,7 +204,7 @@ } /* add module paths */ - E_SOURCE_ADD_DEFAULTS (source, E_SOURCE_URI_TYPE_LOCATION, &error); + g_assert (error == NULL); /* add configuration files */ Modified: trunk/ebdl/tests/Linux/modutils/e-modprobe.c =================================================================== --- trunk/ebdl/tests/Linux/modutils/e-modprobe.c 2008-09-11 17:12:30 UTC (rev 806) +++ trunk/ebdl/tests/Linux/modutils/e-modprobe.c 2008-09-11 17:18:32 UTC (rev 807) @@ -29,8 +29,11 @@ static void add_to_env_var (const char *option) { - char *env = getenv("MODPROBE_OPTIONS"); - asprintf(&env, "%s %s", env != NULL ? env : "", option); + gint ret; + char *env; + + env = getenv("MODPROBE_OPTIONS"); + ret = asprintf(&env, "%s %s", env != NULL ? env : "", option); setenv("MODPROBE_OPTIONS", env, 1); } Modified: trunk/ebdl/tests/tc-kernel.c =================================================================== --- trunk/ebdl/tests/tc-kernel.c 2008-09-11 17:12:30 UTC (rev 806) +++ trunk/ebdl/tests/tc-kernel.c 2008-09-11 17:18:32 UTC (rev 807) @@ -52,7 +52,7 @@ g_strdelimit (path, "\n", '\0'); - uri = e_uri_new_printf (path); + uri = e_uri_new_printf ("%s", path); g_free (path); kernel = e_part_factory_create_kernel (factory, (EHandler *)uri, NULL); Modified: trunk/ebdl/tests/ts-ebdl.c =================================================================== --- trunk/ebdl/tests/ts-ebdl.c 2008-09-11 17:12:30 UTC (rev 806) +++ trunk/ebdl/tests/ts-ebdl.c 2008-09-11 17:18:32 UTC (rev 807) @@ -79,7 +79,7 @@ /* parse */ if (G_UNLIKELY (! g_option_context_parse (context, argc, argv, &error))) { - g_printerr (error->message); + g_printerr ("%s", error->message); g_error_free (error); return FALSE; } Modified: trunk/ebdl/tests/ts-plugin.c =================================================================== --- trunk/ebdl/tests/ts-plugin.c 2008-09-11 17:12:30 UTC (rev 806) +++ trunk/ebdl/tests/ts-plugin.c 2008-09-11 17:18:32 UTC (rev 807) @@ -97,7 +97,7 @@ /* parse */ if (G_UNLIKELY (! g_option_context_parse (context, argc, argv, &error))) { - g_printerr (error->message); + g_printerr ("%s", error->message); g_error_free (error); return FALSE; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <in...@us...> - 2008-09-11 17:12:40
|
Revision: 806 http://ebdl.svn.sourceforge.net/ebdl/?rev=806&view=rev Author: inean Date: 2008-09-11 17:12:30 +0000 (Thu, 11 Sep 2008) Log Message: ----------- s/<e-*/<ebdl/e-*/ Modified Paths: -------------- trunk/ebdl/acinclude.m4 trunk/ebdl/configure.ac trunk/ebdl/ebdl/e-action.h trunk/ebdl/ebdl/e-app.h trunk/ebdl/ebdl/e-data-client.h trunk/ebdl/ebdl/e-data-extension.h trunk/ebdl/ebdl/e-data-factory-backend.h trunk/ebdl/ebdl/e-data-factory.h trunk/ebdl/ebdl/e-data-host.h trunk/ebdl/ebdl/e-data-kernel.h trunk/ebdl/ebdl/e-data-module.h trunk/ebdl/ebdl/e-data-source.h trunk/ebdl/ebdl/e-data.h trunk/ebdl/ebdl/e-elf-section.h trunk/ebdl/ebdl/e-elf-symbol.h trunk/ebdl/ebdl/e-elf.h trunk/ebdl/ebdl/e-factory.h trunk/ebdl/ebdl/e-file-handler.h trunk/ebdl/ebdl/e-file-parser.h trunk/ebdl/ebdl/e-file.h trunk/ebdl/ebdl/e-finder.h trunk/ebdl/ebdl/e-function.h trunk/ebdl/ebdl/e-handler.h trunk/ebdl/ebdl/e-iterable.h trunk/ebdl/ebdl/e-kernel.h trunk/ebdl/ebdl/e-monitor-factory.h trunk/ebdl/ebdl/e-part-factory-backend.h trunk/ebdl/ebdl/e-part-factory.h trunk/ebdl/ebdl/e-part-set.h trunk/ebdl/ebdl/e-part.h trunk/ebdl/ebdl/e-progress-bar.h trunk/ebdl/ebdl/e-regex-pcre.h trunk/ebdl/ebdl/e-registry.h trunk/ebdl/ebdl/e-rule-and.h trunk/ebdl/ebdl/e-rule-leaf.h trunk/ebdl/ebdl/e-rule-not.h trunk/ebdl/ebdl/e-rule-or.h trunk/ebdl/ebdl/e-rule-part.h trunk/ebdl/ebdl/e-rule-set.h trunk/ebdl/ebdl/e-rule-simple.h trunk/ebdl/ebdl/e-rule.h trunk/ebdl/ebdl/e-scanner-shell.h trunk/ebdl/ebdl/e-scanner.h trunk/ebdl/ebdl/e-section.h trunk/ebdl/ebdl/e-set.h trunk/ebdl/ebdl/e-source-extension.h trunk/ebdl/ebdl/e-source-factory-backend.h trunk/ebdl/ebdl/e-source-factory.h trunk/ebdl/ebdl/e-source-host.h trunk/ebdl/ebdl/e-source-kernel.h trunk/ebdl/ebdl/e-source.h trunk/ebdl/ebdl/e-stream-decorator-gzip.h trunk/ebdl/ebdl/e-stream-decorator.h trunk/ebdl/ebdl/e-stream-factory.h trunk/ebdl/ebdl/e-stream-fs.h trunk/ebdl/ebdl/e-stream-mem.h trunk/ebdl/ebdl/e-stream-terminal.h trunk/ebdl/ebdl/e-symbol.h trunk/ebdl/ebdl/e-table-factory-backend.h trunk/ebdl/ebdl/e-table-factory.h trunk/ebdl/ebdl/e-table-view.h trunk/ebdl/ebdl/e-table.h trunk/ebdl/ebdl/e-uri.h trunk/ebdl/ebdl/e-worker-factory-backend.h trunk/ebdl/ebdl/e-worker-factory.h trunk/ebdl/packing/deb/debian/changelog Modified: trunk/ebdl/acinclude.m4 =================================================================== --- trunk/ebdl/acinclude.m4 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/acinclude.m4 2008-09-11 17:12:30 UTC (rev 806) @@ -28,7 +28,7 @@ full_var="$FROM_VAR" dnl loop until it doesn't change anymore while true; do - new_full_var="`eval echo $full_var`" + new_full_var="`eval eval echo $full_var`" if test "x$new_full_var"="x$full_var"; then break; fi full_var=$new_full_var done @@ -51,9 +51,9 @@ ]) dnl AS_PROG_INTLTOOL -AC_DEFUN([AS_PROG_INTLTOOL],[ +AC_DEFUN([AS_PROG_CHECK_INTLTOOL_VERSION],[ AC_REQUIRE([AM_GLIB_GNU_GETTEXT]) - IT_PROG_INTLTOOL([$1]) + AC_REQUIRE([IT_PROG_INTLTOOL]) INTLTOOL_VERSION=`$INTLTOOL_MERGE --version | sed -n '/^intltool/p' | awk '{print $[]3}'` INTLTOOL_VERSION=`echo $INTLTOOL_VERSION | awk -F. '{print $[]1*10000 + $[]2*1000 + $[]3}'` Modified: trunk/ebdl/configure.ac =================================================================== --- trunk/ebdl/configure.ac 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/configure.ac 2008-09-11 17:12:30 UTC (rev 806) @@ -93,7 +93,8 @@ AS_DEFINE_GETTEXT([AC_PACKAGE_NAME]) AM_GLIB_GNU_GETTEXT -AS_PROG_INTLTOOL([0.35.0]) +IT_PROG_INTLTOOL([0.35.0]) +AS_PROG_CHECK_INTLTOOL_VERSION dnl ================= Check headers and libs ====================================== Modified: trunk/ebdl/ebdl/e-action.h =================================================================== --- trunk/ebdl/ebdl/e-action.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-action.h 2008-09-11 17:12:30 UTC (rev 806) @@ -46,7 +46,7 @@ GCallback callback; }; -#include <e-worker.h> +#include <ebdl/e-worker.h> struct _EActionIface { GTypeInterface base_iface; Modified: trunk/ebdl/ebdl/e-app.h =================================================================== --- trunk/ebdl/ebdl/e-app.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-app.h 2008-09-11 17:12:30 UTC (rev 806) @@ -96,7 +96,7 @@ }; -#include <e-conf.h> +#include <ebdl/e-conf.h> #include <sys/types.h> /* FIXME: Add Exceptions to public and Protected ? API */ Modified: trunk/ebdl/ebdl/e-data-client.h =================================================================== --- trunk/ebdl/ebdl/e-data-client.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-data-client.h 2008-09-11 17:12:30 UTC (rev 806) @@ -25,7 +25,7 @@ #ifndef __E_DATA_CLIENT_H__ #define __E_DATA_CLIENT_H__ -#include <e-data.h> +#include <ebdl/e-data.h> G_BEGIN_DECLS Modified: trunk/ebdl/ebdl/e-data-extension.h =================================================================== --- trunk/ebdl/ebdl/e-data-extension.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-data-extension.h 2008-09-11 17:12:30 UTC (rev 806) @@ -25,7 +25,7 @@ #ifndef __E_DATA_EXTENSION_H__ #define __E_DATA_EXTENSION_H__ -#include <e-data.h> +#include <ebdl/e-data.h> G_BEGIN_DECLS Modified: trunk/ebdl/ebdl/e-data-factory-backend.h =================================================================== --- trunk/ebdl/ebdl/e-data-factory-backend.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-data-factory-backend.h 2008-09-11 17:12:30 UTC (rev 806) @@ -37,8 +37,8 @@ typedef struct _EDataFactoryBackend EDataFactoryBackend; /* dummy */ typedef struct _EDataFactoryBackendIface EDataFactoryBackendIface; -#include <e-data.h> -#include <e-handler.h> +#include <ebdl/e-data.h> +#include <ebdl/e-handler.h> struct _EDataFactoryBackendIface { GTypeInterface parent_iface; Modified: trunk/ebdl/ebdl/e-data-factory.h =================================================================== --- trunk/ebdl/ebdl/e-data-factory.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-data-factory.h 2008-09-11 17:12:30 UTC (rev 806) @@ -25,7 +25,7 @@ #ifndef __E_DATA_FACTORY_H__ #define __E_DATA_FACTORY_H__ -#include <e-factory.h> +#include <ebdl/e-factory.h> G_BEGIN_DECLS @@ -50,7 +50,7 @@ GType e_data_factory_get_type (void); -#include <e-data.h> +#include <ebdl/e-data.h> EData * e_data_factory_create (EDataFactory *factory, Modified: trunk/ebdl/ebdl/e-data-host.h =================================================================== --- trunk/ebdl/ebdl/e-data-host.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-data-host.h 2008-09-11 17:12:30 UTC (rev 806) @@ -25,7 +25,7 @@ #ifndef __E_DATA_HOST_H__ #define __E_DATA_HOST_H__ -#include <e-data.h> +#include <ebdl/e-data.h> G_BEGIN_DECLS Modified: trunk/ebdl/ebdl/e-data-kernel.h =================================================================== --- trunk/ebdl/ebdl/e-data-kernel.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-data-kernel.h 2008-09-11 17:12:30 UTC (rev 806) @@ -25,7 +25,7 @@ #ifndef __E_DATA_KERNEL_H__ #define __E_DATA_KERNEL_H__ -#include <e-data.h> +#include <ebdl/e-data.h> G_BEGIN_DECLS Modified: trunk/ebdl/ebdl/e-data-module.h =================================================================== --- trunk/ebdl/ebdl/e-data-module.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-data-module.h 2008-09-11 17:12:30 UTC (rev 806) @@ -25,7 +25,7 @@ #ifndef __E_DATA_MODULE_H__ #define __E_DATA_MODULE_H__ -#include <e-data.h> +#include <ebdl/e-data.h> G_BEGIN_DECLS Modified: trunk/ebdl/ebdl/e-data-source.h =================================================================== --- trunk/ebdl/ebdl/e-data-source.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-data-source.h 2008-09-11 17:12:30 UTC (rev 806) @@ -25,7 +25,7 @@ #ifndef __E_DATA_SOURCE_H__ #define __E_DATA_SOURCE_H__ -#include <e-data.h> +#include <ebdl/e-data.h> G_BEGIN_DECLS Modified: trunk/ebdl/ebdl/e-data.h =================================================================== --- trunk/ebdl/ebdl/e-data.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-data.h 2008-09-11 17:12:30 UTC (rev 806) @@ -46,7 +46,7 @@ const GArray *closure; }; -#include <e-part.h> +#include <ebdl/e-part.h> struct _EDataIface { GTypeInterface base_iface; Modified: trunk/ebdl/ebdl/e-elf-section.h =================================================================== --- trunk/ebdl/ebdl/e-elf-section.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-elf-section.h 2008-09-11 17:12:30 UTC (rev 806) @@ -25,7 +25,7 @@ #ifndef __E_ELF_SECTION_H__ #define __E_ELF_SECTION_H__ -#include <e-section.h> +#include <ebdl/e-section.h> G_BEGIN_DECLS @@ -91,7 +91,7 @@ GError **error); -#include <e-elf.h> +#include <ebdl/e-elf.h> EElf *e_elf_section_get_owner (EElfSection *section, GError **error); Modified: trunk/ebdl/ebdl/e-elf-symbol.h =================================================================== --- trunk/ebdl/ebdl/e-elf-symbol.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-elf-symbol.h 2008-09-11 17:12:30 UTC (rev 806) @@ -25,7 +25,7 @@ #ifndef __E_ELF_SYMBOL_H__ #define __E_ELF_SYMBOL_H__ -#include <e-symbol.h> +#include <ebdl/e-symbol.h> G_BEGIN_DECLS @@ -68,7 +68,7 @@ ESymbolFlags e_elf_symbol_get_flags (EElfSymbol *symbol); -#include <e-elf.h> +#include <ebdl/e-elf.h> EElf *e_elf_symbol_get_owner (EElfSymbol *symbol, GError **error); Modified: trunk/ebdl/ebdl/e-elf.h =================================================================== --- trunk/ebdl/ebdl/e-elf.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-elf.h 2008-09-11 17:12:30 UTC (rev 806) @@ -3,7 +3,7 @@ #ifndef __E_ELF_H__ #define __E_ELF_H__ -#include <e-uri.h> +#include <ebdl/e-uri.h> G_BEGIN_DECLS @@ -182,7 +182,7 @@ guchar digest[16], GError **error); -#include <e-elf-section.h> +#include <ebdl/e-elf-section.h> EElfSection *e_elf_get_section (EElf *elf, ElfPERBIT(Addr) address, @@ -217,7 +217,7 @@ gboolean ereaseall, GError **error); -#include <e-elf-symbol.h> +#include <ebdl/e-elf-symbol.h> EElfSymbol *e_elf_get_symbol (EElf *elf, ElfPERBIT(Addr) address, Modified: trunk/ebdl/ebdl/e-factory.h =================================================================== --- trunk/ebdl/ebdl/e-factory.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-factory.h 2008-09-11 17:12:30 UTC (rev 806) @@ -39,7 +39,7 @@ typedef struct _EFactory EFactory; typedef struct _EFactoryClass EFactoryClass; -#include <e-factory-backend.h> +#include <ebdl/e-factory-backend.h> struct _EFactory { GObject parent; @@ -68,7 +68,7 @@ void e_factory_register_backend (EFactory *factory, EFactoryBackend *backend_factory); -#include <e-handler.h> +#include <ebdl/e-handler.h> GHashTable *e_factory_peek_backends (EFactory *factory); EHandler *e_factory_peek_handler (EFactory *factory); Modified: trunk/ebdl/ebdl/e-file-handler.h =================================================================== --- trunk/ebdl/ebdl/e-file-handler.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-file-handler.h 2008-09-11 17:12:30 UTC (rev 806) @@ -25,7 +25,7 @@ #ifndef __E_FILE_HANDLER_H__ #define __E_FILE_HANDLER_H__ -#include <e-uri.h> +#include <ebdl/e-uri.h> G_BEGIN_DECLS @@ -53,7 +53,7 @@ E_FILE_HANDLER_CLOSED = 1 << 1, } EFileHandlerState; -#include <e-stream.h> +#include <ebdl/e-stream.h> struct _EFileHandlerClass { EUriClass parent_class; Modified: trunk/ebdl/ebdl/e-file-parser.h =================================================================== --- trunk/ebdl/ebdl/e-file-parser.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-file-parser.h 2008-09-11 17:12:30 UTC (rev 806) @@ -25,7 +25,7 @@ #ifndef __E_FILE_PARSER_H__ #define __E_FILE_PARSER_H__ -#include <e-file-handler.h> +#include <ebdl/e-file-handler.h> G_BEGIN_DECLS Modified: trunk/ebdl/ebdl/e-file.h =================================================================== --- trunk/ebdl/ebdl/e-file.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-file.h 2008-09-11 17:12:30 UTC (rev 806) @@ -47,9 +47,9 @@ #include <sys/stat.h> -#include <e-header.h> -#include <e-stream.h> -#include <e-monitor.h> +#include <ebdl/e-header.h> +#include <ebdl/e-stream.h> +#include <ebdl/e-monitor.h> struct _EFileIface { GTypeInterface base_iface; Modified: trunk/ebdl/ebdl/e-finder.h =================================================================== --- trunk/ebdl/ebdl/e-finder.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-finder.h 2008-09-11 17:12:30 UTC (rev 806) @@ -46,7 +46,7 @@ typedef struct _EFinder EFinder; /* dummy */ typedef struct _EFinderIface EFinderIface; -#include <e-rule.h> +#include <ebdl/e-rule.h> struct _EFinderIface { GTypeInterface base_iface; Modified: trunk/ebdl/ebdl/e-function.h =================================================================== --- trunk/ebdl/ebdl/e-function.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-function.h 2008-09-11 17:12:30 UTC (rev 806) @@ -55,8 +55,8 @@ }; -#include <e-argument.h> -#include <e-iterator.h> +#include <ebdl/e-argument.h> +#include <ebdl/e-iterator.h> GType e_function_get_type (void); GQuark e_function_error_quark (void); Modified: trunk/ebdl/ebdl/e-handler.h =================================================================== --- trunk/ebdl/ebdl/e-handler.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-handler.h 2008-09-11 17:12:30 UTC (rev 806) @@ -25,7 +25,7 @@ #ifndef __E_HANDLER_H__ #define __E_HANDLER_H__ -#include <e-url.h> +#include <ebdl/e-url.h> G_BEGIN_DECLS Modified: trunk/ebdl/ebdl/e-iterable.h =================================================================== --- trunk/ebdl/ebdl/e-iterable.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-iterable.h 2008-09-11 17:12:30 UTC (rev 806) @@ -37,7 +37,7 @@ typedef struct _EIterable EIterable; /* dummy */ typedef struct _EIterableIface EIterableIface; -#include <e-iterator.h> +#include <ebdl/e-iterator.h> struct _EIterableIface { GTypeInterface base_iface; Modified: trunk/ebdl/ebdl/e-kernel.h =================================================================== --- trunk/ebdl/ebdl/e-kernel.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-kernel.h 2008-09-11 17:12:30 UTC (rev 806) @@ -46,7 +46,7 @@ typedef struct _EKernel EKernel; /* dummy */ typedef struct _EKernelIface EKernelIface; -#include <e-extension.h> +#include <ebdl/e-extension.h> struct _EKernelIface { GTypeInterface base_iface; Modified: trunk/ebdl/ebdl/e-monitor-factory.h =================================================================== --- trunk/ebdl/ebdl/e-monitor-factory.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-monitor-factory.h 2008-09-11 17:12:30 UTC (rev 806) @@ -55,8 +55,8 @@ GQuark e_monitor_factory_error_quark (void); -#include <e-monitor.h> -#include <e-handler.h> +#include <ebdl/e-monitor.h> +#include <ebdl/e-handler.h> EMonitor *e_monitor_factory_create_monitor (EMonitorFactory *factory, EHandler *handler, Modified: trunk/ebdl/ebdl/e-part-factory-backend.h =================================================================== --- trunk/ebdl/ebdl/e-part-factory-backend.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-part-factory-backend.h 2008-09-11 17:12:30 UTC (rev 806) @@ -37,8 +37,8 @@ typedef struct _EPartFactoryBackend EPartFactoryBackend; /* dummy */ typedef struct _EPartFactoryBackendIface EPartFactoryBackendIface; -#include <e-part.h> -#include <e-handler.h> +#include <ebdl/e-part.h> +#include <ebdl/e-handler.h> struct _EPartFactoryBackendIface { GTypeInterface parent_iface; Modified: trunk/ebdl/ebdl/e-part-factory.h =================================================================== --- trunk/ebdl/ebdl/e-part-factory.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-part-factory.h 2008-09-11 17:12:30 UTC (rev 806) @@ -25,7 +25,7 @@ #ifndef __E_PART_FACTORY_H__ #define __E_PART_FACTORY_H__ -#include <e-factory.h> +#include <ebdl/e-factory.h> G_BEGIN_DECLS @@ -50,7 +50,7 @@ GType e_part_factory_get_type (void); -#include <e-part.h> +#include <ebdl/e-part.h> EPart *e_part_factory_create (EPartFactory *factory, Modified: trunk/ebdl/ebdl/e-part-set.h =================================================================== --- trunk/ebdl/ebdl/e-part-set.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-part-set.h 2008-09-11 17:12:30 UTC (rev 806) @@ -53,7 +53,7 @@ typedef struct _EPartSet EPartSet; /* dummy */ typedef struct _EPartSetIface EPartSetIface; -#include <e-part.h> +#include <ebdl/e-part.h> struct _EPartSetIface { GTypeInterface parent_iface; Modified: trunk/ebdl/ebdl/e-part.h =================================================================== --- trunk/ebdl/ebdl/e-part.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-part.h 2008-09-11 17:12:30 UTC (rev 806) @@ -37,7 +37,7 @@ typedef struct _EPart EPart; /* dummy */ typedef struct _EPartIface EPartIface; -#include <e-data.h> +#include <ebdl/e-data.h> struct _EPartIface { GTypeInterface base_iface; Modified: trunk/ebdl/ebdl/e-progress-bar.h =================================================================== --- trunk/ebdl/ebdl/e-progress-bar.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-progress-bar.h 2008-09-11 17:12:30 UTC (rev 806) @@ -63,7 +63,7 @@ typedef struct _EProgressBar EProgressBar; typedef struct _EProgressBarClass EProgressBarClass; -#include <e-stream.h> +#include <ebdl/e-stream.h> struct _EProgressBar { GObject parent; Modified: trunk/ebdl/ebdl/e-regex-pcre.h =================================================================== --- trunk/ebdl/ebdl/e-regex-pcre.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-regex-pcre.h 2008-09-11 17:12:30 UTC (rev 806) @@ -43,7 +43,7 @@ #ifndef __E_REGEX_PCRE_H__ #define __E_REGEX_PCRE_H__ -#include <e-regex.h> +#include <ebdl/e-regex.h> G_BEGIN_DECLS Modified: trunk/ebdl/ebdl/e-registry.h =================================================================== --- trunk/ebdl/ebdl/e-registry.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-registry.h 2008-09-11 17:12:30 UTC (rev 806) @@ -65,7 +65,7 @@ ERNode *node); }; -#include <e-iterator.h> +#include <ebdl/e-iterator.h> GType e_registry_get_type (void); Modified: trunk/ebdl/ebdl/e-rule-and.h =================================================================== --- trunk/ebdl/ebdl/e-rule-and.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-rule-and.h 2008-09-11 17:12:30 UTC (rev 806) @@ -25,7 +25,7 @@ #ifndef __E_RULE_AND_H__ #define __E_RULE_AND_H__ -#include <e-rule-set.h> +#include <ebdl/e-rule-set.h> G_BEGIN_DECLS Modified: trunk/ebdl/ebdl/e-rule-leaf.h =================================================================== --- trunk/ebdl/ebdl/e-rule-leaf.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-rule-leaf.h 2008-09-11 17:12:30 UTC (rev 806) @@ -25,7 +25,7 @@ #ifndef __E_RULE_LEAF_H__ #define __E_RULE_LEAF_H__ -#include <e-rule.h> +#include <ebdl/e-rule.h> G_BEGIN_DECLS Modified: trunk/ebdl/ebdl/e-rule-not.h =================================================================== --- trunk/ebdl/ebdl/e-rule-not.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-rule-not.h 2008-09-11 17:12:30 UTC (rev 806) @@ -25,7 +25,7 @@ #ifndef __E_RULE_NOT_H__ #define __E_RULE_NOT_H__ -#include <e-rule-set.h> +#include <ebdl/e-rule-set.h> G_BEGIN_DECLS Modified: trunk/ebdl/ebdl/e-rule-or.h =================================================================== --- trunk/ebdl/ebdl/e-rule-or.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-rule-or.h 2008-09-11 17:12:30 UTC (rev 806) @@ -25,7 +25,7 @@ #ifndef __E_RULE_OR_H__ #define __E_RULE_OR_H__ -#include <e-rule-set.h> +#include <ebdl/e-rule-set.h> G_BEGIN_DECLS Modified: trunk/ebdl/ebdl/e-rule-part.h =================================================================== --- trunk/ebdl/ebdl/e-rule-part.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-rule-part.h 2008-09-11 17:12:30 UTC (rev 806) @@ -25,7 +25,7 @@ #ifndef __E_RULE_PART_H__ #define __E_RULE_PART_H__ -#include <e-rule-leaf.h> +#include <ebdl/e-rule-leaf.h> G_BEGIN_DECLS Modified: trunk/ebdl/ebdl/e-rule-set.h =================================================================== --- trunk/ebdl/ebdl/e-rule-set.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-rule-set.h 2008-09-11 17:12:30 UTC (rev 806) @@ -25,7 +25,7 @@ #ifndef __E_RULE_SET_H__ #define __E_RULE_SET_H__ -#include <e-rule.h> +#include <ebdl/e-rule.h> G_BEGIN_DECLS Modified: trunk/ebdl/ebdl/e-rule-simple.h =================================================================== --- trunk/ebdl/ebdl/e-rule-simple.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-rule-simple.h 2008-09-11 17:12:30 UTC (rev 806) @@ -25,7 +25,7 @@ #ifndef __E_RULE_SIMPLE_H__ #define __E_RULE_SIMPLE_H__ -#include <e-rule-leaf.h> +#include <ebdl/e-rule-leaf.h> G_BEGIN_DECLS Modified: trunk/ebdl/ebdl/e-rule.h =================================================================== --- trunk/ebdl/ebdl/e-rule.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-rule.h 2008-09-11 17:12:30 UTC (rev 806) @@ -40,7 +40,7 @@ typedef struct _ERule ERule; typedef struct _ERuleClass ERuleClass; -#include <e-data.h> +#include <ebdl/e-data.h> struct _ERule { GObject parent; Modified: trunk/ebdl/ebdl/e-scanner-shell.h =================================================================== --- trunk/ebdl/ebdl/e-scanner-shell.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-scanner-shell.h 2008-09-11 17:12:30 UTC (rev 806) @@ -24,7 +24,7 @@ #ifndef __E_SHELL_SCANNER_H__ #define __E_SHELL_SCANNER_H__ -#include <e-scanner.h> +#include <ebdl/e-scanner.h> G_BEGIN_DECLS Modified: trunk/ebdl/ebdl/e-scanner.h =================================================================== --- trunk/ebdl/ebdl/e-scanner.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-scanner.h 2008-09-11 17:12:30 UTC (rev 806) @@ -25,7 +25,7 @@ #ifndef __E_SCANNER_H__ #define __E_SCANNER_H__ -#include <e-object.h> +#include <ebdl/e-object.h> G_BEGIN_DECLS @@ -119,8 +119,8 @@ GType e_scanner_get_type (void); -#include <e-regex.h> -#include <e-stream.h> +#include <ebdl/e-regex.h> +#include <ebdl/e-stream.h> gboolean e_scanner_parse (EScanner *scanner, @@ -165,7 +165,7 @@ ERegexMatchFlags flags, GError **error); -#include <e-iterator.h> +#include <ebdl/e-iterator.h> EIterator *e_scanner_get_iterator (EScanner *scanner, EScannerScope scope, Modified: trunk/ebdl/ebdl/e-section.h =================================================================== --- trunk/ebdl/ebdl/e-section.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-section.h 2008-09-11 17:12:30 UTC (rev 806) @@ -79,8 +79,8 @@ typedef struct _ESectionIface ESectionIface; -#include <e-file.h> -#include <e-header.h> +#include <ebdl/e-file.h> +#include <ebdl/e-header.h> struct _ESectionIface { GTypeInterface base_iface; Modified: trunk/ebdl/ebdl/e-set.h =================================================================== --- trunk/ebdl/ebdl/e-set.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-set.h 2008-09-11 17:12:30 UTC (rev 806) @@ -25,7 +25,7 @@ #ifndef __E_SET_H__ #define __E_SET_H__ -#include <e-object.h> +#include <ebdl/e-object.h> G_BEGIN_DECLS Modified: trunk/ebdl/ebdl/e-source-extension.h =================================================================== --- trunk/ebdl/ebdl/e-source-extension.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-source-extension.h 2008-09-11 17:12:30 UTC (rev 806) @@ -25,7 +25,7 @@ #ifndef __E_SOURCE_EXTENSION_H__ #define __E_SOURCE_EXTENSION_H__ -#include <e-source.h> +#include <ebdl/e-source.h> G_BEGIN_DECLS Modified: trunk/ebdl/ebdl/e-source-factory-backend.h =================================================================== --- trunk/ebdl/ebdl/e-source-factory-backend.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-source-factory-backend.h 2008-09-11 17:12:30 UTC (rev 806) @@ -37,8 +37,8 @@ typedef struct _ESourceFactoryBackend ESourceFactoryBackend; /* dummy */ typedef struct _ESourceFactoryBackendIface ESourceFactoryBackendIface; -#include <e-source.h> -#include <e-handler.h> +#include <ebdl/e-source.h> +#include <ebdl/e-handler.h> struct _ESourceFactoryBackendIface { GTypeInterface parent_iface; Modified: trunk/ebdl/ebdl/e-source-factory.h =================================================================== --- trunk/ebdl/ebdl/e-source-factory.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-source-factory.h 2008-09-11 17:12:30 UTC (rev 806) @@ -25,7 +25,7 @@ #ifndef __E_SOURCE_FACTORY_H__ #define __E_SOURCE_FACTORY_H__ -#include <e-factory.h> +#include <ebdl/e-factory.h> G_BEGIN_DECLS @@ -50,7 +50,7 @@ GType e_source_factory_get_type (void); -#include <e-source.h> +#include <ebdl/e-source.h> ESource * e_source_factory_create_source_kernel (ESourceFactory *factory, EHandler *handler, Modified: trunk/ebdl/ebdl/e-source-host.h =================================================================== --- trunk/ebdl/ebdl/e-source-host.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-source-host.h 2008-09-11 17:12:30 UTC (rev 806) @@ -25,7 +25,7 @@ #ifndef __E_SOURCE_HOST_H__ #define __E_SOURCE_HOST_H__ -#include <e-source.h> +#include <ebdl/e-source.h> G_BEGIN_DECLS Modified: trunk/ebdl/ebdl/e-source-kernel.h =================================================================== --- trunk/ebdl/ebdl/e-source-kernel.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-source-kernel.h 2008-09-11 17:12:30 UTC (rev 806) @@ -25,7 +25,7 @@ #ifndef __E_SOURCE_KERNEL_H__ #define __E_SOURCE_KERNEL_H__ -#include <e-source.h> +#include <ebdl/e-source.h> G_BEGIN_DECLS Modified: trunk/ebdl/ebdl/e-source.h =================================================================== --- trunk/ebdl/ebdl/e-source.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-source.h 2008-09-11 17:12:30 UTC (rev 806) @@ -75,8 +75,8 @@ typedef struct _ESource ESource; /* dummy */ typedef struct _ESourceIface ESourceIface; -#include <e-finder.h> -#include <e-iterator.h> +#include <ebdl/e-finder.h> +#include <ebdl/e-iterator.h> struct _ESourceIface { GTypeInterface base_iface; Modified: trunk/ebdl/ebdl/e-stream-decorator-gzip.h =================================================================== --- trunk/ebdl/ebdl/e-stream-decorator-gzip.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-stream-decorator-gzip.h 2008-09-11 17:12:30 UTC (rev 806) @@ -24,7 +24,7 @@ #ifndef __E_STREAM_DECORATOR_GZIP_H__ #define __E_STREAM_DECORATOR_GZIP_H__ -#include <e-stream-decorator.h> +#include <ebdl/e-stream-decorator.h> G_BEGIN_DECLS Modified: trunk/ebdl/ebdl/e-stream-decorator.h =================================================================== --- trunk/ebdl/ebdl/e-stream-decorator.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-stream-decorator.h 2008-09-11 17:12:30 UTC (rev 806) @@ -25,7 +25,7 @@ #ifndef __E_STREAM_DECORATOR_H__ #define __E_STREAM_DECORATOR_H__ -#include <e-stream.h> +#include <ebdl/e-stream.h> G_BEGIN_DECLS Modified: trunk/ebdl/ebdl/e-stream-factory.h =================================================================== --- trunk/ebdl/ebdl/e-stream-factory.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-stream-factory.h 2008-09-11 17:12:30 UTC (rev 806) @@ -55,8 +55,8 @@ GQuark e_stream_factory_error_quark (void); -#include <e-stream.h> -#include <e-handler.h> +#include <ebdl/e-stream.h> +#include <ebdl/e-handler.h> EStream *e_stream_factory_create_stream (EStreamFactory *factory, EHandler *handler, Modified: trunk/ebdl/ebdl/e-stream-fs.h =================================================================== --- trunk/ebdl/ebdl/e-stream-fs.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-stream-fs.h 2008-09-11 17:12:30 UTC (rev 806) @@ -24,7 +24,7 @@ #ifndef __E_STREAM_FS_H__ #define __E_STREAM_FS_H__ -#include <e-stream.h> +#include <ebdl/e-stream.h> G_BEGIN_DECLS Modified: trunk/ebdl/ebdl/e-stream-mem.h =================================================================== --- trunk/ebdl/ebdl/e-stream-mem.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-stream-mem.h 2008-09-11 17:12:30 UTC (rev 806) @@ -24,7 +24,7 @@ #ifndef __E_STREAM_MEM_H__ #define __E_STREAM_MEM_H__ -#include <e-stream.h> +#include <ebdl/e-stream.h> G_BEGIN_DECLS Modified: trunk/ebdl/ebdl/e-stream-terminal.h =================================================================== --- trunk/ebdl/ebdl/e-stream-terminal.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-stream-terminal.h 2008-09-11 17:12:30 UTC (rev 806) @@ -22,7 +22,7 @@ #ifndef __E_STREAM_TERMINAL_H__ #define __E_STREAM_TERMINAL_H__ -#include <e-stream-fs.h> +#include <ebdl/e-stream-fs.h> G_BEGIN_DECLS Modified: trunk/ebdl/ebdl/e-symbol.h =================================================================== --- trunk/ebdl/ebdl/e-symbol.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-symbol.h 2008-09-11 17:12:30 UTC (rev 806) @@ -25,7 +25,7 @@ #ifndef __E_SYMBOL_H__ #define __E_SYMBOL_H__ -#include <e-file.h> +#include <ebdl/e-file.h> G_BEGIN_DECLS @@ -60,8 +60,8 @@ typedef struct _ESymbolIface ESymbolIface; -#include <e-file.h> -#include <e-header.h> +#include <ebdl/e-file.h> +#include <ebdl/e-header.h> struct _ESymbolIface { GTypeInterface base_iface; Modified: trunk/ebdl/ebdl/e-table-factory-backend.h =================================================================== --- trunk/ebdl/ebdl/e-table-factory-backend.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-table-factory-backend.h 2008-09-11 17:12:30 UTC (rev 806) @@ -37,8 +37,8 @@ typedef struct _ETableFactoryBackend ETableFactoryBackend; /* dummy */ typedef struct _ETableFactoryBackendIface ETableFactoryBackendIface; -#include <e-handler.h> -#include <e-table-view.h> +#include <ebdl/e-handler.h> +#include <ebdl/e-table-view.h> struct _ETableFactoryBackendIface { GTypeInterface parent_iface; Modified: trunk/ebdl/ebdl/e-table-factory.h =================================================================== --- trunk/ebdl/ebdl/e-table-factory.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-table-factory.h 2008-09-11 17:12:30 UTC (rev 806) @@ -25,7 +25,7 @@ #ifndef __E_TABLE_FACTORY_H__ #define __E_TABLE_FACTORY_H__ -#include <e-factory.h> +#include <ebdl/e-factory.h> G_BEGIN_DECLS @@ -50,8 +50,8 @@ GType e_table_factory_get_type (void); -#include <e-table.h> -#include <e-table-view.h> +#include <ebdl/e-table.h> +#include <ebdl/e-table-view.h> ETableView * e_table_factory_create_viewer (ETableFactory *factory, EHandler *handler, Modified: trunk/ebdl/ebdl/e-table-view.h =================================================================== --- trunk/ebdl/ebdl/e-table-view.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-table-view.h 2008-09-11 17:12:30 UTC (rev 806) @@ -64,7 +64,7 @@ }; -#include <e-table.h> +#include <ebdl/e-table.h> GType e_table_view_get_type (void); Modified: trunk/ebdl/ebdl/e-table.h =================================================================== --- trunk/ebdl/ebdl/e-table.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-table.h 2008-09-11 17:12:30 UTC (rev 806) @@ -79,8 +79,8 @@ }; -#include <e-stream.h> -#include <e-iterator.h> +#include <ebdl/e-stream.h> +#include <ebdl/e-iterator.h> GType e_table_get_type (void); ETable * e_table_new_from_csv (EStream *stream); Modified: trunk/ebdl/ebdl/e-uri.h =================================================================== --- trunk/ebdl/ebdl/e-uri.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-uri.h 2008-09-11 17:12:30 UTC (rev 806) @@ -39,7 +39,7 @@ typedef struct _EUri EUri; typedef struct _EUriClass EUriClass; -#include <e-data.h> +#include <ebdl/e-data.h> struct _EUri { GObject parent; Modified: trunk/ebdl/ebdl/e-worker-factory-backend.h =================================================================== --- trunk/ebdl/ebdl/e-worker-factory-backend.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-worker-factory-backend.h 2008-09-11 17:12:30 UTC (rev 806) @@ -25,7 +25,7 @@ #ifndef __E_WORKER_FACTORY_BACKEND_H__ #define __E_WORKER_FACTORY_BACKEND_H__ -#include <e-object.h> +#include <ebdl/e-object.h> G_BEGIN_DECLS @@ -37,8 +37,8 @@ typedef struct _EWorkerFactoryBackend EWorkerFactoryBackend; /* dummy */ typedef struct _EWorkerFactoryBackendIface EWorkerFactoryBackendIface; -#include <e-worker.h> -#include <e-handler.h> +#include <ebdl/e-worker.h> +#include <ebdl/e-handler.h> struct _EWorkerFactoryBackendIface { GTypeInterface parent_iface; Modified: trunk/ebdl/ebdl/e-worker-factory.h =================================================================== --- trunk/ebdl/ebdl/e-worker-factory.h 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/ebdl/e-worker-factory.h 2008-09-11 17:12:30 UTC (rev 806) @@ -25,7 +25,7 @@ #ifndef __E_WORKER_FACTORY_H__ #define __E_WORKER_FACTORY_H__ -#include <e-factory.h> +#include <ebdl/e-factory.h> G_BEGIN_DECLS @@ -50,7 +50,7 @@ GType e_worker_factory_get_type (void); -#include <e-worker.h> +#include <ebdl/e-worker.h> EWorker * e_worker_factory_create_worker (EWorkerFactory *factory, EHandler *handler, Modified: trunk/ebdl/packing/deb/debian/changelog =================================================================== --- trunk/ebdl/packing/deb/debian/changelog 2008-09-10 14:56:13 UTC (rev 805) +++ trunk/ebdl/packing/deb/debian/changelog 2008-09-11 17:12:30 UTC (rev 806) @@ -1,3 +1,9 @@ +ebdl (0.10.3-5) intrepid; urgency=low + + * NMU: reorder devel header files + + -- Carlos Martín <in...@us...> Thu, 11 Sep 2008 16:41:12 +0200 + ebdl (0.10.3-4) hardy; urgency=low * NMU: Remove invalid control section for some packages This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <in...@us...> - 2008-09-10 14:56:16
|
Revision: 805 http://ebdl.svn.sourceforge.net/ebdl/?rev=805&view=rev Author: inean Date: 2008-09-10 14:56:13 +0000 (Wed, 10 Sep 2008) Log Message: ----------- Fix printf warning Modified Paths: -------------- trunk/ebdl/ebdl/e-app.c Modified: trunk/ebdl/ebdl/e-app.c =================================================================== --- trunk/ebdl/ebdl/e-app.c 2008-09-10 14:54:37 UTC (rev 804) +++ trunk/ebdl/ebdl/e-app.c 2008-09-10 14:56:13 UTC (rev 805) @@ -271,7 +271,7 @@ } if (! g_option_context_parse (priv->context, &priv->argc, &priv->argv, &local_error)) { - g_critical (local_error ? local_error->message: "Unknown error"); + g_critical ("%s", local_error ? local_error->message: "Unknown error"); g_propagate_error (error, local_error); return FALSE; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <in...@us...> - 2008-09-10 14:54:39
|
Revision: 804 http://ebdl.svn.sourceforge.net/ebdl/?rev=804&view=rev Author: inean Date: 2008-09-10 14:54:37 +0000 (Wed, 10 Sep 2008) Log Message: ----------- Minor bugfixes Modified Paths: -------------- trunk/ebdl/Makefile.am trunk/ebdl/configure.ac trunk/ebdl/ebdl/e-app.c trunk/ebdl/ebdl/e-debug.c trunk/ebdl/packing/deb/debian/changelog Modified: trunk/ebdl/Makefile.am =================================================================== --- trunk/ebdl/Makefile.am 2008-09-06 17:54:49 UTC (rev 803) +++ trunk/ebdl/Makefile.am 2008-09-10 14:54:37 UTC (rev 804) @@ -1,7 +1,7 @@ -NULL= +NULL = -SUBDIRS= ebdl-plugin ebdl po docs $(TEST) packing -DIST_SUBDIRS= ebdl-plugin ebdl po docs tests packing +SUBDIRS = ebdl-plugin ebdl po docs $(TEST) packing +DIST_SUBDIRS = ebdl-plugin ebdl po docs tests packing pkgconfigdir= $(libdir)/pkgconfig pkgconfig_DATA= \ @@ -15,7 +15,7 @@ $(NULL) if INTLTOOL_LOCAL -EXTRA_DIST+= \ +EXTRA_DIST += \ intltool-extract.in \ intltool-merge.in \ intltool-update.in \ @@ -124,8 +124,6 @@ @echo "Need to reconfigure with --enable-coverage and lcov must be installed" endif -# Optional code required to make a tarball - dist-hook: dist-hook-dbus dist-hook-fam dist-hook-pcre dist-hook-log DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-dbus --disable-kernel-test-modules Modified: trunk/ebdl/configure.ac =================================================================== --- trunk/ebdl/configure.ac 2008-09-06 17:54:49 UTC (rev 803) +++ trunk/ebdl/configure.ac 2008-09-10 14:54:37 UTC (rev 804) @@ -1,6 +1,7 @@ dnl -*- tab-width: 2; indent-tabs-mode: nil -*- AC_PREREQ(2.52) +dnl the ebdl version number m4_define([ebdl_major_version],[0]) m4_define([ebdl_minor_version],[10]) m4_define([ebdl_micro_version],[3]) @@ -8,10 +9,10 @@ m4_define([ebdl_core_packages],[gobject-2.0 ebdl-plugin-1]) m4_define([ebdl_plug_packages],[gobject-2.0 gmodule-2.0]) - + AC_INIT([ebdl],[ebdl_version], [http://ebdl.sf.net/bugs.php?package=ebdl]) +AC_CANONICAL_TARGET -AC_CANONICAL_TARGET AM_INIT_AUTOMAKE([-Wno-portability no-define]) AC_CONFIG_SRCDIR([ebdl/e-part.c]) @@ -208,4 +209,3 @@ echo fi eval eval echo EBDL libs will be installed in $libdir. - Modified: trunk/ebdl/ebdl/e-app.c =================================================================== --- trunk/ebdl/ebdl/e-app.c 2008-09-06 17:54:49 UTC (rev 803) +++ trunk/ebdl/ebdl/e-app.c 2008-09-10 14:54:37 UTC (rev 804) @@ -292,6 +292,7 @@ e_app_do_daemonize (EApp *app) { gint fd; + gint ret; gchar *pid; EAppPrivate *priv; G_GNUC_UNUSED gint i; @@ -317,7 +318,7 @@ e_debug (E_DEBUG_LEVEL_INFO, "Workdir isn't set."); } else { - chdir (priv->workdir); + ret = chdir (priv->workdir); } /* Reset file creation mask */ umask (priv->umask); @@ -370,7 +371,7 @@ } else { pid = g_strdup_printf ("%d", priv->pid); - write (fd, pid, strlen (pid)); + ret = write (fd, pid, strlen (pid)); close (fd); g_free (pid); Modified: trunk/ebdl/ebdl/e-debug.c =================================================================== --- trunk/ebdl/ebdl/e-debug.c 2008-09-06 17:54:49 UTC (rev 803) +++ trunk/ebdl/ebdl/e-debug.c 2008-09-10 14:54:37 UTC (rev 804) @@ -736,7 +736,7 @@ { gchar buffer [HUGE_BUFFER] = ""; - g_printerr ( \ + g_printerr ("%s", \ e_debug_log_default (log, \ buffer, \ HUGE_BUFFER, \ @@ -805,7 +805,7 @@ _MATCH (level, syslog_level, DEBUG, DEBUG); _MATCH (level, syslog_level, LOG, DEBUG); - syslog (syslog_level, \ + syslog (syslog_level, "%s", \ e_debug_log_default (log, \ buffer, \ HUGE_BUFFER, \ Modified: trunk/ebdl/packing/deb/debian/changelog =================================================================== --- trunk/ebdl/packing/deb/debian/changelog 2008-09-06 17:54:49 UTC (rev 803) +++ trunk/ebdl/packing/deb/debian/changelog 2008-09-10 14:54:37 UTC (rev 804) @@ -1,3 +1,9 @@ +ebdl (0.10.3-4) hardy; urgency=low + + * NMU: Remove invalid control section for some packages + + -- Carlos Martín <in...@us...> Sat, 06 Sep 2008 18:19:30 +0200 + ebdl (0.10.3-1) hardy; urgency=low * NMU: New release This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <in...@us...> - 2008-09-06 17:54:52
|
Revision: 803 http://ebdl.svn.sourceforge.net/ebdl/?rev=803&view=rev Author: inean Date: 2008-09-06 17:54:49 +0000 (Sat, 06 Sep 2008) Log Message: ----------- Fix debian packing Modified Paths: -------------- trunk/ebdl/packing/deb/debian/control Modified: trunk/ebdl/packing/deb/debian/control =================================================================== --- trunk/ebdl/packing/deb/debian/control 2008-09-06 17:54:14 UTC (rev 802) +++ trunk/ebdl/packing/deb/debian/control 2008-09-06 17:54:49 UTC (rev 803) @@ -31,13 +31,13 @@ Description: Loader to handle plugins which makes use of C API - Shlib Loader Package: ebdl-dbus1 -Section: daemons +Section: libs Architecture: any Depends: libebdl1, ${shlibs:Depends} Description: Ebdl DBUS complement - Daemon binary Package: libebdl1-dbus-module -Section: daemons +Section: libs Architecture: any Depends: libebdl1-shlib-loader, ebdl-dbus1, ${shlibs:Depends} Description: Ebdl DBUS complement - DBUS source Agent This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <in...@us...> - 2008-09-06 17:54:18
|
Revision: 802 http://ebdl.svn.sourceforge.net/ebdl/?rev=802&view=rev Author: inean Date: 2008-09-06 17:54:14 +0000 (Sat, 06 Sep 2008) Log Message: ----------- Update ia64 support Modified Paths: -------------- trunk/ebdl/Makefile.am trunk/ebdl/acinclude.m4 trunk/ebdl/autogen.sh trunk/ebdl/configure.ac trunk/ebdl/ebdl/lk-module26.c trunk/ebdl/ebdl-plugin/e-plugins-manager.c trunk/ebdl/packing/deb/debian/changelog trunk/ebdl/packing/deb/debian/control trunk/ebdl/tests/Linux/modutils/tests/git-update.sh Modified: trunk/ebdl/Makefile.am =================================================================== --- trunk/ebdl/Makefile.am 2008-09-04 19:16:19 UTC (rev 801) +++ trunk/ebdl/Makefile.am 2008-09-06 17:54:14 UTC (rev 802) @@ -10,12 +10,17 @@ $(NULL) EXTRA_DIST= \ + NEWS \ + AUTHORS \ + $(NULL) + +if INTLTOOL_LOCAL +EXTRA_DIST+= \ intltool-extract.in \ intltool-merge.in \ intltool-update.in \ - NEWS \ - AUTHORS \ $(NULL) +endif DISTCLEANFILES = \ intltool-extract \ Modified: trunk/ebdl/acinclude.m4 =================================================================== --- trunk/ebdl/acinclude.m4 2008-09-04 19:16:19 UTC (rev 801) +++ trunk/ebdl/acinclude.m4 2008-09-06 17:54:14 UTC (rev 802) @@ -42,6 +42,26 @@ exec_prefix=$exec_prefix_save ]) +dnl AS_DEFINE_GETTEXT +AC_DEFUN([AS_DEFINE_GETTEXT],[ + AC_DEFINE(GETTEXT_PACKAGE, "$1", [Define to the gettext package name]) + GETTEXT_PACKAGE=$1 + + AC_SUBST(GETTEXT_PACKAGE) +]) + +dnl AS_PROG_INTLTOOL +AC_DEFUN([AS_PROG_INTLTOOL],[ + AC_REQUIRE([AM_GLIB_GNU_GETTEXT]) + IT_PROG_INTLTOOL([$1]) + + INTLTOOL_VERSION=`$INTLTOOL_MERGE --version | sed -n '/^intltool/p' | awk '{print $[]3}'` + INTLTOOL_VERSION=`echo $INTLTOOL_VERSION | awk -F. '{print $[]1*10000 + $[]2*1000 + $[]3}'` + AC_SUBST(INTLTOOL_VERSION) + + AM_CONDITIONAL([INTLTOOL_LOCAL],[test "$INTLTOOL_VERSION" -lt 4001]) +]) + dnl AS_ENABLE_FEATURE(NAME, VAR_NAME, DEFAULT, PKG_CONFIG_NAME, FLAGS_PREFIX, CONDITIONAL_SUFFIX) dnl dnl example @@ -87,20 +107,15 @@ AM_CONDITIONAL([ENABLE_$7],[test "x$enable_$3" = "xyes"]) ]) -#try to check for VALGRIND library -AC_DEFUN([AS_CHECK_VALGRIND],[ - AC_CHECK_HEADERS([valgrind/memcheck.h valgrind/valgrind.h]) -]) - #try to check for CHECK library AC_DEFUN([AS_ENABLE_TESTS],[ - AC_REQUIRE([AS_CONFIGURE_KERNEL]) + AC_REQUIRE([AS_CONFIGURE_KERNEL]) AS_ENABLE_FEATURE([tests],[Build satity test cases], [tests],$1,[gobject-2.0 check],EBDL_TEST,TESTS, [ if test "x$enable_kernel_test_modules" != "xyes"; then if test "x$enable_tests" = "xyes"; then - AC_MSG_ERROR([Unable to find a valid kernel tree]) + AC_MSG_ERROR([Unable to find a valid kernel tree]) fi enable_tests=no fi @@ -152,22 +167,19 @@ # enable backends support AC_DEFUN([AS_ENABLE_BACKENDS],[ + AC_ARG_ENABLE(backends, + AC_HELP_STRING([--enable-backends], + [Enable building of backend libraries required to manage modules[default=$1]]),, + enable_backends=m4_default([$1],[yes])) AC_ARG_WITH(backenddir, AC_HELP_STRING([--with-backenddir=dir], - [Path to plugin dir repository [default=${libexecdir}/${PACKAGE_NAME}-1/backends]]), - backenddir=$withval) + [Path to backend dir repository [default=${libexecdir}/${PACKAGE_NAME}-1/backends]]), + backenddir=$withval) AC_ARG_WITH(loaderdir, AC_HELP_STRING([--with-loaderdir=dir], [Path to loaders dir repository [default=${libexecdir}/${PACKAGE_NAME}-1/loaders]]), loaderdir=$withval) - AC_ARG_ENABLE(backends, - AC_HELP_STRING([--enable-backends], - [Build plugin library [default=$1]]),, - enable_backends=$1) - if test x"$enable_backends" = x; then - enable_backends=yes - fi if test x"$backenddir" = x; then backenddir=${libexecdir}/${PACKAGE_NAME}-1/backends fi @@ -177,11 +189,11 @@ AC_SUBST(loaderdir) AS_EXPAND(LOADERDIR,[$loaderdir]) - AC_DEFINE_UNQUOTED([EBDL_LOADERS_PATH],"$LOADERDIR", package loaders dir) + AC_DEFINE_UNQUOTED([EBDL_LOADERS_DIR],"$LOADERDIR",[package loaders dir]) AC_SUBST(backenddir) AS_EXPAND(BACKENDDIR,[$backenddir]) - AC_DEFINE_UNQUOTED([EBDL_AGENTS_PATH],"$BACKENDDIR", package backends dir) + AC_DEFINE_UNQUOTED([EBDL_AGENTS_DIR],"$BACKENDDIR",[package backends dir]) AM_CONDITIONAL(ENABLE_BACKENDS, test x"$enable_backends" = "xyes") ]) @@ -225,6 +237,11 @@ ]) ]) +#try to check for VALGRIND library +AC_DEFUN([AS_CHECK_VALGRIND],[ + AC_CHECK_HEADERS([valgrind/memcheck.h valgrind/valgrind.h]) +]) + AC_DEFUN([AS_ENABLE_LINUX_KERNEL_DATA_BACKEND],[ AS_ENABLE_BACKEND([linux-data-backend],[linux_kernel_data],$1, LINUX_KERNEL_DATA, [ AC_REQUIRE([AC_CANONICAL_TARGET]) @@ -297,19 +314,19 @@ #EBDL_ARG_KERNEL_PATH # let the user over-ride the kernel source path AC_DEFUN([AS_CONFIGURE_KERNEL],[ - AC_REQUIRE([AC_PROG_CC]) - - AC_ARG_ENABLE(kernel-test-modules, - AC_HELP_STRING([--enable-kernel-test-modules], + AC_REQUIRE([AC_PROG_CC]) + + AC_ARG_ENABLE(kernel-test-modules, + AC_HELP_STRING([--enable-kernel-test-modules], [Build kernel test modules cases [default=$1]]),, enable_kernel_test_modules=$1) - AC_ARG_WITH(linux, - AC_HELP_STRING([--with-linux=dir], + AC_ARG_WITH(linux, + AC_HELP_STRING([--with-linux=dir], [Path to Linux source tree]), KSRC=$withval) - AC_ARG_WITH(kconfig, - AC_HELP_STRING([--with-kconfig=file], + AC_ARG_WITH(kconfig, + AC_HELP_STRING([--with-kconfig=file], [Path to Kernel config file]), KCONFIG=$withval) @@ -542,21 +559,19 @@ AC_DEFINE_UNQUOTED([ENABLE_NORMALIZE_UNDERSCORE], 1, [normalize with scores to underscores]) vendor=debian ;; - other) - AC_DEFINE_UNQUOTED([ENABLE_NORMALIZE], 1, [normalize with underscores to scores]) - vendor=lsb - ;; *edora | *edhat) vendor=redhat - ;; - *) + ;; + *) + AC_DEFINE_UNQUOTED([ENABLE_NORMALIZE], 1, [normalize with underscores to scores]) + AC_CHECK_FILE([/lib/lsb/init-functions],[vendor=lsb]) + vendor=lsb ;; esac - + AC_SUBST(vendor) ]) - # enable coverage analysis AC_DEFUN([AS_ENABLE_LOG_AND_COVERAGE],[ AC_REQUIRE([AS_ENABLE_TESTS]) @@ -630,8 +645,7 @@ AS_COMPILER_FLAG(["-ftest-coverage"],[ASX_CFLAGS="-ftest-coverage $ASX_CFLAGS"], true) AS_COMPILER_FLAG(["-fprofile-arcs"], [ASX_CFLAGS="-fprofile-arcs $ASX_CFLAGS"], true) ASX_CFLAGS=`echo "$ASX_CFLAGS" | sed -e 's/-O[[0-9]]*//g'` - AC_DEFINE_UNQUOTED(GCOV_ENABLED, 1, - [Defined if gcov is enabled to force a rebuild due to config.h changing]) + AC_DEFINE_UNQUOTED(GCOV_ENABLED, 1, [Defined if gcov is enabled to force a rebuild due to config.h changing]) fi fi @@ -741,7 +755,6 @@ AC_SUBST($1_LIBS) ]) - # Common dirs AC_DEFUN([AS_DEFINE_DIRS],[ AS_EXPAND(LOCALEDIR,[${prefix}/share/$PACKAGE_NAME]) Modified: trunk/ebdl/autogen.sh =================================================================== --- trunk/ebdl/autogen.sh 2008-09-04 19:16:19 UTC (rev 801) +++ trunk/ebdl/autogen.sh 2008-09-06 17:54:14 UTC (rev 802) @@ -26,7 +26,11 @@ GTKDOCIZE="gtkdocize --docdir docs/reference --flavour no-tmpl" # update files -. tests/Linux/modutils/tests/git-update.sh - +./tests/Linux/modutils/tests/git-update.sh 2>/dev/null || { + echo + echo "**Error**: \`git-update' failed. Please fix the warnings" + echo "(probably missing development files) and try again." + exit 1 +} # common autogen . gnome-autogen.sh Modified: trunk/ebdl/configure.ac =================================================================== --- trunk/ebdl/configure.ac 2008-09-04 19:16:19 UTC (rev 801) +++ trunk/ebdl/configure.ac 2008-09-06 17:54:14 UTC (rev 802) @@ -90,16 +90,16 @@ dnl ================== Internationalization ======================================= -AC_DEFINE(GETTEXT_PACKAGE, "AC_PACKAGE_NAME", [Define to the gettext package name]) -GETTEXT_PACKAGE=AC_PACKAGE_NAME -AC_SUBST(GETTEXT_PACKAGE) +AS_DEFINE_GETTEXT([AC_PACKAGE_NAME]) AM_GLIB_GNU_GETTEXT -IT_PROG_INTLTOOL([0.35.0]) +AS_PROG_INTLTOOL([0.35.0]) dnl ================= Check headers and libs ====================================== AC_CHECK_HEADERS([grp.h pwd.h sys/utsname.h linux/prctl.h]) +AS_CHECK_VALGRIND + AS_CHECK_EXISTS([glib-2.0 >= glib_required_version]) AS_CHECK_EXISTS([libxml-2.0 >= libxml_required_version]) @@ -167,7 +167,6 @@ echo compile with FAM ...................... ${enable_fam:-no} echo compile with PCRE \(Perl based regexp\).. ${enable_pcre:-no} echo add valgrind support .................. ${ac_cv_header_valgrind_valgrind_h:-no} -echo boost compilation with ccache ......... ${enable_ccache:-no} if test "x$enable_coverage" = "xyes"; then echo build tests with coverage support ..... ${enable_tests:-no} else Modified: trunk/ebdl/ebdl/lk-module26.c =================================================================== --- trunk/ebdl/ebdl/lk-module26.c 2008-09-04 19:16:19 UTC (rev 801) +++ trunk/ebdl/ebdl/lk-module26.c 2008-09-06 17:54:14 UTC (rev 802) @@ -455,23 +455,34 @@ } #define G_TYPE_UINT32 G_TYPE_UINT +#define G_TYPE_USHORT G_TYPE_UINT -#if ELF_EI_CLASS == 2 -# define g_value_new_uint g_value_new_uint64 -# define g_value_set_uint64 g_value_set_uint64 -#else -# define g_value_new_uint g_value_new_uint32 -# define g_value_set_uint32 g_value_set_uint -#endif - static inline GValue * -PERBIT(g_value_new_uint) (PERBIT(guint) v) +PERBIT(g_value_new_uint) (guint v) { +#define g_value_set_uint32 g_value_set_uint + GValue *value = g_new0 (GValue, 1); g_value_init (value, PERBIT(G_TYPE_UINT)); PERBIT(g_value_set_uint) (value, v); return value; } +static inline GValue * +g_value_new_uint (guint v) +{ + GValue *value = g_new0 (GValue, 1); + g_value_init (value, G_TYPE_UINT); + g_value_set_uint (value, v); + return value; +} +static inline GValue * +g_value_new_ushort (guint v) +{ + GValue *value = g_new0 (GValue, 1); + g_value_init (value, G_TYPE_UINT); + g_value_set_uint (value, v); + return value; +} static inline GValue * g_value_new_array_long (glong *v, gint size) @@ -555,7 +566,7 @@ "__mod_pci_device_table", &error); if (G_UNLIKELY (error != NULL)) { - e_log_log (error->message); + e_log_log ("%s",error->message); g_error_free (error); } @@ -594,14 +605,6 @@ return table; } -#ifndef G_TYPE_USHORT -# ifndef G_TYPE_UINT16 -# define G_TYPE_UINT16 G_TYPE_UINT -# endif -# define G_TYPE_USHORT G_TYPE_UINT16 -# define g_value_new_ushort g_value_new_uint -#endif - static ETable * lk_module26_get_usb_etable (LkModule *module) { @@ -1109,7 +1112,7 @@ /* iterate over usb_device_id struct */ for (; tuple->match_flags || tuple->driver_info; tuple++) { list = NULL; - + list = g_list_prepend (list, g_value_new_string(modname)); list = g_list_prepend (list, PERBIT(g_value_new_uint)(tuple->match_flags)); list = g_list_prepend (list, g_value_new_ushort(PRINT_SCALAR(bustype))); Modified: trunk/ebdl/ebdl-plugin/e-plugins-manager.c =================================================================== --- trunk/ebdl/ebdl-plugin/e-plugins-manager.c 2008-09-04 19:16:19 UTC (rev 801) +++ trunk/ebdl/ebdl-plugin/e-plugins-manager.c 2008-09-06 17:54:14 UTC (rev 802) @@ -495,7 +495,7 @@ dirs = e_plugins_manager_get_dirs_from_env (&dirs, "EBDL_LOADERS_PATH"); dirs = e_plugins_manager_get_dirs_from_dir (&dirs, buffer); - dirs = e_plugins_manager_get_dirs_from_dir (&dirs, EBDL_LOADERS_PATH); + dirs = e_plugins_manager_get_dirs_from_dir (&dirs, EBDL_LOADERS_DIR); for (i = 0; dirs[i] != NULL; i++) { e_plugins_manager_load_loaders (manager, dirs[i]); @@ -595,7 +595,7 @@ g_snprintf (buffer, 1024, EBDL_AGENTS_USER_PATH, g_get_user_data_dir ()); dirs = e_plugins_manager_get_dirs_from_env (&dirs, "EBDL_AGENTS_PATH"); dirs = e_plugins_manager_get_dirs_from_dir (&dirs, buffer); - dirs = e_plugins_manager_get_dirs_from_dir (&dirs, EBDL_AGENTS_PATH); + dirs = e_plugins_manager_get_dirs_from_dir (&dirs, EBDL_AGENTS_DIR); for (i = 0; dirs[i] != NULL; i++) { e_plugins_manager_load_agents (manager, dirs[i]); Modified: trunk/ebdl/packing/deb/debian/changelog =================================================================== --- trunk/ebdl/packing/deb/debian/changelog 2008-09-04 19:16:19 UTC (rev 801) +++ trunk/ebdl/packing/deb/debian/changelog 2008-09-06 17:54:14 UTC (rev 802) @@ -1,6 +1,6 @@ -ebdl (0.10.3) intrepid; urgency=low +ebdl (0.10.3-1) hardy; urgency=low - * New release + * NMU: New release -- Carlos Martín <in...@us...> Thu, 04 Sep 2008 18:19:30 +0200 Modified: trunk/ebdl/packing/deb/debian/control =================================================================== --- trunk/ebdl/packing/deb/debian/control 2008-09-04 19:16:19 UTC (rev 801) +++ trunk/ebdl/packing/deb/debian/control 2008-09-06 17:54:14 UTC (rev 802) @@ -4,8 +4,8 @@ Maintainer: Ubuntu MOTU Developers <ubu...@li...> XSBC-Original-Maintainer: Carlos Martin <in...@us...> Homepage: http://ebdl.sf.net/ebdl -Build-Depends: debhelper (>= 4.0.0), autotools-dev, libglib2.0-dev, libpcre3-dev, libxml2-dev, libdbus-1-dev, libdbus-glib-1-dev, libgamin-dev, libffi4-dev -Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 4.0.0), autotools-dev, libglib2.0-dev, libpcre3-dev, libxml2-dev, libdbus-1-dev, libdbus-glib-1-dev, libgamin-dev, intltool, libffi-dev | libffi4-dev | libffi5-dev +Standards-Version: 3.8.0 Package: libebdl1-dev Section: libdevel Modified: trunk/ebdl/tests/Linux/modutils/tests/git-update.sh =================================================================== --- trunk/ebdl/tests/Linux/modutils/tests/git-update.sh 2008-09-04 19:16:19 UTC (rev 801) +++ trunk/ebdl/tests/Linux/modutils/tests/git-update.sh 2008-09-06 17:54:14 UTC (rev 802) @@ -24,7 +24,11 @@ printbold "updating kernel test module files..." rm -rf $GITTMP git-clone $1 $2 $GITTMP >/dev/null 2>&1 - + if [ $? -ne 0]; then + rm -rf $GITTIMP + echo "failed to retrieve from $1" + exit 1 + fi for f in `ls $GITTMP/tests/data/src/*.c`; do cp -a $f $vcsdir/data/src/ done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <in...@us...> - 2008-09-04 19:16:21
|
Revision: 801 http://ebdl.svn.sourceforge.net/ebdl/?rev=801&view=rev Author: inean Date: 2008-09-04 19:16:19 +0000 (Thu, 04 Sep 2008) Log Message: ----------- Fix debian packing Modified Paths: -------------- trunk/ebdl/ebdl/Makefile.am trunk/ebdl/packing/deb/debian/changelog trunk/ebdl/packing/deb/debian/libebdl1-dbus-module.install trunk/ebdl/packing/deb/debian/libebdl1-linux-module.install Modified: trunk/ebdl/ebdl/Makefile.am =================================================================== --- trunk/ebdl/ebdl/Makefile.am 2008-09-04 18:58:30 UTC (rev 800) +++ trunk/ebdl/ebdl/Makefile.am 2008-09-04 19:16:19 UTC (rev 801) @@ -329,6 +329,7 @@ -rpath $(ebdldir) \ $(NULL) libebdl_la_LIBADD = \ + $(top_builddir)/ebdl-plugin/libebdl-plugin.la \ $(EBDL_CORE_LIBS) \ $(EBDL_CORE_OPT_LIBS) \ $(NULL) @@ -461,6 +462,7 @@ -rpath $(backenddir) liblk_la_LIBADD = \ libebdl.la \ + $(top_builddir)/ebdl-plugin/libebdl-plugin.la \ $(EBDL_CORE_LIBS) \ $(NULL) @@ -493,6 +495,7 @@ -rpath $(backenddir) liblkfs_source_la_LIBADD = \ libebdl.la \ + $(top_builddir)/ebdl-plugin/libebdl-plugin.la \ $(EBDL_CORE_LIBS) \ $(NULL) $(liblkfs_la_OBJECTS) : $(libebdl_built_sources) @@ -529,6 +532,7 @@ -rpath $(backenddir) libdbus_source_la_LIBADD = \ libebdl.la \ + $(top_builddir)/ebdl-plugin/libebdl-plugin.la \ $(EBDL_DAEMON_LIBS) \ $(NULL) $(libdbus_source_la_OBJECTS) : $(libebdl_dbus_built_sources) Modified: trunk/ebdl/packing/deb/debian/changelog =================================================================== --- trunk/ebdl/packing/deb/debian/changelog 2008-09-04 18:58:30 UTC (rev 800) +++ trunk/ebdl/packing/deb/debian/changelog 2008-09-04 19:16:19 UTC (rev 801) @@ -1,21 +1,9 @@ -ebdl (0.10+cvs20070519-1) feisty; urgency=low +ebdl (0.10.3) intrepid; urgency=low - * New Snapshop build + * New release - -- Carlos Martin <in...@us...> Sat, 19 May 2007 23:54:40 +0200 + -- Carlos Martín <in...@us...> Thu, 04 Sep 2008 18:19:30 +0200 -ebdl (0.09+cvs20060909-2) unstable; urgency=low - - * New Snapshop build - - -- Carlos Martin <in...@us...> Sat, 9 Sep 2006 23:08:23 +0200 - -ebdl (0.09+cvs20060909-1) unstable; urgency=low - - * New Snapshop build - - -- Carlos Martin <in...@us...> Sat, 9 Sep 2006 23:07:38 +0200 - ebdl (0.09-1) unstable; urgency=low * Initial Release. Modified: trunk/ebdl/packing/deb/debian/libebdl1-dbus-module.install =================================================================== --- trunk/ebdl/packing/deb/debian/libebdl1-dbus-module.install 2008-09-04 18:58:30 UTC (rev 800) +++ trunk/ebdl/packing/deb/debian/libebdl1-dbus-module.install 2008-09-04 19:16:19 UTC (rev 801) @@ -1 +1 @@ -/usr/libexec/ebdl-1/modules/libdbus-source.so +/usr/libexec/ebdl-1/backends/libdbus-source.so Modified: trunk/ebdl/packing/deb/debian/libebdl1-linux-module.install =================================================================== --- trunk/ebdl/packing/deb/debian/libebdl1-linux-module.install 2008-09-04 18:58:30 UTC (rev 800) +++ trunk/ebdl/packing/deb/debian/libebdl1-linux-module.install 2008-09-04 19:16:19 UTC (rev 801) @@ -1 +1 @@ -/usr/libexec/ebdl-1/modules/liblk*.so +/usr/libexec/ebdl-1/backends/liblk*.so This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <in...@us...> - 2008-09-04 17:45:46
|
Revision: 796 http://ebdl.svn.sourceforge.net/ebdl/?rev=796&view=rev Author: inean Date: 2008-09-04 17:45:43 +0000 (Thu, 04 Sep 2008) Log Message: ----------- Partially support 64bit architectures Modified Paths: -------------- trunk/ebdl/acinclude.m4 trunk/ebdl/src/e-elf-section.c trunk/ebdl/src/e-elf.c trunk/ebdl/src/e-elf.h trunk/ebdl/src/e-factory.c trunk/ebdl/src/lk-module26.c trunk/ebdl/tests/Linux/modutils/modutils-test-suite.sh Modified: trunk/ebdl/acinclude.m4 =================================================================== --- trunk/ebdl/acinclude.m4 2008-09-04 17:40:35 UTC (rev 795) +++ trunk/ebdl/acinclude.m4 2008-09-04 17:45:43 UTC (rev 796) @@ -271,7 +271,7 @@ AH_VERBATIM([_ELF_BYTES], [/* Macros required by elf header */ -#if ELF_EI_CLASS == ELFCLASS64 +#if ELF_EI_CLASS == 2 # define PERBIT(x) x##64 # define ElfPERBIT(x) Elf64_##x # define ELFPERBIT(x) ELF64_##x Modified: trunk/ebdl/src/e-elf-section.c =================================================================== --- trunk/ebdl/src/e-elf-section.c 2008-09-04 17:40:35 UTC (rev 795) +++ trunk/ebdl/src/e-elf-section.c 2008-09-04 17:45:43 UTC (rev 796) @@ -710,7 +710,7 @@ if (G_LIKELY (priv->content)) { *size = _get_header_by_flags (CONTENT, size); - return GPOINTER_TO_INT (priv->content); + return ((ElfPERBIT(Addr)) (priv->content)); } if (G_LIKELY (priv->source)) { ElfPERBIT(Ehdr) *ehdr; @@ -724,7 +724,7 @@ } *size = _get (size); priv->content = GINT_TO_POINTER(ehdr) + _get (offset); - return GPOINTER_TO_INT (priv->content); + return ((ElfPERBIT(Addr)) (priv->content)); } return 0; } Modified: trunk/ebdl/src/e-elf.c =================================================================== --- trunk/ebdl/src/e-elf.c 2008-09-04 17:40:35 UTC (rev 795) +++ trunk/ebdl/src/e-elf.c 2008-09-04 17:45:43 UTC (rev 796) @@ -318,7 +318,7 @@ g_set_error (error, E_FILE_ERROR, E_FILE_ERROR_OPEN_FAILS, - "Unable to get stream content. Get %d of %ld", + "Unable to get stream content. Get %ld of %ld", size, status.st_size); g_assert_not_reached (); @@ -1164,7 +1164,7 @@ if (G_UNLIKELY (! (shdr = e_elf_get_shdr_by_index (elf, index, error)))) { return NULL; } - return e_elf_get_shdr_name (elf, GPOINTER_TO_INT(shdr), error); + return e_elf_get_shdr_name (elf, ((ElfPERBIT(Addr)) shdr), error); } const gchar * @@ -1198,7 +1198,7 @@ if (G_LIKELY (size != NULL)) { *size = shdr->sh_size; } - return GPOINTER_TO_INT (GINT_TO_POINTER(ehdr) + shdr->sh_offset); + return ((ElfPERBIT(Addr)) (GINT_TO_POINTER(ehdr) + shdr->sh_offset)); } ElfPERBIT(Addr) @@ -1219,7 +1219,7 @@ if (G_LIKELY (size != NULL)) { *size = shdr->sh_size; } - return GPOINTER_TO_INT (GINT_TO_POINTER(ehdr) + shdr->sh_offset); + return ((ElfPERBIT(Addr)) (GINT_TO_POINTER(ehdr) + shdr->sh_offset)); } ElfPERBIT(Addr) @@ -1241,7 +1241,7 @@ if (G_LIKELY (size != NULL)) { *size = shdr->sh_size; } - return GPOINTER_TO_INT (GINT_TO_POINTER(ehdr) + shdr->sh_offset); + return ((ElfPERBIT(Addr)) (GINT_TO_POINTER(ehdr) + shdr->sh_offset)); } ElfPERBIT(Half) @@ -1267,7 +1267,7 @@ g_set_error (error, E_ELF_ERROR, E_ELF_ERROR_BAD_ADDRESS, - "address %d point to an unknown section", address); + "address %ld point to an unknown section", address); return E_SECTION_INDEX_MAGIC; } @@ -1322,7 +1322,7 @@ g_return_val_if_fail (sstream != NULL, 0); g_return_val_if_fail (ssize != NULL, 0); - + /* get ehdr header */ if (G_UNLIKELY (! (ehdr = e_elf_get_ehdr (elf, error)))) { return 0; @@ -1335,13 +1335,13 @@ if (G_UNLIKELY (! (shdr = e_elf_get_shdr_by_index (elf, indx, error)))) { return 0; } - g_assert (GPOINTER_TO_INT (shdr) + (2 * ehdr->e_shentsize) > GPOINTER_TO_INT (ehdr)); + g_assert (((ElfPERBIT(Addr)) shdr) + (2 * ehdr->e_shentsize) > ((ElfPERBIT(Addr)) ehdr)); priv = E_ELF_GET_PRIVATE (elf); /* copy elf contents */ new_ehdr = g_memdup (ehdr, priv->size); - offset = GPOINTER_TO_INT(shdr) + ehdr->e_shentsize - GPOINTER_TO_INT (ehdr); + offset = ((ElfPERBIT(Addr)) shdr) + ehdr->e_shentsize - ((ElfPERBIT(Addr)) ehdr); /* Fix section string indx */ e_elf_ehdr_fix_section_string_index_on_add ( @@ -1367,7 +1367,7 @@ /* update output params */ *ssize = priv->size + ehdr->e_shentsize; - *sstream = GPOINTER_TO_UINT(new_ehdr); + *sstream = ((ElfPERBIT(Addr)) new_ehdr); } return *sstream + offset; } @@ -1419,10 +1419,10 @@ /* set return values */ *ssize = priv->size; - *sstream = GPOINTER_TO_INT (stream); + *sstream = ((ElfPERBIT(Addr)) stream); /* return a pointer to new section header address */ - return GPOINTER_TO_INT(new_shdr); + return ((ElfPERBIT(Addr)) new_shdr); } ElfPERBIT(Addr) @@ -1460,14 +1460,14 @@ if (G_UNLIKELY (! (shdr = e_elf_get_shdr_by_index (elf, indx, error)))) { return 0; } - g_assert (GPOINTER_TO_INT (shdr) + ehdr->e_shentsize > GPOINTER_TO_INT (ehdr)); + g_assert (((ElfPERBIT(Addr)) shdr) + ehdr->e_shentsize > ((ElfPERBIT(Addr)) ehdr)); priv = E_ELF_GET_PRIVATE (elf); /* copy elf contents */ new_ehdr = g_memdup (ehdr, priv->size); - offset = GPOINTER_TO_INT (shdr) - GPOINTER_TO_INT (ehdr); - + offset = ((ElfPERBIT(Addr)) shdr) - ((ElfPERBIT(Addr)) ehdr); + /* Fix section string indx */ e_elf_ehdr_fix_section_string_index_on_remove ( new_ehdr, indx); @@ -1489,7 +1489,8 @@ /* update output params */ *ssize = priv->size - ehdr->e_shentsize; - *sstream = GPOINTER_TO_INT (g_realloc (new_ehdr, priv->size - ehdr->e_shentsize)); + *sstream = ((ElfPERBIT(Addr)) (g_realloc (new_ehdr, priv->size - ehdr->e_shentsize))); + } return *sstream + offset; } @@ -1530,10 +1531,10 @@ /* copy elf contents */ new_ehdr = g_memdup (ehdr, priv->size); - offset = ctx + shdrtab->sh_size - GPOINTER_TO_INT (ehdr); + offset = ctx + shdrtab->sh_size - ((ElfPERBIT(Addr)) ehdr); injert = strlen (name) + 1; - g_assert (ctx + shdrtab->sh_size + injert > GPOINTER_TO_INT (ehdr)); + g_assert (ctx + shdrtab->sh_size + injert > ((ElfPERBIT(Addr)) (ehdr))); /* Update Section offset */ e_elf_ehdr_fix_section_name_on_add ( @@ -1557,7 +1558,8 @@ memcpy ((gpointer)new_ehdr + offset, name, injert); *ssize = priv->size + injert; - *sstream = GPOINTER_TO_INT(new_ehdr); + *sstream = ((ElfPERBIT(Addr)) (new_ehdr)); + } return ctx + shdrtab->sh_size; } @@ -1602,7 +1604,7 @@ new_ehdr = g_memdup (ehdr, priv->size); oname = GINT_TO_POINTER (ctx + shdr->sh_name); oname_len = strlen (oname); - offset = ctx + shdr->sh_name - GPOINTER_TO_UINT (ehdr); + offset = ctx + shdr->sh_name - ((ElfPERBIT(Addr)) (ehdr)); injert = oname_len + 1; /* set vars when name != NULL */ @@ -1658,7 +1660,7 @@ new_ehdr = g_realloc (new_ehdr, priv->size - injert); } - *sstream = GPOINTER_TO_UINT(new_ehdr); + *sstream = ((ElfPERBIT(Addr)) (new_ehdr)); return *sstream + offset; } @@ -1711,9 +1713,9 @@ memcpy ((gpointer)nehdr + offset, GINT_TO_POINTER(addr), bsize); *ssize = priv->size + bsize; - *sstream = GPOINTER_TO_UINT (nehdr); + *sstream = ((ElfPERBIT(Addr)) (nehdr)); } - return GPOINTER_TO_UINT (nehdr) + offset; + return ((ElfPERBIT(Addr)) (nehdr)) + offset; } ElfPERBIT(Addr) @@ -1790,7 +1792,7 @@ g_free (tmp_content); *ssize = priv->size - oldsize + bsize; - *sstream = GPOINTER_TO_UINT (nehdr); + *sstream = ((ElfPERBIT(Addr)) (nehdr)); return *sstream + offset; } @@ -2065,7 +2067,7 @@ EElfSection * -e_elf_get_section (EElf *elf, ElfPERBIT(Word) address, GError **error) +e_elf_get_section (EElf *elf, ElfPERBIT(Addr) address, GError **error) { ElfPERBIT(Half) indx; GError *local_error = NULL; @@ -2283,7 +2285,7 @@ { if (G_UNLIKELY (! (ocontent = e_elf_add_content ( elf, - GPOINTER_TO_INT(content), + ((ElfPERBIT(Addr)) (content)), size, 0, &sstream, @@ -2386,7 +2388,7 @@ goto rollback; } if (! (e_elf_update_content (elf, - GPOINTER_TO_INT(content), + ((ElfPERBIT(Addr)) (content)), size, shdr->sh_offset, shdr->sh_size, Modified: trunk/ebdl/src/e-elf.h =================================================================== --- trunk/ebdl/src/e-elf.h 2008-09-04 17:40:35 UTC (rev 795) +++ trunk/ebdl/src/e-elf.h 2008-09-04 17:45:43 UTC (rev 796) @@ -116,12 +116,12 @@ ElfPERBIT(Addr) *sstream, ElfPERBIT(Word) *ssize, GError **error); -ElfPERBIT(Word) e_elf_add_shdr_name (EElf *elf, +ElfPERBIT(Addr) e_elf_add_shdr_name (EElf *elf, const gchar *name, ElfPERBIT(Addr) *sstream, ElfPERBIT(Word) *ssize, GError **error); -ElfPERBIT(Word) e_elf_update_shdr_name (EElf *elf, +ElfPERBIT(Addr) e_elf_update_shdr_name (EElf *elf, const gchar *name, ElfPERBIT(Half) indx, ElfPERBIT(Addr) *sstream, Modified: trunk/ebdl/src/e-factory.c =================================================================== --- trunk/ebdl/src/e-factory.c 2008-09-04 17:40:35 UTC (rev 795) +++ trunk/ebdl/src/e-factory.c 2008-09-04 17:45:43 UTC (rev 796) @@ -191,7 +191,7 @@ case PROP_BACKEND_TYPE: if (G_LIKELY (! priv->backend_type)) { - priv->backend_type = g_value_get_uint (value); + priv->backend_type = g_value_get_ulong (value); } break; @@ -222,7 +222,7 @@ switch (prop_id) { case PROP_BACKEND_TYPE: - g_value_set_uint (value, priv->backend_type); + g_value_set_ulong (value, priv->backend_type); break; case PROP_HANDLER: @@ -327,12 +327,12 @@ g_object_class_install_property ( object_class, PROP_BACKEND_TYPE, - g_param_spec_uint ("backend-type", + g_param_spec_ulong ("backend-type", _("Backend Implemented Type"), _("The type of backend factory" "for this factory's implementation"), 0, - G_MAXUINT, + G_MAXULONG, 0, G_PARAM_READWRITE | G_PARAM_USE_STATIC_STRINGS)); Modified: trunk/ebdl/src/lk-module26.c =================================================================== --- trunk/ebdl/src/lk-module26.c 2008-09-04 17:40:35 UTC (rev 795) +++ trunk/ebdl/src/lk-module26.c 2008-09-04 17:45:43 UTC (rev 796) @@ -463,9 +463,15 @@ } #define G_TYPE_UINT32 G_TYPE_UINT -#define g_value_new_uint g_value_new_uint32 -#define g_value_set_uint32 g_value_set_uint +#if ELF_EI_CLASS == 2 +# define g_value_new_uint g_value_new_uint64 +# define g_value_set_uint64 g_value_set_uint64 +#else +# define g_value_new_uint g_value_new_uint32 +# define g_value_set_uint32 g_value_set_uint +#endif + static inline GValue * PERBIT(g_value_new_uint) (PERBIT(guint) v) { @@ -1223,7 +1229,6 @@ for (i = 0; sections[i] != NULL; i++) { sec = e_elf_get_section_by_name (elf, sections[i], NULL); if (sec != NULL) { - symbols = e_iterable_get_iterator ((EIterable *)sec, NULL); if (G_LIKELY (symbols != NULL)) { while ((s = e_iterator_get_next (symbols, NULL))) { Modified: trunk/ebdl/tests/Linux/modutils/modutils-test-suite.sh =================================================================== --- trunk/ebdl/tests/Linux/modutils/modutils-test-suite.sh 2008-09-04 17:40:35 UTC (rev 795) +++ trunk/ebdl/tests/Linux/modutils/modutils-test-suite.sh 2008-09-04 17:45:43 UTC (rev 796) @@ -271,12 +271,12 @@ modutils_test_compliant () { # Create endianness links - case `file e-modinfo.o` in + case `file modinfo-e-modinfo.o` in *MSB*) ENDIAN=be;; *LSB*) ENDIAN=le;; *) echo Unknown endian! >&2; exit 1;; esac - case `file e-modinfo.o` in + case `file modinfo-e-modinfo.o` in *32-bit*) BITNESS=32;; *64-bit*) BITNESS=64;; *) echo Unknown bitness! >&2; exit 1;; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <in...@us...> - 2008-09-04 17:40:38
|
Revision: 795 http://ebdl.svn.sourceforge.net/ebdl/?rev=795&view=rev Author: inean Date: 2008-09-04 17:40:35 +0000 (Thu, 04 Sep 2008) Log Message: ----------- Fix type Modified Paths: -------------- trunk/ebdl/src/e-table.c Modified: trunk/ebdl/src/e-table.c =================================================================== --- trunk/ebdl/src/e-table.c 2008-09-04 13:12:19 UTC (rev 794) +++ trunk/ebdl/src/e-table.c 2008-09-04 17:40:35 UTC (rev 795) @@ -482,7 +482,7 @@ priv->colname[len] = g_strdup (colname); priv->colname[len+1] = NULL; - priv->coltype = g_realloc (priv->coltype, (len + 2) * sizeof (gint)); + priv->coltype = g_realloc (priv->coltype, (len + 2) * sizeof (GType)); priv->coltype[len] = type; priv->coltype[len+1] = G_TYPE_INVALID; priv->n_columns++; @@ -771,7 +771,7 @@ /* should have same number of tuples */ if (columns2 < columns1) { priv2->colname = g_realloc (priv2->colname, (columns1 + 1) * sizeof (gchar *)); - priv2->coltype = g_realloc (priv2->coltype, (columns1 + 1) * sizeof (gint)); + priv2->coltype = g_realloc (priv2->coltype, (columns1 + 1) * sizeof (GType)); for (; priv2->n_columns < columns1; priv2->n_columns++) { priv2->colname[priv2->n_columns] = g_strdup (priv1->colname[priv2->n_columns]); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <in...@us...> - 2008-09-04 13:12:22
|
Revision: 794 http://ebdl.svn.sourceforge.net/ebdl/?rev=794&view=rev Author: inean Date: 2008-09-04 13:12:19 +0000 (Thu, 04 Sep 2008) Log Message: ----------- Fix Spec for fedora <= 8 Modified Paths: -------------- trunk/ebdl/packing/rpm/fedora/ebdl.spec.in.in Modified: trunk/ebdl/packing/rpm/fedora/ebdl.spec.in.in =================================================================== --- trunk/ebdl/packing/rpm/fedora/ebdl.spec.in.in 2008-08-28 20:03:58 UTC (rev 793) +++ trunk/ebdl/packing/rpm/fedora/ebdl.spec.in.in 2008-09-04 13:12:19 UTC (rev 794) @@ -24,9 +24,12 @@ Summary: Elf Beans Data Library (EBDL) Group: Development/Libraries +Requires: gettext Requires: glib2 >= @EBDL__REQUIRED@ Requires: libxml2 >= @EBDL_LIBXML_REQUIRED@ + BuildRequires: intltool +BuildRequires: gettext-devel BuildRequires: glib2-devel >= @EBDL_GLIB_REQUIRED@ BuildRequires: libxml2-devel >= @EBDL_LIBXML_REQUIRED@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <in...@us...> - 2008-08-28 20:04:01
|
Revision: 793 http://ebdl.svn.sourceforge.net/ebdl/?rev=793&view=rev Author: inean Date: 2008-08-28 20:03:58 +0000 (Thu, 28 Aug 2008) Log Message: ----------- Remove autogen.sh Modified Paths: -------------- trunk/ebdl-bonobo/acinclude.m4 trunk/ebdl-bonobo/packing/rpm/fedora/ebdl-bonobo.spec.in.in trunk/ebdl-bonobo/src/Makefile.am trunk/ebdl-bonobo/src/ebas/Makefile.am trunk/ebdl-bonobo/src/ebc-source-host-finder.c trunk/ebdl-bonobo/src/ebl-discover.c Added Paths: ----------- trunk/ebdl-bonobo/configure.ac Removed Paths: ------------- trunk/ebdl-bonobo/configure.in Modified: trunk/ebdl-bonobo/acinclude.m4 =================================================================== --- trunk/ebdl-bonobo/acinclude.m4 2008-08-28 20:03:04 UTC (rev 792) +++ trunk/ebdl-bonobo/acinclude.m4 2008-08-28 20:03:58 UTC (rev 793) @@ -490,8 +490,8 @@ AC_PROG_YACC PKG_CHECK_EXISTS([avahi-client >= $2 avahi-glib >= $2], enable_avahi=yes, enable_avahi=no) - if test "x$enable_avahi" = "xyes" -a "x$enable_ebas" != "xno" -a "x$LEX" = "xflex"; then - enable_ebas=yes + if test "x$enable_avahi" = "xyes" -a "x$LEX" = "xflex"; then + enable_ebas=yes # check capabilities AC_CHECK_HEADERS([linux/capability.h]) Copied: trunk/ebdl-bonobo/configure.ac (from rev 785, trunk/ebdl-bonobo/configure.in) =================================================================== --- trunk/ebdl-bonobo/configure.ac (rev 0) +++ trunk/ebdl-bonobo/configure.ac 2008-08-28 20:03:58 UTC (rev 793) @@ -0,0 +1,190 @@ +dnl -*- tab-width: 2; indent-tabs-mode: nil -*- +AC_PREREQ(2.52) + +dnl the ebdl-bonobo version number +m4_define([ebdl_bonobo_major_version],[0]) +m4_define([ebdl_bonobo_minor_version],[1]) +m4_define([ebdl_bonobo_micro_version],[2]) +m4_define([ebdl_bonobo_version],[ebdl_bonobo_major_version.ebdl_bonobo_minor_version.ebdl_bonobo_micro_version]) + +AC_INIT([ebdl-bonobo],[ebdl_bonobo_version], [http://ebdl.sf.net/bugs.php?package=ebdl-bonobo]) + +AM_INIT_AUTOMAKE([-Wno-portability no-define]) +AC_CONFIG_SRCDIR([src/eb-main.c]) + +AM_MAINTAINER_MODE +AM_CONFIG_HEADER([config.h]) + +AC_DEFINE([EBDL_BONOBO_MAJOR_VERSION], ebdl_bonobo_major_version, [ebdl_bonono_major_version]) +AC_DEFINE([EBDL_BONOBO_MINOR_VERSION], ebdl_bonobo_minor_version, [ebdl_bonobo_minor_version]) +AC_DEFINE([EBDL_BONOBO_MICRO_VERSION], ebdl_bonobo_micro_version, [ebdl_bonobo_micro_version]) + +BASE_VERSION=1.0 +AC_SUBST(BASE_VERSION) + +dnl ================= Requirements ================================================ + +m4_define([libebdl_required_version], [0.10]) +m4_define([liborbit2_required_version], [2.4.0]) +m4_define([libbonobo_required_version], [2.0.0]) +m4_define([libavahi_required_version], [0.6.0]) +m4_define([libgobject_required_version], [2.4.0]) + +LIBEBDL_REQUIRED=libebdl_required_version +LIBORBIT2_REQUIRED=liborbit2_required_version +LIBBONOBO_REQUIRED=libbonobo_required_version +LIBAVAHI_REQUIRED=libavahi_required_version +LIBGOBJECT_REQUIRED=libgobject_required_version + +AC_SUBST(LIBEBDL_REQUIRED) +AC_SUBST(LIBORBIT2_REQUIRED) +AC_SUBST(LIBBONOBO_REQUIRED) +AC_SUBST(LIBAVAHI_REQUIRED) +AC_SUBST(LIBGOBJECT_REQUIRED) + +dnl ================= Configure Stuff ============================================= + +m4_define([_LT_AC_TAGCONFIG], []) +m4_ifdef([AC_LIBTOOL_TAGS], [AC_LIBTOOL_TAGS([])]) + +AC_DISABLE_STATIC +AC_PROG_LIBTOOL + +dnl ================= Check tools ================================================= + +PKG_PROG_PKG_CONFIG +dnl GTK_DOC_CHECK([1.4]) + +dnl ================= Arguments =================================================== + +AS_SET_CCACHE_STUFF([no]) +AS_SET_KERNEL_STUFF([auto]) +AS_SET_DEBUG_MODE([minimum]) +AS_SET_COMPILE_MODE([minimum]) +AS_SET_COMPONENT_DIR([auto]) +AS_SET_DISTRO_VENDOR([auto]) + +dnl ====================== Optional Code ========================================== + +dnl build forked activation server +AS_ENABLE_EBAS([auto],[libavahi_required_version]) +dnl enable tests cases +AS_ENABLE_TESTS([auto]) +dnl enable coverage analysis +AS_SET_COVERAGE([auto]) + +dnl Backends support +AS_ENABLE_BACKENDS([yes]) + +dnl ================== Internationalization ======================================= + +AC_DEFINE(GETTEXT_PACKAGE, "AC_PACKAGE_NAME", [Define to the gettext package name]) +GETTEXT_PACKAGE=AC_PACKAGE_NAME +AC_SUBST(GETTEXT_PACKAGE) +AM_GLIB_GNU_GETTEXT + +dnl ====================== Check headers ========================================== + +AS_CHECK_VALGRIND +AC_CHECK_FUNCS([setresuid setfsuid]) +AC_CHECK_HEADERS([netdb.h sys/prctl.h sys/fsuid.h pwd.h grp.h unistd.h]) + +dnl ================= Check version libs ========================================== + +PKG_CHECK_EXISTS([ebdl-1 >= libebdl_required_version]) +PKG_CHECK_EXISTS([ebdl-plugin-1 >= libebdl_required_version]) +PKG_CHECK_EXISTS([ORBit-2.0 >= liborbit2_required_version]) +PKG_CHECK_EXISTS([libbonobo-2.0 >= libbonobo_required_version]) +PKG_CHECK_EXISTS([bonobo-activation-2.0 >= libbonobo_required_version]) +PKG_CHECK_EXISTS([gobject-2.0 >= libgobject_required_version]) + +dnl ================= Set up tools ================================================ + +AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) +AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums) + +dnl ================= Set compile flags =========================================== + +AS_CHECK_MODULES(EBDL_BONOBO, [libbonobo-2.0 ORBit-2.0],,$GCOV_LIBS) +AS_CHECK_MODULES(EBDL_SERVER, [libbonobo-2.0 ORBit-2.0 ebdl-1],,$GCOV_LIBS) +AS_CHECK_MODULES(EBDL_CLIENT, [libbonobo-2.0 ORBit-2.0 ebdl-1 ebdl-plugin-1],,$GCOV_LIBS) +AS_CHECK_MODULES(EBDL_EBAS, [libbonobo-2.0 ORBit-2.0], $AVAHI_CFLAGS, $GCOV_LIBS $AVAHI_LIBS) +AS_CHECK_MODULES(EBDL_TEST, [libbonobo-2.0 bonobo-activation-2.0 ORBit-2.0 ebdl-1 ebdl-plugin-1], $AVAHI_FLAGS $CHECK_CFLAGS, $GCOV_LIBS $AVAHI_LIBS $CHECK_LIBS) + +ORBIT_IDL=`$PKG_CONFIG --variable=orbit_idl ORBit-2.0` +if test "x$ORBIT_IDL" = "x"; then + AC_MSG_ERROR([No IDL Compiler defined]) +fi + +EBDL_IDL_ACTIVATION_CFLAGS="-I"`$PKG_CONFIG --variable=idldir bonobo-activation-2.0` +if test "x`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`" = "x"; then + AC_MSG_ERROR([No bonobo-activation-2.0 idldir defined]) +fi + +EBDL_IDL_CFLAGS="$EBDL_IDL_ACTIVATION_CFLAGS -I"`$PKG_CONFIG --variable=idldir libbonobo-2.0` +if test "x`$PKG_CONFIG --variable=idldir libbonobo-2.0`" = "x"; then + AC_MSG_ERROR([No libbonobo-2.0 idldir defined]) +fi + +dnl ================= Setting Up! ================================================= + +AC_SUBST(EBDL_IDL_ACTIVATION_CFLAGS) +AC_SUBST(EBDL_IDL_CFLAGS) +AC_SUBST(ORBIT_IDL) + +AC_CONFIG_FILES([ + Makefile + packing/Makefile + packing/deb/Makefile + packing/deb/debian/Makefile + packing/rpm/Makefile + packing/rpm/fedora/Makefile + packing/rpm/fedora/ebdl-bonobo.spec.in + idl/Makefile + src/Makefile + src/ebas/Makefile + tests/Makefile + tests/Linux/Makefile + tests/Linux/modules/Makefile + tests/Linux/modules/test01/Makefile +]) +AC_OUTPUT + +echo_bold() { + echo $ECHO_N "`tput bold 2>/dev/null`" + echo "$@" + echo $ECHO_N "`tput sgr0 2>/dev/null`" +} + +echo +echo EBDL Bonobo Components Version $VERSION +echo +echo_bold Configuration: +echo prefix ................................ $prefix +echo source code location .................. `cd $srcdir && pwd` +echo compiler .............................. $CC +echo add valgrind support .................. ${ac_cv_header_valgrind_valgrind_h:-no} +echo boost compilation with ccache ......... ${enable_ccache:-no} +if test "x$enable_coverage" = "xyes"; then + echo build tests with coverage support ..... ${enable_tests:-no} +else + echo build tests ........................... ${enable_tests:-no} +fi +echo + +echo_bold Bonobo details: +eval eval eval echo components destination dir ............ $componentdir +echo build ebdl bonobo activation server ... ${enable_ebas:-no} +if test "x$enable_ebas" = "xyes"; then + echo target vendor ......................... ${with_distro_vendor:-unknown} \($vendor\) +fi + +if test x"$enable_backends" = "xyes"; then + echo + echo_bold Backends: +eval eval eval echo \ Modules Dir ........................... $backenddir + echo \ Bonobo Client backend ................ ${enable_backends:-no} +fi + +echo +eval eval echo EBDL Bonobo libraries will be installed in $libdir. Deleted: trunk/ebdl-bonobo/configure.in =================================================================== --- trunk/ebdl-bonobo/configure.in 2008-08-28 20:03:04 UTC (rev 792) +++ trunk/ebdl-bonobo/configure.in 2008-08-28 20:03:58 UTC (rev 793) @@ -1,184 +0,0 @@ -dnl -*- tab-width: 2; indent-tabs-mode: nil -*- -AC_PREREQ(2.52) - -dnl the ebdl-bonobo version number -m4_define([ebdl_bonobo_major_version],[0]) -m4_define([ebdl_bonobo_minor_version],[1]) -m4_define([ebdl_bonobo_micro_version],[2]) -m4_define([ebdl_bonobo_version],[ebdl_bonobo_major_version.ebdl_bonobo_minor_version]) - -AC_INIT([ebdl-bonobo],[ebdl_bonobo_version], [http://ebdl.sf.net/bugs.php?package=ebdl-bonobo]) - -AM_INIT_AUTOMAKE([-Wno-portability no-define]) -AC_CONFIG_SRCDIR([src/eb-main.c]) - -AM_MAINTAINER_MODE -AM_CONFIG_HEADER([config.h]) - -AC_DEFINE([EBDL_BONOBO_MAJOR_VERSION], ebdl_bonobo_major_version, [ebdl_bonono_major_version]) -AC_DEFINE([EBDL_BONOBO_MINOR_VERSION], ebdl_bonobo_minor_version, [ebdl_bonobo_minor_version]) -AC_DEFINE([EBDL_BONOBO_MICRO_VERSION], ebdl_bonobo_micro_version, [ebdl_bonobo_micro_version]) - -BASE_VERSION=1.0 -AC_SUBST(BASE_VERSION) - -dnl ================= Requirements ================================================ - -m4_define([libebdl_required_version], [0.10]) -m4_define([liborbit2_required_version], [2.4.0]) -m4_define([libbonobo_required_version], [2.0.0]) -m4_define([libavahi_required_version], [0.6.0]) -m4_define([libgobject_required_version], [2.4.0]) - -LIBEBDL_REQUIRED=libebdl_required_version -LIBORBIT2_REQUIRED=liborbit2_required_version -LIBBONOBO_REQUIRED=libbonobo_required_version -LIBAVAHI_REQUIRED=libavahi_required_version -LIBGOBJECT_REQUIRED=libgobject_required_version - -AC_SUBST(LIBEBDL_REQUIRED) -AC_SUBST(LIBORBIT2_REQUIRED) -AC_SUBST(LIBBONOBO_REQUIRED) -AC_SUBST(LIBAVAHI_REQUIRED) -AC_SUBST(LIBGOBJECT_REQUIRED) - -dnl ================= Configure Stuff ============================================= - -m4_define([_LT_AC_TAGCONFIG], []) -m4_ifdef([AC_LIBTOOL_TAGS], [AC_LIBTOOL_TAGS([])]) - -AS_PROG_CC -AC_DISABLE_STATIC -AC_PROG_LIBTOOL - -dnl ================= Check tools ================================================= - -PKG_PROG_PKG_CONFIG -dnl GTK_DOC_CHECK([1.4]) - -dnl ================= Arguments =================================================== - -AS_SET_CCACHE_STUFF([no]) -AS_SET_KERNEL_STUFF([auto]) -AS_SET_DEBUG_MODE([minimum]) -AS_SET_COMPILE_MODE([minimum]) -AS_SET_COMPONENT_DIR([auto]) -AS_SET_DISTRO_VENDOR([auto]) - -dnl ====================== Optional Code ========================================== - -dnl build forked activation server -AS_ENABLE_EBAS([auto],[libavahi_required_version]) -dnl enable tests cases -AS_ENABLE_TESTS([auto]) -dnl enable coverage analysis -AS_SET_COVERAGE([auto]) - -dnl Backends support -AS_ENABLE_BACKENDS([yes]) - -dnl ====================== Check headers ========================================== - -AS_CHECK_VALGRIND -AC_CHECK_FUNCS([setresuid setfsuid]) -AC_CHECK_HEADERS([netdb.h sys/prctl.h sys/fsuid.h pwd.h grp.h unistd.h]) - -dnl ================= Check version libs ========================================== - -PKG_CHECK_EXISTS([ebdl-1 >= libebdl_required_version]) -PKG_CHECK_EXISTS([ebdl-plugin-1 >= libebdl_required_version]) -PKG_CHECK_EXISTS([ORBit-2.0 >= liborbit2_required_version]) -PKG_CHECK_EXISTS([libbonobo-2.0 >= libbonobo_required_version]) -PKG_CHECK_EXISTS([bonobo-activation-2.0 >= libbonobo_required_version]) -PKG_CHECK_EXISTS([gobject-2.0 >= libgobject_required_version]) - -dnl ================= Set up tools ================================================ - -AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) -AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums) - -dnl ================= Set compile flags =========================================== - -AS_CHECK_MODULES(EBDL_BONOBO, [libbonobo-2.0 ORBit-2.0],,$GCOV_LIBS) -AS_CHECK_MODULES(EBDL_SERVER, [libbonobo-2.0 ORBit-2.0 ebdl-1],,$GCOV_LIBS) -AS_CHECK_MODULES(EBDL_CLIENT, [libbonobo-2.0 ORBit-2.0 ebdl-1 ebdl-plugin-1],,$GCOV_LIBS) -AS_CHECK_MODULES(EBDL_EBAS, [libbonobo-2.0 ORBit-2.0], $AVAHI_CFLAGS, $GCOV_LIBS $AVAHI_LIBS) -AS_CHECK_MODULES(EBDL_TEST, [libbonobo-2.0 bonobo-activation-2.0 ORBit-2.0 ebdl-1 ebdl-plugin-1], $AVAHI_FLAGS $CHECK_CFLAGS, $GCOV_LIBS $AVAHI_LIBS $CHECK_LIBS) - -ORBIT_IDL=`$PKG_CONFIG --variable=orbit_idl ORBit-2.0` -if test "x$ORBIT_IDL" = "x"; then - AC_MSG_ERROR([No IDL Compiler defined]) -fi - -EBDL_IDL_ACTIVATION_CFLAGS="-I"`$PKG_CONFIG --variable=idldir bonobo-activation-2.0` -if test "x`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`" = "x"; then - AC_MSG_ERROR([No bonobo-activation-2.0 idldir defined]) -fi - -EBDL_IDL_CFLAGS="$EBDL_IDL_ACTIVATION_CFLAGS -I"`$PKG_CONFIG --variable=idldir libbonobo-2.0` -if test "x`$PKG_CONFIG --variable=idldir libbonobo-2.0`" = "x"; then - AC_MSG_ERROR([No libbonobo-2.0 idldir defined]) -fi - -dnl ================= Setting Up! ================================================= - -AC_SUBST(EBDL_IDL_ACTIVATION_CFLAGS) -AC_SUBST(EBDL_IDL_CFLAGS) -AC_SUBST(ORBIT_IDL) - -AC_CONFIG_FILES([ - Makefile - packing/Makefile - packing/deb/Makefile - packing/deb/debian/Makefile - packing/rpm/Makefile - packing/rpm/fedora/Makefile - packing/rpm/fedora/ebdl-bonobo.spec.in - idl/Makefile - src/Makefile - src/ebas/Makefile - tests/Makefile - tests/Linux/Makefile - tests/Linux/modules/Makefile - tests/Linux/modules/test01/Makefile -]) -AC_OUTPUT - -echo_bold() { - echo $ECHO_N "`tput bold 2>/dev/null`" - echo "$@" - echo $ECHO_N "`tput sgr0 2>/dev/null`" -} - -echo -echo EBDL Bonobo Components Version $VERSION -echo -echo_bold Configuration: -echo prefix ................................ $prefix -echo source code location .................. `cd $srcdir && pwd` -echo compiler .............................. $CC -echo add valgrind support .................. ${ac_cv_header_valgrind_valgrind_h:-no} -echo boost compilation with ccache ......... ${enable_ccache:-no} -if test "x$enable_coverage" = "xyes"; then - echo build tests with coverage support ..... ${enable_tests:-no} -else - echo build tests ........................... ${enable_tests:-no} -fi -echo - -echo_bold Bonobo details: -eval eval eval echo components destination dir ............ $componentdir -echo build ebdl bonobo activation server ... ${enable_ebas:-no} -if test "x$enable_ebas" = "xyes"; then - echo target vendor ......................... ${with_distro_vendor:-unknown} \($vendor\) -fi - -if test x"$enable_backends" = "xyes"; then - echo - echo_bold Backends: -eval eval eval echo \ Modules Dir ........................... $backenddir - echo \ Bonobo Client backend ................ ${enable_backends:-no} -fi - -echo -eval eval echo EBDL Bonobo libraries will be installed in $libdir. Modified: trunk/ebdl-bonobo/packing/rpm/fedora/ebdl-bonobo.spec.in.in =================================================================== --- trunk/ebdl-bonobo/packing/rpm/fedora/ebdl-bonobo.spec.in.in 2008-08-28 20:03:04 UTC (rev 792) +++ trunk/ebdl-bonobo/packing/rpm/fedora/ebdl-bonobo.spec.in.in 2008-08-28 20:03:58 UTC (rev 793) @@ -56,7 +56,7 @@ Module to operate into remote systems as they will be local. %files module -%{_libexecdir}/ebdl-1/modules/libebc*.so +%{_libexecdir}/ebdl-1/backends/libebc*.so %{_libexecdir}/ebdl-1/components/libebl*.so %{_libdir}/bonobo/servers/*Discover*.server Modified: trunk/ebdl-bonobo/src/Makefile.am =================================================================== --- trunk/ebdl-bonobo/src/Makefile.am 2008-08-28 20:03:04 UTC (rev 792) +++ trunk/ebdl-bonobo/src/Makefile.am 2008-08-28 20:03:58 UTC (rev 793) @@ -212,6 +212,7 @@ endif +if ENABLE_EBAS component_LTLIBRARIES = \ libebl_discover.la \ $(NULL) @@ -283,6 +284,7 @@ $(libebl_discover_la_OBJECTS) : $(libebl_discover_built_sources) +endif component_PROGRAMS = \ ebdl-bonobo \ Modified: trunk/ebdl-bonobo/src/ebas/Makefile.am =================================================================== --- trunk/ebdl-bonobo/src/ebas/Makefile.am 2008-08-28 20:03:04 UTC (rev 792) +++ trunk/ebdl-bonobo/src/ebas/Makefile.am 2008-08-28 20:03:58 UTC (rev 793) @@ -6,7 +6,7 @@ -DSERVER_CONFDIR=\"$(sysconfdir)\" \ -DSERVER_INFODIR=\"$(libdir)/bonobo/servers\" \ -DE_ENABLE_DEPRECATED_DEBUG=1 \ - -DEBDL_ENABLE_DEBUG_LOG=1 \ + -DE_ENABLE_DEBUG_LOG=1 \ $(EBDL_EBAS_CFLAGS) \ $(ASX_CFLAGS) \ $(NULL) Modified: trunk/ebdl-bonobo/src/ebc-source-host-finder.c =================================================================== --- trunk/ebdl-bonobo/src/ebc-source-host-finder.c 2008-08-28 20:03:04 UTC (rev 792) +++ trunk/ebdl-bonobo/src/ebc-source-host-finder.c 2008-08-28 20:03:58 UTC (rev 793) @@ -308,8 +308,8 @@ g_object_class_install_property ( \ object_class, PROP_TYPE, \ g_param_spec_enum ("type", \ - _P("Type"), \ - _P("Data container's type"), \ + _("Type"), \ + _("Data container's type"), \ E_TYPE_FINDER_TYPE, \ E_FINDER_TYPE_INVALID, \ G_PARAM_CONSTRUCT | G_PARAM_WRITABLE)); Modified: trunk/ebdl-bonobo/src/ebl-discover.c =================================================================== --- trunk/ebdl-bonobo/src/ebl-discover.c 2008-08-28 20:03:04 UTC (rev 792) +++ trunk/ebdl-bonobo/src/ebl-discover.c 2008-08-28 20:03:58 UTC (rev 793) @@ -89,7 +89,7 @@ { #define CMPTYPE(T,F) (!memcmp(&((T*)s1)->F,&((T*)s2)->F,sizeof(((T*)s1)->F))) - if (s1->sa_family != s2->sa_family) + if (!s1 || !s2 || s1->sa_family != s2->sa_family) return FALSE; switch (s1->sa_family) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <in...@us...> - 2008-08-28 20:03:07
|
Revision: 792 http://ebdl.svn.sourceforge.net/ebdl/?rev=792&view=rev Author: inean Date: 2008-08-28 20:03:04 +0000 (Thu, 28 Aug 2008) Log Message: ----------- Pass distcheck Modified Paths: -------------- trunk/ebdl-python/packing/rpm/fedora/ebdl-python.spec.in.in trunk/ebdl-python/src/ebdl.override trunk/ebdl-python/src/stream.override Added Paths: ----------- trunk/ebdl-python/configure.ac Removed Paths: ------------- trunk/ebdl-python/configure.in Copied: trunk/ebdl-python/configure.ac (from rev 788, trunk/ebdl-python/configure.in) =================================================================== --- trunk/ebdl-python/configure.ac (rev 0) +++ trunk/ebdl-python/configure.ac 2008-08-28 20:03:04 UTC (rev 792) @@ -0,0 +1,152 @@ +dnl -*- tab width: 2; indent-tabs-mode: nil -*- +AC_PREREQ(2.52) + +dnl the ebdl-python version number +m4_define([ebdl_python_major_version], [0]) +m4_define([ebdl_python_minor_version], [1]) +m4_define([ebdl_python_micro_version], [2]) +m4_define([ebdl_python_version], [ebdl_python_major_version.ebdl_python_minor_version.ebdl_python_micro_version]) + +AC_INIT([ebdl-python], [ebdl_python_version], [http://ebdl.sf.net/bugs?package=ebdl-python]) +AC_CANONICAL_TARGET + +AM_INIT_AUTOMAKE([-Wno-portability no-define]) +AC_CONFIG_SRCDIR([src/ep-python-loader.c]) + +AM_MAINTAINER_MODE +AM_CONFIG_HEADER([config.h]) + +AC_DEFINE([EBDL_PYTHON_MAJOR_VERSION], ebdl_python_major_version, [ebdl_python_major_version]) +AC_DEFINE([EBDL_PYTHON_MINOR_VERSION], ebdl_python_minor_version, [ebdl_python_minor_version]) +AC_DEFINE([EBDL_PYTHON_MICRO_VERSION], ebdl_python_micro_version, [ebdl_python_micro_version]) + +dnl ================= Requirements ================================================ + +m4_define([libebdl_required_version], [0.10.3]) +m4_define([libgobject_required_version],[2.6.0]) +m4_define([pygobject_required_version], [2.8.0]) + +LIBEBDL_REQUIRED=libebdl_required_version +LIBGOBJECT_REQUIRED=libgobject_required_version +PYGOBJECT_REQUIRED=pygobject_required_version + +AC_SUBST(LIBEBDL_REQUIRED) +AC_SUBST(LIBGOBJECT_VERSION) +AC_SUBST(PYGOBJECT_REQUIRED) + +dnl ================= Configure Stuff ============================================= + +m4_define([_LT_AC_TAGCONFIG], []) +m4_ifdef([AC_LIBTOOL_TAGS], [AC_LIBTOOL_TAGS([])]) + +AS_PROG_CC +AC_DISABLE_STATIC +AC_PROG_LIBTOOL + +dnl ================= Check tools ================================================= + +PKG_PROG_PKG_CONFIG + +dnl ================= Arguments =================================================== + +AS_SET_KERNEL([auto]) +AS_SET_DEBUG_MODE([minimum]) +AS_SET_COMPILE_MODE([minimum]) + +dnl ================= Backends and Optional Code ================================== + +dnl enable tests cases +AS_ENABLE_TESTS([auto]) +dnl enable coverage analysis +AS_SET_COVERAGE([auto]) +dnl Backends support +AS_ENABLE_LOADERS([yes]) + +dnl ================= Check for Python ============================================ + +AM_PATH_PYTHON([2.3]) +AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) +AM_CHECK_PYTHON_LIBS(,[AC_MSG_ERROR(could not find Python lib)]) + +AC_SUBST([pkgpythondir], [\${pythondir}/ebdl-1]) +AC_SUBST([pkgpyexecdir], [\${pyexecdir}/ebdl-1]) + +dnl ================= Check version libs ========================================== + +AS_CHECK_EXISTS([ebdl-1 >= libebdl_required_version]) +AS_CHECK_EXISTS([ebdl-plugin-1 >= libebdl_required_version]) +AS_CHECK_EXISTS([gobject-2.0 >= libgobject_required_version]) +AS_CHECK_EXISTS([pygobject-2.0 >= pygobject_required_version]) + +dnl ================= Set up tools ================================================ + +# Use custom codegen to get more info like paramaters direction +PYGOBJECT_CODEGEN="$PYTHON `cd $srcdir && pwd`/codegen/codegen.py" + +# Get args defs default dir +PYGOBJECT_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygobject-2.0` +if test "x$PYGOBJECT_DEFSDIR" = "x" ; then + PYGOBJECT_DEFSDIR='${datadir}/pygtk/2.0/defs' +fi + +AC_SUBST(PYGOBJECT_CODEGEN) +AC_SUBST(PYGOBJECT_DEFSDIR) + +# Process pygobject version +PYGOBJECT_VERSION=`$PKG_CONFIG --modversion pygobject-2.0` +PYGOBJECT_VERSION=`echo $PYGOBJECT_VERSION | awk -F. '{ print $[]1 * 10000 + $[]2 * 100 + $[]3;}'` +AC_DEFINE_UNQUOTED([PYGOBJECT_VERSION],$PYGOBJECT_VERSION, [pygobject_version]) + + +dnl ================= Set compile flags =========================================== + +AS_CHECK_MODULES(EBDL_BINDING, [pygobject-2.0 gobject-2.0 ebdl-1 ebdl-plugin-1], $PYTHON_INCLUDES, $PYTHON_LIBS $GCOV_LIBS) +AS_CHECK_MODULES(EBDL_LOADER, [gobject-2.0 pygobject-2.0 ebdl-plugin-1], $PYTHON_INCLUDES, $PYTHON_LIBS $GCOV_LIBS) + +dnl ================= Setting Up! ================================================= + +AC_CONFIG_FILES([ + Makefile + codegen/Makefile + packing/Makefile + packing/deb/Makefile + packing/deb/debian/Makefile + packing/rpm/Makefile + packing/rpm/fedora/Makefile + packing/rpm/fedora/ebdl-python.spec.in + src/Makefile + tests/Makefile +]) +AC_OUTPUT + +echo_bold() { + echo $ECHO_N "`tput bold 2>/dev/null`" + echo "$@" + echo $ECHO_N "`tput sgr0 2>/dev/null`" +} + +echo +echo EBDL Python bindings Version $VERSION +echo +echo_bold Configuration: +echo prefix ................................ $prefix +echo source code location .................. `cd $srcdir && pwd` +echo compiler .............................. $CC +echo use custom codegen .................... yes +if test "x$enable_coverage" = "xyes"; then + echo build tests with coverage support ..... ${enable_tests:-no} +else + echo build tests ........................... ${enable_tests:-no} +fi +echo + +if test x"$enable_loaders" = "xyes"; then + echo + echo_bold Loaders: +eval eval eval echo \ Loaders Dir ........................... $loaderdir + echo \ Python Loader ........................ ${enable_loaders:-no} +fi + +echo +eval eval echo EBDL Python will be installed in $pyexecdir/gtk-2.0 + Deleted: trunk/ebdl-python/configure.in =================================================================== --- trunk/ebdl-python/configure.in 2008-08-28 19:54:31 UTC (rev 791) +++ trunk/ebdl-python/configure.in 2008-08-28 20:03:04 UTC (rev 792) @@ -1,152 +0,0 @@ -dnl -*- tab width: 2; indent-tabs-mode: nil -*- -AC_PREREQ(2.52) - -dnl the ebdl-python version number -m4_define([ebdl_python_major_version], [0]) -m4_define([ebdl_python_minor_version], [1]) -m4_define([ebdl_python_micro_version], [2]) -m4_define([ebdl_python_version], [ebdl_python_major_version.ebdl_python_minor_version.ebdl_python_micro_version]) - -AC_INIT([ebdl-python], [ebdl_python_version], [http://ebdl.sf.net/bugs?package=ebdl-python]) -AC_CANONICAL_TARGET - -AM_INIT_AUTOMAKE([-Wno-portability no-define]) -AC_CONFIG_SRCDIR([src/ep-python-loader.c]) - -AM_MAINTAINER_MODE -AM_CONFIG_HEADER([config.h]) - -AC_DEFINE([EBDL_PYTHON_MAJOR_VERSION], ebdl_python_major_version, [ebdl_python_major_version]) -AC_DEFINE([EBDL_PYTHON_MINOR_VERSION], ebdl_python_minor_version, [ebdl_python_minor_version]) -AC_DEFINE([EBDL_PYTHON_MICRO_VERSION], ebdl_python_micro_version, [ebdl_python_micro_version]) - -dnl ================= Requirements ================================================ - -m4_define([libebdl_required_version], [0.10.3]) -m4_define([libgobject_required_version],[2.6.0]) -m4_define([pygobject_required_version], [2.8.0]) - -LIBEBDL_REQUIRED=libebdl_required_version -LIBGOBJECT_REQUIRED=libgobject_required_version -PYGOBJECT_REQUIRED=pygobject_required_version - -AC_SUBST(LIBEBDL_REQUIRED) -AC_SUBST(LIBGOBJECT_VERSION) -AC_SUBST(PYGOBJECT_REQUIRED) - -dnl ================= Configure Stuff ============================================= - -m4_define([_LT_AC_TAGCONFIG], []) -m4_ifdef([AC_LIBTOOL_TAGS], [AC_LIBTOOL_TAGS([])]) - -AS_PROG_CC -AC_DISABLE_STATIC -AC_PROG_LIBTOOL - -dnl ================= Check tools ================================================= - -PKG_PROG_PKG_CONFIG - -dnl ================= Arguments =================================================== - -AS_SET_KERNEL([auto]) -AS_SET_DEBUG_MODE([minimum]) -AS_SET_COMPILE_MODE([minimum]) - -dnl ================= Backends and Optional Code ================================== - -dnl enable tests cases -AS_ENABLE_TESTS([auto]) -dnl enable coverage analysis -AS_SET_COVERAGE([auto]) -dnl Backends support -AS_ENABLE_LOADERS([yes]) - -dnl ================= Check for Python ============================================ - -AM_PATH_PYTHON([2.3]) -AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) -AM_CHECK_PYTHON_LIBS(,[AC_MSG_ERROR(could not find Python lib)]) - -AC_SUBST([pkgpythondir], [\${pythondir}/ebdl-1]) -AC_SUBST([pkgpyexecdir], [\${pyexecdir}/ebdl-1]) - -dnl ================= Check version libs ========================================== - -AS_CHECK_EXISTS([ebdl-1 >= libebdl_required_version]) -AS_CHECK_EXISTS([ebdl-plugin-1 >= libebdl_required_version]) -AS_CHECK_EXISTS([gobject-2.0 >= libgobject_required_version]) -AS_CHECK_EXISTS([pygobject-2.0 >= pygobject_required_version]) - -dnl ================= Set up tools ================================================ - -# Use custom codegen to get more info like paramaters direction -PYGOBJECT_CODEGEN="$PYTHON `cd $srcdir && pwd`/codegen/codegen.py" - -# Get args defs default dir -PYGOBJECT_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygobject-2.0` -if test "x$PYGOBJECT_DEFSDIR" = "x" ; then - PYGOBJECT_DEFSDIR='${datadir}/pygtk/2.0/defs' -fi - -AC_SUBST(PYGOBJECT_CODEGEN) -AC_SUBST(PYGOBJECT_DEFSDIR) - -# Process pygobject version -PYGOBJECT_VERSION=`$PKG_CONFIG --modversion pygobject-2.0` -PYGOBJECT_VERSION=`echo $PYGOBJECT_VERSION | awk -F. '{ print $[]1 * 10000 + $[]2 * 100 + $[]3;}'` -AC_DEFINE_UNQUOTED([PYGOBJECT_VERSION],$PYGOBJECT_VERSION, [pygobject_version]) - - -dnl ================= Set compile flags =========================================== - -AS_CHECK_MODULES(EBDL_BINDING, [pygobject-2.0 gobject-2.0 ebdl-1 ebdl-plugin-1], $PYTHON_INCLUDES, $PYTHON_LIBS $GCOV_LIBS) -AS_CHECK_MODULES(EBDL_LOADER, [gobject-2.0 pygobject-2.0 ebdl-plugin-1], $PYTHON_INCLUDES, $PYTHON_LIBS $GCOV_LIBS) - -dnl ================= Setting Up! ================================================= - -AC_CONFIG_FILES([ - Makefile - codegen/Makefile - packing/Makefile - packing/deb/Makefile - packing/deb/debian/Makefile - packing/rpm/Makefile - packing/rpm/fedora/Makefile - packing/rpm/fedora/ebdl-python.spec.in - src/Makefile - tests/Makefile -]) -AC_OUTPUT - -echo_bold() { - echo $ECHO_N "`tput bold 2>/dev/null`" - echo "$@" - echo $ECHO_N "`tput sgr0 2>/dev/null`" -} - -echo -echo EBDL Python bindings Version $VERSION -echo -echo_bold Configuration: -echo prefix ................................ $prefix -echo source code location .................. `cd $srcdir && pwd` -echo compiler .............................. $CC -echo use custom codegen .................... yes -if test "x$enable_coverage" = "xyes"; then - echo build tests with coverage support ..... ${enable_tests:-no} -else - echo build tests ........................... ${enable_tests:-no} -fi -echo - -if test x"$enable_loaders" = "xyes"; then - echo - echo_bold Loaders: -eval eval eval echo \ Loaders Dir ........................... $loaderdir - echo \ Python Loader ........................ ${enable_loaders:-no} -fi - -echo -eval eval echo EBDL Python will be installed in $pyexecdir/gtk-2.0 - Modified: trunk/ebdl-python/packing/rpm/fedora/ebdl-python.spec.in.in =================================================================== --- trunk/ebdl-python/packing/rpm/fedora/ebdl-python.spec.in.in 2008-08-28 19:54:31 UTC (rev 791) +++ trunk/ebdl-python/packing/rpm/fedora/ebdl-python.spec.in.in 2008-08-28 20:03:04 UTC (rev 792) @@ -20,11 +20,11 @@ Summary: The sources for the Ebdl Python (PyEbdl) extension module. Group: Development/Languages Requires: %{python} -Requires: pygtk2 >= @PYGOBJECT_REQUIRED@ +Requires: pygobject2 >= @PYGOBJECT_REQUIRED@ Requires: ebdl >= @LIBEBDL_REQUIRED@ BuildRequires: %{python}-devel -BuildRequires: pygtk2-devel >= @PYGOBJECT_REQUIRED@ +BuildRequires: pygobject2-devel >= @PYGOBJECT_REQUIRED@ BuildRequires: ebdl-devel >= @LIBEBDL_REQUIRED@ %description @@ -39,8 +39,8 @@ %defattr(-, root, root) %doc AUTHORS NEWS README ChangeLog %{_libdir}/python?.?/site-packages/*/ebdl.so -%{_datadir}/pygtk/2.0/argtypes/* -%{_datadir}/pygtk/2.0/defs/* +%{_datadir}/py*/2.0/argtypes/* +%{_datadir}/py*/2.0/defs/* # python loader package Modified: trunk/ebdl-python/src/ebdl.override =================================================================== --- trunk/ebdl-python/src/ebdl.override 2008-08-28 19:54:31 UTC (rev 791) +++ trunk/ebdl-python/src/ebdl.override 2008-08-28 20:03:04 UTC (rev 792) @@ -424,16 +424,17 @@ modules = PyImport_GetModuleDict (); /* get option group module */ - if (G_LIKELY (module = PyDict_GetItemString (modules, "gobject.option"))) { + ret = NULL; + if (G_LIKELY ((module = PyDict_GetItemString (modules, "gobject.option")))) { /* Get OptionGroup constructor */ - if (G_LIKELY (func = PyObject_GetAttrString (module, "OptionGroup"))) { + if (G_LIKELY ((func = PyObject_GetAttrString (module, "OptionGroup")))) { /* build args */ - if (G_LIKELY (args = Py_BuildValue("(zzz)","name","description","help"))) { + if (G_LIKELY ((args = Py_BuildValue("(zzz)","name","description","help")))) { /* invoke */ if ((ret = PyObject_CallObject(func, args))) { /* replace group with our group */ - if (G_LIKELY (group = e_debug_log_get_option_group())) { + if (G_LIKELY ((group = e_debug_log_get_option_group()))) { g_option_group_free (((_PyGOptionGroup *)ret)->group); ((_PyGOptionGroup *)ret)->group = group; ((_PyGOptionGroup *)ret)->other_owner = FALSE; Modified: trunk/ebdl-python/src/stream.override =================================================================== --- trunk/ebdl-python/src/stream.override 2008-08-28 19:54:31 UTC (rev 791) +++ trunk/ebdl-python/src/stream.override 2008-08-28 20:03:04 UTC (rev 792) @@ -47,7 +47,7 @@ if (G_UNLIKELY (pyg_error_check(&error))) return NULL; - if (G_UNLIKELY (ret != E_SUCESS)) { + if (G_UNLIKELY (ret < 0)) { PyErr_SetString(PyExc_RuntimeError, "Unknown Error on ebdl.StreamDecorator" " object. Report this bug"); @@ -84,7 +84,7 @@ if (G_UNLIKELY (pyg_error_check(&error))) return NULL; - if (G_UNLIKELY (ret != E_SUCESS)) { + if (G_UNLIKELY (ret < 0)) { PyErr_SetString(PyExc_RuntimeError, "Unknown Error on ebdl.StreamDecorator" " object. Report this bug"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <in...@us...> - 2008-08-28 19:54:35
|
Revision: 791 http://ebdl.svn.sourceforge.net/ebdl/?rev=791&view=rev Author: inean Date: 2008-08-28 19:54:31 +0000 (Thu, 28 Aug 2008) Log Message: ----------- Use no-tmpl. Prepare to 0.10.3 release Modified Paths: -------------- trunk/ebdl/ChangeLog trunk/ebdl/Makefile.am trunk/ebdl/acinclude.m4 trunk/ebdl/autogen.sh trunk/ebdl/packing/rpm/fedora/ebdl.spec.in.in trunk/ebdl/src/Makefile.am trunk/ebdl/src/ebdl.h.in trunk/ebdl/src/ed-app.c trunk/ebdl/src/net.sourceforge.ebdl.service.in trunk/ebdl/tests/Linux/modutils/tests/git-update.sh Modified: trunk/ebdl/ChangeLog =================================================================== --- trunk/ebdl/ChangeLog 2008-08-28 19:52:50 UTC (rev 790) +++ trunk/ebdl/ChangeLog 2008-08-28 19:54:31 UTC (rev 791) @@ -1,8 +1,3 @@ -2008-08-25 gettextize <bug...@gn...> - - * Makefile.am (ACLOCAL_AMFLAGS): New variable. - (EXTRA_DIST): Add config.rpath, m4/ChangeLog. - 2007-11-15 Carlos Martin <in...@us...> * src/docs/ebdl-sections.txt: Fix EInternalLoader section Modified: trunk/ebdl/Makefile.am =================================================================== --- trunk/ebdl/Makefile.am 2008-08-28 19:52:50 UTC (rev 790) +++ trunk/ebdl/Makefile.am 2008-08-28 19:54:31 UTC (rev 791) @@ -10,10 +10,19 @@ $(NULL) EXTRA_DIST= \ - ChangeLog \ - README \ + intltool-extract.in \ + intltool-merge.in \ + intltool-update.in \ + NEWS \ + AUTHORS \ $(NULL) +DISTCLEANFILES = \ + intltool-extract \ + intltool-merge \ + intltool-update \ + $(NULL) + snapshot: $(MAKE) dist distdir=$(PACKAGE)-$(VERSION)+snap`LANG=en_US date +"%Y%m%d"` Modified: trunk/ebdl/acinclude.m4 =================================================================== --- trunk/ebdl/acinclude.m4 2008-08-28 19:52:50 UTC (rev 790) +++ trunk/ebdl/acinclude.m4 2008-08-28 19:54:31 UTC (rev 791) @@ -131,13 +131,18 @@ if test "x$have_dbus" = "xyes"; then dbus_systemdir=${sysconfdir}/dbus-1/system.d AC_SUBST(dbus_systemdir) + AS_EXPAND(DBUS_SYSTEM_DIR,[$dbus_systemdir]) + dbus_servicesdir=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1` + dbus_servicesdir=`echo $dbus_servicesdir |sed -e "s/\(\/usr\)/\$\{prefix\}/"` + AC_SUBST(dbus_servicesdir) + AS_EXPAND(DBUS_SERVICES_DIR,[$dbus_servicesdir]) AC_CHECK_PROG([DBUS_BINDING_TOOL], dbus-binding-tool, dbus-binding-tool, no) - AC_DEFINE_UNQUOTED(DBUS_SYSTEM_DIR, "$dbys_systemdir", [Where system.d dir for DBUS is]) - AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$dbus_servicesdir", [Where services should be installed]) + AC_DEFINE_UNQUOTED(DBUS_SYSTEM_DIR, "$DBUS_SYSTEM_DIR", [Where system.d dir for DBUS is]) + AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [Where services should be installed]) if `$PKG_CONFIG dbus-1 --max-version=1.0.0`; then AC_DEFINE([DBUS_API_SUBJECT_TO_CHANGE],1,[Yes i know it's beta code...]) @@ -149,11 +154,11 @@ AC_DEFUN([AS_ENABLE_BACKENDS],[ AC_ARG_WITH(backenddir, AC_HELP_STRING([--with-backenddir=dir], - [Path to plugin dir repository [default=${libexecdir}/${PACKAGE_NAME}/backends]]), + [Path to plugin dir repository [default=${libexecdir}/${PACKAGE_NAME}-1/backends]]), backenddir=$withval) AC_ARG_WITH(loaderdir, AC_HELP_STRING([--with-loaderdir=dir], - [Path to loaders dir repository [default=${libexecdir}/${PACKAGE_NAME}/loaders]]), + [Path to loaders dir repository [default=${libexecdir}/${PACKAGE_NAME}-1/loaders]]), loaderdir=$withval) AC_ARG_ENABLE(backends, AC_HELP_STRING([--enable-backends], @@ -164,10 +169,10 @@ enable_backends=yes fi if test x"$backenddir" = x; then - backenddir=${libexecdir}/${PACKAGE_NAME}/backends + backenddir=${libexecdir}/${PACKAGE_NAME}-1/backends fi if test x"$loaderdir" = x; then - loaderdir=${libexecdir}/${PACKAGE_NAME}/loaders + loaderdir=${libexecdir}/${PACKAGE_NAME}-1/loaders fi AC_SUBST(loaderdir) Modified: trunk/ebdl/autogen.sh =================================================================== --- trunk/ebdl/autogen.sh 2008-08-28 19:52:50 UTC (rev 790) +++ trunk/ebdl/autogen.sh 2008-08-28 19:54:31 UTC (rev 791) @@ -11,6 +11,11 @@ echo "top-level $PKG_NAME directory" exit 1 } +(test -f $srcdir/tests/Linux/modutils/tests/git-update.sh) || { + echo "***Error***: \`git-update.sh' failed. Please fix the warnings" + echo "(probably missing development files) and try again." + exit -1 +} which gnome-autogen.sh || { echo "You need to install gnome-common from the GNOME SVN" @@ -18,6 +23,10 @@ } REQUIRED_GTK_DOC_VERSION=1.9 +GTKDOCIZE="gtkdocize --docdir docs/reference --flavour no-tmpl" +# update files +. tests/Linux/modutils/tests/git-update.sh + # common autogen . gnome-autogen.sh Modified: trunk/ebdl/packing/rpm/fedora/ebdl.spec.in.in =================================================================== --- trunk/ebdl/packing/rpm/fedora/ebdl.spec.in.in 2008-08-28 19:52:50 UTC (rev 790) +++ trunk/ebdl/packing/rpm/fedora/ebdl.spec.in.in 2008-08-28 19:54:31 UTC (rev 791) @@ -26,12 +26,13 @@ Requires: glib2 >= @EBDL__REQUIRED@ Requires: libxml2 >= @EBDL_LIBXML_REQUIRED@ +BuildRequires: intltool BuildRequires: glib2-devel >= @EBDL_GLIB_REQUIRED@ BuildRequires: libxml2-devel >= @EBDL_LIBXML_REQUIRED@ %if %{?_with_fam:1}%{!?_with_fam:0} -Requires: fam -BuildRequires: fam-devel +Requires: gamin +BuildRequires: gamin-devel %endif %if %{?_with_pcre:1}%{!?_with_pcre:0} @@ -39,6 +40,11 @@ BuildRequires: pcre-devel %endif +%if %{?_with_ffi:1}%{!?_with_ffi:0} +Requires: libffi +BuildRequires: libffi-devel +%endif + %description This package contains libraries required to manage an elf modules, beans of code which implements kernel functionality which could be @@ -78,11 +84,14 @@ Requires: %{nam}-shlib-loader >= %{ver} %if %{?_with_fam:1}%{!?_with_fam:0} -Requires: fam-devel +Requires: gamin-devel %endif %if %{?_with_pcre:1}%{!?_with_pcre:0} Requires: pcre-devel %endif +%if %{?_with_ffi:1}%{!?_with_ffi:0} +BuildRequires: libffi-devel +%endif %description devel This package contains header files and static libraries to manage @@ -113,7 +122,7 @@ %files linux-module %defattr(-, root, root, -) -%{_libexecdir}/%{nam}-1/modules/liblk*.so +%{_libexecdir}/%{nam}-1/backends/liblk*.so # dbus package @@ -147,7 +156,7 @@ %defattr(-, root, root, -) %{_bindir}/%{nam} %{_datadir}/%{nam}-1/dbus-1/*.xml -%{_libexecdir}/%{nam}-1/modules/libdbus-source.so +%{_libexecdir}/%{nam}-1/backends/libdbus-source.so %dir %{_datadir}/dbus-1 %{_datadir}/dbus-1/services/*.service %dir %{_sysconfdir}/dbus-1/system.d @@ -161,6 +170,7 @@ %configure --disable-gtk-doc --enable-static --enable-debug=yes \ --with-distro-vendor=redhat \ --enable-fam=%{?_with_fam:yes}%{!?_with_fam:no} \ + --enable-ffi=%{?_with_ffi:yes}%{!?_with_ffi:no} \ --enable-pcre=%{?_with_pcre:yes}%{!?_with_pcre:no} \ --enable-dbus=%{?_without_dbus:no}%{!?_without_dbus:yes}\ --enable-tests=no @@ -181,6 +191,9 @@ %postun -p /sbin/ldconfig %changelog +* Tue Aug 26 2008 Carlos Martín <in...@us...> - 0.10.3-1 +- Prepare new release for 0.11 milestone + * Tue May 22 2007 Carlos Martín <in...@us...> - 0.10-1 - Fix some rpmlint errors Modified: trunk/ebdl/src/Makefile.am =================================================================== --- trunk/ebdl/src/Makefile.am 2008-08-28 19:52:50 UTC (rev 790) +++ trunk/ebdl/src/Makefile.am 2008-08-28 19:54:31 UTC (rev 791) @@ -753,7 +753,7 @@ confdir = $(sysconfdir)/usal/ebdl-1 conf_DATA = ebdl.conf -dbuspolicydir= $(DBUS_SYS_DIR) +dbuspolicydir= $(dbus_systemdir) dbuspolicy_DATA = ebdl-dbus1.conf init_file = ebdl-dbus1 @@ -764,14 +764,17 @@ -@sed -e "s|\@prefix\@|$(prefix)|" $< > $@ chmod +x $@ -servicedir = $(DBUS_SERVICES_DIR) +servicedir = $(dbus_servicesdir) service_in_file = net.sourceforge.ebdl.service.in service_DATA = $(service_in_file:.service.in=.service) # Rule to make the service file with bindir expanded -$(service_DATA): $(service_file) Makefile +$(service_DATA): $(service_in_file) @sed -e "s|\@bindir\@|$(bindir)|" $< > $@ +EXTRA_DIST += $(service_in_file) +CLEANFILES += $(service_DATA) + dist-hook-dbus: else dist-hook-dbus: Modified: trunk/ebdl/src/ebdl.h.in =================================================================== --- trunk/ebdl/src/ebdl.h.in 2008-08-28 19:52:50 UTC (rev 790) +++ trunk/ebdl/src/ebdl.h.in 2008-08-28 19:54:31 UTC (rev 791) @@ -47,7 +47,6 @@ #include <@PACKAGE@/e-debug.h> #include <@PACKAGE@/e-dict.h> #include <@PACKAGE@/e-disposable.h> -#include <@PACKAGE@/e-error.h> #include <@PACKAGE@/e-extension.h> #include <@PACKAGE@/e-factory-backend.h> #include <@PACKAGE@/e-factory.h> Modified: trunk/ebdl/src/ed-app.c =================================================================== --- trunk/ebdl/src/ed-app.c 2008-08-28 19:52:50 UTC (rev 790) +++ trunk/ebdl/src/ed-app.c 2008-08-28 19:54:31 UTC (rev 791) @@ -53,6 +53,7 @@ #include <dbus/dbus-glib-lowlevel.h> #include <dbus/dbus-glib-bindings.h> +#include <e-error.h> #include <ebdl-local.h> #include <ed-app.h> Modified: trunk/ebdl/src/net.sourceforge.ebdl.service.in =================================================================== --- trunk/ebdl/src/net.sourceforge.ebdl.service.in 2008-08-28 19:52:50 UTC (rev 790) +++ trunk/ebdl/src/net.sourceforge.ebdl.service.in 2008-08-28 19:54:31 UTC (rev 791) @@ -1,3 +1,3 @@ [D-BUS Service] Name=net.sourceforge.ebdl -Exec=@bindir@/program-providing-servicename +Exec=@bindir@/ebdl-dbus1 Modified: trunk/ebdl/tests/Linux/modutils/tests/git-update.sh =================================================================== --- trunk/ebdl/tests/Linux/modutils/tests/git-update.sh 2008-08-28 19:52:50 UTC (rev 790) +++ trunk/ebdl/tests/Linux/modutils/tests/git-update.sh 2008-08-28 19:54:31 UTC (rev 791) @@ -1,19 +1,46 @@ #!/bin/sh +# Not all echo versions allow -n, so we check what is possible. This test is +# based on the one in autoconf. +case `echo -n x` in + *c*,-n*) ECHO_N= ;; + *c*,* ) ECHO_N=-n ;; + *) ECHO_N=-n ;; +esac -REMOTE=http://www.kerneltools.org/pub/downloads/module-init-tools/devel/module-init-tools.git -GITTMP=.gittmp +# some terminal codes ... +printbold() { + echo $ECHO_N "`tput bold 2>/dev/null`" + echo "$@" + echo $ECHO_N "`tput sgr0 2>/dev/null`" +} +printerr() { + echo "$@" >&2 +} -rm -rf $GITTMP +update() { + GITTMP=.gittmp -git-clone $REMOTE $GITTMP + printbold "updating kernel test module files..." + rm -rf $GITTMP + git-clone $1 $2 $GITTMP >/dev/null 2>&1 -for f in `ls $GITTMP/tests/data/src/*.c`; do - cp -a $f data/src/ -done -for f in `ls -d $GITTMP/tests/test-*`; do - cp -a $f . -done + for f in `ls $GITTMP/tests/data/src/*.c`; do + cp -a $f $vcsdir/data/src/ + done + for f in `ls -d $GITTMP/tests/test-*`; do + cp -a $f $vcsdir + done -rm -rf test-generate-modprobe.conf -rm -rf $GITTMP + rm -rf test-generate-modprobe.conf +# rm -rf $GITTMP +} +vcsdir=. +[ ! -z $srcdir ] && vcsdir=$srcdir +[ -f $vcsdir/configure.ac ] && vcsdir=tests/Linux/modutils/tests + +REMOTE=http://www.kerneltools.org/pub/downloads/module-init-tools/devel/module-init-tools.git +GIT_REMOTE=git://git.altlinux.org/archive/m/module-init-tools.git + +#update files +update $REMOTE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <in...@us...> - 2008-08-28 19:52:53
|
Revision: 790 http://ebdl.svn.sourceforge.net/ebdl/?rev=790&view=rev Author: inean Date: 2008-08-28 19:52:50 +0000 (Thu, 28 Aug 2008) Log Message: ----------- Fix leak Modified Paths: -------------- trunk/ebdl/Makefile.am trunk/ebdl/src/e-url.c trunk/ebdl/tests/Linux/modutils/Makefile.am trunk/ebdl/tests/Makefile.am Added Paths: ----------- trunk/ebdl/po/ChangeLog Removed Paths: ------------- trunk/ebdl/po/Changelog Modified: trunk/ebdl/Makefile.am =================================================================== --- trunk/ebdl/Makefile.am 2008-08-28 19:51:18 UTC (rev 789) +++ trunk/ebdl/Makefile.am 2008-08-28 19:52:50 UTC (rev 790) @@ -9,7 +9,7 @@ ebdl-1.pc \ $(NULL) -EXTRA_DIST= config.rpath m4/ChangeLog \ +EXTRA_DIST= \ ChangeLog \ README \ $(NULL) Modified: trunk/ebdl/src/e-url.c =================================================================== --- trunk/ebdl/src/e-url.c 2008-08-28 19:51:18 UTC (rev 789) +++ trunk/ebdl/src/e-url.c 2008-08-28 19:52:50 UTC (rev 790) @@ -156,7 +156,7 @@ { #define CMPTYPE(T,F) (!memcmp(&((T*)s1)->F,&((T*)s2)->F,sizeof(((T*)s1)->F))) - if (s1->sa_family != s2->sa_family) + if (!s1 || !s2 || s1->sa_family != s2->sa_family) return FALSE; switch (s1->sa_family) { Modified: trunk/ebdl/tests/Linux/modutils/Makefile.am =================================================================== --- trunk/ebdl/tests/Linux/modutils/Makefile.am 2008-08-28 19:51:18 UTC (rev 789) +++ trunk/ebdl/tests/Linux/modutils/Makefile.am 2008-08-28 19:52:50 UTC (rev 790) @@ -11,7 +11,7 @@ libtesting.la \ $(NULL) -if BACKEND_LK +if ENABLE_LINUX_KERNEL libtesting_la_SOURCES = \ e-testing.c \ $(NULL) Modified: trunk/ebdl/tests/Makefile.am =================================================================== --- trunk/ebdl/tests/Makefile.am 2008-08-28 19:51:18 UTC (rev 789) +++ trunk/ebdl/tests/Makefile.am 2008-08-28 19:52:50 UTC (rev 790) @@ -52,6 +52,7 @@ ts_plugin_LDADD = \ $(top_builddir)/src/libebdl.la \ $(EBDL_TEST_LIBS) \ + $(EBDL_CHECK_SIMPLE_LIBS) \ $(NULL) ts_plugin_LDFLAGS = -export-dynamic -no-install @@ -71,7 +72,7 @@ tc-class-object.c \ $(NULL) -if BACKEND_LKFSS +if ENABLE_LINUX_KERNEL_DATA tc_linux_sources = \ tc-modconf.c \ $(NULL) @@ -131,6 +132,7 @@ $(tc_platform_objects) \ $(top_builddir)/src/libebdl.la \ $(EBDL_TEST_LIBS) \ + $(EBDL_CHECK_SIMPLE_LIBS) \ $(NULL) ts_ebdl_LDFLAGS = -export-dynamic -no-install This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <in...@us...> - 2008-08-23 13:49:52
|
Revision: 788 http://ebdl.svn.sourceforge.net/ebdl/?rev=788&view=rev Author: inean Date: 2008-08-23 13:49:50 +0000 (Sat, 23 Aug 2008) Log Message: ----------- Remoe unneeded code and change PythonModule Base class Modified Paths: -------------- trunk/ebdl-python/src/ep-python-loader.c trunk/ebdl-python/src/ep-python-module.c Modified: trunk/ebdl-python/src/ep-python-loader.c =================================================================== --- trunk/ebdl-python/src/ep-python-loader.c 2008-08-23 13:33:20 UTC (rev 787) +++ trunk/ebdl-python/src/ep-python-loader.c 2008-08-23 13:49:50 UTC (rev 788) @@ -625,8 +625,6 @@ { EpPythonLoaderPrivate *priv; - priv = EP_PYTHON_LOADER_GET_PRIVATE (loader); - priv = loader->priv = G_TYPE_INSTANCE_GET_PRIVATE ( \ (loader), \ EP_TYPE_PYTHON_LOADER, EpPythonLoaderPrivate); Modified: trunk/ebdl-python/src/ep-python-module.c =================================================================== --- trunk/ebdl-python/src/ep-python-module.c 2008-08-23 13:33:20 UTC (rev 787) +++ trunk/ebdl-python/src/ep-python-module.c 2008-08-23 13:49:50 UTC (rev 788) @@ -2,7 +2,7 @@ /* * ep-python-module.c * - * Copyright (C) 2006,2007 by Carlos Martín + * Copyright (C) 2006,2008 by Carlos Martín * Copyright (C) 2006,2007 Universidad de Salamanca * * This library is free software; you can redistribute it and/or @@ -33,7 +33,7 @@ #include <ep-python-module.h> struct _EpPythonModule { - GObject parent; + GTypeModule parent; /* lib data */ gchar *modname; @@ -45,7 +45,7 @@ }; struct _EpPythonModuleClass { - GObjectClass parent_class; + GTypeModuleClass parent_class; }; enum { @@ -74,7 +74,7 @@ */ -G_DEFINE_TYPE (EpPythonModule, ep_python_module, G_TYPE_OBJECT); +G_DEFINE_TYPE (EpPythonModule, ep_python_module, G_TYPE_TYPE_MODULE); static void This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <in...@us...> - 2008-08-23 13:33:26
|
Revision: 787 http://ebdl.svn.sourceforge.net/ebdl/?rev=787&view=rev Author: inean Date: 2008-08-23 13:33:20 +0000 (Sat, 23 Aug 2008) Log Message: ----------- Fix Log errors. Also implement e_debug_log Modified Paths: -------------- trunk/ebdl/src/e-debug.c trunk/ebdl/src/e-debug.h trunk/ebdl/tests/Linux/modutils/e-testing.c trunk/ebdl/tests/tc-pickler.c Modified: trunk/ebdl/src/e-debug.c =================================================================== --- trunk/ebdl/src/e-debug.c 2008-07-08 16:30:09 UTC (rev 786) +++ trunk/ebdl/src/e-debug.c 2008-08-23 13:33:20 UTC (rev 787) @@ -662,7 +662,7 @@ "\033[33;01m", /* GST_LEVEL_WARNING */ "\033[32;01m", /* GST_LEVEL_USAGE */ "\033[35m", /* GST_LEVEL_EVENT */ - "\033[36m" /* GST_LEVEL_DEBUG */ + "\033[36m", /* GST_LEVEL_DEBUG */ "\033[37m" /* GST_LEVEL_LOG */ }; @@ -1744,12 +1744,23 @@ EdlCategory * e_debug_log_get_category (EDebugLog *log, const gchar *name) { + EdlCategory *cat; + g_return_val_if_fail (E_IS_DEBUG_LOG (log), NULL); g_return_val_if_fail (name != NULL && name[0] != '\0', NULL); - return g_hash_table_lookup ( \ + cat = g_hash_table_lookup ( \ E_DEBUG_LOG_GET_PRIVATE (log)->categories, \ name); + + if (G_UNLIKELY (! cat)) { + cat = g_hash_table_lookup ( \ + E_DEBUG_LOG_GET_PRIVATE (log)->categories, \ + "default"); + } + + g_assert (cat); + return cat; } /** @@ -1794,6 +1805,38 @@ #define MESSAGE_SIZE 256; +void +e_debug_log (const gchar *section, EdlLevel level, + const gchar *file, const gchar *func, + gint line, GObject *object, const gchar *format, + ...) +{ + va_list ap; + EDebugLog *log; + EdlCategory *cat; + + g_return_if_fail (section != NULL && section[0] != '\0'); + + if (G_LIKELY (! e_debug_log_activated ())) { + return; + } + + log = e_debug_log_create (); + cat = e_debug_log_get_category (log, section); + g_assert (cat); + + va_start(ap, format); + e_debug_log_full_valist (cat, level, file, func, line, object, format, ap); + va_end(ap); +} +void +e_debug_log_simple (const gchar *section, EdlLevel level, + const gchar *file, const gchar *func, gint line) +{ + e_debug_log (section, level, + file, func, line, NULL, NULL); +} + /** * e_debug_log_full: * @category: category to log Modified: trunk/ebdl/src/e-debug.h =================================================================== --- trunk/ebdl/src/e-debug.h 2008-07-08 16:30:09 UTC (rev 786) +++ trunk/ebdl/src/e-debug.h 2008-08-23 13:33:20 UTC (rev 787) @@ -334,6 +334,19 @@ GSList *e_debug_log_get_categories (EDebugLog *log, const gchar *filter); +void e_debug_log (const gchar *section, + EdlLevel level, + const gchar *file, + const gchar *func, + gint line, + GObject *object, + const gchar *format, + ...) G_GNUC_PRINTF(7, 8) G_GNUC_NO_INSTRUMENT; +void e_debug_log_simple (const gchar *section, + EdlLevel level, + const gchar *file, + const gchar *funct, + gint line); void e_debug_log_full (EdlCategory *category, EdlLevel level, const gchar *file, Modified: trunk/ebdl/tests/Linux/modutils/e-testing.c =================================================================== --- trunk/ebdl/tests/Linux/modutils/e-testing.c 2008-07-08 16:30:09 UTC (rev 786) +++ trunk/ebdl/tests/Linux/modutils/e-testing.c 2008-08-23 13:33:20 UTC (rev 787) @@ -338,7 +338,7 @@ return v.rename (mapname(oldpath), mapname(newpath)); } -G_GNUC_UNUSED int +G_GNUC_UNUSED ssize_t readlink(const char *path, char *buf, size_t bufsiz) { vfunc_assert (readlink); Modified: trunk/ebdl/tests/tc-pickler.c =================================================================== --- trunk/ebdl/tests/tc-pickler.c 2008-07-08 16:30:09 UTC (rev 786) +++ trunk/ebdl/tests/tc-pickler.c 2008-08-23 13:33:20 UTC (rev 787) @@ -30,6 +30,11 @@ #ifdef HAVE_VALGRIND_MEMCHECK_H # include <valgrind/memcheck.h> + +# ifndef VALGRIND_MAKE_MEM_DEFINED +# define VALGRIND_MAKE_MEM_DEFINED VALGRIND_MAKE_READABLE +# endif + #endif TCase *create_test_e_pickler (void); @@ -146,7 +151,7 @@ #endif mem = g_malloc0 (99); #ifdef HAVE_VALGRIND_MEMCHECK_H - VALGRIND_MAKE_READABLE (mem, 99); + VALGRIND_MAKE_MEM_DEFINED (mem, 99); #endif ERule *rule_string = (gpointer) e_rule_simple_string_new_full ("prop-string", "test", mem, 99); ERule *rule_strv = (gpointer) e_rule_simple_strv_new ("prop-strv", strv); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <in...@us...> - 2008-07-08 16:30:17
|
Revision: 786 http://ebdl.svn.sourceforge.net/ebdl/?rev=786&view=rev Author: inean Date: 2008-07-08 09:30:09 -0700 (Tue, 08 Jul 2008) Log Message: ----------- Fix debug options Modified Paths: -------------- trunk/ebdl/src/e-debug.c trunk/ebdl/src/e-debug.h trunk/ebdl/src/e-regex-pcre.c Modified: trunk/ebdl/src/e-debug.c =================================================================== --- trunk/ebdl/src/e-debug.c 2008-05-23 19:42:26 UTC (rev 785) +++ trunk/ebdl/src/e-debug.c 2008-07-08 16:30:09 UTC (rev 786) @@ -134,6 +134,7 @@ GSList *stack_trace; #endif + GList *overrides; }; enum { @@ -257,86 +258,66 @@ #define _mask(_x) CLAMP (_x, (E_DEBUG_LOG_LEVEL_COUNT -1) * -1, E_DEBUG_LOG_LEVEL_COUNT -1) static void -e_debug_log_goption_parse_debug_list (const gchar *list) +e_debug_log_goption_parse_override (const gchar *override, gchar **category, + gchar **handler, gint *level, gint *detail) { gchar *t; - gint level; - gint i, len; - EDebugLog *log; - gchar **split, **values; - const gchar *handler, *category; - GSList *s, *c, *categories, *handlers; - gint detail = E_DEBUG_LOG_DETAIL_COUNT; - - g_return_if_fail (list != NULL); + gint len; + gchar **values; - log = e_debug_log_create (); g_assert (log); - - split = g_strsplit (list, ",", 0); + g_assert (override); + g_assert (category); + g_assert (! strchr (override, ',')); - for (i = 0; split[i] != NULL; i++) { - - if (G_LIKELY ((t = strrchr (split[i], ':')))) { - detail = e_debug_detail_get_from_name (t + 1); - if (detail < E_DEBUG_LOG_DETAIL_COUNT) { - t[0] = '\0'; + if (detail) { + *detail = E_DEBUG_LOG_DETAIL_COUNT; + if (G_LIKELY ((t = strrchr (override, ':')))) { + *detail = e_debug_detail_get_from_name (t + 1); + if (*detail < E_DEBUG_LOG_DETAIL_COUNT) { + t[0] = '\0'; } } - - values = g_strsplit (split[i], ":", -1); - len = g_strv_length (values); + } + values = g_strsplit (override, ":", -1); + len = g_strv_length (values); - if (G_LIKELY (len > 1)) { - handler = NULL; - - /* parse elements */ - if (values[0] && values[1] && values[2]) { - category = e_debug_log_goption_parse_debug_word (values[0]); - handler = e_debug_log_goption_parse_debug_word (values[1]); - level = e_debug_log_goption_parse_debug_digit (values[2]); - } - else { - category = e_debug_log_goption_parse_debug_word (values[0]); - level = e_debug_log_goption_parse_debug_digit (values[1]); + if (G_LIKELY (len > 1)) { + /* parse elements */ + *category = e_debug_log_goption_parse_debug_word (values[0]); + values[0] = NULL; + + if (handler) { + if (values[2]) { + *handler = e_debug_log_goption_parse_debug_word (values[1]); + values[1] = NULL; } - - /* check that we have a cvalid category */ - if (G_UNLIKELY (category == NULL)) { - g_strfreev (values); - continue; - } - - /* get categories and handlers if specified */ - categories = e_debug_log_get_categories (log, category); - handlers = handler ? e_debug_log_get_handlers (log, handler) : NULL; - - for (s = handlers; s != NULL; s = s->next) { - if (category[0] == '*' && category[1] == '\0') { - e_debug_handler_set_threshold (s->data, _threshold (level)); - if (detail < E_DEBUG_LOG_DETAIL_COUNT) { - e_debug_handler_set_detail (s->data, detail); - } - continue; - } - - for (c = categories; c != NULL; c = c->next) { - e_debug_log_set_threshold (log, c->data, s->data, _mask (level)); - } - } - - /* if no handler is specified, then we are setting a mask */ - if (handler == NULL) { - for (s = categories; s != NULL; s = s->next) { - e_debug_category_set_mask (s->data, _mask (level)); - } - } - g_slist_free (categories); - g_slist_free (handlers); } - g_strfreev (values); + if (level) { + *level = values[2] ? + e_debug_log_goption_parse_debug_digit (values[2]): + e_debug_log_goption_parse_debug_digit (values[1]); + } } + g_strfreev (values); +} + +static void +e_debug_log_goption_parse_debug_list (const gchar *list) +{ + gint i; + gchar **split; + g_return_if_fail (list != NULL); + + e_debug_log_create (); + g_assert (log); + + split = g_strsplit (list, ",", 0); + + for (i = 0; split[i] != NULL; i++) { + e_debug_log_set_override (log, split[i]); + } g_strfreev (split); } @@ -413,6 +394,13 @@ g_print ("separeted separted glob debug levels. See developer documentation \n"); g_print ("to know about how this level value should be used.\n"); g_print ("\n"); + g_print ("Examples:\n"); + g_print ("\t *:*:1 Sets threshold to 1 for all categories and handlers\n"); + g_print ("\t EBDL_DEBUG:*:5 Sets threshold to 5 for all EBDL_DEBUG category\n"); + g_print ("\t *:syslog*:5 Sets threshold to 5 for syslog handler\n"); + g_print ("\t *:5 Set mask for all categories to 5 (so threshold will "); + g_print ("be handlers->threshold + mask)"); + g_print ("\n"); } @@ -440,6 +428,8 @@ priv->timer = g_timer_new (); } #endif + /*notify that log subsystem is up */ + g_signal_emit (log, signals[SUPPORTED], 0, NULL); break; case ARG_DEBUG_NO_COLOR: @@ -451,6 +441,8 @@ break; case ARG_DEBUG_HELP: + /*notify that log subsystem is up */ + g_signal_emit (log, signals[SUPPORTED], 0, NULL); e_debug_log_goption_print_help (); exit (0); @@ -577,7 +569,6 @@ } } - #ifdef E_ENABLE_PROFILING # define _PRINT_STUFF_HIGH "[%f (%f)]" " (%s%5d%s:%s%s%s - [%s%s%s]) %s:%d (%s on %s) %s\n", \ @@ -861,7 +852,6 @@ g_value_set_boolean (value, priv->debug_enabled); break; - default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -883,6 +873,16 @@ case PROP_ACTIVATED: priv->debug_enabled = g_value_get_boolean (value); + + if (priv->debug_enabled) { +#ifdef E_ENABLE_PROFILING + if (G_UNLIKELY (! priv->timer)) { + priv->timer = g_timer_new (); + } +#endif + /*notify that log subsystem is up */ + g_signal_emit (object, signals[SUPPORTED], 0, NULL); + } break; default: @@ -1032,8 +1032,6 @@ g_assert (handler && handler->id == E_DEBUG_LOG_HANDLER_RING); - /*notify that log subsystem is up */ - g_signal_emit (log, signals[SUPPORTED], 0, NULL); return (GObject *)log; } @@ -1047,6 +1045,10 @@ priv = E_DEBUG_LOG_GET_PRIVATE (object); + if (priv->overrides) { + g_list_foreach (priv->overrides, (GFunc)g_free, NULL); + g_list_free (priv->overrides); + } if (G_LIKELY (priv->categories)) { g_hash_table_destroy (priv->categories); priv->categories = NULL; @@ -1258,6 +1260,79 @@ } +void +e_debug_log_add_override (EDebugLog *log, const gchar *override) +{ + GList *l; + EDebugLogPrivate *priv; + + g_assert (E_IS_DEBUG_LOG (log)); + + priv = E_DEBUG_LOG_GET_PRIVATE (log); + + for (l = priv->overrides; l != NULL; l= l->next) { + if (strcmp (l->data, override) == 0) + return; + } + priv->overrides = g_list_append ( \ + priv->overrides, g_strdup (override)); +} +gboolean +e_debug_log_set_override (EDebugLog *log, const gchar *override) +{ + gint level, detail; + gchar *handler, *category; + GSList *s, *c, *categories, *handlers; + + g_return_val_if_fail (override != NULL && override[0] != '\0', FALSE); + + g_assert (log); + + /* parse args */ + handler = category = NULL; + e_debug_log_goption_parse_override (override, &category, &handler, &level, &detail); + + /* check that we have a valid category */ + if (G_UNLIKELY (category == NULL)) { + g_free (handler); + return FALSE; + } + + /* add override */ + e_debug_log_add_override (log, override); + + /* get categories and handlers if specified */ + handlers = NULL; + categories = e_debug_log_get_categories (log, category); + + if (handler) { + handlers = e_debug_log_get_handlers (log, handler); + } + for (s = handlers; s != NULL; s = s->next) { + if (category[0] == '*' && category[1] == '\0') { + e_debug_handler_set_threshold (s->data, _threshold (level)); + if (detail < E_DEBUG_LOG_DETAIL_COUNT) { + e_debug_handler_set_detail (s->data, detail); + } + continue; + } + for (c = categories; c != NULL; c = c->next) { + e_debug_log_set_threshold (log, c->data, s->data, _mask (level)); + } + } + /* if no handler is specified, then we are setting a mask */ + if (handler == NULL) { + for (s = categories; s != NULL; s = s->next) { + e_debug_category_set_mask (s->data, _mask (level)); + } + } + g_slist_free (categories); + g_slist_free (handlers); + + return TRUE; +} + + #define _GET_HANDLER_ID(_l) ((EdlHandler *)_l->data)->id #define _GET_HANDLER_FUNC(_l) ((EdlHandler *)_l->data)->func @@ -1292,7 +1367,11 @@ gpointer data, GDestroyNotify notify) { - EdlHandler *handler; + GList *l; + gint d, lv; + gchar *c, *h; + EdlHandler *handler; + GSList *s, *categories; EDebugLogPrivate *priv; g_return_val_if_fail (E_IS_DEBUG_LOG (log), NULL); @@ -1321,6 +1400,29 @@ handler->max_lines = DEFAULT_RING_BUFFER_NUM_LINES; priv->handlers = g_slist_prepend (priv->handlers, handler); + + /* apply overrides */ + for (l = priv->overrides; l != NULL; l = l->next) { + e_debug_log_goption_parse_override (l->data, &c, &h, &lv, &d); + if (h && g_pattern_match_simple (h, handler->name)) { + if (c[0] == '*' && c[1] == '\0') { + handler->threshold = _threshold (lv); + if (d < E_DEBUG_LOG_DETAIL_COUNT) { + handler->detail = d; + } + } + else { + categories = e_debug_log_get_categories (log, c); + for (s = categories; s != NULL; s = s->next) { + e_debug_log_set_threshold (log, s->data, handler, _mask (lv)); + } + g_slist_free (categories); + } + } + g_free (c); + g_free (h); + } + return handler; } @@ -1543,7 +1645,11 @@ e_debug_log_add_category (EDebugLog *log, const gchar *name, guint color, const gchar *description) { - EDebugLogPrivate *priv; + GList *l; + gint d, lv; + gchar *c, *h; + GSList *handlers, *s; + EDebugLogPrivate *priv; EdlCategory *category; g_return_val_if_fail (E_IS_DEBUG_LOG (log), NULL); @@ -1567,6 +1673,29 @@ category->active = TRUE; g_hash_table_insert (priv->categories, (gchar *)category->name, category); + + /* apply overrides */ + for (l = priv->overrides; l != NULL; l = l->next) { + h = c = NULL; + e_debug_log_goption_parse_override (l->data, &c, &h, &lv, &d); + + if (h && (! (c[0] == '*' && c[1] == '\0'))) { + if (g_pattern_match_simple (c, category->name)) { + handlers = e_debug_log_get_handlers (log, h); + for (s = handlers; s != NULL; s = s->next) { + e_debug_log_set_threshold (log, category, s->data, _mask (lv)); + } + g_slist_free (handlers); + } + } + if (! h && g_pattern_match_simple (c, category->name)) { + e_debug_category_set_mask (category, _mask (lv)); + } + + g_free (c); + g_free (h); + } + return category; } /** @@ -1693,7 +1822,7 @@ priv = E_DEBUG_LOG_GET_PRIVATE (log); - if (! priv->debug_enabled || ! category->active) { + if (! priv->debug_enabled || ! category->active) { return; } Modified: trunk/ebdl/src/e-debug.h =================================================================== --- trunk/ebdl/src/e-debug.h 2008-05-23 19:42:26 UTC (rev 785) +++ trunk/ebdl/src/e-debug.h 2008-07-08 16:30:09 UTC (rev 786) @@ -289,6 +289,11 @@ gboolean e_debug_log_on_valgrind (void); GOptionGroup *e_debug_log_get_option_group (void); +void e_debug_log_add_override (EDebugLog *log, + const gchar *override); +gboolean e_debug_log_set_override (EDebugLog *log, + const gchar *override); + EdlHandler *e_debug_log_add_handler (EDebugLog *log, const gchar *name, EDebugLogFn func, Modified: trunk/ebdl/src/e-regex-pcre.c =================================================================== --- trunk/ebdl/src/e-regex-pcre.c 2008-05-23 19:42:26 UTC (rev 785) +++ trunk/ebdl/src/e-regex-pcre.c 2008-07-08 16:30:09 UTC (rev 786) @@ -318,7 +318,7 @@ tmp_error = g_error_new (E_REGEX_ERROR, E_REGEX_ERROR_REPLACE, P_("Error while parsing replacement " - "text \"%s\" at char %d: %s"), + "text \"%s\" at char %ld: %s"), replacement, p - replacement, error_detail); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |