GNOME.org
 

r7238 - in dumbhippo/trunk/client: . common linux

Author: otaylor
Date: 2008-01-21 12:04:16 -0600 (Mon, 21 Jan 2008)
New Revision: 7238

Removed:
   dumbhippo/trunk/client/common/ddm/
   dumbhippo/trunk/client/common/engine/
   dumbhippo/trunk/client/common/hippo/
   dumbhippo/trunk/client/linux/Makefile-engine-dbus.am
   dumbhippo/trunk/client/linux/Makefile-libddm.am
   dumbhippo/trunk/client/linux/Makefile-libengine.am
   dumbhippo/trunk/client/linux/engine-dbus/
   dumbhippo/trunk/client/linux/org.freedesktop.od.Engine.service.in
Modified:
   dumbhippo/trunk/client/
Log:
Remove files moved to http://svn.gnome.org/svn/desktop-data-model


Property changes on: dumbhippo/trunk/client
___________________________________________________________________
Name: svn:externals
   - canvas http://svn.mugshot.org/hippo-canvas/trunk

   + canvas http://svn.gnome.org/svn/hippo-canvas/trunk


Deleted: dumbhippo/trunk/client/linux/Makefile-engine-dbus.am
===================================================================
--- dumbhippo/trunk/client/linux/Makefile-engine-dbus.am	2008-01-18 21:36:37 UTC (rev 7237)
+++ dumbhippo/trunk/client/linux/Makefile-engine-dbus.am	2008-01-21 18:04:16 UTC (rev 7238)
@@ -1,60 +0,0 @@
-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)

Deleted: dumbhippo/trunk/client/linux/Makefile-libddm.am
===================================================================
--- dumbhippo/trunk/client/linux/Makefile-libddm.am	2008-01-18 21:36:37 UTC (rev 7237)
+++ dumbhippo/trunk/client/linux/Makefile-libddm.am	2008-01-21 18:04:16 UTC (rev 7238)
@@ -1,193 +0,0 @@
-pkgconfig_DATA += ddm-1.pc
-
-EXTRA_DIST += ddm-1.pc.in
-
-lib_LTLIBRARIES += libddm-1.la
-
-libddm_1_la_CPPFLAGS =			\
-	$(AM_CPPFLAGS)			\
-	-I $(MARSHAL_DIR)		\
-	$(LIBDDM_CFLAGS)		\
-	 -DDDM_COMPILATION=1
-
-libddm_1_la_LIBADD = 			\
-	$(LIBDDM_LIBS)
-
-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_HEADER=$(MARSHAL_DIR)/ddm-marshal.h
-DDM_MARSHAL_BODY=$(MARSHAL_DIR)/ddm-marshal.c
-
-$(DDM_MARSHAL_HEADER): $(DDM_MARSHAL_LIST)
-	mkdir $(MARSHAL_DIR) 2>/dev/null || true
-	$(GLIB_GENMARSHAL) --prefix=ddm_marshal $(DDM_MARSHAL_LIST) --header > $(DDM_MARSHAL_HEADER)
-
-$(DDM_MARSHAL_BODY): $(DDM_MARSHAL_LIST)
-	mkdir $(MARSHAL_DIR) 2>/dev/null || true
-	(echo "#include \"ddm-marshal.h\""; $(GLIB_GENMARSHAL) --prefix=ddm_marshal $(DDM_MARSHAL_LIST) --body) > $(DDM_MARSHAL_BODY)
-
-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
-
-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
-
-LIBDDM_BUILT_SOURCEFILES =		\
-	$(DDM_MARSHAL_HEADER)		\
-	$(DDM_MARSHAL_BODY)
-
-MAINTAINERCLEANFILES +=	$(LIBDDM_BUILT_SOURCEFILES)
-BUILT_SOURCES += $(LIBDDM_BUILT_SOURCEFILES)
-
-nodist_libddm_1_la_SOURCES=$(LIBDDM_SOURCEFILES) $(LIBDDM_BUILT_SOURCEFILES)
-
-######################################################################
-# Build test-specific source files into a convenience library
-
-noinst_LTLIBRARIES += libddm-test.la
-
-libddm_test_la_CPPFLAGS =		\
-	$(AM_CPPFLAGS)			\
-	$(LIBDDM_CFLAGS)		\
-	 -DDDM_COMPILATION=1
-
-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
-
-
-######################################################################
-# Test programs
-
-# Note that test-ddm isn't really a "test", it's a demo
-ddm_tests =					\
-	test-condition-parser			\
-	test-condition-reduce			\
-	test-feed-object			\
-	test-multipart-fetch			\
-	test-notification			\
-	test-rules				\
-	test-static-file-parser			\
-	test-static-file-backend
-
-# We use noinst_PROGRAMS not check_PROGRAMS so if someone changes the API
-# without running 'make check', they still break the build
-noinst_PROGRAMS +=				\
-	$(ddm_tests)				\
-	test-ddm
-
-TESTS += $(ddm_tests)
-
-TESTS_ENVIRONMENT=DDM_SRCDIR=$(COMMONSRCDIR)/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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-

Deleted: dumbhippo/trunk/client/linux/Makefile-libengine.am
===================================================================
--- dumbhippo/trunk/client/linux/Makefile-libengine.am	2008-01-18 21:36:37 UTC (rev 7237)
+++ dumbhippo/trunk/client/linux/Makefile-libengine.am	2008-01-21 18:04:16 UTC (rev 7238)
@@ -1,77 +0,0 @@
-noinst_LTLIBRARIES += libengine.la
-
-libengine_la_CPPFLAGS =			\
-	$(AM_CPPFLAGS)			\
-	-I $(MARSHAL_DIR)		\
-	$(LIBENGINE_CFLAGS)		\
-	-DDDM_I_KNOW_THIS_IS_UNSTABLE=1
-
-libengine_la_LIBADD = 			\
-	$(LIBENGINE_LIBS)		\
-	libhippo.la			\
-	libddm-1.la
-
-# none of this actually matters since it's just a convenience library, keeping it 
-# 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
-
-$(COMMON_MARSHAL_HEADER): $(COMMON_MARSHAL_LIST)
-	mkdir $(MARSHAL_DIR) || true
-	$(GLIB_GENMARSHAL) --prefix=hippo_engine_marshal $(COMMON_MARSHAL_LIST) --header > $(COMMON_MARSHAL_HEADER)
-
-$(COMMON_MARSHAL_BODY): $(COMMON_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)
-
-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
-
-LIBENGINE_BUILT_SOURCEFILES =			\
-	$(COMMON_MARSHAL_HEADER)		\
-	$(COMMON_MARSHAL_BODY)
-
-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

Deleted: dumbhippo/trunk/client/linux/org.freedesktop.od.Engine.service.in
===================================================================
--- dumbhippo/trunk/client/linux/org.freedesktop.od.Engine.service.in	2008-01-18 21:36:37 UTC (rev 7237)
+++ dumbhippo/trunk/client/linux/org.freedesktop.od.Engine.service.in	2008-01-21 18:04:16 UTC (rev 7238)
@@ -1,5 +0,0 @@
-[D-BUS Service]
-## This is the Online Desktop Engine, a D-Bus service that proxies to an Internet server
-Name=org.freedesktop.od.Engine
-Exec= libexecdir@/desktop-data-engine
-
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]