Merge lp:~sinzui/ubuntu/precise/gedit-developer-plugins/0.5.13 into lp:ubuntu/precise/gedit-developer-plugins

Proposed by Curtis Hovey
Status: Merged
Merged at revision: 12
Proposed branch: lp:~sinzui/ubuntu/precise/gedit-developer-plugins/0.5.13
Merge into: lp:ubuntu/precise/gedit-developer-plugins
Diff against target: 2479 lines (+949/-366)
28 files modified
ChangeLog (+103/-0)
Makefile.in (+48/-24)
aclocal.m4 (+67/-47)
configure (+35/-28)
configure.ac (+1/-1)
debian/changelog (+12/-0)
install-sh (+18/-11)
language-specs/Makefile.in (+19/-10)
missing (+4/-49)
plugins/Makefile.in (+28/-21)
plugins/gdp/Makefile.in (+28/-21)
plugins/gdp/__init__.py (+11/-0)
plugins/gdp/bzr.py (+14/-3)
plugins/gdp/complete.py (+5/-1)
plugins/gdp/find.py (+31/-11)
plugins/gdp/find.ui (+6/-0)
plugins/gdp/format.py (+95/-34)
plugins/gdp/tests/test_bzr.py (+51/-0)
plugins/gdp/tests/test_complete.py (+26/-0)
plugins/gdp/tests/test_find.py (+36/-1)
plugins/gdp/tests/test_format.py (+184/-57)
plugins/gdpbase.py (+6/-0)
plugins/gdpformat.py (+3/-11)
plugins/tests/test_gdpformat.py (+0/-10)
py-compile (+33/-18)
testing/Makefile.in (+12/-7)
testing/__init__.py (+72/-0)
testing/testrunner.py (+1/-1)
To merge this branch: bzr merge lp:~sinzui/ubuntu/precise/gedit-developer-plugins/0.5.13
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+97015@code.launchpad.net

Description of the change

Merge upstream 0.5.13 that fixes performance issues and errors.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2012-02-07 12:20:48 +0000
3+++ ChangeLog 2012-03-12 13:25:20 +0000
4@@ -1,5 +1,108 @@
5 <Generated by bzr log --log-format=gnu>
6
7+2012-03-10 Curtis Hovey <sinzui.is@verizon.net>
8+
9+ [567] Inc version.
10+
11+2012-03-10 Curtis Hovey <sinzui.is@verizon.net>
12+
13+ [566] Search when enter is presses in the path entry.
14+
15+2012-03-10 Curtis Hovey <sinzui.is@verizon.net>
16+
17+ [565] Always accept the document arg.
18+
19+2012-03-10 Curtis Hovey <sinzui.is@verizon.net>
20+
21+ [564] Added method to ensure bacground syntax checking does not
22+ needlessly interupt.
23+
24+2012-03-10 Curtis Hovey <sinzui.is@verizon.net>
25+
26+ [563] added MockProperty to __all__.
27+
28+2012-03-10 Curtis Hovey <sinzui.is@verizon.net>
29+
30+ [562] Update test helpers.
31+
32+2012-03-02 Curtis Hovey <sinzui.is@verizon.net>
33+
34+ [561] Correct the order of args in DoctestReviewer calls
35+
36+2012-02-28 Curtis Hovey <sinzui.is@verizon.net>
37+
38+ [560] Increment for release.
39+
40+2012-02-24 Curtis Hovey <sinzui.is@verizon.net>
41+
42+ [559] Separate the on_check_style_complete into
43+ on_check_style_complete that queues the real method
44+ do_check_style_complete in the main_loop.
45+
46+2012-02-24 Curtis Hovey <sinzui.is@verizon.net>
47+
48+ [558] Use props to get text.
49+
50+2012-02-19 Curtis Hovey <sinzui.is@verizon.net>
51+
52+ [557] Reset reporter.piter before checking each file's syntax. Do not
53+ queue the call to set the reporter piter because it must be know
54+ immediately for subsequent calls to work.
55+
56+2012-02-18 Curtis Hovey <sinzui.is@verizon.net>
57+
58+ [556] Moved MockMethod and FakeMethod to testing. Added test for
59+ open_changed_files_to_push().
60+
61+2012-02-18 Curtis Hovey <sinzui.is@verizon.net>
62+
63+ [555] Show a dialog when there is no branch.
64+
65+2012-02-18 Curtis Hovey <sinzui.is@verizon.net>
66+
67+ [554] Remove unneeded callback.
68+
69+2012-02-18 Curtis Hovey <sinzui.is@verizon.net>
70+
71+ [553] Connect after the main signal callbacks because format assumes
72+ the action was complete.
73+
74+2012-02-18 Curtis Hovey <sinzui.is@verizon.net>
75+
76+ [552] Added comments.
77+
78+2012-02-18 Curtis Hovey <sinzui.is@verizon.net>
79+
80+ [551] Run the format checker in a thread that queues the gtk events.
81+
82+2012-02-18 Curtis Hovey <sinzui.is@verizon.net>
83+
84+ [550] Signal callback returns False to indicate the action is handled.
85+
86+2012-02-17 Curtis Hovey <sinzui.is@verizon.net>
87+
88+ [549] Queue treestore appends into the main loop.
89+
90+2012-02-17 Curtis Hovey <sinzui.is@verizon.net>
91+
92+ [548] Use the COLLECTOR report_type in tests.
93+
94+2012-02-17 Curtis Hovey <sinzui.is@verizon.net>
95+
96+ [547] Make python threads play with glib threads.
97+
98+2012-02-14 Curtis Hovey <sinzui.is@verizon.net>
99+
100+ [546] Exist the loop with a valid module early.
101+
102+2012-02-14 Curtis Hovey <sinzui.is@verizon.net>
103+
104+ [545] Autotools updated py-compile on regeneration.
105+
106+2012-02-14 Curtis Hovey <sinzui.is@verizon.net>
107+
108+ [544] Update test runner to prepend to the sys.path.
109+
110 2012-02-06 Curtis Hovey <sinzui.is@verizon.net>
111
112 [543] Updated docs for release.
113
114=== modified file 'Makefile.in'
115--- Makefile.in 2012-02-07 12:20:48 +0000
116+++ Makefile.in 2012-03-12 13:25:20 +0000
117@@ -1,9 +1,9 @@
118-# Makefile.in generated by automake 1.11.1 from Makefile.am.
119+# Makefile.in generated by automake 1.11.3 from Makefile.am.
120 # @configure_input@
121
122 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
123-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
124-# Inc.
125+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
126+# Foundation, Inc.
127 # This Makefile.in is free software; the Free Software Foundation
128 # gives unlimited permission to copy and/or distribute it,
129 # with or without modifications, as long as this notice is preserved.
130@@ -67,9 +67,11 @@
131 distdir = $(PACKAGE)-$(VERSION)
132 top_distdir = $(distdir)
133 am__remove_distdir = \
134- { test ! -d "$(distdir)" \
135- || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
136- && rm -fr "$(distdir)"; }; }
137+ if test -d "$(distdir)"; then \
138+ find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
139+ && rm -rf "$(distdir)" \
140+ || { sleep 5 && rm -rf "$(distdir)"; }; \
141+ else :; fi
142 am__relativize = \
143 dir0=`pwd`; \
144 sed_first='s,^\([^/]*\)/.*$$,\1,'; \
145@@ -98,6 +100,8 @@
146 DIST_ARCHIVES = $(distdir).tar.gz
147 GZIP_ENV = --best
148 distuninstallcheck_listfiles = find . -type f -print
149+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
150+ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
151 distcleancheck_listfiles = find . -type f -print
152 ACLOCAL = @ACLOCAL@
153 ALL_LINGUAS = @ALL_LINGUAS@
154@@ -261,7 +265,7 @@
155 all: all-recursive
156
157 .SUFFIXES:
158-am--refresh:
159+am--refresh: Makefile
160 @:
161 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
162 @for dep in $?; do \
163@@ -503,7 +507,11 @@
164 $(am__remove_distdir)
165
166 dist-bzip2: distdir
167- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
168+ tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
169+ $(am__remove_distdir)
170+
171+dist-lzip: distdir
172+ tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
173 $(am__remove_distdir)
174
175 dist-lzma: distdir
176@@ -511,7 +519,7 @@
177 $(am__remove_distdir)
178
179 dist-xz: distdir
180- tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
181+ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
182 $(am__remove_distdir)
183
184 dist-tarZ: distdir
185@@ -542,6 +550,8 @@
186 bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
187 *.tar.lzma*) \
188 lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
189+ *.tar.lz*) \
190+ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
191 *.tar.xz*) \
192 xz -dc $(distdir).tar.xz | $(am__untar) ;;\
193 *.tar.Z*) \
194@@ -561,6 +571,7 @@
195 && am__cwd=`pwd` \
196 && $(am__cd) $(distdir)/_build \
197 && ../configure --srcdir=.. --prefix="$$dc_install_base" \
198+ $(AM_DISTCHECK_CONFIGURE_FLAGS) \
199 $(DISTCHECK_CONFIGURE_FLAGS) \
200 && $(MAKE) $(AM_MAKEFLAGS) \
201 && $(MAKE) $(AM_MAKEFLAGS) dvi \
202@@ -589,8 +600,16 @@
203 list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
204 sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
205 distuninstallcheck:
206- @$(am__cd) '$(distuninstallcheck_dir)' \
207- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
208+ @test -n '$(distuninstallcheck_dir)' || { \
209+ echo 'ERROR: trying to run $@ with an empty' \
210+ '$$(distuninstallcheck_dir)' >&2; \
211+ exit 1; \
212+ }; \
213+ $(am__cd) '$(distuninstallcheck_dir)' || { \
214+ echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
215+ exit 1; \
216+ }; \
217+ test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
218 || { echo "ERROR: files left after uninstall:" ; \
219 if test -n "$(DESTDIR)"; then \
220 echo " (check DESTDIR support)"; \
221@@ -621,10 +640,15 @@
222
223 installcheck: installcheck-recursive
224 install-strip:
225- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
226- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
227- `test -z '$(STRIP)' || \
228- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
229+ if test -z '$(STRIP)'; then \
230+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
231+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
232+ install; \
233+ else \
234+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
235+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
236+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
237+ fi
238 mostlyclean-generic:
239
240 clean-generic:
241@@ -712,15 +736,15 @@
242 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
243 all all-am am--refresh check check-am clean clean-generic \
244 ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
245- dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \
246- distclean distclean-generic distclean-tags distcleancheck \
247- distdir distuninstallcheck dvi dvi-am html html-am info \
248- info-am install install-am install-data install-data-am \
249- install-dvi install-dvi-am install-exec install-exec-am \
250- install-html install-html-am install-info install-info-am \
251- install-man install-pdf install-pdf-am install-ps \
252- install-ps-am install-strip installcheck installcheck-am \
253- installdirs installdirs-am maintainer-clean \
254+ dist-lzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
255+ distcheck distclean distclean-generic distclean-tags \
256+ distcleancheck distdir distuninstallcheck dvi dvi-am html \
257+ html-am info info-am install install-am install-data \
258+ install-data-am install-dvi install-dvi-am install-exec \
259+ install-exec-am install-html install-html-am install-info \
260+ install-info-am install-man install-pdf install-pdf-am \
261+ install-ps install-ps-am install-strip installcheck \
262+ installcheck-am installdirs installdirs-am maintainer-clean \
263 maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
264 pdf-am ps ps-am tags tags-recursive uninstall uninstall-am
265
266
267=== modified file 'aclocal.m4'
268--- aclocal.m4 2012-02-07 12:20:48 +0000
269+++ aclocal.m4 2012-03-12 13:25:20 +0000
270@@ -1,7 +1,8 @@
271-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
272+# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
273
274 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
275-# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
276+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
277+# Inc.
278 # This file is free software; the Free Software Foundation
279 # gives unlimited permission to copy and/or distribute it,
280 # with or without modifications, as long as this notice is preserved.
281@@ -458,7 +459,7 @@
282
283
284 dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
285-# serial 41 IT_PROG_INTLTOOL
286+# serial 42 IT_PROG_INTLTOOL
287 AC_DEFUN([IT_PROG_INTLTOOL], [
288 AC_PREREQ([2.50])dnl
289 AC_REQUIRE([AM_NLS])dnl
290@@ -471,13 +472,11 @@
291 ;;
292 esac
293
294+INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
295+INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
296+INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
297 if test -n "$1"; then
298 AC_MSG_CHECKING([for intltool >= $1])
299-
300- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
301- INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
302- [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
303- ]
304 AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
305 test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
306 AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.])
307@@ -520,7 +519,11 @@
308 INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
309 INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
310 INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
311+if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
312 INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@'
313+else
314+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir'
315+fi
316 INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
317 INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
318 INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
319@@ -862,12 +865,15 @@
320 fi[]dnl
321 ])# PKG_CHECK_MODULES
322
323-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
324+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
325+# Foundation, Inc.
326 #
327 # This file is free software; the Free Software Foundation
328 # gives unlimited permission to copy and/or distribute it,
329 # with or without modifications, as long as this notice is preserved.
330
331+# serial 1
332+
333 # AM_AUTOMAKE_VERSION(VERSION)
334 # ----------------------------
335 # Automake X.Y traces this macro to ensure aclocal.m4 has been
336@@ -877,7 +883,7 @@
337 [am__api_version='1.11'
338 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
339 dnl require some minimum version. Point them to the right macro.
340-m4_if([$1], [1.11.1], [],
341+m4_if([$1], [1.11.3], [],
342 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
343 ])
344
345@@ -893,19 +899,21 @@
346 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
347 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
348 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
349-[AM_AUTOMAKE_VERSION([1.11.1])dnl
350+[AM_AUTOMAKE_VERSION([1.11.3])dnl
351 m4_ifndef([AC_AUTOCONF_VERSION],
352 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
353 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
354
355 # AM_AUX_DIR_EXPAND -*- Autoconf -*-
356
357-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
358+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
359 #
360 # This file is free software; the Free Software Foundation
361 # gives unlimited permission to copy and/or distribute it,
362 # with or without modifications, as long as this notice is preserved.
363
364+# serial 1
365+
366 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
367 # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
368 # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
369@@ -987,14 +995,14 @@
370 Usually this means the macro was only invoked conditionally.]])
371 fi])])
372
373-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
374-# Free Software Foundation, Inc.
375+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
376+# 2010, 2011 Free Software Foundation, Inc.
377 #
378 # This file is free software; the Free Software Foundation
379 # gives unlimited permission to copy and/or distribute it,
380 # with or without modifications, as long as this notice is preserved.
381
382-# serial 10
383+# serial 12
384
385 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
386 # written in clear, in which case automake, when reading aclocal.m4,
387@@ -1034,6 +1042,7 @@
388 # instance it was reported that on HP-UX the gcc test will end up
389 # making a dummy file named `D' -- because `-MD' means `put the output
390 # in D'.
391+ rm -rf conftest.dir
392 mkdir conftest.dir
393 # Copy depcomp to subdir because otherwise we won't find it if we're
394 # using a relative directory.
395@@ -1098,7 +1107,7 @@
396 break
397 fi
398 ;;
399- msvisualcpp | msvcmsys)
400+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
401 # This compiler won't grok `-c -o', but also, the minuso test has
402 # not run yet. These depmodes are late enough in the game, and
403 # so weak that their functioning should not be impacted.
404@@ -1163,10 +1172,13 @@
405 if test "x$enable_dependency_tracking" != xno; then
406 am_depcomp="$ac_aux_dir/depcomp"
407 AMDEPBACKSLASH='\'
408+ am__nodep='_no'
409 fi
410 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
411 AC_SUBST([AMDEPBACKSLASH])dnl
412 _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
413+AC_SUBST([am__nodep])dnl
414+_AM_SUBST_NOTMAKE([am__nodep])dnl
415 ])
416
417 # Generate code to set up dependency tracking. -*- Autoconf -*-
418@@ -1388,12 +1400,15 @@
419 done
420 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
421
422-# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
423+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
424+# Inc.
425 #
426 # This file is free software; the Free Software Foundation
427 # gives unlimited permission to copy and/or distribute it,
428 # with or without modifications, as long as this notice is preserved.
429
430+# serial 1
431+
432 # AM_PROG_INSTALL_SH
433 # ------------------
434 # Define $install_sh.
435@@ -1433,8 +1448,8 @@
436 # Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
437 # From Jim Meyering
438
439-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
440-# Free Software Foundation, Inc.
441+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
442+# 2011 Free Software Foundation, Inc.
443 #
444 # This file is free software; the Free Software Foundation
445 # gives unlimited permission to copy and/or distribute it,
446@@ -1454,7 +1469,7 @@
447 [disable], [m4_define([am_maintainer_other], [enable])],
448 [m4_define([am_maintainer_other], [enable])
449 m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
450-AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
451+AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
452 dnl maintainer-mode's default is 'disable' unless 'enable' is passed
453 AC_ARG_ENABLE([maintainer-mode],
454 [ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
455@@ -1565,12 +1580,15 @@
456 fi
457 ])
458
459-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
460+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
461+# Inc.
462 #
463 # This file is free software; the Free Software Foundation
464 # gives unlimited permission to copy and/or distribute it,
465 # with or without modifications, as long as this notice is preserved.
466
467+# serial 1
468+
469 # AM_PROG_MKDIR_P
470 # ---------------
471 # Check for `mkdir -p'.
472@@ -1593,13 +1611,14 @@
473
474 # Helper functions for option handling. -*- Autoconf -*-
475
476-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
477+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
478+# Foundation, Inc.
479 #
480 # This file is free software; the Free Software Foundation
481 # gives unlimited permission to copy and/or distribute it,
482 # with or without modifications, as long as this notice is preserved.
483
484-# serial 4
485+# serial 5
486
487 # _AM_MANGLE_OPTION(NAME)
488 # -----------------------
489@@ -1607,13 +1626,13 @@
490 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
491
492 # _AM_SET_OPTION(NAME)
493-# ------------------------------
494+# --------------------
495 # Set option NAME. Presently that only means defining a flag for this option.
496 AC_DEFUN([_AM_SET_OPTION],
497 [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
498
499 # _AM_SET_OPTIONS(OPTIONS)
500-# ----------------------------------
501+# ------------------------
502 # OPTIONS is a space-separated list of Automake options.
503 AC_DEFUN([_AM_SET_OPTIONS],
504 [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
505@@ -1624,13 +1643,15 @@
506 AC_DEFUN([_AM_IF_OPTION],
507 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
508
509-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009
510-# Free Software Foundation, Inc.
511+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009,
512+# 2011 Free Software Foundation, Inc.
513 #
514 # This file is free software; the Free Software Foundation
515 # gives unlimited permission to copy and/or distribute it,
516 # with or without modifications, as long as this notice is preserved.
517
518+# serial 2
519+
520 # AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
521 # ---------------------------------------------------------------------------
522 # Adds support for distributing Python modules and packages. To
523@@ -1658,8 +1679,10 @@
524 dnl Find a Python interpreter. Python versions prior to 2.0 are not
525 dnl supported. (2.0 was released on October 16, 2000).
526 m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
527- [python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 dnl
528-python2.1 python2.0])
529+[python python2 python3 python3.2 python3.1 python3.0 python2.7 dnl
530+ python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0])
531+
532+ AC_ARG_VAR([PYTHON], [the Python interpreter])
533
534 m4_if([$1],[],[
535 dnl No version check is needed.
536@@ -1731,9 +1754,7 @@
537 dnl site-packages directory, not the python standard library
538 dnl directory like in previous automake betas. This behavior
539 dnl is more consistent with lispdir.m4 for example.
540- dnl Query distutils for this directory. distutils does not exist in
541- dnl Python 1.5, so we fall back to the hardcoded directory if it
542- dnl doesn't work.
543+ dnl Query distutils for this directory.
544 AC_CACHE_CHECK([for $am_display_PYTHON script directory],
545 [am_cv_python_pythondir],
546 [if test "x$prefix" = xNONE
547@@ -1742,8 +1763,7 @@
548 else
549 am_py_prefix=$prefix
550 fi
551- am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
552- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
553+ am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null`
554 case $am_cv_python_pythondir in
555 $am_py_prefix*)
556 am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
557@@ -1769,9 +1789,7 @@
558
559 dnl pyexecdir -- directory for installing python extension modules
560 dnl (shared libraries)
561- dnl Query distutils for this directory. distutils does not exist in
562- dnl Python 1.5, so we fall back to the hardcoded directory if it
563- dnl doesn't work.
564+ dnl Query distutils for this directory.
565 AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
566 [am_cv_python_pyexecdir],
567 [if test "x$exec_prefix" = xNONE
568@@ -1780,8 +1798,7 @@
569 else
570 am_py_exec_prefix=$exec_prefix
571 fi
572- am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||
573- echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
574+ am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null`
575 case $am_cv_python_pyexecdir in
576 $am_py_exec_prefix*)
577 am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
578@@ -1894,12 +1911,14 @@
579 fi
580 AC_MSG_RESULT(yes)])
581
582-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
583+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
584 #
585 # This file is free software; the Free Software Foundation
586 # gives unlimited permission to copy and/or distribute it,
587 # with or without modifications, as long as this notice is preserved.
588
589+# serial 1
590+
591 # AM_PROG_INSTALL_STRIP
592 # ---------------------
593 # One issue with vendor `install' (even GNU) is that you can't
594@@ -1922,13 +1941,13 @@
595 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
596 AC_SUBST([INSTALL_STRIP_PROGRAM])])
597
598-# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
599+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
600 #
601 # This file is free software; the Free Software Foundation
602 # gives unlimited permission to copy and/or distribute it,
603 # with or without modifications, as long as this notice is preserved.
604
605-# serial 2
606+# serial 3
607
608 # _AM_SUBST_NOTMAKE(VARIABLE)
609 # ---------------------------
610@@ -1937,13 +1956,13 @@
611 AC_DEFUN([_AM_SUBST_NOTMAKE])
612
613 # AM_SUBST_NOTMAKE(VARIABLE)
614-# ---------------------------
615+# --------------------------
616 # Public sister of _AM_SUBST_NOTMAKE.
617 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
618
619 # Check how to create a tarball. -*- Autoconf -*-
620
621-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
622+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
623 #
624 # This file is free software; the Free Software Foundation
625 # gives unlimited permission to copy and/or distribute it,
626@@ -1965,10 +1984,11 @@
627 # a tarball read from stdin.
628 # $(am__untar) < result.tar
629 AC_DEFUN([_AM_PROG_TAR],
630-[# Always define AMTAR for backward compatibility.
631-AM_MISSING_PROG([AMTAR], [tar])
632+[# Always define AMTAR for backward compatibility. Yes, it's still used
633+# in the wild :-( We should find a proper way to deprecate it ...
634+AC_SUBST([AMTAR], ['$${TAR-tar}'])
635 m4_if([$1], [v7],
636- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
637+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
638 [m4_case([$1], [ustar],, [pax],,
639 [m4_fatal([Unknown tar format])])
640 AC_MSG_CHECKING([how to create a $1 tar archive])
641
642=== modified file 'configure'
643--- configure 2012-02-07 12:20:48 +0000
644+++ configure 2012-03-12 13:25:20 +0000
645@@ -1,6 +1,6 @@
646 #! /bin/sh
647 # Guess values for system-dependent variables and create Makefiles.
648-# Generated by GNU Autoconf 2.68 for gedit-developer-plugins 0.5.11.
649+# Generated by GNU Autoconf 2.68 for gedit-developer-plugins 0.5.13.
650 #
651 # Report bugs to <sinzui.is@verizon.net>.
652 #
653@@ -560,8 +560,8 @@
654 # Identity of this package.
655 PACKAGE_NAME='gedit-developer-plugins'
656 PACKAGE_TARNAME='gedit-developer-plugins'
657-PACKAGE_VERSION='0.5.11'
658-PACKAGE_STRING='gedit-developer-plugins 0.5.11'
659+PACKAGE_VERSION='0.5.13'
660+PACKAGE_STRING='gedit-developer-plugins 0.5.13'
661 PACKAGE_BUGREPORT='sinzui.is@verizon.net'
662 PACKAGE_URL=''
663
664@@ -643,6 +643,7 @@
665 am__fastdepCC_FALSE
666 am__fastdepCC_TRUE
667 CCDEPMODE
668+am__nodep
669 AMDEPBACKSLASH
670 AMDEP_FALSE
671 AMDEP_TRUE
672@@ -769,6 +770,7 @@
673 LDFLAGS
674 LIBS
675 CPPFLAGS
676+PYTHON
677 PKG_CONFIG
678 PKG_CONFIG_PATH
679 PKG_CONFIG_LIBDIR
680@@ -1317,7 +1319,7 @@
681 # Omit some internal or obsolete options to make the list less imposing.
682 # This message is too long to be a string in the A/UX 3.1 sh.
683 cat <<_ACEOF
684-\`configure' configures gedit-developer-plugins 0.5.11 to adapt to many kinds of systems.
685+\`configure' configures gedit-developer-plugins 0.5.13 to adapt to many kinds of systems.
686
687 Usage: $0 [OPTION]... [VAR=VALUE]...
688
689@@ -1384,7 +1386,7 @@
690
691 if test -n "$ac_init_help"; then
692 case $ac_init_help in
693- short | recursive ) echo "Configuration of gedit-developer-plugins 0.5.11:";;
694+ short | recursive ) echo "Configuration of gedit-developer-plugins 0.5.13:";;
695 esac
696 cat <<\_ACEOF
697
698@@ -1412,6 +1414,7 @@
699 LIBS libraries to pass to the linker, e.g. -l<library>
700 CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
701 you have headers in a nonstandard directory <include dir>
702+ PYTHON the Python interpreter
703 PKG_CONFIG path to pkg-config utility
704 PKG_CONFIG_PATH
705 directories to add to pkg-config's search path
706@@ -1488,7 +1491,7 @@
707 test -n "$ac_init_help" && exit $ac_status
708 if $ac_init_version; then
709 cat <<\_ACEOF
710-gedit-developer-plugins configure 0.5.11
711+gedit-developer-plugins configure 0.5.13
712 generated by GNU Autoconf 2.68
713
714 Copyright (C) 2010 Free Software Foundation, Inc.
715@@ -1857,7 +1860,7 @@
716 This file contains any messages produced by compilers while
717 running configure, to aid debugging if configure makes a mistake.
718
719-It was created by gedit-developer-plugins $as_me 0.5.11, which was
720+It was created by gedit-developer-plugins $as_me 0.5.13, which was
721 generated by GNU Autoconf 2.68. Invocation command line was
722
723 $ $0 $@
724@@ -2672,7 +2675,7 @@
725
726 # Define the identity of the package.
727 PACKAGE='gedit-developer-plugins'
728- VERSION='0.5.11'
729+ VERSION='0.5.13'
730
731
732 cat >>confdefs.h <<_ACEOF
733@@ -2702,11 +2705,11 @@
734
735 # We need awk for the "check" target. The system "awk" is bad on
736 # some platforms.
737-# Always define AMTAR for backward compatibility.
738-
739-AMTAR=${AMTAR-"${am_missing_run}tar"}
740-
741-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
742+# Always define AMTAR for backward compatibility. Yes, it's still used
743+# in the wild :-( We should find a proper way to deprecate it ...
744+AMTAR='$${TAR-tar}'
745+
746+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
747
748
749
750@@ -2778,6 +2781,7 @@
751 if test "x$enable_dependency_tracking" != xno; then
752 am_depcomp="$ac_aux_dir/depcomp"
753 AMDEPBACKSLASH='\'
754+ am__nodep='_no'
755 fi
756 if test "x$enable_dependency_tracking" != xno; then
757 AMDEP_TRUE=
758@@ -3591,6 +3595,7 @@
759 # instance it was reported that on HP-UX the gcc test will end up
760 # making a dummy file named `D' -- because `-MD' means `put the output
761 # in D'.
762+ rm -rf conftest.dir
763 mkdir conftest.dir
764 # Copy depcomp to subdir because otherwise we won't find it if we're
765 # using a relative directory.
766@@ -3650,7 +3655,7 @@
767 break
768 fi
769 ;;
770- msvisualcpp | msvcmsys)
771+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
772 # This compiler won't grok `-c -o', but also, the minuso test has
773 # not run yet. These depmodes are late enough in the game, and
774 # so weak that their functioning should not be impacted.
775@@ -3716,14 +3721,12 @@
776 ;;
777 esac
778
779+INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
780+INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
781+INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
782 if test -n "0.35.0"; then
783 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5
784 $as_echo_n "checking for intltool >= 0.35.0... " >&6; }
785-
786- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
787- INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
788- INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
789-
790 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
791 $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
792 test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
793@@ -3884,7 +3887,11 @@
794 INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
795 INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
796 INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
797+if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
798 INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@'
799+else
800+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir'
801+fi
802 INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
803 INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
804 INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
805@@ -4310,9 +4317,11 @@
806
807
808
809+
810+
811 # Find any Python interpreter.
812 if test -z "$PYTHON"; then
813- for ac_prog in python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
814+ for ac_prog in python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
815 do
816 # Extract the first word of "$ac_prog", so it can be a program name with args.
817 set dummy $ac_prog; ac_word=$2
818@@ -4400,7 +4409,7 @@
819
820
821
822- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
823+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
824 $as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
825 if ${am_cv_python_pythondir+:} false; then :
826 $as_echo_n "(cached) " >&6
827@@ -4411,8 +4420,7 @@
828 else
829 am_py_prefix=$prefix
830 fi
831- am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
832- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
833+ am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null`
834 case $am_cv_python_pythondir in
835 $am_py_prefix*)
836 am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
837@@ -4438,7 +4446,7 @@
838 pkgpythondir=\${pythondir}/$PACKAGE
839
840
841- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
842+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
843 $as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }
844 if ${am_cv_python_pyexecdir+:} false; then :
845 $as_echo_n "(cached) " >&6
846@@ -4449,8 +4457,7 @@
847 else
848 am_py_exec_prefix=$exec_prefix
849 fi
850- am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||
851- echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
852+ am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null`
853 case $am_cv_python_pyexecdir in
854 $am_py_exec_prefix*)
855 am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
856@@ -6518,7 +6525,7 @@
857 # report actual input values of CONFIG_FILES etc. instead of their
858 # values after options handling.
859 ac_log="
860-This file was extended by gedit-developer-plugins $as_me 0.5.11, which was
861+This file was extended by gedit-developer-plugins $as_me 0.5.13, which was
862 generated by GNU Autoconf 2.68. Invocation command line was
863
864 CONFIG_FILES = $CONFIG_FILES
865@@ -6575,7 +6582,7 @@
866 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
867 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
868 ac_cs_version="\\
869-gedit-developer-plugins config.status 0.5.11
870+gedit-developer-plugins config.status 0.5.13
871 configured by $0, generated by GNU Autoconf 2.68,
872 with options \\"\$ac_cs_config\\"
873
874
875=== modified file 'configure.ac'
876--- configure.ac 2012-02-07 12:20:48 +0000
877+++ configure.ac 2012-03-12 13:25:20 +0000
878@@ -4,7 +4,7 @@
879
880 m4_define(gdp_major_version, 0)
881 m4_define(gdp_minor_version, 5)
882-m4_define(gdp_micro_version, 11)
883+m4_define(gdp_micro_version, 13)
884 m4_define(gdp_version, gdp_major_version.gdp_minor_version.gdp_micro_version)
885
886 AC_INIT(gedit-developer-plugins, gdp_version, sinzui.is@verizon.net)
887
888=== modified file 'debian/changelog'
889--- debian/changelog 2012-02-07 12:20:48 +0000
890+++ debian/changelog 2012-03-12 13:25:20 +0000
891@@ -1,3 +1,15 @@
892+gedit-developer-plugins (0.5.13-0ubuntu1) precise; urgency=low
893+
894+ * New upstream bug-fix release
895+ - Error: Gtk.Justification. does not complete (LP: #932086)
896+ - gdpfind's theads to not play with gtk's threads (LP:# 934643)
897+ - gdpformat syntax checking can block the use of gedit (LP: #934653)
898+ - gdpbzr error opening diverged from when there is no parent (LP: #935421)
899+ - doctest reformatter replaces the text with the filename (LP: #944954)
900+ - Pressing enter in the "Look in" entry does not start find (LP: #951900)
901+
902+ -- Curtis C. Hovey <sinzui.is@verizon.net> Mon, 12 Mar 2012 09:04:13 -0400
903+
904 gedit-developer-plugins (0.5.11-0ubuntu1) precise; urgency=low
905
906 * New upstream release. Fixes LP: #892848, LP: #909810, LP: #910310,
907
908=== modified file 'install-sh'
909--- install-sh 2011-01-14 10:24:47 +0000
910+++ install-sh 2012-03-12 13:25:20 +0000
911@@ -1,7 +1,7 @@
912 #!/bin/sh
913 # install - install a program, script, or datafile
914
915-scriptversion=2009-04-28.21; # UTC
916+scriptversion=2011-01-19.21; # UTC
917
918 # This originates from X11R5 (mit/util/scripts/install.sh), which was
919 # later released in X11R6 (xc/config/util/install.sh) with the
920@@ -156,6 +156,10 @@
921 -s) stripcmd=$stripprog;;
922
923 -t) dst_arg=$2
924+ # Protect names problematic for `test' and other utilities.
925+ case $dst_arg in
926+ -* | [=\(\)!]) dst_arg=./$dst_arg;;
927+ esac
928 shift;;
929
930 -T) no_target_directory=true;;
931@@ -186,6 +190,10 @@
932 fi
933 shift # arg
934 dst_arg=$arg
935+ # Protect names problematic for `test' and other utilities.
936+ case $dst_arg in
937+ -* | [=\(\)!]) dst_arg=./$dst_arg;;
938+ esac
939 done
940 fi
941
942@@ -200,7 +208,11 @@
943 fi
944
945 if test -z "$dir_arg"; then
946- trap '(exit $?); exit' 1 2 13 15
947+ do_exit='(exit $ret); exit $ret'
948+ trap "ret=129; $do_exit" 1
949+ trap "ret=130; $do_exit" 2
950+ trap "ret=141; $do_exit" 13
951+ trap "ret=143; $do_exit" 15
952
953 # Set umask so as not to create temps with too-generous modes.
954 # However, 'strip' requires both read and write access to temps.
955@@ -228,9 +240,9 @@
956
957 for src
958 do
959- # Protect names starting with `-'.
960+ # Protect names problematic for `test' and other utilities.
961 case $src in
962- -*) src=./$src;;
963+ -* | [=\(\)!]) src=./$src;;
964 esac
965
966 if test -n "$dir_arg"; then
967@@ -252,12 +264,7 @@
968 echo "$0: no destination specified." >&2
969 exit 1
970 fi
971-
972 dst=$dst_arg
973- # Protect names starting with `-'.
974- case $dst in
975- -*) dst=./$dst;;
976- esac
977
978 # If destination is a directory, append the input filename; won't work
979 # if double slashes aren't ignored.
980@@ -385,7 +392,7 @@
981
982 case $dstdir in
983 /*) prefix='/';;
984- -*) prefix='./';;
985+ [-=\(\)!]*) prefix='./';;
986 *) prefix='';;
987 esac
988
989@@ -403,7 +410,7 @@
990
991 for d
992 do
993- test -z "$d" && continue
994+ test X"$d" = X && continue
995
996 prefix=$prefix$d
997 if test -d "$prefix"; then
998
999=== modified file 'language-specs/Makefile.in'
1000--- language-specs/Makefile.in 2012-02-07 12:20:48 +0000
1001+++ language-specs/Makefile.in 2012-03-12 13:25:20 +0000
1002@@ -1,9 +1,9 @@
1003-# Makefile.in generated by automake 1.11.1 from Makefile.am.
1004+# Makefile.in generated by automake 1.11.3 from Makefile.am.
1005 # @configure_input@
1006
1007 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1008-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
1009-# Inc.
1010+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
1011+# Foundation, Inc.
1012 # This Makefile.in is free software; the Free Software Foundation
1013 # gives unlimited permission to copy and/or distribute it,
1014 # with or without modifications, as long as this notice is preserved.
1015@@ -65,6 +65,12 @@
1016 am__base_list = \
1017 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
1018 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
1019+am__uninstall_files_from_dir = { \
1020+ test -z "$$files" \
1021+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
1022+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
1023+ $(am__cd) "$$dir" && rm -f $$files; }; \
1024+ }
1025 am__installdirs = "$(DESTDIR)$(langsdir)"
1026 DATA = $(langs_DATA)
1027 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
1028@@ -259,9 +265,7 @@
1029 @$(NORMAL_UNINSTALL)
1030 @list='$(langs_DATA)'; test -n "$(langsdir)" || list=; \
1031 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
1032- test -n "$$files" || exit 0; \
1033- echo " ( cd '$(DESTDIR)$(langsdir)' && rm -f" $$files ")"; \
1034- cd "$(DESTDIR)$(langsdir)" && rm -f $$files
1035+ dir='$(DESTDIR)$(langsdir)'; $(am__uninstall_files_from_dir)
1036 tags: TAGS
1037 TAGS:
1038
1039@@ -316,10 +320,15 @@
1040
1041 installcheck: installcheck-am
1042 install-strip:
1043- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
1044- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
1045- `test -z '$(STRIP)' || \
1046- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
1047+ if test -z '$(STRIP)'; then \
1048+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
1049+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
1050+ install; \
1051+ else \
1052+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
1053+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
1054+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
1055+ fi
1056 mostlyclean-generic:
1057
1058 clean-generic:
1059
1060=== modified file 'missing'
1061--- missing 2011-01-14 10:24:47 +0000
1062+++ missing 2012-03-12 13:25:20 +0000
1063@@ -1,10 +1,10 @@
1064 #! /bin/sh
1065 # Common stub for a few missing GNU programs while installing.
1066
1067-scriptversion=2009-04-28.21; # UTC
1068+scriptversion=2012-01-06.13; # UTC
1069
1070 # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
1071-# 2008, 2009 Free Software Foundation, Inc.
1072+# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
1073 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
1074
1075 # This program is free software; you can redistribute it and/or modify
1076@@ -84,7 +84,6 @@
1077 help2man touch the output file
1078 lex create \`lex.yy.c', if possible, from existing .c
1079 makeinfo touch the output file
1080- tar try tar, gnutar, gtar, then tar without non-portable flags
1081 yacc create \`y.tab.[ch]', if possible, from existing .[ch]
1082
1083 Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
1084@@ -122,15 +121,6 @@
1085 # Not GNU programs, they don't have --version.
1086 ;;
1087
1088- tar*)
1089- if test -n "$run"; then
1090- echo 1>&2 "ERROR: \`tar' requires --run"
1091- exit 1
1092- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
1093- exit 1
1094- fi
1095- ;;
1096-
1097 *)
1098 if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
1099 # We have it, but it failed.
1100@@ -226,7 +216,7 @@
1101 \`Bison' from any GNU archive site."
1102 rm -f y.tab.c y.tab.h
1103 if test $# -ne 1; then
1104- eval LASTARG="\${$#}"
1105+ eval LASTARG=\${$#}
1106 case $LASTARG in
1107 *.y)
1108 SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
1109@@ -256,7 +246,7 @@
1110 \`Flex' from any GNU archive site."
1111 rm -f lex.yy.c
1112 if test $# -ne 1; then
1113- eval LASTARG="\${$#}"
1114+ eval LASTARG=\${$#}
1115 case $LASTARG in
1116 *.l)
1117 SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
1118@@ -318,41 +308,6 @@
1119 touch $file
1120 ;;
1121
1122- tar*)
1123- shift
1124-
1125- # We have already tried tar in the generic part.
1126- # Look for gnutar/gtar before invocation to avoid ugly error
1127- # messages.
1128- if (gnutar --version > /dev/null 2>&1); then
1129- gnutar "$@" && exit 0
1130- fi
1131- if (gtar --version > /dev/null 2>&1); then
1132- gtar "$@" && exit 0
1133- fi
1134- firstarg="$1"
1135- if shift; then
1136- case $firstarg in
1137- *o*)
1138- firstarg=`echo "$firstarg" | sed s/o//`
1139- tar "$firstarg" "$@" && exit 0
1140- ;;
1141- esac
1142- case $firstarg in
1143- *h*)
1144- firstarg=`echo "$firstarg" | sed s/h//`
1145- tar "$firstarg" "$@" && exit 0
1146- ;;
1147- esac
1148- fi
1149-
1150- echo 1>&2 "\
1151-WARNING: I can't seem to be able to run \`tar' with the given arguments.
1152- You may want to install GNU tar or Free paxutils, or check the
1153- command line arguments."
1154- exit 1
1155- ;;
1156-
1157 *)
1158 echo 1>&2 "\
1159 WARNING: \`$1' is needed, and is $msg.
1160
1161=== modified file 'plugins/Makefile.in'
1162--- plugins/Makefile.in 2012-02-07 12:20:48 +0000
1163+++ plugins/Makefile.in 2012-03-12 13:25:20 +0000
1164@@ -1,9 +1,9 @@
1165-# Makefile.in generated by automake 1.11.1 from Makefile.am.
1166+# Makefile.in generated by automake 1.11.3 from Makefile.am.
1167 # @configure_input@
1168
1169 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1170-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
1171-# Inc.
1172+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
1173+# Foundation, Inc.
1174 # This Makefile.in is free software; the Free Software Foundation
1175 # gives unlimited permission to copy and/or distribute it,
1176 # with or without modifications, as long as this notice is preserved.
1177@@ -73,6 +73,13 @@
1178 am__base_list = \
1179 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
1180 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
1181+am__uninstall_files_from_dir = { \
1182+ test -z "$$files" \
1183+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
1184+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
1185+ $(am__cd) "$$dir" && rm -f $$files; }; \
1186+ }
1187+am__py_compile = PYTHON=$(PYTHON) $(SHELL) $(py_compile)
1188 am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"
1189 py_compile = $(top_srcdir)/py-compile
1190 DATA = $(plugin_DATA)
1191@@ -316,11 +323,8 @@
1192 $(INSTALL_DATA) $$files "$(DESTDIR)$(plugindir)" || exit $$?; \
1193 done || exit $$?; \
1194 if test -n "$$dlist"; then \
1195- if test -z "$(DESTDIR)"; then \
1196- PYTHON=$(PYTHON) $(py_compile) --basedir "$(plugindir)" $$dlist; \
1197- else \
1198- PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(plugindir)" $$dlist; \
1199- fi; \
1200+ $(am__py_compile) --destdir "$(DESTDIR)" \
1201+ --basedir "$(plugindir)" $$dlist; \
1202 else :; fi
1203
1204 uninstall-pluginPYTHON:
1205@@ -328,14 +332,14 @@
1206 @list='$(plugin_PYTHON)'; test -n "$(plugindir)" || list=; \
1207 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
1208 test -n "$$files" || exit 0; \
1209+ dir='$(DESTDIR)$(plugindir)'; \
1210 filesc=`echo "$$files" | sed 's|$$|c|'`; \
1211 fileso=`echo "$$files" | sed 's|$$|o|'`; \
1212- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
1213- cd "$(DESTDIR)$(plugindir)" && rm -f $$files || exit $$?; \
1214- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$filesc ")"; \
1215- cd "$(DESTDIR)$(plugindir)" && rm -f $$filesc || exit $$?; \
1216- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$fileso ")"; \
1217- cd "$(DESTDIR)$(plugindir)" && rm -f $$fileso
1218+ st=0; \
1219+ for files in "$$files" "$$filesc" "$$fileso"; do \
1220+ $(am__uninstall_files_from_dir) || st=$$?; \
1221+ done; \
1222+ exit $$st
1223 install-pluginDATA: $(plugin_DATA)
1224 @$(NORMAL_INSTALL)
1225 test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
1226@@ -353,9 +357,7 @@
1227 @$(NORMAL_UNINSTALL)
1228 @list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
1229 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
1230- test -n "$$files" || exit 0; \
1231- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
1232- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
1233+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
1234
1235 # This directory's subdirectories are mostly independent; you can cd
1236 # into them and run `make' without going through this Makefile.
1237@@ -571,10 +573,15 @@
1238
1239 installcheck: installcheck-recursive
1240 install-strip:
1241- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
1242- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
1243- `test -z '$(STRIP)' || \
1244- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
1245+ if test -z '$(STRIP)'; then \
1246+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
1247+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
1248+ install; \
1249+ else \
1250+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
1251+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
1252+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
1253+ fi
1254 mostlyclean-generic:
1255
1256 clean-generic:
1257
1258=== modified file 'plugins/gdp/Makefile.in'
1259--- plugins/gdp/Makefile.in 2012-02-07 12:20:48 +0000
1260+++ plugins/gdp/Makefile.in 2012-03-12 13:25:20 +0000
1261@@ -1,9 +1,9 @@
1262-# Makefile.in generated by automake 1.11.1 from Makefile.am.
1263+# Makefile.in generated by automake 1.11.3 from Makefile.am.
1264 # @configure_input@
1265
1266 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1267-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
1268-# Inc.
1269+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
1270+# Foundation, Inc.
1271 # This Makefile.in is free software; the Free Software Foundation
1272 # gives unlimited permission to copy and/or distribute it,
1273 # with or without modifications, as long as this notice is preserved.
1274@@ -66,6 +66,13 @@
1275 am__base_list = \
1276 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
1277 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
1278+am__uninstall_files_from_dir = { \
1279+ test -z "$$files" \
1280+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
1281+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
1282+ $(am__cd) "$$dir" && rm -f $$files; }; \
1283+ }
1284+am__py_compile = PYTHON=$(PYTHON) $(SHELL) $(py_compile)
1285 am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(uidir)"
1286 py_compile = $(top_srcdir)/py-compile
1287 DATA = $(ui_DATA)
1288@@ -271,11 +278,8 @@
1289 $(INSTALL_DATA) $$files "$(DESTDIR)$(plugindir)" || exit $$?; \
1290 done || exit $$?; \
1291 if test -n "$$dlist"; then \
1292- if test -z "$(DESTDIR)"; then \
1293- PYTHON=$(PYTHON) $(py_compile) --basedir "$(plugindir)" $$dlist; \
1294- else \
1295- PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(plugindir)" $$dlist; \
1296- fi; \
1297+ $(am__py_compile) --destdir "$(DESTDIR)" \
1298+ --basedir "$(plugindir)" $$dlist; \
1299 else :; fi
1300
1301 uninstall-pluginPYTHON:
1302@@ -283,14 +287,14 @@
1303 @list='$(plugin_PYTHON)'; test -n "$(plugindir)" || list=; \
1304 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
1305 test -n "$$files" || exit 0; \
1306+ dir='$(DESTDIR)$(plugindir)'; \
1307 filesc=`echo "$$files" | sed 's|$$|c|'`; \
1308 fileso=`echo "$$files" | sed 's|$$|o|'`; \
1309- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
1310- cd "$(DESTDIR)$(plugindir)" && rm -f $$files || exit $$?; \
1311- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$filesc ")"; \
1312- cd "$(DESTDIR)$(plugindir)" && rm -f $$filesc || exit $$?; \
1313- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$fileso ")"; \
1314- cd "$(DESTDIR)$(plugindir)" && rm -f $$fileso
1315+ st=0; \
1316+ for files in "$$files" "$$filesc" "$$fileso"; do \
1317+ $(am__uninstall_files_from_dir) || st=$$?; \
1318+ done; \
1319+ exit $$st
1320 install-uiDATA: $(ui_DATA)
1321 @$(NORMAL_INSTALL)
1322 test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)"
1323@@ -308,9 +312,7 @@
1324 @$(NORMAL_UNINSTALL)
1325 @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \
1326 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
1327- test -n "$$files" || exit 0; \
1328- echo " ( cd '$(DESTDIR)$(uidir)' && rm -f" $$files ")"; \
1329- cd "$(DESTDIR)$(uidir)" && rm -f $$files
1330+ dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir)
1331 tags: TAGS
1332 TAGS:
1333
1334@@ -368,10 +370,15 @@
1335
1336 installcheck: installcheck-am
1337 install-strip:
1338- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
1339- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
1340- `test -z '$(STRIP)' || \
1341- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
1342+ if test -z '$(STRIP)'; then \
1343+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
1344+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
1345+ install; \
1346+ else \
1347+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
1348+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
1349+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
1350+ fi
1351 mostlyclean-generic:
1352
1353 clean-generic:
1354
1355=== modified file 'plugins/gdp/__init__.py'
1356--- plugins/gdp/__init__.py 2012-02-07 12:20:48 +0000
1357+++ plugins/gdp/__init__.py 2012-03-12 13:25:20 +0000
1358@@ -127,6 +127,17 @@
1359 elif file_path.endswith('.tac'):
1360 document.set_language(lang_manager.get_language('python'))
1361
1362+ def show_info_dialog(self, message):
1363+ use_fake_gedit = os.environ.get('use_fake_gedit') == 'true'
1364+ if use_fake_gedit:
1365+ self._message = message
1366+ return
1367+ dialog = Gtk.MessageDialog(
1368+ self.window, 0, Gtk.MessageType.INFO, Gtk.ButtonsType.CLOSE,
1369+ message)
1370+ dialog.run()
1371+ dialog.destroy()
1372+
1373
1374 def set_file_line(column, cell, model, piter, cell_type):
1375 """Set the value as file or line information."""
1376
1377=== modified file 'plugins/gdp/bzr.py'
1378--- plugins/gdp/bzr.py 2012-02-07 12:20:48 +0000
1379+++ plugins/gdp/bzr.py 2012-03-12 13:25:20 +0000
1380@@ -18,7 +18,10 @@
1381
1382 from bzrlib import workingtree
1383 from bzrlib.branch import Branch
1384-from bzrlib.errors import NotBranchError, NoWorkingTree
1385+from bzrlib.errors import (
1386+ NotBranchError,
1387+ NoWorkingTree,
1388+ )
1389 from bzrlib.revisionspec import RevisionSpec
1390
1391 try:
1392@@ -123,11 +126,19 @@
1393
1394 def open_changed_files_to_push(self, action):
1395 """Open the changed files in the branch that not been pushed."""
1396- self.open_changed_files(self._push_tree)
1397+ try:
1398+ self.open_changed_files(self._push_tree)
1399+ except NotBranchError:
1400+ self.show_info_dialog(
1401+ _('This branch does not have a push location.'))
1402
1403 def open_changed_files_from_parent(self, action):
1404 """Open the changed files that diverged from the parent branch."""
1405- self.open_changed_files(self._parent_tree)
1406+ try:
1407+ self.open_changed_files(self._parent_tree)
1408+ except NotBranchError:
1409+ self.show_info_dialog(
1410+ _('This branch does not have a parent location.'))
1411
1412 @property
1413 def diff_file_path(self):
1414
1415=== modified file 'plugins/gdp/complete.py'
1416--- plugins/gdp/complete.py 2012-02-07 12:20:48 +0000
1417+++ plugins/gdp/complete.py 2012-03-12 13:25:20 +0000
1418@@ -590,7 +590,11 @@
1419 return is_authoritative, []
1420
1421 for symbol in namespaces[1:]:
1422- module_ = getattr(module_, symbol)
1423+ next_module = getattr(module_, symbol, None)
1424+ if next_module is not None:
1425+ module_ = next_module
1426+ else:
1427+ break
1428 is_authoritative = True
1429 symbols = [self._get_dynamic_proposal(module_, name)
1430 for name in dir(module_) if name.startswith(prefix)]
1431
1432=== modified file 'plugins/gdp/find.py'
1433--- plugins/gdp/find.py 2012-02-07 12:20:48 +0000
1434+++ plugins/gdp/find.py 2012-03-12 13:25:20 +0000
1435@@ -21,9 +21,11 @@
1436 import threading
1437 from optparse import OptionParser
1438
1439-from gi.repository import GObject
1440-from gi.repository import Gdk
1441-from gi.repository import Gtk
1442+from gi.repository import (
1443+ GObject,
1444+ Gdk,
1445+ Gtk,
1446+ )
1447
1448 from gdp import (
1449 config,
1450@@ -32,6 +34,9 @@
1451 )
1452
1453
1454+GObject.threads_init()
1455+
1456+
1457 find_params = namedtuple(
1458 'FindParams', ['path', 'pattern', 'is_re', 'is_case', 'file_pattern'])
1459
1460@@ -98,6 +103,7 @@
1461 class FinderWorker(threading.Thread):
1462
1463 def __init__(self, treestore, find_params, callback, substitution=None):
1464+ super(FinderWorker, self).__init__()
1465 self.treestore = treestore
1466 self.find_params = find_params
1467 self.callback = callback
1468@@ -113,6 +119,18 @@
1469 pattern = '(?i)%s' % pattern
1470 return pattern
1471
1472+ def append_match(self, piter, file_path, icon, lineno, text, path):
1473+ self.treestore.append(piter, (file_path, icon, lineno, text, path))
1474+ return False
1475+
1476+ def idle_append_match(self, piter, file_path, icon, lineno, text, path):
1477+ GObject.idle_add(
1478+ self.append_match, piter, file_path, icon, lineno, text, path)
1479+
1480+ def start(self):
1481+ super(FinderWorker, self).start()
1482+ return False
1483+
1484 def run(self):
1485 try:
1486 for summary in find_matches(
1487@@ -131,17 +149,17 @@
1488 else:
1489 icon = 'edit-find-replace' # Gtk.STOCK_FIND_AND_REPLACE
1490 for line in summary['lines']:
1491- self.treestore.append(piter,
1492- (file_path, icon, line['lineno'], line['text'],
1493- self.find_params.path))
1494+ self.idle_append_match(
1495+ piter, file_path, icon, line['lineno'], line['text'],
1496+ self.find_params.path)
1497 if self.treestore.get_iter_first() is None:
1498 message = 'No matches found'
1499- self.treestore.append(
1500- None, (message, 'stock_dialog-info', 0, None, None))
1501+ self.idle_append_match(
1502+ None, message, 'stock_dialog-info', 0, None, None)
1503 except sre_constants.error, e:
1504 message = 'Find could not be run: %s' % str(e)
1505- self.treestore.append(
1506- None, (message, 'stock_dialog-info', 0, None, None))
1507+ self.idle_append_match(
1508+ None, message, 'stock_dialog-info', 0, None, None)
1509 self.callback()
1510
1511
1512@@ -317,7 +335,9 @@
1513 'Matches for [%s]' % pattern)
1514 find_worker = FinderWorker(
1515 treestore, find_params, self.on_find_complete, substitution)
1516- find_worker.run()
1517+ # Queue the find worker after the events emited at the top
1518+ # of this method.
1519+ GObject.idle_add(find_worker.start)
1520
1521 def on_find_complete(self):
1522 if self.path_comboentry.get_active_text() == self.CURRENT_FILE:
1523
1524=== modified file 'plugins/gdp/find.ui'
1525--- plugins/gdp/find.ui 2012-02-07 12:20:48 +0000
1526+++ plugins/gdp/find.ui 2012-03-12 13:25:20 +0000
1527@@ -76,6 +76,7 @@
1528 <child>
1529 <object class="GtkButton" id="find_in_files_button">
1530 <property name="label" translatable="yes"> Find </property>
1531+ <property name="use_action_appearance">False</property>
1532 <property name="visible">True</property>
1533 <property name="can_focus">True</property>
1534 <property name="receives_default">True</property>
1535@@ -109,6 +110,7 @@
1536 <object class="GtkEntry" id="comboboxtext-entry4">
1537 <property name="can_focus">True</property>
1538 <property name="invisible_char">•</property>
1539+ <signal name="activate" handler="on_find_in_files" swapped="no"/>
1540 </object>
1541 </child>
1542 </object>
1543@@ -155,6 +157,7 @@
1544 <child>
1545 <object class="GtkCheckButton" id="re_checkbox">
1546 <property name="label" translatable="yes">Regular expression</property>
1547+ <property name="use_action_appearance">False</property>
1548 <property name="visible">True</property>
1549 <property name="can_focus">True</property>
1550 <property name="receives_default">False</property>
1551@@ -173,6 +176,7 @@
1552 <child>
1553 <object class="GtkCheckButton" id="match_case_checkbox">
1554 <property name="label" translatable="yes">Match case</property>
1555+ <property name="use_action_appearance">False</property>
1556 <property name="visible">True</property>
1557 <property name="can_focus">True</property>
1558 <property name="receives_default">False</property>
1559@@ -326,6 +330,7 @@
1560 <child>
1561 <object class="GtkButton" id="replace_in_files_button">
1562 <property name="label" translatable="yes">Replace</property>
1563+ <property name="use_action_appearance">False</property>
1564 <property name="visible">True</property>
1565 <property name="can_focus">True</property>
1566 <property name="receives_default">True</property>
1567@@ -357,6 +362,7 @@
1568 <child>
1569 <object class="GtkButton" id="save_results_button">
1570 <property name="label" translatable="yes">Save matches</property>
1571+ <property name="use_action_appearance">False</property>
1572 <property name="visible">True</property>
1573 <property name="can_focus">True</property>
1574 <property name="receives_default">True</property>
1575
1576=== modified file 'plugins/gdp/format.py'
1577--- plugins/gdp/format.py 2012-02-07 12:20:48 +0000
1578+++ plugins/gdp/format.py 2012-03-12 13:25:20 +0000
1579@@ -12,9 +12,11 @@
1580 import re
1581 from tempfile import NamedTemporaryFile
1582 from textwrap import wrap
1583+import threading
1584
1585 from gi.repository import (
1586 Gio,
1587+ GObject,
1588 Gtk,
1589 )
1590
1591@@ -44,6 +46,67 @@
1592 # Suppress the set behaviour because the config controls the rules.
1593 pass
1594
1595+ def _message_file_lines(self, line_no, message, icon=None,
1596+ base_dir=None, file_name=None):
1597+ """Queue the messages in the file_lines_view."""
1598+ if self.piter is None:
1599+ mime_type = 'gnome-mime-text'
1600+ # Do not queue this call because the piter must be known now
1601+ # for all subsequent appends to work.
1602+ self.piter = self.treestore.append(
1603+ None, (file_name, mime_type, 0, None, base_dir))
1604+ self.idle_append_issue(
1605+ self.piter, file_name, icon, line_no, message, base_dir)
1606+
1607+ def append_issue(self, piter, file_path, icon, lineno, text, path):
1608+ self.treestore.append(piter, (file_path, icon, lineno, text, path))
1609+ return False
1610+
1611+ def idle_append_issue(self, piter, file_path, icon, lineno, text, path):
1612+ GObject.idle_add(
1613+ self.append_issue, piter, file_path, icon, lineno, text, path)
1614+
1615+
1616+class CheckerWorker(threading.Thread):
1617+
1618+ def __init__(self, documents, reporter, callback, quiet):
1619+ super(CheckerWorker, self).__init__()
1620+ self.documents = documents
1621+ self.reporter = reporter
1622+ self.callback = callback
1623+ self.quiet = quiet
1624+ self.model = self.reporter.file_lines_view.get_model()
1625+
1626+ def _ensure_file_path(self, checker):
1627+ if os.path.isfile(checker.file_path):
1628+ return None
1629+ temp_file = NamedTemporaryFile(suffix='gdp', delete=False)
1630+ temp_file.write(checker.text)
1631+ temp_file.flush()
1632+ checker.file_path = temp_file.name
1633+ return temp_file
1634+
1635+ def start(self):
1636+ super(CheckerWorker, self).start()
1637+ return False
1638+
1639+ def run(self):
1640+ for document in self.documents:
1641+ file_path = document.get_uri_for_display()
1642+ text = document.props.text
1643+ language = Language.get_language(file_path)
1644+ self.reporter.piter = None
1645+ checker = UniversalChecker(
1646+ file_path, text=text, language=language,
1647+ reporter=self.reporter)
1648+ temp_file = self._ensure_file_path(checker)
1649+ try:
1650+ checker.check()
1651+ finally:
1652+ if temp_file:
1653+ temp_file.unlink(temp_file.name)
1654+ self.callback(self.quiet)
1655+
1656
1657 class Formatter(ControllerMixin):
1658 """Format Gedit Document and selection text."""
1659@@ -76,6 +139,10 @@
1660 icon = Gtk.Image.new_from_stock(Gtk.STOCK_INFO, Gtk.IconSize.MENU)
1661 panel.add_item(
1662 self.file_lines, 'gdpformat', 'Check syntax and style', icon)
1663+ self.reporter = FilteredReporter(
1664+ Reporter.FILE_LINES, treeview=self.file_lines_view)
1665+ self.checker_id = None
1666+ self.checker_worker = None
1667
1668 def deactivate(self):
1669 """Clean up resources before deactivation."""
1670@@ -304,54 +371,48 @@
1671 """Reformat the doctest."""
1672 bounds, text = self._get_bounded_text()
1673 file_name = self.active_document.get_uri_for_display()
1674- reviewer = DoctestReviewer(text, file_name)
1675+ reviewer = DoctestReviewer(file_name, text)
1676 new_text = reviewer.format()
1677 self._put_bounded_text(bounds, new_text)
1678
1679- def _ensure_file_path(self, checker):
1680- if os.path.isfile(checker.file_path):
1681- return None
1682- temp_file = NamedTemporaryFile(suffix='gdp', delete=False)
1683- temp_file.write(checker.text)
1684- temp_file.flush()
1685- checker.file_path = temp_file.name
1686- return temp_file
1687-
1688- def _check_style(self, document):
1689- """Check the style and syntax of a document."""
1690- file_path = document.get_uri_for_display()
1691- start_iter = document.get_start_iter()
1692- end_iter = document.get_end_iter()
1693- text = document.get_text(start_iter, end_iter, True)
1694- reporter = FilteredReporter(
1695- Reporter.FILE_LINES, treeview=self.file_lines_view)
1696- language = Language.get_language(file_path)
1697- checker = UniversalChecker(
1698- file_path, text=text, language=language, reporter=reporter)
1699- temp_file = self._ensure_file_path(checker)
1700- try:
1701- checker.check()
1702- finally:
1703- if temp_file:
1704- temp_file.unlink(temp_file.name)
1705-
1706 def check_style(self, action, documents=None, quiet=False):
1707 """Check the style and syntax of the active document."""
1708+ if self.checker_id is not None:
1709+ return
1710+ if self.checker_worker is not None and self.checker_worker.is_alive():
1711+ # This is not as reliable to Gtk's idle handle. Maybe this
1712+ # sould call join() to wait tot the process to terminate.
1713+ return
1714 self.file_lines_view.get_model().clear()
1715 if documents is None:
1716 documents = [self.active_document]
1717- for document in documents:
1718- self._check_style(document)
1719+ self.checker_worker = CheckerWorker(
1720+ documents, self.reporter, self.on_check_style_complete, quiet)
1721+ # Queue the find worker after the events emited at the top
1722+ # of this method.
1723+ self.checker_id = GObject.idle_add(self.checker_worker.start)
1724+
1725+ def on_check_style_complete(self, quiet):
1726+ # Gracefully end the operation in the main_loop.
1727+ GObject.idle_add(self.do_check_style_complete, quiet)
1728+
1729+ def do_check_style_complete(self, quiet):
1730+ self.checker_worker = None
1731+ self.checker_id = None
1732 model = self.file_lines_view.get_model()
1733 first = model.get_iter_first()
1734 if first is None:
1735+ # Noted that the mesage is in the file_path position.
1736 model.append(
1737 None, ('No problems found', 'emblem-default', 0, None, None))
1738- if first is None and quiet:
1739- # Do not interupt the user to say there is nothing to see.
1740- return
1741 self.file_lines_view.expand_all()
1742- self.show()
1743+ if first is not None or not quiet:
1744+ self.show()
1745+ return False
1746+
1747+ def check_style_background(self, action, documents=None):
1748+ """Check the style in the background."""
1749+ self.check_style(action, quiet=True)
1750
1751 def check_all_style(self, action):
1752 """Check the style and syntax of all open documents."""
1753
1754=== added file 'plugins/gdp/tests/test_bzr.py'
1755--- plugins/gdp/tests/test_bzr.py 1970-01-01 00:00:00 +0000
1756+++ plugins/gdp/tests/test_bzr.py 2012-03-12 13:25:20 +0000
1757@@ -0,0 +1,51 @@
1758+# Copyright (C) 2012 - Curtis Hovey <sinzui.is at verizon.net>
1759+# This software is licensed under the MIT license (see the file COPYING).
1760+
1761+__metaclass__ = type
1762+
1763+from bzrlib.errors import (
1764+ NotBranchError,
1765+ )
1766+
1767+from gdp.bzr import (
1768+ BzrProject,
1769+ )
1770+from testing import GeditTestCase
1771+
1772+
1773+class FakeBranch:
1774+
1775+ def get_parent(self):
1776+ raise NotBranchError('test')
1777+
1778+ def get_push_location(self):
1779+ raise NotBranchError('test')
1780+
1781+
1782+class FakeTree:
1783+
1784+ def __init__(self):
1785+ self.branch = FakeBranch()
1786+
1787+
1788+class BzrTestCase(GeditTestCase):
1789+
1790+ def test_open_changed_files_from_parent_no_parent(self):
1791+ text_file = self.make_file('hello')
1792+ window, view, document = self.make_gedit(text_file.name)
1793+ bzr_project = BzrProject(window)
1794+ bzr_project.working_tree = FakeTree()
1795+ bzr_project.open_changed_files_from_parent(None)
1796+ self.assertEqual(
1797+ 'This branch does not have a parent location.',
1798+ bzr_project._message)
1799+
1800+ def test_open_changed_files_to_push_no_push(self):
1801+ text_file = self.make_file('hello')
1802+ window, view, document = self.make_gedit(text_file.name)
1803+ bzr_project = BzrProject(window)
1804+ bzr_project.working_tree = FakeTree()
1805+ bzr_project.open_changed_files_to_push(None)
1806+ self.assertEqual(
1807+ 'This branch does not have a push location.',
1808+ bzr_project._message)
1809
1810=== modified file 'plugins/gdp/tests/test_complete.py'
1811--- plugins/gdp/tests/test_complete.py 2012-02-07 12:20:48 +0000
1812+++ plugins/gdp/tests/test_complete.py 2012-03-12 13:25:20 +0000
1813@@ -276,6 +276,32 @@
1814 ['while'],
1815 [proposal._word for proposal in sorted(proposals)])
1816
1817+ def test_get_words_gtk_module(self):
1818+ python_file = self.make_file('\n'.join([
1819+ 'from gi.repository import Gtk',
1820+ 'justification = Gtk.Justification.',
1821+ ]))
1822+ window, view, document = self.make_gedit(python_file.name)
1823+ document.place_cursor(document.get_end_iter())
1824+ generator = PythonGenerator(document)
1825+ is_authoritative, proposals = generator.get_words()
1826+ self.assertEqual(
1827+ ['CENTER', 'FILL', 'LEFT', 'RIGHT'],
1828+ [proposal._word for proposal in sorted(proposals)][0:4])
1829+
1830+ def test_get_words_python_module(self):
1831+ python_file = self.make_file('\n'.join([
1832+ 'import os.path',
1833+ 'dirname = os.path.',
1834+ ]))
1835+ window, view, document = self.make_gedit(python_file.name)
1836+ document.place_cursor(document.get_end_iter())
1837+ generator = PythonGenerator(document)
1838+ is_authoritative, proposals = generator.get_words('a')
1839+ self.assertEqual(
1840+ ['abspath', 'altsep'],
1841+ [proposal._word for proposal in sorted(proposals)])
1842+
1843 def test_get_words_is_authoratative(self):
1844 # The matches are authoritative when a namespace is
1845 # matched without a prefix.
1846
1847=== modified file 'plugins/gdp/tests/test_find.py'
1848--- plugins/gdp/tests/test_find.py 2012-02-07 12:20:48 +0000
1849+++ plugins/gdp/tests/test_find.py 2012-03-12 13:25:20 +0000
1850@@ -18,12 +18,19 @@
1851
1852 class TestCallback:
1853
1854- def __init__(self):
1855+ def __init__(self, func=None):
1856 self.called = False
1857+ if func is None:
1858+ func = self.on_callback
1859+ self.func = func
1860
1861 def on_callback(self):
1862 self.called = True
1863
1864+ def __call__(self):
1865+ self.func()
1866+ self.on_callback()
1867+
1868
1869 class FinderWorkerTestCase(GeditTestCase):
1870
1871@@ -64,6 +71,34 @@
1872 worker = FinderWorker(treestore, params, callback)
1873 self.assertEqual('Snark\\(', worker.pattern)
1874
1875+ def test_append_match(self):
1876+ params = find_params('./', 'snark', False, False, None)
1877+ treestore = self.makeTreeStore()
1878+ callback = TestCallback()
1879+ worker = FinderWorker(treestore, params, callback)
1880+ result = worker.append_match(
1881+ None, 'hello', 'stock_dialog-info', 0, None, None)
1882+ self.assertIs(False, result)
1883+ self.assertEqual('hello', worker.treestore[0][0])
1884+
1885+ def test_run(self):
1886+ params = find_params('./', 'snark', False, False, None)
1887+ treestore = self.makeTreeStore()
1888+ callback = TestCallback()
1889+ worker = FinderWorker(treestore, params, callback)
1890+ worker.run()
1891+ self.assertIs(True, callback.called)
1892+
1893+ def test_start(self):
1894+ params = find_params('./', 'snark', False, False, None)
1895+ treestore = self.makeTreeStore()
1896+ callback = TestCallback()
1897+ worker = FinderWorker(treestore, params, callback)
1898+ result = worker.start()
1899+ self.assertIs(False, result)
1900+ worker.join()
1901+ self.assertIs(True, callback.called)
1902+
1903
1904 class FinderTestCase(GeditTestCase):
1905
1906
1907=== modified file 'plugins/gdp/tests/test_format.py'
1908--- plugins/gdp/tests/test_format.py 2012-02-07 12:20:48 +0000
1909+++ plugins/gdp/tests/test_format.py 2012-03-12 13:25:20 +0000
1910@@ -11,13 +11,18 @@
1911 format,
1912 )
1913 from gdp.format import (
1914+ CheckerWorker,
1915 FilteredReporter,
1916 Formatter,
1917 )
1918-from testing import GeditTestCase
1919+from testing import (
1920+ GeditTestCase,
1921+ MockMethod,
1922+ )
1923
1924
1925 class TestFilteredReporter(FilteredReporter):
1926+
1927 def _message_console(self, line_no, message, icon=None,
1928 base_dir=None, file_name=None):
1929 # Suppress printing to stdout.
1930@@ -66,6 +71,107 @@
1931 config.set('formatter', 'report_only_errors', str(False))
1932 self.assertIs(False, reporter.error_only)
1933
1934+ def test_append_issue(self):
1935+ window, view, document = self.make_gedit(
1936+ 'plugins/gdp/data/snark12.txt')
1937+ formatter = Formatter(window)
1938+ model = formatter.file_lines_view.get_model()
1939+ model.clear()
1940+ reporter = TestFilteredReporter(
1941+ FilteredReporter.FILE_LINES, treeview=formatter.file_lines_view)
1942+ result = reporter.append_issue(
1943+ None, 'eg.txt', 'error', 1, 'message', './')
1944+ self.assertIs(False, result)
1945+ return
1946+ # This is slow but interesting.
1947+ while Gtk.events_pending():
1948+ Gtk.main_iteration()
1949+ lines = []
1950+ for line_match in model:
1951+ lines.append((line_match[2], line_match[3]))
1952+ self.assertEqual([(1, 'message')], lines)
1953+
1954+
1955+class CheckerWorkerTestCase(GeditTestCase):
1956+
1957+ def test_init(self):
1958+ window, view, document = self.make_gedit(
1959+ 'plugins/gdp/data/snark12.txt')
1960+ formatter = Formatter(window)
1961+ formatter.reporter = FilteredReporter(
1962+ FilteredReporter.COLLECTOR, treeview=formatter.file_lines_view)
1963+ checker_worker = CheckerWorker(
1964+ [document], formatter.reporter,
1965+ formatter.on_check_style_complete, True)
1966+ self.assertEqual([document], checker_worker.documents)
1967+ self.assertIs(formatter.reporter, checker_worker.reporter)
1968+ self.assertEqual(
1969+ formatter.on_check_style_complete, checker_worker.callback)
1970+ self.assertIs(True, checker_worker.quiet)
1971+ self.assertIs(
1972+ formatter.file_lines_view.get_model(), checker_worker.model)
1973+
1974+ def test_check_style(self):
1975+ # A general test of check_style.
1976+ self.make_config(format, Config)
1977+ css = '\n'.join([
1978+ 'div {',
1979+ ' margins: 5px;',
1980+ ' }',
1981+ ])
1982+ css_file = self.make_file(css, suffix='.css')
1983+ window, view, document = self.make_gedit(css_file.name)
1984+ formatter = Formatter(window)
1985+ formatter.reporter = FilteredReporter(
1986+ FilteredReporter.COLLECTOR, treeview=formatter.file_lines_view)
1987+ checker_worker = CheckerWorker(
1988+ [document], formatter.reporter,
1989+ formatter.on_check_style_complete, True)
1990+ checker_worker.run()
1991+ lines = [message for message in formatter.reporter.messages]
1992+ self.assertEqual(
1993+ [(2, 'Unknown Property name.: margins')], lines)
1994+
1995+ def test_check_style_show_errors_only(self):
1996+ # A general test of check_style.
1997+ self.make_config(format, Config)
1998+ css = '\n'.join([
1999+ 'div {',
2000+ ' margins: 5px;',
2001+ ' }',
2002+ ])
2003+ css_file = self.make_file(css, suffix='.css')
2004+ window, view, document = self.make_gedit(css_file.name)
2005+ formatter = Formatter(window)
2006+ menu_item = Gtk.CheckMenuItem(label='test')
2007+ menu_item.set_active(True)
2008+ formatter.on_show_syntax_errors_only_toggled(menu_item)
2009+ formatter.reporter = FilteredReporter(
2010+ FilteredReporter.COLLECTOR, treeview=formatter.file_lines_view)
2011+ checker_worker = CheckerWorker(
2012+ [document], formatter.reporter,
2013+ formatter.on_check_style_complete, True)
2014+ checker_worker.run()
2015+
2016+ lines = [message for message in formatter.reporter.messages]
2017+ self.assertEqual([], lines)
2018+
2019+ def test_check_style_without_file(self):
2020+ self.make_config(format, Config)
2021+ python_file = self.make_file('import os; os\n', suffix='.py')
2022+ window, view, document = self.make_gedit(python_file.name)
2023+ # The temp file was removed after the helper loaded the file.
2024+ formatter = Formatter(window)
2025+ formatter.reporter = FilteredReporter(
2026+ FilteredReporter.COLLECTOR, treeview=formatter.file_lines_view)
2027+ checker_worker = CheckerWorker(
2028+ [document], formatter.reporter,
2029+ formatter.on_check_style_complete, True)
2030+ checker_worker.run()
2031+ lines = [message for message in formatter.reporter.messages]
2032+ self.assertEqual(
2033+ [(1, 'E702 multiple statements on one line (semicolon)')], lines)
2034+
2035
2036 class FormatterTestCase(GeditTestCase):
2037
2038@@ -112,6 +218,25 @@
2039 }""")
2040 self.assertEqual(expected, formatter.text)
2041
2042+ def test_reformat_doctest(self):
2043+ text = '\n'.join([
2044+ "narrative",
2045+ ">>> 1 == 2",
2046+ "False",
2047+ ])
2048+ text_file = self.make_file(text)
2049+ window, view, document = self.make_gedit(text_file.name)
2050+ formatter = Formatter(window)
2051+ formatter.reformat_doctest(None)
2052+ expected = dedent("""\
2053+ narrative
2054+
2055+ >>> 1 == 2
2056+ False
2057+
2058+ """)
2059+ self.assertEqual(expected, formatter.text)
2060+
2061 def test_rewrap_text_language_78(self):
2062 # Known formats/languages are wrapped at 78 characters.
2063 long_text = (
2064@@ -178,59 +303,61 @@
2065 False,
2066 format.config.getboolean('formatter', 'report_only_errors'))
2067
2068- def test_check_style(self):
2069- # A general test of check_style.
2070- self.make_config(format, Config)
2071- css = '\n'.join([
2072- 'div {',
2073- ' margins: 5px;',
2074- ' }',
2075- ])
2076- css_file = self.make_file(css, suffix='.css')
2077- window, view, document = self.make_gedit(css_file.name)
2078- formatter = Formatter(window)
2079- formatter.check_style(None, None, None)
2080- model = formatter.file_lines_view.get_model()
2081- lines = []
2082- for file_match in model:
2083- for line_match in file_match.iterchildren():
2084- lines.append((line_match[2], line_match[3]))
2085- self.assertEqual(
2086- [(2, 'Unknown Property name.: margins')], lines)
2087-
2088- def test_check_style_show_errors_only(self):
2089- # A general test of check_style.
2090- self.make_config(format, Config)
2091- css = '\n'.join([
2092- 'div {',
2093- ' margins: 5px;',
2094- ' }',
2095- ])
2096- css_file = self.make_file(css, suffix='.css')
2097- window, view, document = self.make_gedit(css_file.name)
2098- formatter = Formatter(window)
2099- menu_item = Gtk.CheckMenuItem(label='test')
2100- menu_item.set_active(True)
2101- formatter.on_show_syntax_errors_only_toggled(menu_item)
2102- formatter.check_style(None, None, None)
2103- model = formatter.file_lines_view.get_model()
2104- lines = []
2105- for file_match in model:
2106- for line_match in file_match.iterchildren():
2107- lines.append((line_match[2], line_match[3]))
2108- self.assertEqual([], lines)
2109-
2110- def test_check_style_without_file(self):
2111- self.make_config(format, Config)
2112- python_file = self.make_file('import os; os\n', suffix='.py')
2113- window, view, document = self.make_gedit(python_file.name)
2114- # The temp file was removed after the helper loaded the file.
2115- formatter = Formatter(window)
2116- formatter.check_style(None, None, None)
2117- model = formatter.file_lines_view.get_model()
2118- lines = []
2119- for file_match in model:
2120- for line_match in file_match.iterchildren():
2121- lines.append((line_match[2], line_match[3]))
2122- self.assertEqual(
2123- [(1, 'E702 multiple statements on one line (semicolon)')], lines)
2124+ def test_check_style_already_running(self):
2125+ window, view, document = self.make_gedit(
2126+ 'plugins/gdp/data/snark12.txt')
2127+ formatter = Formatter(window)
2128+ formatter.checker_id = 1
2129+ formatter.checker_worker = 'Bogus'
2130+ formatter.check_style(None)
2131+ self.assertEqual('Bogus', formatter.checker_worker)
2132+
2133+ def test_check_style_background(self):
2134+ # Background style checking does not show the panel when there
2135+ # are no issues.
2136+ css_file = self.make_file("", suffix='.css')
2137+ window, view, document = self.make_gedit(css_file.name)
2138+ formatter = Formatter(window)
2139+ MockMethod.bind(self, formatter, 'check_style')
2140+ formatter.check_style_background(None)
2141+ self.assertIs(True, formatter.check_style.called)
2142+ self.assertEqual({'quiet': True}, formatter.check_style.kwargs)
2143+
2144+ def test_do_check_style_complete_quiet_show(self):
2145+ # Background style checking does not show the panel when there
2146+ # are no issues.
2147+ css_file = self.make_file("", suffix='.css')
2148+ window, view, document = self.make_gedit(css_file.name)
2149+ formatter = Formatter(window)
2150+ MockMethod.bind(self, formatter, 'show')
2151+ formatter.file_lines_view.get_model().clear()
2152+ formatter.do_check_style_complete(True)
2153+ self.assertIs(False, formatter.show.called)
2154+
2155+ def test_do_check_style_complete_is_quiet(self):
2156+ window, view, document = self.make_gedit(
2157+ 'plugins/gdp/data/snark12.txt')
2158+ panel = window.get_side_panel()
2159+ panel.props.visible = False
2160+ formatter = Formatter(window)
2161+ model = formatter.file_lines_view.get_model()
2162+ model.clear()
2163+ formatter.checker_worker = 'worker'
2164+ formatter.checker_id = 1
2165+ formatter.do_check_style_complete(True)
2166+ self.assertIs(None, formatter.checker_worker)
2167+ self.assertIs(None, formatter.checker_id)
2168+ lines = []
2169+ for line_match in model:
2170+ lines.append((line_match[0], line_match[1]))
2171+ self.assertEqual([('No problems found', 'emblem-default')], lines)
2172+ self.assertIs(False, panel.props.visible)
2173+
2174+ def test_do_check_style_complete_is_not_quiet(self):
2175+ window, view, document = self.make_gedit(
2176+ 'plugins/gdp/data/snark12.txt')
2177+ panel = window.get_side_panel()
2178+ panel.props.visible = False
2179+ formatter = Formatter(window)
2180+ formatter.do_check_style_complete(True)
2181+ self.assertIs(True, panel.props.visible)
2182
2183=== modified file 'plugins/gdpbase.py'
2184--- plugins/gdpbase.py 2012-02-07 12:20:48 +0000
2185+++ plugins/gdpbase.py 2012-03-12 13:25:20 +0000
2186@@ -93,6 +93,12 @@
2187 return
2188 self.signal_ids[signal] = obj.connect(signal, method)
2189
2190+ def connect_signal_after(self, obj, signal, method):
2191+ """Connect the signal from the provided object to a method."""
2192+ if obj is None:
2193+ return
2194+ self.signal_ids[signal] = obj.connect_after(signal, method)
2195+
2196 def disconnect_signal(self, obj, signal):
2197 """Disconnect the signal from the provided object."""
2198 if obj is None:
2199
2200=== modified file 'plugins/gdpformat.py'
2201--- plugins/gdpformat.py 2012-02-07 12:20:48 +0000
2202+++ plugins/gdpformat.py 2012-03-12 13:25:20 +0000
2203@@ -152,15 +152,7 @@
2204 format_css_item = '/MenuBar/ToolsMenu/ToolsOps_2/ReformatCSS'
2205 manager.get_action(format_css_item).props.sensitive = (
2206 language_id == 'css')
2207- self.connect_signal(
2208+ self.connect_signal_after(
2209 document, 'syntax-error-python', self.controller.check_style)
2210- self.connect_signal(
2211- document, 'saved', self.on_document_saved)
2212-
2213- def on_document_saved(self, document, user_data):
2214- """Callback method for `document-saved` document signal.
2215-
2216- Automaticaly check syntax when file is saved.
2217- """
2218- if self.controller:
2219- self.controller.check_style(None, None, True)
2220+ self.connect_signal_after(
2221+ document, 'saved', self.controller.check_style_background)
2222
2223=== modified file 'plugins/tests/test_gdpformat.py'
2224--- plugins/tests/test_gdpformat.py 2012-02-07 12:20:48 +0000
2225+++ plugins/tests/test_gdpformat.py 2012-03-12 13:25:20 +0000
2226@@ -108,13 +108,3 @@
2227 self.assertEqual('ShowSyntaxErrorsOnly', action[0])
2228 self.assertEqual(
2229 config.getboolean('formatter', 'report_only_errors'), action[6])
2230-
2231- def test_on_document_saved_no_controller(self):
2232- window, view, document = self.make_gedit(
2233- 'plugins/gdp/data/snark12.txt')
2234- plugin = FormatPlugin()
2235- plugin.window = window
2236- plugin.do_activate()
2237- plugin.controller = None
2238- self.assertIs(
2239- None, plugin.on_document_saved(document, None))
2240
2241=== modified file 'py-compile'
2242--- py-compile 2011-01-14 10:24:47 +0000
2243+++ py-compile 2012-03-12 13:25:20 +0000
2244@@ -1,10 +1,10 @@
2245 #!/bin/sh
2246 # py-compile - Compile a Python program
2247
2248-scriptversion=2009-04-28.21; # UTC
2249+scriptversion=2011-06-08.12; # UTC
2250
2251-# Copyright (C) 2000, 2001, 2003, 2004, 2005, 2008, 2009 Free Software
2252-# Foundation, Inc.
2253+# Copyright (C) 2000, 2001, 2003, 2004, 2005, 2008, 2009, 2011 Free
2254+# Software Foundation, Inc.
2255
2256 # This program is free software; you can redistribute it and/or modify
2257 # it under the terms of the GNU General Public License as published by
2258@@ -32,28 +32,36 @@
2259 PYTHON=python
2260 fi
2261
2262+me=py-compile
2263+
2264+usage_error ()
2265+{
2266+ echo "$me: $*" >&2
2267+ echo "Try \`$me --help' for more information." >&2
2268+ exit 1
2269+}
2270+
2271 basedir=
2272 destdir=
2273-files=
2274 while test $# -ne 0; do
2275 case "$1" in
2276 --basedir)
2277- basedir=$2
2278- if test -z "$basedir"; then
2279- echo "$0: Missing argument to --basedir." 1>&2
2280- exit 1
2281+ if test $# -lt 2; then
2282+ usage_error "option '--basedir' requires an argument"
2283+ else
2284+ basedir=$2
2285 fi
2286 shift
2287 ;;
2288 --destdir)
2289- destdir=$2
2290- if test -z "$destdir"; then
2291- echo "$0: Missing argument to --destdir." 1>&2
2292- exit 1
2293+ if test $# -lt 2; then
2294+ usage_error "option '--destdir' requires an argument"
2295+ else
2296+ destdir=$2
2297 fi
2298 shift
2299 ;;
2300- -h|--h*)
2301+ -h|--help)
2302 cat <<\EOF
2303 Usage: py-compile [--help] [--version] [--basedir DIR] [--destdir DIR] FILES..."
2304
2305@@ -69,20 +77,27 @@
2306 EOF
2307 exit $?
2308 ;;
2309- -v|--v*)
2310- echo "py-compile $scriptversion"
2311+ -v|--version)
2312+ echo "$me $scriptversion"
2313 exit $?
2314 ;;
2315+ --)
2316+ shift
2317+ break
2318+ ;;
2319+ -*)
2320+ usage_error "unrecognized option '$1'"
2321+ ;;
2322 *)
2323- files="$files $1"
2324+ break
2325 ;;
2326 esac
2327 shift
2328 done
2329
2330+files=$*
2331 if test -z "$files"; then
2332- echo "$0: No files given. Try \`$0 --help' for more information." 1>&2
2333- exit 1
2334+ usage_error "no files given"
2335 fi
2336
2337 # if basedir was given, then it should be prepended to filenames before
2338
2339=== modified file 'testing/Makefile.in'
2340--- testing/Makefile.in 2012-02-07 12:20:48 +0000
2341+++ testing/Makefile.in 2012-03-12 13:25:20 +0000
2342@@ -1,9 +1,9 @@
2343-# Makefile.in generated by automake 1.11.1 from Makefile.am.
2344+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2345 # @configure_input@
2346
2347 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
2348-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
2349-# Inc.
2350+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
2351+# Foundation, Inc.
2352 # This Makefile.in is free software; the Free Software Foundation
2353 # gives unlimited permission to copy and/or distribute it,
2354 # with or without modifications, as long as this notice is preserved.
2355@@ -271,10 +271,15 @@
2356
2357 installcheck: installcheck-am
2358 install-strip:
2359- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
2360- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
2361- `test -z '$(STRIP)' || \
2362- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
2363+ if test -z '$(STRIP)'; then \
2364+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
2365+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
2366+ install; \
2367+ else \
2368+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
2369+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
2370+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
2371+ fi
2372 mostlyclean-generic:
2373
2374 clean-generic:
2375
2376=== modified file 'testing/__init__.py'
2377--- testing/__init__.py 2012-02-07 12:20:48 +0000
2378+++ testing/__init__.py 2012-03-12 13:25:20 +0000
2379@@ -5,9 +5,12 @@
2380
2381 __all__ = [
2382 'Dummy',
2383+ 'FakeMethod',
2384 'GeditTestCase',
2385 'SignalTester',
2386 'make_gedit',
2387+ 'MockMethod'
2388+ 'MockProperty',
2389 'literal',
2390 'proof',
2391 ]
2392@@ -71,6 +74,75 @@
2393 return text_file
2394
2395
2396+class MockMethod:
2397+
2398+ @classmethod
2399+ def bind(klass, test_instance, obj, method_name,
2400+ return_value=None, raise_error=None, raise_on=1):
2401+ original_method = getattr(obj, method_name)
2402+ test_instance.addCleanup(setattr, obj, method_name, original_method)
2403+ setattr(obj, method_name, klass(return_value, raise_error, raise_on))
2404+
2405+ def __init__(self, return_value=None, raise_error=None, raise_on=1):
2406+ self.called = False
2407+ self.call_count = 0
2408+ self.args = None
2409+ self.kwargs = None
2410+ self.return_value = return_value
2411+ self.raise_error = raise_error
2412+ self.raise_on = raise_on
2413+
2414+ def __call__(self, *args, **kwargs):
2415+ self.called = True
2416+ self.call_count += 1
2417+ self.args = args
2418+ self.kwargs = kwargs
2419+ if self.raise_error is not None and self.call_count == self.raise_on:
2420+ raise self.raise_error
2421+ return self.return_value
2422+
2423+
2424+class FakeMethod(MockMethod):
2425+
2426+ @classmethod
2427+ def bind(klass, test_instance, obj, method_name, function):
2428+ original_method = getattr(obj, method_name)
2429+ test_instance.addCleanup(setattr, obj, method_name, original_method)
2430+ setattr(obj, method_name, klass(function))
2431+
2432+ def __init__(self, function=None):
2433+ super(FakeMethod, self).__init__()
2434+ if function is None:
2435+ function = self.no_def
2436+ self.function = function
2437+
2438+ def __call__(self, *args, **kwargs):
2439+ super(FakeMethod, self).__call__(*args, **kwargs)
2440+ self.function()
2441+
2442+ def no_def(self):
2443+ return None
2444+
2445+
2446+class MockProperty(MockMethod):
2447+
2448+ @classmethod
2449+ def bind(klass, test_instance, obj, method_name, return_value=None):
2450+ original_method = getattr(obj, method_name)
2451+ test_instance.addCleanup(setattr, obj, method_name, original_method)
2452+ mock = klass(return_value)
2453+ setattr(obj, method_name, property(mock.get_value, mock.set_value))
2454+ return mock
2455+
2456+ def get_value(self, other):
2457+ self.called = True
2458+ return self.return_value
2459+
2460+ def set_value(self, other, value):
2461+ self.called = True
2462+ self.return_value = value
2463+
2464+
2465 class Dummy(object):
2466 """A class for passing dummy data between the test and the testee."""
2467
2468
2469=== modified file 'testing/testrunner.py'
2470--- testing/testrunner.py 2012-02-07 12:20:48 +0000
2471+++ testing/testrunner.py 2012-03-12 13:25:20 +0000
2472@@ -132,7 +132,7 @@
2473 """
2474 Env.dir_re = re.compile(params.get('dir_re', '(sourcecode)'))
2475 if 'paths' in params:
2476- [sys.path.append(os.path.abspath(path)) for path in params['paths']]
2477+ [sys.path.insert(0, os.path.abspath(path)) for path in params['paths']]
2478 if 'verbosity' in params:
2479 Env.verbosity = params['verbosity']
2480

Subscribers

People subscribed via source and target branches

to all changes: