Zeitgeist Data-Sources

Merge lp:~thekorn/zeitgeist-datasources/fixed-distcheck into lp:zeitgeist-datasources/0.8

  1. fixed-distcheck
  2. Merge into trunk
Proposed by Markus Korn
Status: Merged
Merged at revision: 93
Proposed branch: lp:~thekorn/zeitgeist-datasources/fixed-distcheck
Merge into: lp:zeitgeist-datasources/0.8
Diff against target: 305 lines (+102/-33)
11 files modified
Makefile.am (+1/-0)
bzr/Makefile.am (+1/-1)
chrome/Makefile.am (+16/-7)
configure.ac (+58/-16)
eog/Makefile.am (+1/-1)
firefox-libzg/extension/Makefile.am (+3/-3)
firefox-libzg/extension/components/Makefile.am (+10/-0)
gedit/Makefile.am (+1/-1)
rhythmbox/Makefile.am (+1/-1)
totem-libzg/Makefile.am (+9/-2)
vim/Makefile.am (+1/-1)
To merge this branch: bzr merge lp:~thekorn/zeitgeist-datasources/fixed-distcheck
Reviewer Review Type Date Requested Status
Manish Sinha (मनीष सिन्हा) Approve
Michal Hruby (community) Approve
Siegfried Gevatter Approve
Review via email: mp+39897@code.launchpad.net

Description of the change

Fixed `make distcheck`

To post a comment you must log in.
Revision history for this message
Manish Sinha (मनीष सिन्हा) (manishsinha) wrote :

It fails on Totem.

The log is attached http://paste.ubuntu.com/524674/

review: Needs Fixing (build distcheck)
lp:~thekorn/zeitgeist-datasources/fixed-distcheck updated
98. By Markus Korn

fixed totem-libzg

Revision history for this message
Siegfried Gevatter (rainct) wrote :

Excellent work, Markus. Please push to trunk :).

I'm unsure about the Chrome plugin (especially the line below), but this can be fixed later.
+chromeresourcedir = $(datadir)/opt/google/chrome/resources/zeitgeist_plugin

review: Approve
Revision history for this message
Michal Hruby (mhr3) wrote :

Distcheck worked fine here, and it looks good.

review: Approve
Revision history for this message
Manish Sinha (मनीष सिन्हा) (manishsinha) wrote :

Looks like I was late. It has been merged. Yes. It works

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.am'
2--- Makefile.am 2010-06-08 00:24:42 +0000
3+++ Makefile.am 2010-11-02 21:34:46 +0000
4@@ -1,4 +1,5 @@
5 SUBDIRS = $(PLUGINS)
6+EXTRA_DIST = $(EXTRA_SUBDIRS)
7
8 local-install:
9 for d in $(PLUGINS); \
10
11=== modified file 'bzr/Makefile.am'
12--- bzr/Makefile.am 2010-06-07 19:50:44 +0000
13+++ bzr/Makefile.am 2010-11-02 21:34:46 +0000
14@@ -1,5 +1,5 @@
15 bzrplugindir = $(datadir)/pyshared/bzrlib/plugins/zeitgeist
16-bzrplugin_DATA = __init__.py
17+dist_bzrplugin_DATA = __init__.py
18
19 # we want to allow also local install
20 BZR_PLUGIN_HOME_DIR = ~/.bazaar/plugins/zeitgeist
21
22=== modified file 'chrome/Makefile.am'
23--- chrome/Makefile.am 2010-07-10 18:02:48 +0000
24+++ chrome/Makefile.am 2010-11-02 21:34:46 +0000
25@@ -1,5 +1,5 @@
26-chromeresourcedir = /opt/google/chrome/resources/zeitgeist_plugin
27-chromeresource_DATA = \
28+chromeresourcedir = $(datadir)/opt/google/chrome/resources/zeitgeist_plugin
29+dist_chromeresource_DATA = \
30 background.html \
31 content_script.js \
32 manifest.json \
33@@ -9,15 +9,15 @@
34 pluginbinary_LTLIBRARIES = libzeitgeist-npapi-plugin.la
35
36 libzeitgeist_npapi_plugin_la_SOURCES = \
37- plugin/np-zeitgeist.cc \
38+ $(top_srcdir)/npapi-plugin/np-zeitgeist.cc \
39 $(NULL)
40
41 libzeitgeist_npapi_plugin_la_CXXFLAGS = \
42 -pedantic -fPIC -Wall -std=c++0x -O2 \
43 $(ZEITGEIST_CFLAGS) \
44- -I./plugin \
45- -I./plugin/third_party \
46- -I./plugin/third_party/npapi \
47+ -I$(top_srcdir)/npapi-plugin \
48+ -I$(top_srcdir)/npapi-plugin/third_party \
49+ -I$(top_srcdir)/npapi-plugin/third_party/npapi \
50 $(NULL)
51
52 libzeitgeist_npapi_plugin_la_LIBADD = \
53@@ -28,9 +28,18 @@
54 -Wl,--no-undefined \
55 -module -avoid-version \
56 $(NULL)
57+
58+EXTRA_DIST = \
59+ $(top_srcdir)/npapi-plugin/third_party/webkit/glue/plugins/nphostapi.h \
60+ $(top_srcdir)/npapi-plugin/third_party/npapi/bindings/npapi.h \
61+ $(top_srcdir)/npapi-plugin/third_party/npapi/bindings/npruntime.h \
62+ $(top_srcdir)/npapi-plugin/base/port.h \
63+ $(top_srcdir)/npapi-plugin/base/basictypes.h \
64+ $(top_srcdir)/npapi-plugin/build/build_config.h \
65+ $(NULL)
66
67 # we want to allow also local install
68 local-install: all
69- ln -s $(abs_srcdir)/.libs/libzeitgeist-npapi-plugin.so plugin/libzeitgeist-npapi-plugin.so
70+ ln -s $(abs_srcdir)/.libs/libzeitgeist-npapi-plugin.so $(top_srcdir)/npapi-plugin/libzeitgeist-npapi-plugin.so
71
72 local-uninstall: all
73
74=== modified file 'configure.ac'
75--- configure.ac 2010-08-05 20:45:47 +0000
76+++ configure.ac 2010-11-02 21:34:46 +0000
77@@ -203,30 +203,69 @@
78 AC_SUBST([AM_CXXFLAGS])
79 AC_SUBST([AM_LDFLAGS])
80
81-AC_OUTPUT([
82-Makefile
83-bzr/Makefile
84-chrome/Makefile
85-eog/Makefile
86-firefox-libzg/Makefile
87-firefox-libzg/extension/Makefile
88-firefox-libzg/extension/components/Makefile
89-geany/Makefile
90-gedit/Makefile
91-rhythmbox/Makefile
92-totem-libzg/Makefile
93-vim/Makefile
94-emacs/Makefile
95-])
96+AC_CONFIG_FILES([Makefile])
97
98 AC_MSG_NOTICE([Zeitgeist-dataproviders was configured with the following options:])
99
100+extra_subdirs=""
101+
102 if test "x${PLUGINS}" != "x" ; then
103 for allowed_plugin in ${ALL_PLUGINS}; do
104 for plugin in ${PLUGINS}; do
105 case ${allowed_plugin} in
106 ${plugin})
107 AC_MSG_NOTICE([** ${allowed_plugin} plugin enabled])
108+ case ${allowed_plugin} in
109+ bzr)
110+ AC_CONFIG_FILES([bzr/Makefile])
111+ continue 2
112+ ;;
113+ chrome)
114+ AC_CONFIG_FILES([chrome/Makefile])
115+ extra_subdirs="${extra_subdirs} npapi-plugin"
116+ continue 2
117+ ;;
118+ eog)
119+ AC_CONFIG_FILES([eog/Makefile])
120+ continue 2
121+ ;;
122+ firefox-libzg)
123+ AC_CONFIG_FILES([
124+ firefox-libzg/Makefile
125+ firefox-libzg/extension/Makefile
126+ firefox-libzg/extension/components/Makefile
127+ ])
128+ continue 2
129+ ;;
130+ geany)
131+ AC_CONFIG_FILES([geany/Makefile])
132+ continue 2
133+ ;;
134+ gedit)
135+ AC_CONFIG_FILES([gedit/Makefile])
136+ continue 2
137+ ;;
138+ rhythmbox)
139+ AC_CONFIG_FILES([rhythmbox/Makefile])
140+ continue 2
141+ ;;
142+ totem-libzg)
143+ AC_CONFIG_FILES([totem-libzg/Makefile])
144+ continue 2
145+ ;;
146+ vim)
147+ AC_CONFIG_FILES([vim/Makefile])
148+ continue 2
149+ ;;
150+ emacs)
151+ AC_CONFIG_FILES([emacs/Makefile])
152+ continue 2
153+ ;;
154+ *)
155+ AC_MSG_ERROR([cannot configure ${allowed_plugin}])
156+ continue 2
157+ ;;
158+ esac
159 continue 2
160 ;;
161 *);;
162@@ -237,4 +276,7 @@
163 else
164 AC_MSG_NOTICE([ No plugins enabled])
165 fi
166-
167+
168+EXTRA_SUBDIRS=$extra_subdirs
169+AC_SUBST([EXTRA_SUBDIRS])
170+AC_OUTPUT
171
172=== modified file 'eog/Makefile.am'
173--- eog/Makefile.am 2010-06-07 19:50:44 +0000
174+++ eog/Makefile.am 2010-11-02 21:34:46 +0000
175@@ -1,7 +1,7 @@
176 PLUGIN_FILES = zeitgeist.eog-plugin zeitgeist_plugin.py
177
178 eogplugindir = $(libdir)/eog/plugins
179-eogplugin_DATA = $(PLUGIN_FILES)
180+dist_eogplugin_DATA = $(PLUGIN_FILES)
181
182 # we want to allow also local install
183 EOG_PLUGIN_HOME_DIR = ~/.gnome2/eog/plugins
184
185=== modified file 'firefox-libzg/extension/Makefile.am'
186--- firefox-libzg/extension/Makefile.am 2010-07-10 18:05:00 +0000
187+++ firefox-libzg/extension/Makefile.am 2010-11-02 21:34:46 +0000
188@@ -4,20 +4,20 @@
189 EXTENSIONS_SYMLINK = $(extensiondir)/xpcom_firefox@zeitgeist-project.com
190
191 xul_extdir = $(datadir)/xul-ext-zeitgeist
192-xul_ext_DATA = \
193+dist_xul_ext_DATA = \
194 license.txt \
195 chrome.manifest \
196 install.rdf \
197 $(NULL)
198
199 contentdir = $(xul_extdir)/chrome/content
200-content_DATA = \
201+dist_content_DATA = \
202 chrome/content/zeitgeist.xul \
203 chrome/content/zeitgeist.png \
204 $(NULL)
205
206 prefsdir = $(xul_extdir)/defaults/preferences
207-prefs_DATA = \
208+dist_prefs_DATA = \
209 defaults/preferences/zeitgeist.js \
210 $(NULL)
211
212
213=== modified file 'firefox-libzg/extension/components/Makefile.am'
214--- firefox-libzg/extension/components/Makefile.am 2010-07-10 18:05:00 +0000
215+++ firefox-libzg/extension/components/Makefile.am 2010-11-02 21:34:46 +0000
216@@ -29,6 +29,16 @@
217 zeitgeist.h \
218 zeitgeist.xpt \
219 $(NULL)
220+
221+EXTRA_DIST = \
222+ zeitgeist.idl \
223+ zeitgeistextend.h \
224+ $(NULL)
225+
226+DISTCLEANFILES = \
227+ $(BUILT_SOURCES) \
228+ $(NULL)
229+
230
231 zeitgeist.h: zeitgeist.idl
232 $(AM_V_GEN)$(XPIDL_BIN) -m header -I $(XUL_IDLDIR) -o zeitgeist $<
233
234=== modified file 'gedit/Makefile.am'
235--- gedit/Makefile.am 2010-06-07 20:15:41 +0000
236+++ gedit/Makefile.am 2010-11-02 21:34:46 +0000
237@@ -1,7 +1,7 @@
238 PLUGIN_FILES = zeitgeist.gedit-plugin zeitgeist_plugin.py
239
240 geditplugindir = $(libdir)/gedit-2/plugins
241-geditplugin_DATA = $(PLUGIN_FILES)
242+dist_geditplugin_DATA = $(PLUGIN_FILES)
243
244 # we want to allow also local install
245 GEDIT_PLUGIN_HOME_DIR = ~/.gnome2/gedit/plugins
246
247=== modified file 'rhythmbox/Makefile.am'
248--- rhythmbox/Makefile.am 2010-06-07 19:50:44 +0000
249+++ rhythmbox/Makefile.am 2010-11-02 21:34:46 +0000
250@@ -1,7 +1,7 @@
251 PLUGIN_FILES = zeitgeist.rb-plugin __init__.py
252
253 rhythmboxplugindir = $(libdir)/rhythmbox/plugins/zeitgeist-plugin
254-rhythmboxplugin_DATA = $(PLUGIN_FILES)
255+dist_rhythmboxplugin_DATA = $(PLUGIN_FILES)
256
257 # we want to allow also local install
258 RHYTHMBOX_PLUGIN_HOME_DIR = ~/.local/share/rhythmbox/plugins/zeitgeist-plugin
259
260=== modified file 'totem-libzg/Makefile.am'
261--- totem-libzg/Makefile.am 2010-06-07 19:50:44 +0000
262+++ totem-libzg/Makefile.am 2010-11-02 21:34:46 +0000
263@@ -1,5 +1,5 @@
264 totemplugindir = $(libdir)/totem/plugins/zeitgeist
265-totemplugin_DATA = zeitgeist.totem-plugin
266+dist_totemplugin_DATA = zeitgeist.totem-plugin
267 totemplugin_LTLIBRARIES = libtotem-zeitgeist-plugin.la
268
269 AM_VALAFLAGS = \
270@@ -16,7 +16,7 @@
271 $(ZEITGEIST_CFLAGS) \
272 $(GTK_CFLAGS) \
273 $(TOTEM_PLPARSER_CFLAGS) \
274- -I./headers \
275+ -I$(top_srcdir)/totem-libzg/headers \
276 $(NULL)
277
278 libtotem_zeitgeist_plugin_la_LIBADD = \
279@@ -26,6 +26,13 @@
280 libtotem_zeitgeist_plugin_la_LDFLAGS = \
281 -module -avoid-version \
282 $(NULL)
283+
284+EXTRA_DIST = \
285+ $(top_srcdir)/totem-libzg/headers/totem.h \
286+ $(top_srcdir)/totem-libzg/headers/totem-plugin.h \
287+ $(top_srcdir)/totem-libzg/headers/totem-playlist.h \
288+ $(top_srcdir)/totem-libzg/headers/bacon-video-widget.h \
289+ $(NULL)
290
291
292 # we want to allow also local install
293
294=== modified file 'vim/Makefile.am'
295--- vim/Makefile.am 2010-06-29 20:40:15 +0000
296+++ vim/Makefile.am 2010-11-02 21:34:46 +0000
297@@ -1,7 +1,7 @@
298 PLUGIN_FILES = zeitgeist.vim
299
300 vimplugindir = $(datadir)/vim/vim72/plugin
301-vimplugin_DATA = $(PLUGIN_FILES)
302+dist_vimplugin_DATA = $(PLUGIN_FILES)
303
304 # we want to allow also local install
305 VIM_PLUGIN_HOME_DIR = ~/.vim/plugin

Subscribers

People subscribed via source and target branches