desktop-data-model r7239 - in trunk: . config ddm engine hippo
- From: otaylor svn gnome org
- To: svn-commits-list gnome org
- Subject: desktop-data-model r7239 - in trunk: . config ddm engine hippo
- Date: Mon, 21 Jan 2008 16:55:20 +0000 (GMT)
Author: otaylor
Date: Mon Jan 21 16:55:20 2008
New Revision: 7239
URL: http://svn.gnome.org/viewvc/desktop-data-model?rev=7239&view=rev
Log:
Update the build for the stacker/data-engine split and the flattening of the
directory heirarchy.
hippo-dbus-names.[ch] Makefile-engine-dbus.am: Add some files that got missed
in the subversion split and migration.
ddm-feed.c: Fix an overflow error
Added:
trunk/AUTHORS
trunk/ChangeLog
trunk/Makefile-engine-dbus.am
trunk/NEWS
trunk/README
trunk/autogen.sh (contents, props changed)
trunk/config/
trunk/hippo/hippo-dbus-names.c
trunk/hippo/hippo-dbus-names.h
Modified:
trunk/Makefile-libddm.am
trunk/Makefile-libengine.am
trunk/Makefile-libhippo.am
trunk/Makefile.am
trunk/configure.ac
trunk/ddm/ddm-feed.c
trunk/engine/hippo-engine-basics.c
Added: trunk/AUTHORS
==============================================================================
Added: trunk/Makefile-engine-dbus.am
==============================================================================
--- (empty file)
+++ trunk/Makefile-engine-dbus.am Mon Jan 21 16:55:20 2008
@@ -0,0 +1,60 @@
+libexec_PROGRAMS += desktop-data-engine
+
+desktop_data_engine_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+ -I $(top_srcdir) \
+ $(DESKTOP_DATA_ENGINE_CFLAGS) \
+ -DHOST_CPU=\"$(host_cpu)\" \
+ -DDDM_I_KNOW_THIS_IS_UNSTABLE=1
+
+desktop_data_engine_LDFLAGS=
+desktop_data_engine_LDADD= libhippo.la libengine.la $(DESKTOP_DATA_ENGINE_LIBS)
+
+desktop_data_engine_SOURCES = \
+ engine-dbus/hippo-application-monitor.c \
+ engine-dbus/hippo-application-monitor.h \
+ engine-dbus/hippo-cookies-linux.c \
+ engine-dbus/hippo-cookies-linux.h \
+ engine-dbus/hippo-distribution.c \
+ engine-dbus/hippo-distribution.h \
+ engine-dbus/hippo-dbus-cookies.c \
+ engine-dbus/hippo-dbus-cookies.h \
+ engine-dbus/hippo-dbus-helper.c \
+ engine-dbus/hippo-dbus-helper.h \
+ engine-dbus/hippo-dbus-helper-rename.h \
+ engine-dbus/hippo-dbus-im-client.c \
+ engine-dbus/hippo-dbus-im-client.h \
+ engine-dbus/hippo-dbus-local.c \
+ engine-dbus/hippo-dbus-local.h \
+ engine-dbus/hippo-dbus-model.c \
+ engine-dbus/hippo-dbus-model.h \
+ engine-dbus/hippo-dbus-model-client.c \
+ engine-dbus/hippo-dbus-model-client.h \
+ engine-dbus/hippo-dbus-pidgin.c \
+ engine-dbus/hippo-dbus-pidgin.h \
+ engine-dbus/hippo-dbus-server.c \
+ engine-dbus/hippo-dbus-server.h \
+ engine-dbus/hippo-dbus-settings.c \
+ engine-dbus/hippo-dbus-settings.h \
+ engine-dbus/hippo-dbus-system.c \
+ engine-dbus/hippo-dbus-system.h \
+ engine-dbus/hippo-dbus-web.h \
+ engine-dbus/hippo-dbus-web.c \
+ engine-dbus/hippo-im.c \
+ engine-dbus/hippo-im.h \
+ engine-dbus/hippo-platform-impl.c \
+ engine-dbus/hippo-platform-impl.h \
+ engine-dbus/main.c \
+ engine-dbus/main.h \
+ engine-dbus/json.c \
+ engine-dbus/json.h
+
+# Dbus service file
+servicedir = $(datadir)/dbus-1/services
+service_in_files = org.freedesktop.od.Engine.service.in
+service_DATA = $(service_in_files:.service.in=.service)
+$(service_DATA): $(service_in_files) Makefile
+ @sed -e "s|\ bindir\@|$(bindir)|" $< > $@
+
+EXTRA_DIST += $(service_in_files)
+MAINTAINERCLEANFILES += $(service_DATA)
Modified: trunk/Makefile-libddm.am
==============================================================================
--- trunk/Makefile-libddm.am (original)
+++ trunk/Makefile-libddm.am Mon Jan 21 16:55:20 2008
@@ -15,7 +15,7 @@
libddm_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" -version-info $(DDM_LT_CURRENT):$(DDM_LT_REVISION):$(DDM_LT_AGE) -no-undefined
-DDM_MARSHAL_LIST=$(COMMONSRCDIR)/ddm/ddm-marshal.list
+DDM_MARSHAL_LIST=ddm/ddm-marshal.list
DDM_MARSHAL_HEADER=$(MARSHAL_DIR)/ddm-marshal.h
DDM_MARSHAL_BODY=$(MARSHAL_DIR)/ddm-marshal.c
@@ -29,46 +29,46 @@
libddmincludedir = $(includedir)/ddm-1/ddm
nodist_libddminclude_HEADERS= \
- $(COMMONSRCDIR)/ddm/ddm.h \
- $(COMMONSRCDIR)/ddm/ddm-client.h \
- $(COMMONSRCDIR)/ddm/ddm-data-fetch.h \
- $(COMMONSRCDIR)/ddm/ddm-data-fetch.h \
- $(COMMONSRCDIR)/ddm/ddm-data-model.h \
- $(COMMONSRCDIR)/ddm/ddm-data-model-backend.h \
- $(COMMONSRCDIR)/ddm/ddm-data-model-dbus.h \
- $(COMMONSRCDIR)/ddm/ddm-data-resource.h \
- $(COMMONSRCDIR)/ddm/ddm-data-query.h \
- $(COMMONSRCDIR)/ddm/ddm-feed.h \
- $(COMMONSRCDIR)/ddm/ddm-notification-set.h \
- $(COMMONSRCDIR)/ddm/ddm-qname.h
+ ddm/ddm.h \
+ ddm/ddm-client.h \
+ ddm/ddm-data-fetch.h \
+ ddm/ddm-data-fetch.h \
+ ddm/ddm-data-model.h \
+ ddm/ddm-data-model-backend.h \
+ ddm/ddm-data-model-dbus.h \
+ ddm/ddm-data-resource.h \
+ ddm/ddm-data-query.h \
+ ddm/ddm-feed.h \
+ ddm/ddm-notification-set.h \
+ ddm/ddm-qname.h
LIBDDM_SOURCEFILES = \
- $(COMMONSRCDIR)/ddm/ddm-client.c \
- $(COMMONSRCDIR)/ddm/ddm-client-notification.c \
- $(COMMONSRCDIR)/ddm/ddm-client-notification.h \
- $(COMMONSRCDIR)/ddm/ddm-client-notification-internal.h \
- $(COMMONSRCDIR)/ddm/ddm-condition-parser.c \
- $(COMMONSRCDIR)/ddm/ddm-condition.c \
- $(COMMONSRCDIR)/ddm/ddm-data-fetch.c \
- $(COMMONSRCDIR)/ddm/ddm-data-model.c \
- $(COMMONSRCDIR)/ddm/ddm-data-model-dbus.c \
- $(COMMONSRCDIR)/ddm/ddm-data-model-internal.h \
- $(COMMONSRCDIR)/ddm/ddm-data-resource.c \
- $(COMMONSRCDIR)/ddm/ddm-data-resource-internal.h \
- $(COMMONSRCDIR)/ddm/ddm-data-query.c \
- $(COMMONSRCDIR)/ddm/ddm-data-query-internal.h \
- $(COMMONSRCDIR)/ddm/ddm-feed.c \
- $(COMMONSRCDIR)/ddm/ddm-local-client.c \
- $(COMMONSRCDIR)/ddm/ddm-local-client.h \
- $(COMMONSRCDIR)/ddm/ddm-notification-set.c \
- $(COMMONSRCDIR)/ddm/ddm-rule.c \
- $(COMMONSRCDIR)/ddm/ddm-rule.h \
- $(COMMONSRCDIR)/ddm/ddm-qname.c \
- $(COMMONSRCDIR)/ddm/ddm-work-item.c \
- $(COMMONSRCDIR)/ddm/ddm-work-item.h \
- $(COMMONSRCDIR)/ddm/hippo-dbus-helper.c \
- $(COMMONSRCDIR)/ddm/hippo-dbus-helper.h \
- $(COMMONSRCDIR)/ddm/hippo-dbus-helper-rename.h
+ ddm/ddm-client.c \
+ ddm/ddm-client-notification.c \
+ ddm/ddm-client-notification.h \
+ ddm/ddm-client-notification-internal.h \
+ ddm/ddm-condition-parser.c \
+ ddm/ddm-condition.c \
+ ddm/ddm-data-fetch.c \
+ ddm/ddm-data-model.c \
+ ddm/ddm-data-model-dbus.c \
+ ddm/ddm-data-model-internal.h \
+ ddm/ddm-data-resource.c \
+ ddm/ddm-data-resource-internal.h \
+ ddm/ddm-data-query.c \
+ ddm/ddm-data-query-internal.h \
+ ddm/ddm-feed.c \
+ ddm/ddm-local-client.c \
+ ddm/ddm-local-client.h \
+ ddm/ddm-notification-set.c \
+ ddm/ddm-rule.c \
+ ddm/ddm-rule.h \
+ ddm/ddm-qname.c \
+ ddm/ddm-work-item.c \
+ ddm/ddm-work-item.h \
+ ddm/hippo-dbus-helper.c \
+ ddm/hippo-dbus-helper.h \
+ ddm/hippo-dbus-helper-rename.h
LIBDDM_BUILT_SOURCEFILES = \
$(DDM_MARSHAL_HEADER) \
@@ -92,11 +92,11 @@
libddm_test_la_LIBADD = $(LIBDDM_LIBS) libddm-1.la
nodist_libddm_test_la_SOURCES = \
- $(COMMONSRCDIR)/ddm/static-file-backend.c \
- $(COMMONSRCDIR)/ddm/static-file-backend.h \
- $(COMMONSRCDIR)/ddm/static-file-parser.c \
- $(COMMONSRCDIR)/ddm/test-utils.c \
- $(COMMONSRCDIR)/ddm/test-utils.h
+ ddm/static-file-backend.c \
+ ddm/static-file-backend.h \
+ ddm/static-file-parser.c \
+ ddm/test-utils.c \
+ ddm/test-utils.h
######################################################################
@@ -121,73 +121,60 @@
TESTS += $(ddm_tests)
-TESTS_ENVIRONMENT=DDM_SRCDIR=$(COMMONSRCDIR)/ddm
+TESTS_ENVIRONMENT=DDM_SRCDIR=ddm
ALL_DDM_TESTS =
test_condition_parser_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDDM_CFLAGS) -DDDM_COMPILATION=1
test_condition_parser_LDADD=libddm-1.la
-nodist_test_condition_parser_SOURCES=$(COMMONSRCDIR)/ddm/test-condition-parser.c
+nodist_test_condition_parser_SOURCES=ddm/test-condition-parser.c
ALL_DDM_TESTS += $(nodist_test_condition_parser_SOURCES)
test_condition_reduce_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDDM_CFLAGS) -DDDM_COMPILATION=1
test_condition_reduce_LDADD=libddm-1.la libddm-test.la
-nodist_test_condition_reduce_SOURCES=$(COMMONSRCDIR)/ddm/test-condition-reduce.c
+nodist_test_condition_reduce_SOURCES=ddm/test-condition-reduce.c
ALL_DDM_TESTS += $(nodist_test_condition_reduce_SOURCES)
test_feed_object_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDDM_CFLAGS) -DDDM_COMPILATION=1
test_feed_object_LDADD=libddm-1.la libddm-test.la
-nodist_test_feed_object_SOURCES=$(COMMONSRCDIR)/ddm/test-feed-object.c
+nodist_test_feed_object_SOURCES=ddm/test-feed-object.c
ALL_DDM_TESTS += $(nodist_test_feed_object_SOURCES)
test_ddm_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDDM_CFLAGS)
test_ddm_LDADD=libddm-1.la
-nodist_test_ddm_SOURCES=$(COMMONSRCDIR)/ddm/test-ddm.c
+nodist_test_ddm_SOURCES=ddm/test-ddm.c
ALL_DDM_TESTS += $(nodist_test_ddm_SOURCES)
test_multipart_fetch_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDDM_CFLAGS) -DDDM_COMPILATION=1
test_multipart_fetch_LDADD=libddm-1.la libddm-test.la
-nodist_test_multipart_fetch_SOURCES=$(COMMONSRCDIR)/ddm/test-multipart-fetch.c
+nodist_test_multipart_fetch_SOURCES=ddm/test-multipart-fetch.c
ALL_DDM_TESTS += $(nodist_test_multipart_fetch_SOURCES)
test_notification_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDDM_CFLAGS) -DDDM_COMPILATION=1
test_notification_LDADD=libddm-1.la libddm-test.la
-nodist_test_notification_SOURCES=$(COMMONSRCDIR)/ddm/test-notification.c
+nodist_test_notification_SOURCES=ddm/test-notification.c
ALL_DDM_TESTS += $(nodist_test_notification_SOURCES)
test_rules_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDDM_CFLAGS) -DDDM_COMPILATION=1
test_rules_LDADD=libddm-1.la libddm-test.la
-nodist_test_rules_SOURCES=$(COMMONSRCDIR)/ddm/test-rules.c
+nodist_test_rules_SOURCES=ddm/test-rules.c
ALL_DDM_TESTS += $(nodist_test_rules_SOURCES)
test_static_file_parser_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDDM_CFLAGS) -DDDM_COMPILATION=1
test_static_file_parser_LDADD=libddm-1.la libddm-test.la
-nodist_test_static_file_parser_SOURCES=$(COMMONSRCDIR)/ddm/test-static-file-parser.c
+nodist_test_static_file_parser_SOURCES=ddm/test-static-file-parser.c
ALL_DDM_TESTS += $(nodist_test_static_file_parser_SOURCES)
test_static_file_backend_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDDM_CFLAGS) -DDDM_COMPILATION=1
test_static_file_backend_LDADD=libddm-1.la libddm-test.la
-nodist_test_static_file_backend_SOURCES=$(COMMONSRCDIR)/ddm/test-static-file-backend.c
+nodist_test_static_file_backend_SOURCES=ddm/test-static-file-backend.c
ALL_DDM_TESTS += $(nodist_test_static_file_backend_SOURCES)
-
-######################################################################
-
-## we need to nodist these because otherwise automake would copy
-## ../common to distdir/../common which puts common outside of distdir.
-## so we handle the disting manually so the destination is always distdir/common-dist
-libddm-dist-hook:
- -mkdir $(distdir)/common-dist
- -mkdir $(distdir)/common-dist/ddm
- cp $(LIBDDM_SOURCEFILES) $(nodist_libddminclude_HEADERS) $(nodist_libddm_test_la_SOURCES) $(ALL_DDM_TESTS) $(distdir)/common-dist/ddm
- mkdir $(distdir)/common-dist/ddm/generated
- cp $(COMMONSRCDIR)/ddm/ddm-marshal.list $(COMMONSRCDIR)/ddm/test-data.xml $(COMMONSRCDIR)/ddm/test-local-data.xml $(distdir)/common-dist/ddm
-
Modified: trunk/Makefile-libengine.am
==============================================================================
--- trunk/Makefile-libengine.am (original)
+++ trunk/Makefile-libengine.am Mon Jan 21 16:55:20 2008
@@ -15,63 +15,54 @@
# for future reference
# libengine_la_LDFLAGS= -export-symbols-regex "^[^_].*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -no-undefined
-COMMON_MARSHAL_LIST=$(COMMONSRCDIR)/engine/hippo-engine-marshal.list
-COMMON_MARSHAL_HEADER=$(MARSHAL_DIR)/hippo-engine-marshal.h
-COMMON_MARSHAL_BODY=$(MARSHAL_DIR)/hippo-engine-marshal.c
+ENGINE_MARSHAL_LIST=engine/hippo-engine-marshal.list
+ENGINE_MARSHAL_HEADER=$(MARSHAL_DIR)/hippo-engine-marshal.h
+ENGINE_MARSHAL_BODY=$(MARSHAL_DIR)/hippo-engine-marshal.c
-$(COMMON_MARSHAL_HEADER): $(COMMON_MARSHAL_LIST)
+$(ENGINE_MARSHAL_HEADER): $(ENGINE_MARSHAL_LIST)
mkdir $(MARSHAL_DIR) || true
- $(GLIB_GENMARSHAL) --prefix=hippo_engine_marshal $(COMMON_MARSHAL_LIST) --header > $(COMMON_MARSHAL_HEADER)
+ $(GLIB_GENMARSHAL) --prefix=hippo_engine_marshal $(ENGINE_MARSHAL_LIST) --header > $(ENGINE_MARSHAL_HEADER)
-$(COMMON_MARSHAL_BODY): $(COMMON_MARSHAL_LIST)
+$(ENGINE_MARSHAL_BODY): $(ENGINE_MARSHAL_LIST)
mkdir $(MARSHAL_DIR) || true
- (echo "#include \"hippo-engine-marshal.h\""; $(GLIB_GENMARSHAL) --prefix=hippo_engine_marshal $(COMMON_MARSHAL_LIST) --body) > $(COMMON_MARSHAL_BODY)
+ (echo "#include \"hippo-engine-marshal.h\""; $(GLIB_GENMARSHAL) --prefix=hippo_engine_marshal $(ENGINE_MARSHAL_LIST) --body) > $(ENGINE_MARSHAL_BODY)
LIBENGINE_SOURCEFILES = \
- $(COMMONSRCDIR)/engine/hippo-chat-room.c \
- $(COMMONSRCDIR)/engine/hippo-chat-room.h \
- $(COMMONSRCDIR)/engine/hippo-connection.c \
- $(COMMONSRCDIR)/engine/hippo-connection.h \
- $(COMMONSRCDIR)/engine/hippo-cookies.c \
- $(COMMONSRCDIR)/engine/hippo-cookies.h \
- $(COMMONSRCDIR)/engine/hippo-data-cache.c \
- $(COMMONSRCDIR)/engine/hippo-data-cache.h \
- $(COMMONSRCDIR)/engine/hippo-data-cache-internal.h \
- $(COMMONSRCDIR)/engine/hippo-disk-cache.c \
- $(COMMONSRCDIR)/engine/hippo-disk-cache.h \
- $(COMMONSRCDIR)/engine/hippo-data-model-backend.c \
- $(COMMONSRCDIR)/engine/hippo-data-model-backend.h \
- $(COMMONSRCDIR)/engine/hippo-endpoint-proxy.c \
- $(COMMONSRCDIR)/engine/hippo-endpoint-proxy.h \
- $(COMMONSRCDIR)/engine/hippo-engine.h \
- $(COMMONSRCDIR)/engine/hippo-engine-basics.c \
- $(COMMONSRCDIR)/engine/hippo-engine-basics.h \
- $(COMMONSRCDIR)/engine/hippo-engine-internal.h \
- $(COMMONSRCDIR)/engine/hippo-platform.c \
- $(COMMONSRCDIR)/engine/hippo-platform.h \
- $(COMMONSRCDIR)/engine/hippo-settings.c \
- $(COMMONSRCDIR)/engine/hippo-settings.h \
- $(COMMONSRCDIR)/engine/hippo-sqlite-utils.c \
- $(COMMONSRCDIR)/engine/hippo-sqlite-utils.h \
- $(COMMONSRCDIR)/engine/hippo-title-pattern.c \
- $(COMMONSRCDIR)/engine/hippo-title-pattern.h \
- $(COMMONSRCDIR)/engine/hippo-xml-utils.c \
- $(COMMONSRCDIR)/engine/hippo-xml-utils.h
+ engine/hippo-chat-room.c \
+ engine/hippo-chat-room.h \
+ engine/hippo-connection.c \
+ engine/hippo-connection.h \
+ engine/hippo-cookies.c \
+ engine/hippo-cookies.h \
+ engine/hippo-data-cache.c \
+ engine/hippo-data-cache.h \
+ engine/hippo-data-cache-internal.h \
+ engine/hippo-disk-cache.c \
+ engine/hippo-disk-cache.h \
+ engine/hippo-data-model-backend.c \
+ engine/hippo-data-model-backend.h \
+ engine/hippo-endpoint-proxy.c \
+ engine/hippo-endpoint-proxy.h \
+ engine/hippo-engine.h \
+ engine/hippo-engine-basics.c \
+ engine/hippo-engine-basics.h \
+ engine/hippo-engine-internal.h \
+ engine/hippo-platform.c \
+ engine/hippo-platform.h \
+ engine/hippo-settings.c \
+ engine/hippo-settings.h \
+ engine/hippo-sqlite-utils.c \
+ engine/hippo-sqlite-utils.h \
+ engine/hippo-title-pattern.c \
+ engine/hippo-title-pattern.h \
+ engine/hippo-xml-utils.c \
+ engine/hippo-xml-utils.h
LIBENGINE_BUILT_SOURCEFILES = \
- $(COMMON_MARSHAL_HEADER) \
- $(COMMON_MARSHAL_BODY)
+ $(ENGINE_MARSHAL_HEADER) \
+ $(ENGINE_MARSHAL_BODY)
+
+libengine_la_SOURCES=$(LIBENGINE_SOURCEFILES) $(LIBENGINE_BUILT_SOURCEFILES)
MAINTAINERCLEANFILES += $(LIBENGINE_BUILT_SOURCEFILES)
BUILT_SOURCES += $(LIBENGINE_BUILT_SOURCEFILES)
-
-## we need to nodist these because otherwise automake would copy
-## ../common to distdir/../common which puts common outside of distdir.
-## so we handle the disting manually so the destination is always distdir/common-dist
-nodist_libengine_la_SOURCES=$(LIBENGINE_SOURCEFILES) $(LIBENGINE_BUILT_SOURCEFILES)
-libengine-dist-hook:
- -mkdir $(distdir)/common-dist
- mkdir $(distdir)/common-dist/engine
- mkdir $(distdir)/common-dist/engine/generated
- cp $(LIBENGINE_SOURCEFILES) $(distdir)/common-dist/engine
- cp $(COMMONSRCDIR)/engine/hippo-engine-marshal.list $(distdir)/common-dist/engine
Modified: trunk/Makefile-libhippo.am
==============================================================================
--- trunk/Makefile-libhippo.am (original)
+++ trunk/Makefile-libhippo.am Mon Jan 21 16:55:20 2008
@@ -10,31 +10,21 @@
$(LIBHIPPO_LIBS) \
libddm-1.la
-LIBHIPPO_SOURCEFILES = \
- $(COMMONSRCDIR)/hippo/hippo-basics.c \
- $(COMMONSRCDIR)/hippo/hippo-basics.h \
- $(COMMONSRCDIR)/hippo/hippo-common.h \
- $(COMMONSRCDIR)/hippo/hippo-common-internal.h \
- $(COMMONSRCDIR)/hippo/hippo-dbus-names.c \
- $(COMMONSRCDIR)/hippo/hippo-dbus-names.h \
- $(COMMONSRCDIR)/hippo/hippo-entity.c \
- $(COMMONSRCDIR)/hippo/hippo-entity.h \
- $(COMMONSRCDIR)/hippo/hippo-entity-protected.h \
- $(COMMONSRCDIR)/hippo/hippo-feed.c \
- $(COMMONSRCDIR)/hippo/hippo-feed.h \
- $(COMMONSRCDIR)/hippo/hippo-group.c \
- $(COMMONSRCDIR)/hippo/hippo-group.h \
- $(COMMONSRCDIR)/hippo/hippo-person.c \
- $(COMMONSRCDIR)/hippo/hippo-person.h \
- $(COMMONSRCDIR)/hippo/hippo-track.c \
- $(COMMONSRCDIR)/hippo/hippo-track.h
-
-## we need to nodist these because otherwise automake would copy
-## ../common to distdir/../common which puts common outside of distdir.
-## so we handle the disting manually so the destination is always distdir/common-dist
-nodist_libhippo_la_SOURCES=$(LIBHIPPO_SOURCEFILES) $(LIBHIPPO_BUILT_SOURCEFILES)
-libhippo-dist-hook:
- -mkdir $(distdir)/common-dist
- mkdir $(distdir)/common-dist/hippo
- mkdir $(distdir)/common-dist/hippo/generated
- cp $(LIBHIPPO_SOURCEFILES) $(distdir)/common-dist/hippo
+libhippo_la_SOURCES = \
+ hippo/hippo-basics.c \
+ hippo/hippo-basics.h \
+ hippo/hippo-common.h \
+ hippo/hippo-common-internal.h \
+ hippo/hippo-dbus-names.c \
+ hippo/hippo-dbus-names.h \
+ hippo/hippo-entity.c \
+ hippo/hippo-entity.h \
+ hippo/hippo-entity-protected.h \
+ hippo/hippo-feed.c \
+ hippo/hippo-feed.h \
+ hippo/hippo-group.c \
+ hippo/hippo-group.h \
+ hippo/hippo-person.c \
+ hippo/hippo-person.h \
+ hippo/hippo-track.c \
+ hippo/hippo-track.h
Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am (original)
+++ trunk/Makefile.am Mon Jan 21 16:55:20 2008
@@ -1,16 +1,7 @@
-## this is a teenie bit weird; COMMONSRCDIR can be either ../common (build from CVS)
-## or common-dist in the current dir (build from tarball). We rename it to common-dist
-## when including it to be sure we don't mix the two up.
-if COMMON_OUTSIDE_TREE
-COMMONSRCDIR=$(top_srcdir)/../common
-else
-COMMONSRCDIR=$(top_srcdir)/common-dist
-endif
-
# note that target-specific CPPFLAGS will REPLACE
# not augment these default flags by default,
# so we manually put AM_CPPFLAGS in the target flags
-AM_CPPFLAGS=-DHIPPO_COMPILATION -DHIPPO_OS_LINUX -DVERSION_FILE=\"$(pkgdatadir)/version\" -I$(top_builddir)/config -I$(COMMONSRCDIR) -I$(COMMONSRCDIR)/canvas
+AM_CPPFLAGS=-DHIPPO_COMPILATION -DHIPPO_OS_LINUX -DVERSION_FILE=\"$(pkgdatadir)/version\" -I$(top_builddir)/config
# the "config" dir seems like a convenient place that's already
# in everyone's include path ... I dunno
@@ -34,9 +25,6 @@
rmdir $(BUILT_SRC_DIR) ; \
fi
-dist-hook: libhippo-dist-hook libhippoipc-dist-hook libhippofirefox-dist-hook mugshot-dist-hook libddm-dist-hook libengine-dist-hook libstacker-dist-hook
-.PHONY: libhippo-dist-hook libhippoipc-dist-hook libhippofirefox-dist-hook mugshot-dist-hook libengine-dist-hook libstacker-dist-hook
-
# These are added to using += in the included files
bin_PROGRAMS =
libexec_PROGRAMS =
@@ -50,32 +38,7 @@
pkgconfig_DATA =
TESTS =
-CANVASSRCDIR=$(top_srcdir)/canvas-dist
-
-if USE_INCLUDED_CANVAS
-CANVAS_CFLAGS = \
- -I $(CANVASSRCDIR)/common \
- -I $(CANVASSRCDIR)/linux
-CANVAS_LIBADD= libhippocanvas-1.la
-
-include Makefile-libhippocanvas.am
-else
-# Apparently this doesn't get picked up when automake finds the files to
-# distribute from all branches of the conditional, so add it manually
-EXTRA_DIST += $(CANVASSRCDIR)/common/hippo/hippo-canvas-marshal.list
-endif
-
include Makefile-libddm.am
-include Makefile-libhippoipc.am
include Makefile-libhippo.am
include Makefile-libengine.am
-include Makefile-libstacker.am
-include Makefile-libgtkcopy.am
-include Makefile-libhippofirefox.am
-include Makefile-mugshot.am
include Makefile-engine-dbus.am
-include Makefile-mugshot-uri-handler.am
-include Makefile-test-hippo-ipc.am
-include Makefile-icons.am
-
-DISTCHECK_CONFIGURE_FLAGS=--with-included-canvas
Added: trunk/NEWS
==============================================================================
Added: trunk/README
==============================================================================
Added: trunk/autogen.sh
==============================================================================
--- (empty file)
+++ trunk/autogen.sh Mon Jan 21 16:55:20 2008
@@ -0,0 +1,84 @@
+#!/bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+PACKAGE="desktop-data-model"
+
+have_libtool=false
+have_autoconf=false
+have_automake=false
+need_configure_in=false
+
+have_gtk_doc=false
+want_gtk_doc=false
+
+if libtool --version < /dev/null > /dev/null 2>&1 ; then
+ libtool_version=`libtoolize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
+ have_libtool=true
+ case $libtool_version in
+ 1.3*)
+ need_configure_in=true
+ ;;
+ esac
+fi
+
+if autoconf --version < /dev/null > /dev/null 2>&1 ; then
+ autoconf_version=`autoconf --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
+ have_autoconf=true
+ case $autoconf_version in
+ 2.13)
+ need_configure_in=true
+ ;;
+ esac
+fi
+
+if $have_libtool ; then : ; else
+ echo;
+ echo "You must have libtool >= 1.3 installed to compile $PACKAGE";
+ echo;
+ exit;
+fi
+
+if grep "^GTK_DOC_CHECK" ./configure.ac; then
+ want_gtk_doc=true
+fi
+
+if $want_gtk_doc; then
+ (gtkdocize --version) < /dev/null > /dev/null 2>&1 || {
+ echo;
+ echo "You need gtk-doc to build $PACKAGE";
+ echo;
+ }
+fi
+
+(automake --version) < /dev/null > /dev/null 2>&1 || {
+ echo;
+ echo "You must have automake installed to compile $PACKAGE";
+ echo;
+ exit;
+}
+
+echo "Generating configuration files for $PACKAGE, please wait...."
+echo;
+
+if $need_configure_in ; then
+ if test ! -f configure.in ; then
+ echo "Creating symlink from configure.in to configure.ac..."
+ echo
+ ln -s configure.ac configure.in
+ fi
+fi
+
+aclocal $ACLOCAL_FLAGS
+libtoolize --force
+autoheader
+automake --add-missing -Woverride
+autoconf
+
+cd $ORIGDIR || exit $?
+
+$srcdir/configure $@ --enable-maintainer-mode --enable-compile-warnings
+
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Mon Jan 21 16:55:20 2008
@@ -1,12 +1,12 @@
dnl -*- mode: m4 -*-
AC_PREREQ(2.59)
-AC_INIT(src/hippo-ui.h)
+AC_INIT(ddm/ddm.h)
AC_CONFIG_AUX_DIR(config)
AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(mugshot, 1.1.58)
+AM_INIT_AUTOMAKE(desktop-data-model, 0.9.0)
AM_CONFIG_HEADER(config/config.h)
@@ -70,9 +70,6 @@
AC_PROG_CC
AM_PROG_CC_C_O
-# This disables building a static library for the firefox plugin, while having
-# no effect on our convenience libraries. (I don't know why libtool builds
-# static libraries when -module is supplied on a platform supporting dlopen...)
AM_DISABLE_STATIC
AC_PROG_CXX
AC_PROG_LIBTOOL
@@ -215,24 +212,6 @@
AC_SUBST(CXXFLAGS)
AC_SUBST(LDFLAGS)
-## we prefer to find common in ../common when building from
-## subversion, but the distribution has it in top_srcdir
-AC_MSG_CHECKING(For "$srcdir/../common" or "$srcdir/common-dist")
-if test -d "$srcdir"/common ; then
- AC_MSG_RESULT(found in wrong place)
- AC_MSG_ERROR([The "common" directory should not be here; it should be a sibling of srcdir or be called common-dist and a subdir of it])
-elif test -d "$srcdir"/common-dist ; then
- common_outside_tree=false
- AC_MSG_RESULT(found common-dist inside tree)
-elif test -d "$srcdir"/../common ; then
- common_outside_tree=true
- AC_MSG_RESULT(found outside tree)
-else
- AC_MSG_RESULT(not found)
- AC_MSG_ERROR([The "common" or "common-dist" directory wasn't found])
-fi
-AM_CONDITIONAL(COMMON_OUTSIDE_TREE, $common_outside_tree)
-
# res_init() can be used to work around the inability to see changes
# in /etc/resolv.conf. We need to use AC_TRY_LINK since on GNU libc
# it's a #define for for __res_init
@@ -252,41 +231,6 @@
LIBS="$hippo_save_LIBS"
-# sigsetjmp is a macro on some platforms, so AC_CHECK_FUNCS is not reliable
-AC_MSG_CHECKING(for sigsetjmp)
-AC_TRY_LINK([#include <setjmp.h>], [
-sigjmp_buf env;
-sigsetjmp(env, 0);
-], have_sigsetjmp=yes, have_sigsetjmp=no)
-AC_MSG_RESULT($have_sigsetjmp)
-if test "$have_sigsetjmp" = "yes"; then
- AC_DEFINE(HAVE_SIGSETJMP, 1, [Define to 1 if you have sigsetjmp()])
-fi
-
-
-AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
- jpeg_ok=yes,
- jpeg_ok=no
- AC_MSG_ERROR(*** JPEG library not found ***))
-
-if test "$jpeg_ok" = yes; then
- AC_MSG_CHECKING([for jpeglib.h])
- AC_TRY_CPP(
-[#include <stdio.h>
-#undef PACKAGE
-#undef VERSION
-#undef HAVE_STDLIB_H
-#include <jpeglib.h>],
- jpeg_ok=yes,
- jpeg_ok=no)
- AC_MSG_RESULT($jpeg_ok)
- if test "$jpeg_ok" = yes; then
- JPEG_LIBS='-ljpeg'
- else
- AC_MSG_ERROR(*** JPEG header not found ***)
- fi
-fi
-
AC_ARG_WITH(maemo,
AC_HELP_STRING([--with-maemo=[yes/no]],
[Whether to use Maemo version of Mugshot client]),
@@ -300,48 +244,12 @@
DBUS_REQUIRED=0.60
DBUS_GLIB_REQUIRED=0.60
# earlier might work, but this is what's been tested
-CURL_REQUIRED=7.13.1
-# earlier might work, but this is what's been tested
PCRE_REQUIRED=6.3
# earlier might work, but this is what's been tested
SQLITE_REQUIRED=3.3
# 2.10 for gnome_desktop_item_set_launch_time()
GNOME_DESKTOP_REQUIRED=2.10.0
-## We don't just use PKG_CHECK_MODULES because libcurl.pc has all kinds of crap in it like openssl and kerberos
-## on the link line... we don't want to link to all that stuff. So just do -lcurl
-## For now people doing static linking or putting libcurl in a funny prefix will have to h4x0r the following
-## lines (try just "PKG_CHECK_MODULES(CURL, libcurl >= $CURL_REQUIRED)" if you don't care about linking to
-## all the extra goo)
-## Also, older curl has curl-config instead of a .pc file... mumble grumble
-CURL_LIBS=-lcurl
-CURL_CFLAGS=
-HIPPO_PKG_CHECK_EXISTS(libcurl >= $CURL_REQUIRED, have_curl=true, have_curl=false)
-warn_about_curl_version=false
-if $have_curl ; then
- AC_MSG_NOTICE([Found libcurl, using link flags $CURL_LIBS])
-else
- AC_MSG_WARN([no pkg-config enabled libcurl found; checking for old-timey version of curl])
-
- AC_CHECK_HEADERS([curl/curl.h])
- AC_CHECK_HEADERS([curl/easy.h], [have_curl_headers=true], [have_curl_headers=false],
- [#if HAVE_CURL_CURL_H
- #include <curl/curl.h>
- #endif
- ])
- if $have_curl_headers ; then
- AC_CHECK_LIB(curl, curl_easy_perform, have_curl=true, have_curl=false)
- else
- have_curl=false
- fi
- if $have_curl ; then
- warn_about_curl_version=true
- AC_MSG_WARN([libcurl seems to exist, but we don't know what version it is; if you get weird problems then try upgrading...])
- else
- AC_MSG_ERROR([no libcurl found on system, on some systems you could solve this by installing the curl-devel package])
- fi
-fi
-
XSCREENSAVER_PACKAGES=""
XSCREENSAVER_LIBS=""
XSCREENSAVER_CFLAGS=""
@@ -424,69 +332,24 @@
fi
fi
-#
-# Check if hippo-canvas is installed or we need to build our included version
-# (canvas be forces with --with-included-canvas/--without-included-canvas
-#
-AC_ARG_WITH(included_canvas,
- AC_HELP_STRING([--with-included-canvas=[yes/no/auto]],
- [Use copy of HippoCanvas included with the mugshot sources]),
- ,
- with_included_canvas=auto)
-
-if test "x$with_included_canvas" = xauto ; then
- AC_MSG_CHECKING([for hippo-canvas library])
- HIPPO_PKG_CHECK_EXISTS(hippo-canvas-1, with_included_canvas=no, with_included_canvas=yes)
- if test "x$with_included_canvas" = xyes ; then
- AC_MSG_RESULT([no: using included version])
- else
- AC_MSG_RESULT([yes])
- fi
-fi
-
-if test "x$with_included_canvas" = xyes ; then
- :
-else
- CANVAS_MODULES=hippo-canvas-1
-fi
-
-AM_CONDITIONAL(USE_INCLUDED_CANVAS, test "x$with_included_canvas" = xyes)
-
-extra_mugshot_packages=""
-extra_engine_packages=""
-
+# If we're building for Maemo, we don't need gnome-desktop
if test "x$with_maemo" != xno ; then
- extra_mugshot_packages="libosso >= 0.9.19"
+ :
else
extra_engine_packages="gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED"
fi
PKG_CHECK_MODULES(LIBDDM, gobject-2.0 >= $GLIB2_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED)
-PKG_CHECK_MODULES(LIBHIPPOCANVAS, gtk+-2.0 >= $GTK2_REQUIRED gobject-2.0 >= $GLIB2_REQUIRED cairo pango)
PKG_CHECK_MODULES(LIBHIPPO, gobject-2.0 >= $GLIB2_REQUIRED gthread-2.0)
PKG_CHECK_MODULES(LIBENGINE, gobject-2.0 >= $GLIB2_REQUIRED gthread-2.0 loudmouth-1.0 >= $LOUDMOUTH_REQUIRED $PCRE_MODULES $SQLITE_MODULES)
-PKG_CHECK_MODULES(LIBSTACKER, gobject-2.0 >= $GLIB2_REQUIRED gthread-2.0 cairo pango $CANVAS_MODULES)
AC_DEFINE(HIPPO_LOUDMOUTH_IS_10, 1, [Define if Loudmouth is version 1.0 or below])
-PKG_CHECK_MODULES(LIBHIPPOIPC, gobject-2.0 dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED)
-PKG_CHECK_MODULES(LIBGTKCOPY, gtk+-2.0 >= $GTK2_REQUIRED gtk+-x11-2.0)
-PKG_CHECK_MODULES(DESKTOP_DATA_ENGINE, gtk+-2.0 >= $GTK2_REQUIRED gthread-2.0 loudmouth-1.0 >= $LOUDMOUTH_REQUIRED dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED gnome-vfs-2.0 $XSCREENSAVER_PACKAGES $CANVAS_MODULES $extra_engine_packages)
-PKG_CHECK_MODULES(MUGSHOT_BASE, gtk+-2.0 >= $GTK2_REQUIRED gthread-2.0 dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED $XSCREENSAVER_PACKAGES $CANVAS_MODULES $extra_mugshot_packages)
-
-# If we're building the Maemo client, we don't need gnome-desktop
-
-MUGSHOT_LIBS="$MUGSHOT_BASE_LIBS $XSCREENSAVER_LIBS $CURL_LIBS $JPEG_LIBS $RESOLV_LIBS"
-MUGSHOT_CFLAGS="$MUGSHOT_BASE_CFLAGS $XSCREENSAVER_CFLAGS $CURL_CFLAGS"
-AC_SUBST(MUGSHOT_LIBS)
-AC_SUBST(MUGSHOT_CFLAGS)
+PKG_CHECK_MODULES(DESKTOP_DATA_ENGINE, gtk+-2.0 >= $GTK2_REQUIRED gthread-2.0 loudmouth-1.0 >= $LOUDMOUTH_REQUIRED dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED gnome-vfs-2.0 $XSCREENSAVER_PACKAGES $extra_engine_packages)
-DESKTOP_DATA_ENGINE_LIBS="$DESKTOP_DATA_ENGINE_LIBS $XSCREENSAVER_LIBS $JPEG_LIBS $RESOLV_LIBS"
+DESKTOP_DATA_ENGINE_LIBS="$DESKTOP_DATA_ENGINE_LIBS $XSCREENSAVER_LIBS $RESOLV_LIBS"
DESKTOP_DATA_ENGINE_CFLAGS="$DESKTOP_DATA_ENGINE_CFLAGS $XSCREENSAVER_CFLAGS"
AC_SUBST(DESKTOP_DATA_ENGINE_LIBS)
AC_SUBST(DESKTOP_DATA_ENGINE_CFLAGS)
-PKG_CHECK_MODULES(MUGSHOT_URI_HANDLER, gtk+-2.0 >= $GTK2_REQUIRED gthread-2.0 dbus-1 >= $DBUS_REQUIRED)
-PKG_CHECK_MODULES(TEST_HIPPO_IPC, gobject-2.0 dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED)
-
if test "x$with_maemo" != xno ; then
AC_DEFINE(WITH_MAEMO, , [whether Maemo is active])
fi
@@ -498,9 +361,6 @@
GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
AC_SUBST(GLIB_MKENUMS)
-HIPPO_PKG_CHECK_EXISTS(gtk+-2.0 < 2.9.0, have_gtk210=false, have_gtk210=true)
-AM_CONDITIONAL(HAVE_GTK210, $have_gtk210)
-
HIPPO_PKG_CHECK_EXISTS(dbus-1 < 1.0, have_dbus10=false, have_dbus10=true)
if $have_dbus10 ; then
AC_DEFINE(HAVE_DBUS_1_0, , [whether we have dbus 1.0 or greater])
@@ -517,208 +377,10 @@
AM_GCONF_SOURCE_2
-
-##
-## Checks for Firefox build environment
-##
-AC_ARG_WITH(gecko_sdk,
- AC_HELP_STRING([--with-gecko-sdk=DIR],
- [Path to Gecko SDK]))
-AC_ARG_WITH(gecko_full_headers,
- AC_HELP_STRING([--with-gecko-headers=DIR],
- [Path to Gecko headers]))
-AC_ARG_WITH(gecko_full_idl,
- AC_HELP_STRING([--with-gecko-idl=DIR],
- [Path to Gecko IDL files]))
-AC_ARG_WITH(xpidl,
- AC_HELP_STRING([--with-xpidl=SOURCE_DIR],
- [Path to XPIDL binary]))
-
-have_full_gecko=false
-sdk_includes_nspr=false
-need_separate_js=false
-
-if test "x$with_gecko_sdk" != x -a "x$with_gecko_sdk" != xyes -a "x$with_gecko_sdk" != xno ; then
- GECKO_IDLDIR="$with_gecko_sdk/idl"
- GECKO_INCLUDEDIR="$with_gecko_sdk/include"
- XPIDL="$with_gecko_sdk/bin/xpidl"
-
- if test -f "$GECKO_INCLUDEDIR/nspr.h" ; then
- sdk_includes_nspr=true
- fi
-fi
-
-if test "x$with_gecko_idl" != x -a "x$with_gecko_idl" != xyes -a "x$with_gecko_idl" != xno ; then
- GECKO_IDLDIR="$with_gecko_idl"
-fi
-
-if test "x$with_gecko_headers" != x -a "x$with_gecko_headers" != xyes -a "x$with_gecko_headers" != xno ; then
- GECKO_INCLUDEDIR="$with_gecko_headers"
-fi
-
-if test "x$with_xpidl" != x -a "x$with_xpidl" != xyes -a "x$with_xpidl" != xno ; then
- XPIDL="$with_xpidl"
-fi
-
-AC_MSG_CHECKING([for libxul-unstable])
-HIPPO_PKG_CHECK_EXISTS(libxul-unstable >= 1.9, have_xulrunner=true, have_xulrunner=false)
-if test "x${have_xulrunner}" = "xtrue"; then
- AC_MSG_RESULT([yes])
- AC_DEFINE(HAVE_XULRUNNER, 1, [whether we have XULRunner])
- idldir=`pkg-config --variable=idldir libxul-unstable`
- GECKO_IDLDIR="${idldir}"
- GECKO_INCLUDEDIR=`pkg-config --variable=includedir libxul-unstable`
- XPIDL=`pkg-config --variable=sdkdir libxul-unstable`/bin/xpidl
-else
- AC_MSG_RESULT([no])
-fi
-
-# if the firefox-devel RPM is installed, set paths from that
-if test \( x"$GECKO_IDLDIR" = x -o "x$GECKO_INCLUDEDIR" = x -o "x$XPIDL" = x \) -a -x /bin/rpm ; then
- AC_MSG_CHECKING([for Gecko SDK via the firefox-devel package])
- FIREFOX_VERSION="`/bin/rpm -q --qf '%{version} ' firefox-devel`"
- if test $? = 0 ; then
- # In multi-arch situations, there might be multiple versions of firefox-devel
- # installed; we assume it doesn't matter which one we find; ideally we'd
- # like to find the one that matches the architecture we are building for
- # but that's hard to do, and what we use shouldn't be dependent on
- # architecture or exact version. The only problem would be if the two versions
- # are for wildly different versions of firefox.
- #
- FIREFOX_VERSION=`(set $FIREFOX_VERSION && echo $1)`
-
- AC_MSG_RESULT([yes])
- if test x"$GECKO_IDLDIR" = x ; then
- GECKO_IDLDIR=/usr/share/idl/firefox-$FIREFOX_VERSION
- fi
- if test x"$GECKO_INCLUDEDIR" = x ; then
- GECKO_INCLUDEDIR=/usr/include/firefox-$FIREFOX_VERSION
- fi
- if test x"$XPIDL" = x ; then
- if test -x /usr/lib/firefox-$FIREFOX_VERSION/xpidl ; then
- XPIDL=/usr/lib/firefox-$FIREFOX_VERSION/xpidl
- elif test -x /usr/lib64/firefox-$FIREFOX_VERSION/xpidl ; then
- XPIDL=/usr/lib64/firefox-$FIREFOX_VERSION/xpidl
- else
- AC_MSG_WARN([Found firefox-devel RPM, but couldn't find xpidl binary])
- fi
- fi
- else
- AC_MSG_RESULT([no])
- fi
-fi
-
-if test "x$GECKO_INCLUDEDIR" = x ; then
- AC_MSG_CHECKING([for Gecko SDK in /opt/gecko-sdk])
- if test -f "/opt/gecko-sdk/idl/nsIURI.idl" ; then
- GECKO_IDLDIR="/opt/gecko-sdk/idl"
- GECKO_INCLUDEDIR="/opt/gecko-sdk/include"
- XPIDL="/opt/gecko-sdk/bin/xpidl"
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
- fi
-fi
-
-if test "x$GECKO_IDLDIR" != x ; then
- if ! test -f "$GECKO_IDLDIR/nsIURI.idl" ; then
- AC_MSG_ERROR([Cannot find Gecko IDL files in $GECKO_IDLDIR])
- fi
-else
- AC_MSG_ERROR([Must either specify --with-gecko-sdk=DIR or --with-gecko-idl=DIR])
-fi
-
-if test "x${have_xulrunner}" != xtrue; then
- AC_DEFINE(HAVE_PRE_XULRUNNER_SDK, 1, [Define if not using XULRunner])
-if test "x$GECKO_INCLUDEDIR" != x ; then
- AC_MSG_CHECKING([for "full gecko" style includes])
- if test -f "$GECKO_INCLUDEDIR/caps/nsIScriptSecurityManager.h" ; then
- have_full_gecko=true
- AC_MSG_RESULT([yes])
- elif test -f "$GECKO_INCLUDEDIR/nsIURI.h" ; then
- AC_MSG_RESULT([no])
- else
- AC_MSG_ERROR([Cannot find Gecko headers in $GECKO_INCLUDEDIR])
- fi
-else
- AC_MSG_ERROR([Must either specify --with-gecko-sdk=DIR or --with-gecko-headers=DIR])
-fi
-fi
-
-# If we are using the cut-and-paste version of nsIXPCSecurityManager.h, we don't
-# need the Javascript headers, otherwise we do. Debian packages the Javascript
-# files from XulRunner into a separate directory, so detect that and we'll look
-# for them later
-if $have_full_gecko ; then
- if test -f "$GECKO_INCLUDEDIR/js/jspubtd.h" ; then
- :
- else
- need_separate_js=true
- fi
-fi
-
-if test "x$XPIDL" != x ; then
- if ! test -x "$XPIDL" ; then
- AC_MSG_ERROR([Cannot find xpidl at $XPIDL])
- fi
-else
- AC_MSG_ERROR([Must either specify --with-gecko-sdk=DIR or --with-xpidl=DIR])
-fi
-
-AM_CONDITIONAL(HAVE_FULL_GECKO, $have_full_gecko)
-
-AC_SUBST(GECKO_IDLDIR)
-AC_SUBST(GECKO_INCLUDEDIR)
-AC_SUBST(XPIDL)
-
-if $sdk_includes_nspr ; then
- NSPR_LIBS="-L $with_gecko_sdk/lib -lnspr4"
-else
- for pkg in firefox-nspr xulrunnner-nspr nspr microb-engine-nspr; do
- if test "x$NSPR_PACKAGES" = x ; then
- HIPPO_PKG_CHECK_EXISTS($pkg, NSPR_PACKAGES=$pkg)
- fi
- done
- if test "x$NSPR_PACKAGES" = x ; then
- AC_MSG_ERROR([Can't find nspr])
- fi
-fi
-
-if $need_separate_js ; then
- for pkg in firefox-js xulrunner-js microb-engine-js; do
- if test "x$JS_PACKAGES" = x ; then
- HIPPO_PKG_CHECK_EXISTS($pkg, JS_PACKAGES=$pkg)
- fi
- done
- if test "x$JS_PACKAGES" = x ; then
- AC_MSG_ERROR([Can't find Gecko Javascript package])
- fi
-fi
-
-PKG_CHECK_MODULES(LIBHIPPOFIREFOX, gobject-2.0 dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED $NSPR_PACKAGES $JS_PACKAGES gtk+-2.0)
-
-if test "x${have_xulrunner}"; then
- LIBHIPPOFIREFOX_CFLAGS="`pkg-config --cflags libxul-unstable` ${LIBHIPPOFIREFOX_CFLAGS}"
-fi
-# Should have -lxpcom here, but that upsets libtool for unknown reasons. Or
-# should we use -lxpcomglue instead? We don't actually link to anything private, though
-# we use some private interfaces
-LIBHIPPOFIREFOX_LIBS="$LIBHIPPOFIREFOX_LIBS $NSPR_LIBS"
-if test "x${have_xulrunner}" = "xtrue"; then
- # We need to match the mozilla version by compiling with short-wchar
- LIBHIPPOFIREFOX_LIBS="${LIBHIPPOFIREFOX_LIBS} `pkg-config --libs libxul-unstable`"
-fi
-
#### define absolute path to srcdir for debugging-only code
ABSOLUTE_TOP_SRCDIR=`cd ${srcdir} && pwd`
AC_DEFINE_UNQUOTED(ABSOLUTE_TOP_SRCDIR, "$ABSOLUTE_TOP_SRCDIR", [full path to srcdir])
-AC_ARG_WITH(about_message,
- AC_HELP_STRING([--with-about-message=MESSAGE],
- [Additional message for the about dialog]))
-
-AC_DEFINE_UNQUOTED(HIPPO_ABOUT_MESSAGE, "$with_about_message", [additional message for the about dialog])
-
AC_OUTPUT([
Makefile
version
@@ -728,34 +390,21 @@
dnl ==========================================================================
echo "
- Mugshot $VERSION
- ==================
+ desktop-data-model $VERSION
+ ===========================
prefix: ${prefix}
compiler: ${CC}
- xpidl: ${XPIDL}
- Gecko includes: ${GECKO_INCLUDEDIR}
- Gecko idl files: ${GECKO_IDLDIR}
- Full Gecko: ${have_full_gecko}
-
- LIBHIPPO_CFLAGS: ${LIBHIPPO_CFLAGS}
- LIBDDM_CFLAGS: ${LIBDDM_CFLAGS}
- MUGSHOT_CFLAGS: ${MUGSHOT_CFLAGS}
- LIBHIPPOFIREFOX_CFLAGS: ${LIBHIPPOFIREFOX_CFLAGS}
-
- LIBHIPPO_LIBS: ${LIBHIPPO_LIBS}
- LIBDDM_LIBS: ${LIBDDM_LIBS}
- MUGSHOT_LIBS: ${MUGSHOT_LIBS}
- LIBHIPPOFIREFOX_LIBS: ${LIBHIPPOFIREFOX_LIBS}
+
+ LIBHIPPO_CFLAGS: ${LIBHIPPO_CFLAGS}
+ LIBDDM_CFLAGS: ${LIBDDM_CFLAGS}
+ LIBENGINE_CFLAGS: ${LIBENGINE_CFLAGS}
+ DESKTOP_DATA_ENGINE_CFLAGS: ${DESKTOP_DATA_ENGINE_CFLAGS}
+
+ LIBHIPPO_LIBS: ${LIBHIPPO_LIBS}
+ LIBDDM_LIBS: ${LIBDDM_LIBS}
+ LIBENGINE_LIBS: ${LIBENGINE_LIBS}
+ DESKTOP_DATA_ENGINE_LIBS: ${DESKTOP_DATA_ENGINE_LIBS}
Now type 'make' to build $PACKAGE
"
-
-if "$warn_about_curl_version" ; then
- echo "
- ***** libcurl was found but we couldn't tell what version it is.
- ***** we've tested with versions $CURL_REQUIRED and above.
- ***** If you have an older version, the build might fail or
- ***** there may be bugs at runtime, or, it might work - we don't know!
- "
-fi
Modified: trunk/ddm/ddm-feed.c
==============================================================================
--- trunk/ddm/ddm-feed.c (original)
+++ trunk/ddm/ddm-feed.c Mon Jan 21 16:55:20 2008
@@ -16,7 +16,7 @@
GList *items;
GHashTable *nodes_by_resource;
- gint notify_timestamp;
+ gint64 notify_timestamp;
};
struct _DDMFeedClass {
Modified: trunk/engine/hippo-engine-basics.c
==============================================================================
--- trunk/engine/hippo-engine-basics.c (original)
+++ trunk/engine/hippo-engine-basics.c Mon Jan 21 16:55:20 2008
@@ -347,7 +347,7 @@
GString *gstr;
if (log_level & G_LOG_FLAG_RECURSION) {
- (*hippo_print_debug_func)("Mugshot: log recursed");
+ (*hippo_print_debug_func)("desktop-data-engine: log recursed");
return;
}
@@ -386,7 +386,7 @@
break;
}
- gstr = g_string_new("Mugshot: ");
+ gstr = g_string_new("desktop-data-engine: ");
g_string_append(gstr, prefix);
g_string_append(gstr, message);
Added: trunk/hippo/hippo-dbus-names.c
==============================================================================
--- (empty file)
+++ trunk/hippo/hippo-dbus-names.c Mon Jan 21 16:55:20 2008
@@ -0,0 +1,83 @@
+/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+#include <config.h>
+#include <glib/gi18n-lib.h>
+#include <string.h>
+#include <hippo/hippo-basics.h>
+#include "hippo-dbus-names.h"
+
+static char*
+hippo_dbus_full_bus_name_internal(const char *server,
+ const char *base_bus_name,
+ gboolean backward_hex)
+{
+ GString *str;
+ const char *p;
+ char *server_with_port;
+ static const char hexdigits[16] =
+ { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+ 'A', 'B', 'C', 'D', 'E', 'F' };
+
+ /* we need the "80" canonically in here */
+ if (strchr(server, ':') == NULL)
+ server_with_port = g_strdup_printf("%s:%d", server, 80);
+ else
+ server_with_port = NULL;
+
+ /*
+ * There some kind of very remote security implications if we map multiple domains
+ * to the same dbus name, or vice versa, I guess, so we try to avoid that.
+ * In practice (at least right now) we don't automatically start a dbus client
+ * to some random server so it probably doesn't matter.
+ *
+ */
+ str = g_string_new(base_bus_name);
+ g_string_append_c(str, '.');
+
+ if (server_with_port)
+ p = server_with_port;
+ else
+ p = server;
+ while (*p) {
+ /* only [a-z][A-Z][0-9]_ are allowed, not starting with a digit.
+ * We encode any non-alphanumeric as _ followed by 2-digit hex
+ * of the byte.
+ */
+ if ((*p >= 'a' && *p <= 'z') ||
+ (*p >= 'A' && *p <= 'Z') ||
+ (*p >= '0' && *p <= '9')) {
+ g_string_append_c(str, *p);
+ } else {
+ g_string_append_c(str, '_');
+ if (backward_hex) {
+ /* Nibbles backwards */
+ g_string_append_c(str, hexdigits[(*p) & 0xf]);
+ g_string_append_c(str, hexdigits[(*p) >> 4]);
+ } else {
+ g_string_append_c(str, hexdigits[(*p) >> 4]);
+ g_string_append_c(str, hexdigits[(*p) & 0xf]);
+ }
+ }
+ ++p;
+ }
+ g_free(server_with_port);
+
+ return g_string_free(str, FALSE);
+}
+
+char*
+hippo_dbus_full_bus_name(const char *server)
+{
+ return hippo_dbus_full_bus_name_internal(server, HIPPO_DBUS_ENGINE_BASE_BUS_NAME, FALSE);
+}
+
+char*
+hippo_dbus_full_bus_name_com_dumbhippo_with_forward_hex(const char *server)
+{
+ return hippo_dbus_full_bus_name_internal(server, HIPPO_DBUS_STACKER_BASE_BUS_NAME, FALSE);
+}
+
+char*
+hippo_dbus_full_bus_name_com_dumbhippo_with_backward_hex(const char *server)
+{
+ return hippo_dbus_full_bus_name_internal(server, HIPPO_DBUS_STACKER_BASE_BUS_NAME, TRUE);
+}
Added: trunk/hippo/hippo-dbus-names.h
==============================================================================
--- (empty file)
+++ trunk/hippo/hippo-dbus-names.h Mon Jan 21 16:55:20 2008
@@ -0,0 +1,54 @@
+/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+#ifndef __HIPPO_DBUS_NAMES_H__
+#define __HIPPO_DBUS_NAMES_H__
+
+#include <glib.h>
+
+/* These are the D-BUS bus names we use on Linux. Nothing here actually is dependent
+ * on D-BUS; it's just string manipulation ... so we can stick it here to share it
+ * between the the data model engine and the Mugshot stacker */
+
+G_BEGIN_DECLS
+
+/* combined with host/port the client is connected to, to create full bus name */
+#define HIPPO_DBUS_STACKER_BASE_BUS_NAME "com.dumbhippo.Client"
+
+/* combined with host/port the client is connected to, to create full bus name */
+#define HIPPO_DBUS_ENGINE_BASE_BUS_NAME "org.freedesktop.od.Engine"
+
+/* these are used for operations specific to the Mugshot stacker.
+ */
+#define HIPPO_DBUS_STACKER_INTERFACE "com.dumbhippo.Client"
+#define HIPPO_DBUS_STACKER_PATH "/com/dumbhippo/client"
+
+/* This interface/path is used for callbacks from the server to a client (establish
+ * using the Connect() method
+ */
+#define HIPPO_DBUS_STACKER_LISTENER_INTERFACE "com.dumbhippo.Listener"
+#define HIPPO_DBUS_STACKER_LISTENER_PATH "/com/dumbhippo/listener"
+
+/* these are used for operations that are not related to the stacker,
+ * but are rather desktop-generic, like the data model
+ */
+#define HIPPO_DBUS_ENGINE_INTERFACE "org.freedesktop.od.Engine"
+#define HIPPO_DBUS_ENGINE_PATH "/org/freedesktop/od/Engine"
+
+
+/* This is in the new org.freedesktop.od namespace
+ */
+char* hippo_dbus_full_bus_name (const char *server);
+
+/* This is in the old "com.dumbhippo." namespace with the hex done properly,
+ * replaced by org.freedesktop.od. namespace 2007-08-03
+ */
+char* hippo_dbus_full_bus_name_com_dumbhippo_with_forward_hex (const char *server);
+
+/* This has non-letter characters hex-encoded with the two nibbles backwards,
+ * we grab this name for backwards compatibility. This can be dropped in a
+ * few releases after 2007-06-08.
+ */
+char* hippo_dbus_full_bus_name_com_dumbhippo_with_backward_hex (const char *server);
+
+G_END_DECLS
+
+#endif /* __HIPPO_DBUS_CLIENT_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
