diff -Nru anjuta-3.8.4/AUTHORS anjuta-3.10.2/AUTHORS
--- anjuta-3.8.4/AUTHORS 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/AUTHORS 2013-07-08 21:06:37.000000000 +0000
@@ -1,16 +1,17 @@
-Founder and Lead Developer:
+Founder and former lead Developer:
-------------------------------------------------------------------------------
Naba kumar (Manipur, India)
-Maintainer and Lead Developers:
+Maintainers and Lead Developers:
-------------------------------------------------------------------------------
Johannes Schmid (Germany)
Sebastien Granjoux (France)
+ James Liggett (U.S.)
Developers:
-------------------------------------------------------------------------------
- Massimo Cora'
- James Liggett
+ Massimo Cora' (Italy)
+ Carl-Anton Ingmarsson (Sweden)
Past Developers:
-------------------------------------------------------------------------------
@@ -54,7 +55,6 @@
Armin Burgmeier
Benke Lázló
Bolesław Kulbabiński
- Carl-Anton Ingmarsson
Chris Woodruff (US)
Cygwin Ports maintainer
Dan Elphick (United Kingdom)
diff -Nru anjuta-3.8.4/INSTALL anjuta-3.10.2/INSTALL
--- anjuta-3.8.4/INSTALL 2013-04-30 21:53:40.000000000 +0000
+++ anjuta-3.10.2/INSTALL 2013-11-14 21:21:09.000000000 +0000
@@ -1,7 +1,7 @@
Installation Instructions
*************************
-Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
Inc.
Copying and distribution of this file, with or without modification,
@@ -309,9 +309,10 @@
overridden in the site shell script).
Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug. Until the bug is fixed you can use this workaround:
+an Autoconf limitation. Until the limitation is lifted, you can use
+this workaround:
- CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+ CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
`configure' Invocation
======================
@@ -367,4 +368,3 @@
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.
-
diff -Nru anjuta-3.8.4/MAINTAINERS anjuta-3.10.2/MAINTAINERS
--- anjuta-3.8.4/MAINTAINERS 2012-09-26 20:53:46.000000000 +0000
+++ anjuta-3.10.2/MAINTAINERS 2013-07-08 21:06:37.000000000 +0000
@@ -9,3 +9,7 @@
Sebastien Granjoux
E-Mail: seb.sfo@free.fr
Userid: seb
+
+James Liggett
+E-Mail: jrliggett@cox.net
+Userid: jrliggett
diff -Nru anjuta-3.8.4/Makefile.am anjuta-3.10.2/Makefile.am
--- anjuta-3.8.4/Makefile.am 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/Makefile.am 2013-11-11 17:19:39.000000000 +0000
@@ -8,8 +8,7 @@
pixmaps scripts data \
doc libanjuta plugins src manuals mime launcher po
-anjutadocdir = $(docdir)
-anjutadoc_DATA = \
+dist_doc_DATA = \
MAINTAINERS\
README\
COPYING\
@@ -35,8 +34,7 @@
setup-gettext \
intltool-extract.in\
intltool-merge.in\
- intltool-update.in\
- $(anjutadoc_DATA)
+ intltool-update.in
gnomerelease:
scp *.tar.bz2 master.gnome.org:
diff -Nru anjuta-3.8.4/Makefile.in anjuta-3.10.2/Makefile.in
--- anjuta-3.8.4/Makefile.in 2013-06-03 21:24:33.000000000 +0000
+++ anjuta-3.10.2/Makefile.in 2013-11-14 21:21:09.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
@SET_MAKE@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
esac; \
- test $$am__dry = yes; \
- }
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -52,12 +79,13 @@
build_triplet = @build@
host_triplet = @host@
subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/anjuta.desktop.in.in \
- $(srcdir)/config.h.in $(top_srcdir)/configure ABOUT-NLS \
- AUTHORS COPYING ChangeLog INSTALL NEWS THANKS TODO compile \
- config.guess config.rpath config.sub depcomp install-sh \
- ltmain.sh missing ylwrap
+DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
+ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/configure $(am__configure_deps) \
+ $(srcdir)/config.h.in $(srcdir)/anjuta.desktop.in.in ABOUT-NLS \
+ $(dist_doc_DATA) COPYING THANKS TODO compile config.guess \
+ config.rpath config.sub depcomp install-sh missing ylwrap \
+ ltmain.sh
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
@@ -77,21 +105,28 @@
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = anjuta.desktop.in
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
AM_V_GEN = $(am__v_GEN_@AM_V@)
am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
AM_V_at = $(am__v_at_@AM_V@)
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- install-dvi-recursive install-exec-recursive \
- install-html-recursive install-info-recursive \
- install-pdf-recursive install-ps-recursive install-recursive \
- installcheck-recursive installdirs-recursive pdf-recursive \
- ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+ ctags-recursive dvi-recursive html-recursive info-recursive \
+ install-data-recursive install-dvi-recursive \
+ install-exec-recursive install-html-recursive \
+ install-info-recursive install-pdf-recursive \
+ install-ps-recursive install-recursive installcheck-recursive \
+ installdirs-recursive pdf-recursive ps-recursive \
+ tags-recursive uninstall-recursive
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -124,16 +159,38 @@
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
-am__installdirs = "$(DESTDIR)$(anjuta_datadir)" \
- "$(DESTDIR)$(anjutadocdir)" "$(DESTDIR)$(gnomemenudir)"
-DATA = $(anjuta_data_DATA) $(anjutadoc_DATA) $(gnomemenu_DATA)
+am__installdirs = "$(DESTDIR)$(anjuta_datadir)" "$(DESTDIR)$(docdir)" \
+ "$(DESTDIR)$(gnomemenudir)"
+DATA = $(anjuta_data_DATA) $(dist_doc_DATA) $(gnomemenu_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
- distdir dist dist-all distcheck
+am__recursive_targets = \
+ $(RECURSIVE_TARGETS) \
+ $(RECURSIVE_CLEAN_TARGETS) \
+ $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+ cscope distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+ $(LISP)config.h.in
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
@@ -144,6 +201,7 @@
&& rm -rf "$(distdir)" \
|| { sleep 5 && rm -rf "$(distdir)"; }; \
else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
am__relativize = \
dir0=`pwd`; \
sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -171,6 +229,7 @@
reldir="$$dir2"
GZIP_ENV = --best
DIST_ARCHIVES = $(distdir).tar.xz
+DIST_TARGETS = dist-xz
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -322,6 +381,8 @@
PLUGIN_DEVHELP_LIBS = @PLUGIN_DEVHELP_LIBS@
PLUGIN_GLADE_CFLAGS = @PLUGIN_GLADE_CFLAGS@
PLUGIN_GLADE_LIBS = @PLUGIN_GLADE_LIBS@
+PLUGIN_TERMINAL_CFLAGS = @PLUGIN_TERMINAL_CFLAGS@
+PLUGIN_TERMINAL_LIBS = @PLUGIN_TERMINAL_LIBS@
POSUB = @POSUB@
PREF_SUFFIX = @PREF_SUFFIX@
PYTHON = @PYTHON@
@@ -336,8 +397,11 @@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+SHM_LIBS = @SHM_LIBS@
SOURCEVIEW_CFLAGS = @SOURCEVIEW_CFLAGS@
SOURCEVIEW_LIBS = @SOURCEVIEW_LIBS@
+SQLITE_CFLAGS = @SQLITE_CFLAGS@
+SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
SVNCONFIG = @SVNCONFIG@
SVN_CFLAGS = @SVN_CFLAGS@
@@ -349,8 +413,6 @@
VALA_CFLAGS = @VALA_CFLAGS@
VALA_LIBS = @VALA_LIBS@
VERSION = @VERSION@
-VTE_CFLAGS = @VTE_CFLAGS@
-VTE_LIBS = @VTE_LIBS@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
@@ -431,8 +493,7 @@
pixmaps scripts data \
doc libanjuta plugins src manuals mime launcher po
-anjutadocdir = $(docdir)
-anjutadoc_DATA = \
+dist_doc_DATA = \
MAINTAINERS\
README\
COPYING\
@@ -454,8 +515,7 @@
setup-gettext \
intltool-extract.in\
intltool-merge.in\
- intltool-update.in\
- $(anjutadoc_DATA)
+ intltool-update.in
gnomemenudir = $(datadir)/applications
gnomemenu_premerge_file = anjuta.desktop.in
@@ -555,27 +615,27 @@
@list='$(anjuta_data_DATA)'; test -n "$(anjuta_datadir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(anjuta_datadir)'; $(am__uninstall_files_from_dir)
-install-anjutadocDATA: $(anjutadoc_DATA)
+install-dist_docDATA: $(dist_doc_DATA)
@$(NORMAL_INSTALL)
- @list='$(anjutadoc_DATA)'; test -n "$(anjutadocdir)" || list=; \
+ @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(anjutadocdir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(anjutadocdir)" || exit 1; \
+ echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \
fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
done | $(am__base_list) | \
while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(anjutadocdir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(anjutadocdir)" || exit $$?; \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
done
-uninstall-anjutadocDATA:
+uninstall-dist_docDATA:
@$(NORMAL_UNINSTALL)
- @list='$(anjutadoc_DATA)'; test -n "$(anjutadocdir)" || list=; \
+ @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- dir='$(DESTDIR)$(anjutadocdir)'; $(am__uninstall_files_from_dir)
+ dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
install-gnomemenuDATA: $(gnomemenu_DATA)
@$(NORMAL_INSTALL)
@list='$(gnomemenu_DATA)'; test -n "$(gnomemenudir)" || list=; \
@@ -599,22 +659,25 @@
dir='$(DESTDIR)$(gnomemenudir)'; $(am__uninstall_files_from_dir)
# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-# (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+# (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+ @fail=; \
+ if $(am__make_keepgoing); then \
+ failcom='fail=yes'; \
+ else \
+ failcom='exit 1'; \
+ fi; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ for subdir in $$list; do \
echo "Making $$target in $$subdir"; \
if test "$$subdir" = "."; then \
dot_seen=yes; \
@@ -629,57 +692,12 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -695,12 +713,7 @@
set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@ -712,15 +725,11 @@
$$unique; \
fi; \
fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@ -729,9 +738,31 @@
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+ test ! -s cscope.files \
+ || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+ -rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
distdir: $(DISTFILES)
$(am__remove_distdir)
@@ -799,39 +830,35 @@
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-lzip: distdir
tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
- $(am__remove_distdir)
-
-dist-lzma: distdir
- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-xz: distdir
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-shar: distdir
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-zip: distdir
-rm -f $(distdir).zip
zip -rq $(distdir).zip $(distdir)
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
-dist dist-all: distdir
- tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
- $(am__remove_distdir)
+dist dist-all:
+ $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+ $(am__post_remove_distdir)
# This target untars the dist file and tries a VPATH configuration. Then
# it guarantees that the distribution is self-contained by making another
@@ -842,8 +869,6 @@
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
- lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.lz*) \
lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
*.tar.xz*) \
@@ -855,9 +880,9 @@
*.zip*) \
unzip $(distdir).zip ;;\
esac
- chmod -R a-w $(distdir); chmod u+w $(distdir)
- mkdir $(distdir)/_build
- mkdir $(distdir)/_inst
+ chmod -R a-w $(distdir)
+ chmod u+w $(distdir)
+ mkdir $(distdir)/_build $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
@@ -889,7 +914,7 @@
&& $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
&& cd "$$am__cwd" \
|| exit 1
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
@@ -924,7 +949,7 @@
all-am: Makefile $(DATA) config.h
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(anjuta_datadir)" "$(DESTDIR)$(anjutadocdir)" "$(DESTDIR)$(gnomemenudir)"; do \
+ for dir in "$(DESTDIR)$(anjuta_datadir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(gnomemenudir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
@@ -981,7 +1006,7 @@
info-am:
-install-data-am: install-anjuta_dataDATA install-anjutadocDATA \
+install-data-am: install-anjuta_dataDATA install-dist_docDATA \
install-gnomemenuDATA
install-dvi: install-dvi-recursive
@@ -1028,21 +1053,20 @@
ps-am:
-uninstall-am: uninstall-anjuta_dataDATA uninstall-anjutadocDATA \
+uninstall-am: uninstall-anjuta_dataDATA uninstall-dist_docDATA \
uninstall-gnomemenuDATA
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
- ctags-recursive install-am install-strip tags-recursive
+.MAKE: $(am__recursive_targets) all install-am install-strip
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am am--refresh check check-am clean clean-generic \
- clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
- dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
- dist-zip distcheck distclean distclean-generic distclean-hdr \
- distclean-libtool distclean-tags distcleancheck distdir \
- distuninstallcheck dvi dvi-am html html-am info info-am \
- install install-am install-anjuta_dataDATA \
- install-anjutadocDATA install-data install-data-am install-dvi \
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+ am--refresh check check-am clean clean-cscope clean-generic \
+ clean-libtool cscope cscopelist-am ctags ctags-am dist \
+ dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
+ dist-xz dist-zip distcheck distclean distclean-generic \
+ distclean-hdr distclean-libtool distclean-tags distcleancheck \
+ distdir distuninstallcheck dvi dvi-am html html-am info \
+ info-am install install-am install-anjuta_dataDATA \
+ install-data install-data-am install-dist_docDATA install-dvi \
install-dvi-am install-exec install-exec-am \
install-gnomemenuDATA install-html install-html-am \
install-info install-info-am install-man install-pdf \
@@ -1050,9 +1074,8 @@
installcheck installcheck-am installdirs installdirs-am \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am \
- uninstall-anjuta_dataDATA uninstall-anjutadocDATA \
- uninstall-gnomemenuDATA
+ tags tags-am uninstall uninstall-am uninstall-anjuta_dataDATA \
+ uninstall-dist_docDATA uninstall-gnomemenuDATA
@INTLTOOL_DESKTOP_RULE@
diff -Nru anjuta-3.8.4/NEWS anjuta-3.10.2/NEWS
--- anjuta-3.8.4/NEWS 2013-06-03 21:21:42.000000000 +0000
+++ anjuta-3.10.2/NEWS 2013-11-11 17:28:31.000000000 +0000
@@ -1,92 +1,1034 @@
-Anjuta 3.8.4 (June 3, 2013) -- James Liggett
+Anjuta 3.10.2 (November 11, 2013) -- Johannes Schmid
-Carl-Anton Ingmarsson (1):
+This is a bug-fix release for the stable 3.10 series.
+
+Changes:
+Carles Ferrando (1):
+ [l10n] Updated Catalan (Valencian) translation
+
+James Liggett (1):
+ Post-release version bump
+
+Pavol Klačanský (1):
+ Updated slovak translation
+
+Sébastien Granjoux (2):
+ bgo #711722 - C-Makefile project template broken
+ Avoid warning when compiling with a C++ compiler
+
+kriti (1):
+ document-manager: Fix bgo#711512 - Added an else c
+
+Мирослав Николић (1):
+ Updated Serbian translation
+
+
+Anjuta 3.10.0 (September 23, 2013) -- James Liggett
+
+This is a new stable version of Anjuta and all users should update to this
+version as all 3.8.x versions become unsupported at this point.
+
+Summary of the major changes between 3.8.x and 3.10:
+
+- Various bug fixes across many different plugins, including git, debug-manager,
+ document-manager, symbol-db glade, project-wizard and libanjuta. See the
+ shortlog for complete details.
+
+- Several updates to the git plugin, including an integrated diff viewer in the
+ status pane. The command bar and dock are also packed together and most panes
+ have right-click context menus.
+
+- The beginnings of a Windows port. This work is in its very early stages and
+ is not really usable yet.
+
+- The document manager has a Close Others option accessible by right clicking
+ on a document tab that will close all but the selected document.
+
+Bugs fixed:
+
+symbol-db: bgo #704985 - link with librt on Linux
+libanjuta: bgo #696984 - Update documentation comments
+project-wizard: bgo #696990 - Require package libanjuta-3.0 in anjuta-plugin template
+bgo #696023 - Use dist_ prefix in Makefiles
+devhelp: bgo #696023 - Use dist_ prefix instead of EXTRA_DIST
+glade: bgo #696023 - Use dist_ prefix instead of EXTRA_DIST
+language-support-vala: bgo #696023 - Use dist_ prefix instead of EXTRA_DIST
+python-loader: bgo #696023 - Use dist_ prefix instead of EXTRA_DIST
+subversion: bgo #696023 - Use dist_ prefix instead of EXTRA_DIST
+libanjuta: bgo #697030 - Add close button widget
+document-manager: bgo #697030 - Replace close button in tabs with AnjutaCloseButton
+project-wizard: bgo #688611 - Make templates Windows portable
+libanjuta: bgo #699323 - Use GSettings to get user terminal
+file-loader: bgo #699329 - Convert mime types to content types before comparing
+libanjuta: bgo #699327 - Use G_GSIZE_FORMAT for gsize
+libanjuta: bgo #699330 - Implement anjuta_util_get_real_path in Windows
+libanjuta: bgo #699326 - Replace fork and execlp with g_spawn_async in anjuta-utils.c
+libanjuta: bgo #699326 - Replace fork and execlp with g_spawn_async in resources.c
+glade: bgo #698705 - Add application/x-gtk-builder to supported mime types
+terminal: bgo #699316 - Add option to disable terminal plugin
+file-loader: bgo #700615 - Remove markup from title of Open With dialog
+sourceview: bgo #703637 - Set monospace font as default font
+git: Fix bgo 699544 - Git pane prevents maximize of main window in small screens
+sourceview: bgo#680770 - Don't scroll undo position to center if line already visible
+sourceview: Fix bgo#701443 - When trying to change font of GtkSourceView Anjuta crashes
+glade: bgo #701207 - Glade signal drop no longer works
+glade: bgo #700383 - Anjuta should automatically associate .ui and source files
+bgo #702576 - Use a marker comment to get macro and class name
+project-manager: bgo #501230 - The 'Can not add source files' dialog is too long and his buttons and bottom side are out of the screen
+project-wizard: bgo#696672 - Creating new project using wizard fails due to license files missing
+project wizard: bgo #688611 - Add Windows configuration
+project-wizard: bgo #698011 - Cannot run anything
+bgo #696991 - Anjuta widgets do not load up properly in standalone glade
+bgo #698158: anjuta-3.8.1 fails to build with vala-0.20
+project-wizard: bgo #700318 - Can't build a project whose name starts by a digit
+bgo #694644 - Position of Locals and Stack panes not saved
+bgo #689384 - should install a highcontrast app icon
+bgo #701419 - sqlite not in depencies
+bgo #706630 - Incorrect MimeType in .desktop file
+project-manager: bgo #707562 - Plural forms for "%d elements"
+project-wizard: bgo #707943 - Auto completion code when you click in the widget tree is broken
+document-manager: bgo#698036 - Close Other Tabs enhancement
+
+Thanks to everybody who has helped this cycle and all translators.
+
+Akom Chotiphantawanon (5):
+ Updated Thai translation.
+ Updated Thai translation
+ Updated Thai translation.
+ Updated Thai translation.
+ Updated Thai translation.
+
+Alexandre Franke (2):
+ Update French translation
+ Update French translation
+
+Alexandre Rostovtsev (1):
+ symbol-db: bgo #704985 - link with librt on Linux
+
+Andika Triwidada (1):
+ Updated Indonesian translation
+
+Arnel A. Borja (38):
+ libanjuta: bgo #696984 - Include Gdl-3 when introspecting Anjuta-3.0
+ libanjuta: bgo #696984 - Documentation comment of section anjuta-debug should be inside after inclusion guard
+ libanjuta: bgo #696984 - Remove extra empty lines in documentation comments
+ libanjuta: bgo #696984 - Add missing commas in documentation comments
+ libanjuta: bgo #696984 - Fix missing double asterisk in documentation comments
+ libanjuta: bgo #696984 - Fix function name typos in documentation comments
+ libanjuta: bgo #696984 - Fix function argument name typos in documentation comments
+ libanjuta: bgo #696984 - Fix a signal name typo in documentation comments
+ libanjuta: bgo #696984 - Fix allow-none annotation typo in a documentation comments
+ libanjuta: bgo #696984 - Add some missing documentation comment
+ libanjuta: bgo #696984 - Update some annotations in documentation comments
+ libanjuta: bgo #696984 - Add missing % in constants NULL, TRUE and FALSE in documentation comments
+ libanjuta: bgo #696984 - Add anjuta-tabber section stub
+ libanjuta: bgo #696984 - Remove unused file anjuta-token-style.h
+ libanjuta: bgo #696984 - Update libanjuta.h header
+ project-wizard: bgo #696990 - Require package libanjuta-3.0 in anjuta-plugin template
+ bgo #696023 - Use dist_ prefix in Makefiles
+ devhelp: bgo #696023 - Use dist_ prefix instead of EXTRA_DIST
+ glade: bgo #696023 - Use dist_ prefix instead of EXTRA_DIST
+ language-support-vala: bgo #696023 - Use dist_ prefix instead of EXTRA_DIST
+ python-loader: bgo #696023 - Use dist_ prefix instead of EXTRA_DIST
+ subversion: bgo #696023 - Use dist_ prefix instead of EXTRA_DIST
+ libanjuta: bgo #697030 - Add close button widget
+ document-manager: bgo #697030 - Replace close button in tabs with AnjutaCloseButton
+ project-wizard: bgo #688611 - Make templates Windows portable
+ Use dist_doc_DATA for documentation text files
+ project-wizard: Use dist_doc_DATA for documentation text files
+ libanjuta: bgo #699323 - Use GSettings to get user terminal
+ file-loader: bgo #699329 - Convert mime types to content types before comparing
+ libanjuta: bgo #699327 - Use G_GSIZE_FORMAT for gsize
+ libanjuta: bgo #699330 - Implement anjuta_util_get_real_path in Windows
+ libanjuta: bgo #699326 - Replace fork and execlp with g_spawn_async in anjuta-utils.c
+ libanjuta: bgo #699326 - Replace fork and execlp with g_spawn_async in resources.c
+ glade: bgo #698705 - Add application/x-gtk-builder to supported mime types
+ terminal: bgo #699316 - Add option to disable terminal plugin
+ file-loader: bgo #700615 - Remove markup from title of Open With dialog
+ manuals: Update entries in Anjuta Reference Manual
+ sourceview: bgo #703637 - Set monospace font as default font
+
+Ask H. Larsen (1):
+ Updated Danish translation
+
+Aurimas Černius (4):
+ Updated Lithuanian translation
+ Updated Lithuanian translation
+ Updated Lithuanian translation
+ Updated Lithuanian translation
+
+Balázs Úr (2):
+ Updated Hungarian translation
+ Updated Hungarian translation
+
+Carl-Anton Ingmarsson (61):
+ dir-project: check for NULL groups in dir_project_is_loaded()
+ document-manager: pack notebook with width 1
+ document-manager: remove margin around the document combo box
+ document-manager: don't allocate AnjutaDocmanPriv ourselves
+ document-manager: fix compile warning
+ anjuta-tabber: implement gtk_container_get_path_for_child()
+ anjuta-tabber: rework size allocation
+ anjuta-tabber: remove call to gtk_widget_style_attach()
+ anjuta-tabber: don't iterate list to check if node is first/last
+ message-view: Use AnjutaCloseButton in tabs
+ anjuta-tabber: fix calculation of region flags
+ anjuta-tabber: don't iterate list to check if node is first/last
+ anjuta-tabber: take focus-padding into account when rendering focus
+ anjuta-tabber: Always use the padding of an active tab in y-direction size allocation
+ document-manager: don't free AnjutaDocmanPriv ourselves
+ anjuta-tabber: remove the total padding from total width
+ anjuta-tabber: use tab_curvature for left/right space of first/last tab
+ message-view: use a single box for the tab widget
+ parser-cxx: fix compilation warning
+ anjuta_language_provider: add proposals() function
+ sourceview: remove filtering of single proposals matching pre_word
+ parser-cxx: use anjuta_language_provider_proposals()
+ language-support-python: use anjuta_language_provider_proposals()
+ language-support-js: use anjuta_language_provider_proposals()
+ language-support-js: replace one more use of ianjuta_editor_assist_proposals()
+ language-support-python: replace one more use of ianjuta_editor_assist_proposals()
symbol-db-query: change order of property installation in SymbolDBQuery
+ dir-project: fix compile error
+ subversion: convert builder file to gtk+-3.0
+ starter: guard for NULL document manager or project manager
+ anjuta-column-text-view: don't derive from deprecated GtkVBox
+ anjuta-file-list: fix deprecation warnings
+ anjuta-preferences-dialog: don't use deprecated GtkVBox
+ anjuta-status: don't derive from deprecated GtkHBox
+ anjuta-tree-combo: remove usage of gtk_widget_[push|pop]_composite_child()
+ anjuta-ui: don't use deprecated gtk_widget_render_icon()
+ class-gen: don't derive from deprecated GtkHBox
+ run-program: let IAnjutaEnvironment override command lines
+ anjuta-entry: remove usage of deprecated GtkStyle
+ python: only pass python source files to anjuta-python-autocomplete
+ cvs-plugin: remove unused variables
+ am-project: don't use deprecated g_thread_create()
+ devhelp: remove unused variable
+ debug-manager: fix compile warnings
+ debug-manager: show the disassemble and memory widgets
+ debug-manager: don't use deprecated functions in DmaDataView
+ debug-manager: make DmaDataView's buffer a property
+ debug-manager: don't use deprecated functions in DmaSparseView
+ build-basic-autotools: guard against NULL project_uri when build is configured
+ Add libgd submodule
+ sourceview: use GdRevealer for sliding in the message area
+ message-view: don't manually free private structure
+ snippets-manager: fix compile warnings
+ sourceview: fix compile warnings
+ sourceview: use GtkRevealer for sliding in the message area
+ indentation-python-style: remove unused editor_settings
+ language-support-python: remove unused editor_settings
+ language-support-cpp-java: remove unused editor_settings
+ parser-cxx: remove unused editor_settings
+ Update my email
+ symbol-db: Use a GtkSearchEntry for the search entry in the search view.
-Christian Kirbach (1):
+Chao-Hsiung Liao (3):
+ Updated Traditional Chinese translation(Hong Kong and Taiwan)
+ Updated Traditional Chinese translation(Hong Kong and Taiwan)
+ Updated Traditional Chinese translation(Hong Kong and Taiwan)
+
+Cheng-Chia Tseng (1):
+ Updated Traditional Chinese translation(Hong Kong and Taiwan)
+
+Christian Kirbach (5):
+ Updated German help translation
+ Updated German help translation
+ Updated German help translation
Updated German help translation
+ Updated German translation
-James Liggett (2):
+Claudio Arseni (3):
+ [l10n] Updated Italian translation.
+ [l10n] Updated Italian translation.
+ [l10n] Added Italian translation.
+
+Daniel Mustieles (12):
+ Updated Spanish translation
+ Updated Spanish translation
+ Updated Spanish translation
+ Updated Spanish translation
+ Updated Spanish translation
+ Updated Spanish translation
+ Updated Spanish translation
+ Updated Spanish translation
+ Updated Spanish translation
+ Updated Spanish translation
+ Updated Spanish translation
+ Updated Spanish translation
+
+Dimitris Spingos (2):
+ Updated Greek translation
+ Updated Greek translation
+
+Dirgita (1):
+ Updated Indonesian translation
+
+Dominique Leuenberger (1):
+ build: add support for libvala-0.22
+
+Enrico Nicoletto (2):
+ Updated Brazilian Portuguese translation
+ Updated Brazilian Portuguese translation
+
+Fran Diéguez (9):
+ Updated Galician translations
+ Updated Galician translations
+ Updated Galician translations
+ Updated Galician translations
+ Updated Galician translations
+ Updated Galician translations
+ Updated Galician translations
+ Updated Galician translations
+ Updated Galician translations
+
+Gabor Kelemen (4):
+ Fix errors in the Hungarian translation
+ Updated Hungarian translation
+ Update and relicence Hungarian help translation
+ Updated Hungarian translation
+
+James Liggett (65):
+ Post-release version bump
+ git: Use actions for recurring items in the glade file
+ git: Pack the dock and the command bar together
+ git: Fix more names in the glade file
+ git: Use a toggle button to show and hide the command bar
+ git: More glade file name fixes
+ git: Add a stash button to the Status command bar
+ git: Implement branch switching by double-click
+ Update doap file
+ git: Fix widget names
+ git: Implement adding files by dragging them onto the status view
+ git: Widget name fixes
+ git: Log path entry should be editable
+ git: Widget name fixes
+ libanjuta/manuals: Update documentation sections
+ Revert "git: Log path entry should be editable"
+ Update files for 3.9.1 release
+ Post release version bump
+ git: Widget name fixes
+ git: Add context menus to the Status pane
git: Fix signal names in diff code
git: More signal name fixes in diff code
+ Updated files for release
+ Post-release version bump
+ git: Add a context menu to the log pane
+ git: Add a context menu to the Branches pane
+ git: Add a popup menu to the Remotes pane
+ git: Check box action fixes in Push and Pull panes
+ git: Add a popup menu to the Stash pane
+ git: Fix a warning
+ Revert "Allow to build without libgd"
+ Revert "sourceview: use GdRevealer for sliding in the message area"
+ Revert "Add libgd submodule"
+ Update MAINTAINERS
+ Update files for release
+ Post-release version bump
+ git: Fix the Do Not Commit option in the Revert pane
+ libanjuta/anjuta-entry: Don't use CSS for help text styles
+ Updated POTFILES.in
+ Updated files for release
+ Post-release version bump
+ git: Fix bgo 699544 - Git pane prevents maximize of main window in small screens
+ Update files for release
+ Post-release version bump
+ libanjuta/anjuta-command-bar: Resect GTK button image settings
+ libanjuta/anjuta-command-bar: Don't use a shadow for the scrolled window
+ libanjuta/anjuta-file-list: Fix the help text color
+ git: Widget name fixes
+ libanjuta: Add AnjutaCellRendererDiff
+ libanjuta: Update the glade catalog
+ git: Show diffs of uncommitted changes in the status view
+ git: Show stash diffs in the stash pane
+ git: Don't show the command bar if the Tasks button isn't active
+ libanjuta/anjuta-cell-renderer-diff: Detect diff headers
+ git: Don't show stash numbers on diff rows
+ Updated files for release
+ Post-release version bump
+ git: Fix removed files status display
+ git: Expand the status view tree when all diff commands are finished
+ Update files for release
+ Post-release version bump
+ git: Run diff commands after the status commands finish
+ libanjuta/git: Render diffs one line at a time
+ Update files for release
+ Post-release version bump
-Johannes Schmid (1):
+Jaume Planas (1):
+ [l10n] Add Catalan translation
+
+Jiro Matsuzawa (1):
+ l10n: Update Japanese translation
+
+Johannes Schmid (6):
+ Updated AUTHORS file
+ sourceview: bgo#680770 - Don't scroll undo position to center if line already visible
sourceview: Fix bgo#701443 - When trying to change font of GtkSourceView Anjuta crashes
+ anjuta: Add application menu
+ libanjuta: Make AnjutaCommandBar easier to use on small screens
+ anjuta: Only show app-menu if supported by environment
+Josep Sànchez (1):
+ [l10n] Update Catalan translation
-Anjuta 3.8.3 (May 20, 2013) -- James Liggett
+Juan Pablo Ugarte (1):
+ mk-project: Prevent a crash
-Arnel A. Borja (2):
- libanjuta: bgo #699327 - Use G_GSIZE_FORMAT for gsize
- glade: bgo #698705 - Add application/x-gtk-builder to supported mime types
+Kalev Lember (1):
+ dir-project: Fix compiler warning
-Carl-Anton Ingmarsson (1):
- dir-project: fix compile error
+Kjartan Maraas (2):
+ Updated Norwegian bokmål translation
+ Updated Norwegian bokmål translation
-Fran Diéguez (1):
- Updated Galician translations
+Marco Diego Aurélio Mesquita (8):
+ glade: bgo #701207 - Glade signal drop no longer works
+ glade: bgo #700383 - Anjuta should automatically associate .ui and source files
+ libanjuta: Improve symbol-db behavior on cut, paste, undo, redo and when multiple files are modified.
+ symbol-db: Update symbol database on editor changes without saving
+ language-support-cpp-jave: Fix memory leak
+ doc: Update documentation after the last improvements in glade support
+ Improve c callback body generation.
+ bgo #702576 - Use a marker comment to get macro and class name
+
+Marek Černocký (7):
+ Updated Czech translation
+ Updated Czech translation
+ Updated Czech translation
+ Updated Czech translation
+ Updated Czech translation
+ Updated Czech translation
+ Updated Czech translation
+
+Matej Urbančič (4):
+ Updated Slovenian translation
+ Updated Slovenian translation
+ Updated Slovenian translation
+ Updated Slovenian translation
+
+Michael Catanzaro (3):
+ Use program icon on about dialog
+ Fix column number on lines with tabs
+ help: fix broken images
+
+Milo Casagrande (2):
+ [l10n] Updated Italian translation.
+ [l10n] Updated Italian translation.
+
+Piotr Drąg (5):
+ Updated POTFILES.in
+ Updated POTFILES.in
+ Updated Polish translation
+ Updated Polish translation
+ Updated Polish translation
+
+Quentin Huot-Marchand (1):
+ project-manager: bgo #501230 - The 'Can not add source files' dialog is too long and his buttons and bottom side are out of the screen
+
+Rafael Ferreira (2):
+ Updated Brazilian Portuguese translation
+ Updated Brazilian Portuguese translation
Richard Hughes (1):
Fixed Indonesian translation
-Sébastien Granjoux (1):
+Rūdolfs Mazurs (2):
+ Updated Latvian translation
+ Updated Latvian translation
+
+Seong-ho Cho (2):
+ Updated Korean translation
+ Updated Korean translation
+
+Sébastien Granjoux (42):
+ project-wizard: bgo#696672 - Creating new project using wizard fails due to license files missing
+ project wizard: bgo #688611 - Add Windows configuration
+ mk-project: Ignore conditional directives in makefile
+ git: Fix setting of a custom author in the commit pane
+ libanjuta: Improve editor modeline support
+ project-wizard: bgo #698011 - Cannot run anything
+ bgo #696991 - Anjuta widgets do not load up properly in standalone glade
bgo #698158: anjuta-3.8.1 fails to build with vala-0.20
+ project-wizard: bgo #700318 - Can't build a project whose name starts by a digit
+ debug-manager: show registers pane
+ bgo #694644 - Position of Locals and Stack panes not saved
+ Fix a crash with some version of Gtk due to my last commit
+ libanjuta: Move scoped and descoped signal on AnjutaProfile object
+ libanjuta: Replace AnjutaPluginDescription by AnjutaPluginHandle in API
+ libanjuta: Move anjuta_profile_manager_load_profile function in anjuta_profile
+ libanjuta: Always keep plugins in the system profile
+ Allow to select different profile on the command line
+ libanjuta: Allow to enable only a set of plugins defined in the profile file
+ Add a sample custom profile keeping only the editor
+ document-manager: Automatically open an empty file if starter plugin is not used
+ libanjuta: Keep dynamic allocation data in AnjutaPluginDescription
+ libanjuta: Allow to change plugin description key from profile
+ Allow to build without libgd
+ Keep using loaded plugin even if they are marked as disabled
+ Register GApplication with a different name if a profile is used
+ document-manager: Make use of symbol-db plugin optional
+ language-support-python: Remove critical warnings
+ language-manager: Support symbols in more programming languages
+ Need at least glib 2.34 for g_spawn_check_exit_status
+ dir-project: Load big project faster
+ dir-project: Decrease project load priority to avoid blocking GUI
+ am-project: data target are not distributed by default in automake
+ project-manager: Add a function in the interface to remove a file from a project
+ bgo #689384 - should install a highcontrast app icon
+ bgo #701419 - sqlite not in depencies
+ document-manager: Fix icon size in document manager tabs
+ bgo #706630 - Incorrect MimeType in .desktop file
+ Remove a critical warning when closing a project
+ glade: Fix a critical warning when opening a project with a .ui file opened
+ document-manager: Close all documents when closing a project
+ project-manager: bgo #707562 - Plural forms for "%d elements"
+ project-wizard: bgo #707943 - Auto completion code when you click in the widget tree is broken
+Techlive Zheng (1):
+ anjuta-tags: fix scope information parsing in the Vala parser
-Anjuta 3.8.2 (May 13, 2013) -- James Liggett
+Varad Gautam (1):
+ document-manager: bgo#698036 - Close Other Tabs enhancement
-Arnel A. Borja (1):
- libanjuta: Use dist_ prefix for glade catalog data (bgo #696023)
+Yuri Myasoedov (2):
+ Updated Russian translation
+ Updated Russian translation
-James Liggett (2):
+victory (1):
+ l10n: Update Japanese translation
+
+Мирослав Николић (2):
+ Updated Serbian translation
+ Updated Serbian translation
+
+
+Anjuta 3.9.92 (September 15, 2013) -- James Liggett
+
+Akom Chotiphantawanon (1):
+ Updated Thai translation.
+
+Alexandre Franke (2):
+ Update French translation
+ Update French translation
+
+Andika Triwidada (1):
+ Updated Indonesian translation
+
+Ask H. Larsen (1):
+ Updated Danish translation
+
+Aurimas Černius (1):
+ Updated Lithuanian translation
+
+Chao-Hsiung Liao (1):
+ Updated Traditional Chinese translation(Hong Kong and Taiwan)
+
+Claudio Arseni (2):
+ [l10n] Updated Italian translation.
+ [l10n] Updated Italian translation.
+
+Daniel Mustieles (2):
+ Updated Spanish translation
+ Updated Spanish translation
+
+Enrico Nicoletto (1):
+ Updated Brazilian Portuguese translation
+
+Fran Diéguez (1):
+ Updated Galician translations
+
+Gabor Kelemen (1):
+ Updated Hungarian translation
+
+James Liggett (3):
Post-release version bump
- Revert "git: Log path entry should be editable"
+ git: Run diff commands after the status commands finish
+ libanjuta/git: Render diffs one line at a time
+
+Marek Černocký (2):
+ Updated Czech translation
+ Updated Czech translation
+
+Matej Urbančič (1):
+ Updated Slovenian translation
+
+Piotr Drąg (1):
+ Updated Polish translation
+
+Rūdolfs Mazurs (2):
+ Updated Latvian translation
+ Updated Latvian translation
+
+Seong-ho Cho (2):
+ Updated Korean translation
+ Updated Korean translation
+
+Sébastien Granjoux (2):
+ project-manager: bgo #707562 - Plural forms for "%d elements"
+ project-wizard: bgo #707943 - Auto completion code when you click in the widget tree is broken
+
+Мирослав Николић (1):
+ Updated Serbian translation
+
+
+Anjuta 3.9.91 (September 2, 2013) -- James Liggett
+
+Aurimas Černius (2):
+ Updated Lithuanian translation
+ Updated Lithuanian translation
+
+Balázs Úr (1):
+ Updated Hungarian translation
+
+Christian Kirbach (1):
+ Updated German help translation
+
+Enrico Nicoletto (1):
+ Updated Brazilian Portuguese translation
+
+Fran Diéguez (2):
+ Updated Galician translations
+ Updated Galician translations
+
+Gabor Kelemen (1):
+ Update and relicence Hungarian help translation
+
+James Liggett (3):
+ Post-release version bump
+ git: Fix removed files status display
+ git: Expand the status view tree when all diff commands are finished
Kjartan Maraas (1):
Updated Norwegian bokmål translation
+Matej Urbančič (2):
+ Updated Slovenian translation
+ Updated Slovenian translation
+
+Piotr Drąg (2):
+ Updated Polish translation
+ Updated Polish translation
-Anjuta 3.8.1 (April 15, 2013) -- James Liggett
+Quentin Huot-Marchand (1):
+ project-manager: bgo #501230 - The 'Can not add source files' dialog is too long and his buttons and bottom side are out of the screen
-Arnel A. Borja (5):
- subversion: bgo #696023 - Use dist_ prefix instead of EXTRA_DIST
- python-loader: bgo #696023 - Use dist_ prefix instead of EXTRA_DIST
- language-support-vala: bgo #696023 - Use dist_ prefix instead of EXTRA_DIST
- glade: bgo #696023 - Use dist_ prefix instead of EXTRA_DIST
+Rafael Ferreira (1):
+ Updated Brazilian Portuguese translation
+
+Sébastien Granjoux (4):
+ bgo #706630 - Incorrect MimeType in .desktop file
+ Remove a critical warning when closing a project
+ glade: Fix a critical warning when opening a project with a .ui file opened
+ document-manager: Close all documents when closing a project
+
+
+Anjuta 3.9.90 (August 19, 2013) -- James Liggett
+
+Akom Chotiphantawanon (1):
+ Updated Thai translation.
+
+Alexandre Rostovtsev (1):
+ symbol-db: bgo #704985 - link with librt on Linux
+
+Carl-Anton Ingmarsson (1):
+ symbol-db: Use a GtkSearchEntry for the search entry in the search view.
+
+Daniel Mustieles (1):
+ Updated Spanish translation
+
+Dominique Leuenberger (1):
+ build: add support for libvala-0.22
+
+Fran Diéguez (1):
+ Updated Galician translations
+
+Gabor Kelemen (1):
+ Updated Hungarian translation
+
+James Liggett (12):
+ Post-release version bump
+ libanjuta/anjuta-command-bar: Resect GTK button image settings
+ libanjuta/anjuta-command-bar: Don't use a shadow for the scrolled window
+ libanjuta/anjuta-file-list: Fix the help text color
+ git: Widget name fixes
+ libanjuta: Add AnjutaCellRendererDiff
+ libanjuta: Update the glade catalog
+ git: Show diffs of uncommitted changes in the status view
+ git: Show stash diffs in the stash pane
+ git: Don't show the command bar if the Tasks button isn't active
+ libanjuta/anjuta-cell-renderer-diff: Detect diff headers
+ git: Don't show stash numbers on diff rows
+
+Marek Černocký (1):
+ Updated Czech translation
+
+Michael Catanzaro (3):
+ Use program icon on about dialog
+ Fix column number on lines with tabs
+ help: fix broken images
+
+Piotr Drąg (1):
+ Updated POTFILES.in
+
+Rafael Ferreira (1):
+ Updated Brazilian Portuguese translation
+
+Sébastien Granjoux (3):
+ bgo #689384 - should install a highcontrast app icon
+ bgo #701419 - sqlite not in depencies
+ document-manager: Fix icon size in document manager tabs
+
+
+Anjuta 3.9.5 (July 29, 2013) -- James Liggett
+
+Chao-Hsiung Liao (1):
+ Updated Traditional Chinese translation(Hong Kong and Taiwan)
+
+Daniel Mustieles (1):
+ Updated Spanish translation
+
+James Liggett (2):
+ Post-release version bump
+ git: Fix bgo 699544 - Git pane prevents maximize of main window in small screens
+
+Johannes Schmid (2):
+ libanjuta: Make AnjutaCommandBar easier to use on small screens
+ anjuta: Only show app-menu if supported by environment
+
+Marek Černocký (1):
+ Updated Czech translation
+
+Anjuta 3.9.4 (July 8, 2013) -- James Liggett
+
+Akom Chotiphantawanon (1):
+ Updated Thai translation
+
+Arnel A. Borja (2):
+ manuals: Update entries in Anjuta Reference Manual
+ sourceview: bgo #703637 - Set monospace font as default font
+
+Aurimas Černius (1):
+ Updated Lithuanian translation
+
+Carl-Anton Ingmarsson (5):
+ indentation-python-style: remove unused editor_settings
+ language-support-python: remove unused editor_settings
+ language-support-cpp-java: remove unused editor_settings
+ parser-cxx: remove unused editor_settings
+ Update my email
+
+Christian Kirbach (1):
+ Updated German help translation
+
+James Liggett (3):
+ Post-release version bump
+ git: Fix the Do Not Commit option in the Revert pane
+ libanjuta/anjuta-entry: Don't use CSS for help text styles
+
+Johannes Schmid (1):
+ anjuta: Add application menu
+
+Marco Diego Aurélio Mesquita (1):
+ bgo #702576 - Use a marker comment to get macro and class name
+
+Sébastien Granjoux (10):
+ Keep using loaded plugin even if they are marked as disabled
+ Register GApplication with a different name if a profile is used
+ document-manager: Make use of symbol-db plugin optional
+ language-support-python: Remove critical warnings
+ language-manager: Support symbols in more programming languages
+ Need at least glib 2.34 for g_spawn_check_exit_status
+ dir-project: Load big project faster
+ dir-project: Decrease project load priority to avoid blocking GUI
+ am-project: data target are not distributed by default in automake
+ project-manager: Add a function in the interface to remove a file from a project
+
+
+Anjuta 3.9.3 (June 17, 2013) -- James Liggett
+
+Akom Chotiphantawanon (1):
+ Updated Thai translation.
+
+Carl-Anton Ingmarsson (5):
+ Add libgd submodule
+ sourceview: use GdRevealer for sliding in the message area
+ message-view: don't manually free private structure
+ snippets-manager: fix compile warnings
+ sourceview: fix compile warnings
+
+Cheng-Chia Tseng (1):
+ Updated Traditional Chinese translation(Hong Kong and Taiwan)
+
+Christian Kirbach (1):
+ Updated German help translation
+
+Daniel Mustieles (4):
+ Updated Spanish translation
+ Updated Spanish translation
+ Updated Spanish translation
+ Updated Spanish translation
+
+Fran Diéguez (4):
+ Updated Galician translations
+ Updated Galician translations
+ Updated Galician translations
+ Updated Galician translations
+
+James Liggett (11):
+ Post-release version bump
+ git: Add a context menu to the log pane
+ git: Add a context menu to the Branches pane
+ git: Add a popup menu to the Remotes pane
+ git: Check box action fixes in Push and Pull panes
+ git: Add a popup menu to the Stash pane
+ git: Fix a warning
+ Revert "Allow to build without libgd"
+ Revert "sourceview: use GdRevealer for sliding in the message area"
+ Revert "Add libgd submodule"
+ Update MAINTAINERS
+
+Jiro Matsuzawa (1):
+ l10n: Update Japanese translation
+
+Johannes Schmid (1):
+ sourceview: Fix bgo#701443 - When trying to change font of GtkSourceView Anjuta crashes
+
+Marco Diego Aurélio Mesquita (6):
+ glade: bgo #701207 - Glade signal drop no longer works
+ glade: bgo #700383 - Anjuta should automatically associate .ui and source files
+ libanjuta: Improve symbol-db behavior on cut, paste, undo, redo and when multiple files are modified.
+ symbol-db: Update symbol database on editor changes without saving
+ language-support-cpp-jave: Fix memory leak
+ doc: Update documentation after the last improvements in glade support
+
+Marek Černocký (2):
+ Updated Czech translation
+ Updated Czech translation
+
+Piotr Drąg (1):
+ Updated POTFILES.in
+
+Sébastien Granjoux (12):
+ Fix a crash with some version of Gtk due to my last commit
+ libanjuta: Move scoped and descoped signal on AnjutaProfile object
+ libanjuta: Replace AnjutaPluginDescription by AnjutaPluginHandle in API
+ libanjuta: Move anjuta_profile_manager_load_profile function in anjuta_profile
+ libanjuta: Always keep plugins in the system profile
+ Allow to select different profile on the command line
+ libanjuta: Allow to enable only a set of plugins defined in the profile file
+ Add a sample custom profile keeping only the editor
+ document-manager: Automatically open an empty file if starter plugin is not used
+ libanjuta: Keep dynamic allocation data in AnjutaPluginDescription
+ libanjuta: Allow to change plugin description key from profile
+ Allow to build without libgd
+
+
+Anjuta 3.9.2 (May 27, 2013) -- James Liggett
+
+Arnel A. Borja (9):
+ libanjuta: bgo #699323 - Use GSettings to get user terminal
+ file-loader: bgo #699329 - Convert mime types to content types before comparing
+ libanjuta: bgo #699327 - Use G_GSIZE_FORMAT for gsize
+ libanjuta: bgo #699330 - Implement anjuta_util_get_real_path in Windows
+ libanjuta: bgo #699326 - Replace fork and execlp with g_spawn_async in anjuta-utils.c
+ libanjuta: bgo #699326 - Replace fork and execlp with g_spawn_async in resources.c
+ glade: bgo #698705 - Add application/x-gtk-builder to supported mime types
+ terminal: bgo #699316 - Add option to disable terminal plugin
+ file-loader: bgo #700615 - Remove markup from title of Open With dialog
+
+Carl-Anton Ingmarsson (21):
+ subversion: convert builder file to gtk+-3.0
+ starter: guard for NULL document manager or project manager
+ anjuta-column-text-view: don't derive from deprecated GtkVBox
+ anjuta-file-list: fix deprecation warnings
+ anjuta-preferences-dialog: don't use deprecated GtkVBox
+ anjuta-status: don't derive from deprecated GtkHBox
+ anjuta-tree-combo: remove usage of gtk_widget_[push|pop]_composite_child()
+ anjuta-ui: don't use deprecated gtk_widget_render_icon()
+ class-gen: don't derive from deprecated GtkHBox
+ run-program: let IAnjutaEnvironment override command lines
+ anjuta-entry: remove usage of deprecated GtkStyle
+ python: only pass python source files to anjuta-python-autocomplete
+ cvs-plugin: remove unused variables
+ am-project: don't use deprecated g_thread_create()
+ devhelp: remove unused variable
+ debug-manager: fix compile warnings
+ debug-manager: show the disassemble and memory widgets
+ debug-manager: don't use deprecated functions in DmaDataView
+ debug-manager: make DmaDataView's buffer a property
+ debug-manager: don't use deprecated functions in DmaSparseView
+ build-basic-autotools: guard against NULL project_uri when build is configured
+
+Daniel Mustieles (2):
+ Updated Spanish translation
+ Updated Spanish translation
+
+Fran Diéguez (1):
+ Updated Galician translations
+
+James Liggett (5):
+ Post release version bump
+ git: Widget name fixes
+ git: Add context menus to the Status pane
+ git: Fix signal names in diff code
+ git: More signal name fixes in diff code
+
+Kalev Lember (1):
+ dir-project: Fix compiler warning
+
+Kjartan Maraas (1):
+ Updated Norwegian bokmål translation
+
+Matej Urbančič (1):
+ Updated Slovenian translation
+
+Sébastien Granjoux (5):
+ bgo #696991 - Anjuta widgets do not load up properly in standalone glade
+ bgo #698158: anjuta-3.8.1 fails to build with vala-0.20
+ project-wizard: bgo #700318 - Can't build a project whose name starts by a digit
+ debug-manager: show registers pane
+ bgo #694644 - Position of Locals and Stack panes not saved
+
+Techlive Zheng (1):
+ anjuta-tags: fix scope information parsing in the Vala parser
+
+Varad Gautam (1):
+ document-manager: bgo#698036 - Close Other Tabs enhancement
+
+Anjuta 3.9.1 (April 30, 2013) -- James Liggett
+
+Arnel A. Borja (27):
+ libanjuta: bgo #696984 - Include Gdl-3 when introspecting Anjuta-3.0
+ libanjuta: bgo #696984 - Documentation comment of section anjuta-debug should be inside after inclusion guard
+ libanjuta: bgo #696984 - Remove extra empty lines in documentation comments
+ libanjuta: bgo #696984 - Add missing commas in documentation comments
+ libanjuta: bgo #696984 - Fix missing double asterisk in documentation comments
+ libanjuta: bgo #696984 - Fix function name typos in documentation comments
+ libanjuta: bgo #696984 - Fix function argument name typos in documentation comments
+ libanjuta: bgo #696984 - Fix a signal name typo in documentation comments
+ libanjuta: bgo #696984 - Fix allow-none annotation typo in a documentation comments
+ libanjuta: bgo #696984 - Add some missing documentation comment
+ libanjuta: bgo #696984 - Update some annotations in documentation comments
+ libanjuta: bgo #696984 - Add missing % in constants NULL, TRUE and FALSE in documentation comments
+ libanjuta: bgo #696984 - Add anjuta-tabber section stub
+ libanjuta: bgo #696984 - Remove unused file anjuta-token-style.h
+ libanjuta: bgo #696984 - Update libanjuta.h header
+ project-wizard: bgo #696990 - Require package libanjuta-3.0 in anjuta-plugin template
+ bgo #696023 - Use dist_ prefix in Makefiles
devhelp: bgo #696023 - Use dist_ prefix instead of EXTRA_DIST
+ glade: bgo #696023 - Use dist_ prefix instead of EXTRA_DIST
+ language-support-vala: bgo #696023 - Use dist_ prefix instead of EXTRA_DIST
+ python-loader: bgo #696023 - Use dist_ prefix instead of EXTRA_DIST
+ subversion: bgo #696023 - Use dist_ prefix instead of EXTRA_DIST
+ libanjuta: bgo #697030 - Add close button widget
+ document-manager: bgo #697030 - Replace close button in tabs with AnjutaCloseButton
+ project-wizard: bgo #688611 - Make templates Windows portable
+ Use dist_doc_DATA for documentation text files
+ project-wizard: Use dist_doc_DATA for documentation text files
-Carles Ferrando (1):
- [l10n] Updated Catalan (Valencian) translation
+Balázs Úr (1):
+ Updated Hungarian translation
+
+Carl-Anton Ingmarsson (28):
+ dir-project: check for NULL groups in dir_project_is_loaded()
+ document-manager: pack notebook with width 1
+ document-manager: remove margin around the document combo box
+ document-manager: don't allocate AnjutaDocmanPriv ourselves
+ document-manager: fix compile warning
+ anjuta-tabber: implement gtk_container_get_path_for_child()
+ anjuta-tabber: rework size allocation
+ anjuta-tabber: remove call to gtk_widget_style_attach()
+ anjuta-tabber: don't iterate list to check if node is first/last
+ message-view: Use AnjutaCloseButton in tabs
+ anjuta-tabber: fix calculation of region flags
+ anjuta-tabber: don't iterate list to check if node is first/last
+ anjuta-tabber: take focus-padding into account when rendering focus
+ anjuta-tabber: Always use the padding of an active tab in y-direction size allocation
+ document-manager: don't free AnjutaDocmanPriv ourselves
+ anjuta-tabber: remove the total padding from total width
+ anjuta-tabber: use tab_curvature for left/right space of first/last tab
+ message-view: use a single box for the tab widget
+ parser-cxx: fix compilation warning
+ anjuta_language_provider: add proposals() function
+ sourceview: remove filtering of single proposals matching pre_word
+ parser-cxx: use anjuta_language_provider_proposals()
+ language-support-python: use anjuta_language_provider_proposals()
+ language-support-js: use anjuta_language_provider_proposals()
+ language-support-js: replace one more use of ianjuta_editor_assist_proposals()
+ language-support-python: replace one more use of ianjuta_editor_assist_proposals()
+ symbol-db-query: change order of property installation in SymbolDBQuery
+ dir-project: fix compile error
Christian Kirbach (1):
Updated German help translation
+Daniel Mustieles (2):
+ Updated Spanish translation
+ Updated Spanish translation
+
+Dimitris Spingos (2):
+ Updated Greek translation
+ Updated Greek translation
+
Dirgita (1):
Updated Indonesian translation
-Fran Diéguez (1):
- Updated Galician translations for doc
-
Gabor Kelemen (1):
Fix errors in the Hungarian translation
-James Liggett (2):
+James Liggett (16):
Post-release version bump
+ git: Use actions for recurring items in the glade file
+ git: Pack the dock and the command bar together
+ git: Fix more names in the glade file
+ git: Use a toggle button to show and hide the command bar
+ git: More glade file name fixes
+ git: Add a stash button to the Status command bar
+ git: Implement branch switching by double-click
+ Update doap file
+ git: Fix widget names
+ git: Implement adding files by dragging them onto the status view
+ git: Widget name fixes
git: Log path entry should be editable
+ git: Widget name fixes
+ libanjuta/manuals: Update documentation sections
+ Revert "git: Log path entry should be editable"
Jaume Planas (1):
[l10n] Add Catalan translation
+Johannes Schmid (2):
+ Updated AUTHORS file
+ sourceview: bgo#680770 - Don't scroll undo position to center if line already visible
+
+Juan Pablo Ugarte (1):
+ mk-project: Prevent a crash
+
+Marek Černocký (1):
+ Updated Czech translation
+
Milo Casagrande (2):
[l10n] Updated Italian translation.
[l10n] Updated Italian translation.
-Sébastien Granjoux (1):
+Richard Hughes (1):
+ Fixed Indonesian translation
+
+Sébastien Granjoux (6):
project-wizard: bgo#696672 - Creating new project using wizard fails due to license files missing
+ project wizard: bgo #688611 - Add Windows configuration
+ mk-project: Ignore conditional directives in makefile
+ git: Fix setting of a custom author in the commit pane
+ libanjuta: Improve editor modeline support
+ project-wizard: bgo #698011 - Cannot run anything
Yuri Myasoedov (1):
Updated Russian translation
+Мирослав Николић (1):
+ Updated Serbian translation
Anjuta 3.8.0 (March 24, 2013) -- James Liggett
diff -Nru anjuta-3.8.4/aclocal.m4 anjuta-3.10.2/aclocal.m4
--- anjuta-3.8.4/aclocal.m4 2013-06-03 21:24:27.000000000 +0000
+++ anjuta-3.10.2/aclocal.m4 2013-11-14 21:21:07.000000000 +0000
@@ -1,8 +1,7 @@
-# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.13.4 -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
-# Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -12,17 +11,18 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
[m4_warning([this file was generated for autoconf 2.69.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
# bison-i18n.m4 serial 2
-dnl Copyright (C) 2005-2006, 2009-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2006, 2009-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -578,6 +578,46 @@
fi[]dnl
])# PKG_CHECK_MODULES
+
+# PKG_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable pkgconfigdir as the location where a module
+# should install pkg-config .pc files. By default the directory is
+# $libdir/pkgconfig, but the default can be changed by passing
+# DIRECTORY. The user can override through the --with-pkgconfigdir
+# parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+ [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+ [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+ [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_INSTALLDIR
+
+
+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable noarch_pkgconfigdir as the location where a
+# module should install arch-independent pkg-config .pc files. By
+# default the directory is $datadir/pkgconfig, but the default can be
+# changed by passing DIRECTORY. The user can override through the
+# --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+ [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+ [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+ [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_NOARCH_INSTALLDIR
+
AC_DEFUN([YELP_HELP_INIT],
[
AC_REQUIRE([AC_PROG_LN_S])
@@ -773,25 +813,22 @@
m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([YELP_HELP_RULES])])
])
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 1
-
# AM_AUTOMAKE_VERSION(VERSION)
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11'
+[am__api_version='1.13'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.11.6], [],
+m4_if([$1], [1.13.4], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -807,24 +844,22 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.6])dnl
+[AM_AUTOMAKE_VERSION([1.13.4])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 1
-
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
#
# Of course, Automake must honor this variable whenever it calls a
# tool from the auxiliary directory. The problem is that $srcdir (and
@@ -843,7 +878,7 @@
#
# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
# are both prefixed by $srcdir. In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
+# harmless because $srcdir is '.', but things will broke when you
# start a VPATH build or use an absolute $srcdir.
#
# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
@@ -869,22 +904,19 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 9
-
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
# Define a conditional.
AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
AC_SUBST([$1_TRUE])dnl
AC_SUBST([$1_FALSE])dnl
_AM_SUBST_NOTMAKE([$1_TRUE])dnl
@@ -903,16 +935,14 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
-# 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 12
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
# will think it sees a *use*, and therefore will trigger all it's
# C support machinery. Also note that it means that autoscan, seeing
@@ -922,7 +952,7 @@
# _AM_DEPENDENCIES(NAME)
# ----------------------
# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
# We try a few techniques and use that to set a single cache variable.
#
# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@ -935,12 +965,13 @@
AC_REQUIRE([AM_MAKE_INCLUDE])dnl
AC_REQUIRE([AM_DEP_TRACK])dnl
-ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
- [$1], CXX, [depcc="$CXX" am_compiler_list=],
- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
- [$1], UPC, [depcc="$UPC" am_compiler_list=],
- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
- [depcc="$$1" am_compiler_list=])
+m4_if([$1], [CC], [depcc="$CC" am_compiler_list=],
+ [$1], [CXX], [depcc="$CXX" am_compiler_list=],
+ [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+ [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+ [$1], [UPC], [depcc="$UPC" am_compiler_list=],
+ [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
+ [depcc="$$1" am_compiler_list=])
AC_CACHE_CHECK([dependency style of $depcc],
[am_cv_$1_dependencies_compiler_type],
@@ -948,8 +979,8 @@
# We make a subdir and do the tests there. Otherwise we can end up
# making bogus files that we don't know about and never remove. For
# instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
+ # making a dummy file named 'D' -- because '-MD' means "put the output
+ # in D".
rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
@@ -989,16 +1020,16 @@
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
# mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
am__obj=sub/conftest.${OBJEXT-o}
am__minus_obj="-o $am__obj"
case $depmode in
@@ -1007,8 +1038,8 @@
test "$am__universal" = false || continue
;;
nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
if test "x$enable_dependency_tracking" = xyes; then
continue
else
@@ -1016,7 +1047,7 @@
fi
;;
msvc7 | msvc7msys | msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
+ # This compiler won't grok '-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
am__obj=conftest.${OBJEXT-o}
@@ -1064,7 +1095,7 @@
# AM_SET_DEPDIR
# -------------
# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
AC_DEFUN([AM_SET_DEPDIR],
[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
@@ -1074,9 +1105,13 @@
# AM_DEP_TRACK
# ------------
AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[ --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors])
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+ [--enable-dependency-tracking],
+ [do not reject slow dependency extractors])
+AS_HELP_STRING(
+ [--disable-dependency-tracking],
+ [speeds up one-time build])])
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
@@ -1091,20 +1126,18 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-#serial 5
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
[{
- # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
case $CONFIG_FILES in
@@ -1117,7 +1150,7 @@
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
+ # We used to match only the files named 'Makefile.in', but
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
@@ -1129,21 +1162,19 @@
continue
fi
# Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
+ # from the Makefile without running 'make'.
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue
am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
+ test -z "$am__include" && continue
am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
# Find all dependency output files, they are included files with
# $(DEPDIR) in their names. We invoke sed twice because it is the
# simplest approach to changing $(DEPDIR) to its actual value in the
# expansion.
for file in `sed -n "
s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
fdir=`AS_DIRNAME(["$file"])`
@@ -1161,7 +1192,7 @@
# This macro should only be invoked once -- use via AC_REQUIRE.
#
# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each `.P' file that we will
+# is enabled. FIXME. This creates each '.P' file that we will
# need in order to bootstrap the dependency handling code.
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AC_CONFIG_COMMANDS([depfiles],
@@ -1171,15 +1202,12 @@
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 16
-
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -1195,7 +1223,7 @@
# arguments mandatory, and then we can depend on a new Autoconf
# release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
+[AC_PREREQ([2.65])dnl
dnl Autoconf wants to disallow AM_ names. We explicitly allow
dnl the ones we care about.
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -1224,31 +1252,40 @@
# Define the identity of the package.
dnl Distinguish between old-style and new-style calls.
m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+[AC_DIAGNOSE([obsolete],
+ [$0: two- and three-arguments forms are deprecated.])
+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
AC_SUBST([PACKAGE], [$1])dnl
AC_SUBST([VERSION], [$2])],
[_AM_SET_OPTIONS([$1])dnl
dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+m4_if(
+ m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+ [ok:ok],,
[m4_fatal([AC_INIT should be called with package and version arguments])])dnl
AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
# Some tools Automake needs.
AC_REQUIRE([AM_SANITY_CHECK])dnl
AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+AM_MISSING_PROG([AUTOCONF], [autoconf])
+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+AM_MISSING_PROG([AUTOHEADER], [autoheader])
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility. To be removed once Automake 1.9.x
+# dies out for good. For more background, see:
+#
+#
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
@@ -1259,28 +1296,32 @@
[_AM_PROG_TAR([v7])])])
_AM_IF_OPTION([no-dependencies],,
[AC_PROVIDE_IFELSE([AC_PROG_CC],
- [_AM_DEPENDENCIES(CC)],
- [define([AC_PROG_CC],
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+ [_AM_DEPENDENCIES([CC])],
+ [m4_define([AC_PROG_CC],
+ m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [_AM_DEPENDENCIES(CXX)],
- [define([AC_PROG_CXX],
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+ [_AM_DEPENDENCIES([CXX])],
+ [m4_define([AC_PROG_CXX],
+ m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
AC_PROVIDE_IFELSE([AC_PROG_OBJC],
- [_AM_DEPENDENCIES(OBJC)],
- [define([AC_PROG_OBJC],
- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+ [_AM_DEPENDENCIES([OBJC])],
+ [m4_define([AC_PROG_OBJC],
+ m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+ [_AM_DEPENDENCIES([OBJCXX])],
+ [m4_define([AC_PROG_OBJCXX],
+ m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
+])
+AC_REQUIRE([AM_SILENT_RULES])dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
AC_CONFIG_COMMANDS_PRE(dnl
[m4_provide_if([_AM_COMPILER_EXEEXT],
[AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
])
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
dnl mangled by Autoconf and run in a shell conditional statement.
m4_define([_AC_COMPILER_EXEEXT],
@@ -1308,15 +1349,12 @@
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 1
-
# AM_PROG_INSTALL_SH
# ------------------
# Define $install_sh.
@@ -1330,16 +1368,14 @@
install_sh="\${SHELL} $am_aux_dir/install-sh"
esac
fi
-AC_SUBST(install_sh)])
+AC_SUBST([install_sh])])
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 2
-
# Check whether the underlying file-system supports filenames
# with a leading dot. For instance MS-DOS doesn't.
AC_DEFUN([AM_SET_LEADING_DOT],
@@ -1356,20 +1392,17 @@
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
-# 2011 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 5
-
# AM_MAINTAINER_MODE([DEFAULT-MODE])
# ----------------------------------
# Control maintainer-specific portions of Makefiles.
-# Default is to disable them, unless `enable' is passed literally.
-# For symmetry, `disable' may be passed as well. Anyway, the user
+# Default is to disable them, unless 'enable' is passed literally.
+# For symmetry, 'disable' may be passed as well. Anyway, the user
# can override the default with the --enable/--disable switch.
AC_DEFUN([AM_MAINTAINER_MODE],
[m4_case(m4_default([$1], [disable]),
@@ -1380,10 +1413,11 @@
AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
dnl maintainer-mode's default is 'disable' unless 'enable' is passed
AC_ARG_ENABLE([maintainer-mode],
-[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
- (and sometimes confusing) to the casual installer],
- [USE_MAINTAINER_MODE=$enableval],
- [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
+ [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
+ am_maintainer_other[ make rules and dependencies not useful
+ (and sometimes confusing) to the casual installer])],
+ [USE_MAINTAINER_MODE=$enableval],
+ [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
AC_MSG_RESULT([$USE_MAINTAINER_MODE])
AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
MAINT=$MAINTAINER_MODE_TRUE
@@ -1391,18 +1425,14 @@
]
)
-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 4
-
# AM_MAKE_INCLUDE()
# -----------------
# Check to see how make treats includes.
@@ -1420,7 +1450,7 @@
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
case `$am_make -s -f confmf 2> /dev/null` in #(
*the\ am__doit\ target*)
am__include=include
@@ -1445,15 +1475,12 @@
rm -f confinc confmf
])
-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 6
-
# AM_PROG_CC_C_O
# --------------
# Like AC_PROG_CC_C_O, but changed for automake.
@@ -1482,15 +1509,12 @@
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 6
-
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
AC_DEFUN([AM_MISSING_PROG],
@@ -1498,11 +1522,10 @@
$1=${$1-"${am_missing_run}$2"}
AC_SUBST($1)])
-
# AM_MISSING_HAS_RUN
# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
AC_DEFUN([AM_MISSING_HAS_RUN],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
AC_REQUIRE_AUX_FILE([missing])dnl
@@ -1515,29 +1538,32 @@
esac
fi
# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+ am_missing_run="$MISSING "
else
am_missing_run=
- AC_MSG_WARN([`missing' script is too old or missing])
+ AC_MSG_WARN(['missing' script is too old or missing])
fi
])
-# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2003-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 1
-
# AM_PROG_MKDIR_P
# ---------------
-# Check for `mkdir -p'.
+# Check for 'mkdir -p'.
AC_DEFUN([AM_PROG_MKDIR_P],
[AC_PREREQ([2.60])dnl
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl FIXME we are no longer going to remove this! adjust warning
+dnl FIXME message accordingly.
+AC_DIAGNOSE([obsolete],
+[$0: this macro is deprecated, and will soon be removed.
+You should use the Autoconf-provided 'AC][_PROG_MKDIR_P' macro instead,
+and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files.])
dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
dnl while keeping a definition of mkdir_p for backward compatibility.
dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
@@ -1554,15 +1580,12 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 5
-
# _AM_MANGLE_OPTION(NAME)
# -----------------------
AC_DEFUN([_AM_MANGLE_OPTION],
@@ -1572,7 +1595,7 @@
# --------------------
# Set option NAME. Presently that only means defining a flag for this option.
AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
# _AM_SET_OPTIONS(OPTIONS)
# ------------------------
@@ -1586,14 +1609,12 @@
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009,
-# 2011 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 2
# AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
# ---------------------------------------------------------------------------
@@ -1622,7 +1643,7 @@
dnl Find a Python interpreter. Python versions prior to 2.0 are not
dnl supported. (2.0 was released on October 16, 2000).
m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
-[python python2 python3 python3.2 python3.1 python3.0 python2.7 dnl
+[python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 dnl
python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0])
AC_ARG_VAR([PYTHON], [the Python interpreter])
@@ -1638,10 +1659,11 @@
dnl A version check is needed.
if test -n "$PYTHON"; then
# If the user set $PYTHON, use it and don't search something else.
- AC_MSG_CHECKING([whether $PYTHON version >= $1])
+ AC_MSG_CHECKING([whether $PYTHON version is >= $1])
AM_PYTHON_CHECK_VERSION([$PYTHON], [$1],
- [AC_MSG_RESULT(yes)],
- [AC_MSG_ERROR(too old)])
+ [AC_MSG_RESULT([yes])],
+ [AC_MSG_RESULT([no])
+ AC_MSG_ERROR([Python interpreter is too old])])
am_display_PYTHON=$PYTHON
else
# Otherwise, try each interpreter until we find one that satisfies
@@ -1690,6 +1712,25 @@
[am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`])
AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])
+ # Just factor out some code duplication.
+ am_python_setup_sysconfig="\
+import sys
+# Prefer sysconfig over distutils.sysconfig, for better compatibility
+# with python 3.x. See automake bug#10227.
+try:
+ import sysconfig
+except ImportError:
+ can_use_sysconfig = 0
+else:
+ can_use_sysconfig = 1
+# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs:
+#
+try:
+ from platform import python_implementation
+ if python_implementation() == 'CPython' and sys.version[[:3]] == '2.7':
+ can_use_sysconfig = 0
+except ImportError:
+ pass"
dnl Set up 4 directories:
@@ -1706,7 +1747,14 @@
else
am_py_prefix=$prefix
fi
- 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`
+ am_cv_python_pythondir=`$PYTHON -c "
+$am_python_setup_sysconfig
+if can_use_sysconfig:
+ sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})
+else:
+ from distutils import sysconfig
+ sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
+sys.stdout.write(sitedir)"`
case $am_cv_python_pythondir in
$am_py_prefix*)
am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
@@ -1741,7 +1789,14 @@
else
am_py_exec_prefix=$exec_prefix
fi
- 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`
+ am_cv_python_pyexecdir=`$PYTHON -c "
+$am_python_setup_sysconfig
+if can_use_sysconfig:
+ sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'})
+else:
+ from distutils import sysconfig
+ sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix')
+sys.stdout.write(sitedir)"`
case $am_cv_python_pyexecdir in
$am_py_exec_prefix*)
am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
@@ -1791,22 +1846,16 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 5
-
# AM_SANITY_CHECK
# ---------------
AC_DEFUN([AM_SANITY_CHECK],
[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
# Reject unsafe characters in $srcdir or the absolute working directory
# name. Accept space and tab only in the latter.
am_lf='
@@ -1817,32 +1866,40 @@
esac
case $srcdir in
*[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
- AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+ AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
esac
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$[*]" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- rm -f conftest.file
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
-alias in your environment])
- fi
+ am_has_slept=no
+ for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$[*]" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ if test "$[*]" != "X $srcdir/configure conftest.file" \
+ && test "$[*]" != "X conftest.file $srcdir/configure"; then
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
+ alias in your environment])
+ fi
+ if test "$[2]" = conftest.file || test $am_try -eq 2; then
+ break
+ fi
+ # Just in case.
+ sleep 1
+ am_has_slept=yes
+ done
test "$[2]" = conftest.file
)
then
@@ -1852,31 +1909,50 @@
AC_MSG_ERROR([newly created file is older than distributed files!
Check your system clock])
fi
-AC_MSG_RESULT(yes)])
+AC_MSG_RESULT([yes])
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+ ( sleep 1 ) &
+ am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+ [AC_MSG_CHECKING([that generated files are newer than configure])
+ if test -n "$am_sleep_pid"; then
+ # Hide warnings about reused PIDs.
+ wait $am_sleep_pid 2>/dev/null
+ fi
+ AC_MSG_RESULT([done])])
+rm -f conftest.file
+])
-# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 2
-
# AM_SILENT_RULES([DEFAULT])
# --------------------------
# Enable less verbose build rules; with the default set to DEFAULT
-# (`yes' being less verbose, `no' or empty being verbose).
+# ("yes" being less verbose, "no" or empty being verbose).
AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules],
-[ --enable-silent-rules less verbose build output (undo: `make V=1')
- --disable-silent-rules verbose build output (undo: `make V=0')])
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no) AM_DEFAULT_VERBOSITY=1;;
-*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+[AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+ [--enable-silent-rules],
+ [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+ [--disable-silent-rules],
+ [verbose build output (undo: "make V=0")])dnl
+])
+case $enable_silent_rules in @%:@ (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+ *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
esac
dnl
-dnl A few `make' implementations (e.g., NonStop OS and NextStep)
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
dnl do not support nested variable expansions.
dnl See automake bug#9928 and bug#10237.
am_make=${MAKE-make}
@@ -1894,7 +1970,7 @@
am_cv_make_support_nested_variables=no
fi])
if test $am_cv_make_support_nested_variables = yes; then
- dnl Using `$V' instead of `$(V)' breaks IRIX make.
+ dnl Using '$V' instead of '$(V)' breaks IRIX make.
AM_V='$(V)'
AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
else
@@ -1911,44 +1987,40 @@
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 1
-
# AM_PROG_INSTALL_STRIP
# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
+# One issue with vendor 'install' (even GNU) is that you can't
# specify the program used to strip binaries. This is especially
# annoying in cross-compiling environments, where the build's strip
# is unlikely to handle the host's binaries.
# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
+# always use install-sh in "make install-strip", and initialize
# STRIPPROG with the value of the STRIP variable (set by the user).
AC_DEFUN([AM_PROG_INSTALL_STRIP],
[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip". However 'strip' might not be the right
# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+# will honor the 'STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
if test "$cross_compiling" != no; then
AC_CHECK_TOOL([STRIP], [strip], :)
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2006-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 3
-
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@ -1962,18 +2034,16 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2004-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 2
-
# _AM_PROG_TAR(FORMAT)
# --------------------
# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
#
# Substitute a variable $(am__tar) that is a command
# writing to stdout a FORMAT-tarball containing the directory
@@ -1983,76 +2053,114 @@
# Substitute a variable $(am__untar) that extract such
# a tarball read from stdin.
# $(am__untar) < result.tar
+#
AC_DEFUN([_AM_PROG_TAR],
[# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AC_SUBST([AMTAR], ['$${TAR-tar}'])
-m4_if([$1], [v7],
- [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
- [m4_case([$1], [ustar],, [pax],,
- [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
+
+# We'll loop over all known methods to create a tar archive until one works.
_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
- case $_am_tool in
- gnutar)
- for _am_tar in tar gnutar gtar;
- do
- AM_RUN_LOG([$_am_tar --version]) && break
- done
- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
- am__untar="$_am_tar -xf -"
- ;;
- plaintar)
- # Must skip GNU tar: if it does not support --format= it doesn't create
- # ustar tarball either.
- (tar --version) >/dev/null 2>&1 && continue
- am__tar='tar chf - "$$tardir"'
- am__tar_='tar chf - "$tardir"'
- am__untar='tar xf -'
- ;;
- pax)
- am__tar='pax -L -x $1 -w "$$tardir"'
- am__tar_='pax -L -x $1 -w "$tardir"'
- am__untar='pax -r'
- ;;
- cpio)
- am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
- am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
- am__untar='cpio -i -H $1 -d'
- ;;
- none)
- am__tar=false
- am__tar_=false
- am__untar=false
- ;;
- esac
- # If the value was cached, stop now. We just wanted to have am__tar
- # and am__untar set.
- test -n "${am_cv_prog_tar_$1}" && break
+m4_if([$1], [v7],
+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
- # tar/untar a dummy directory, and stop if the command works
- rm -rf conftest.dir
- mkdir conftest.dir
- echo GrepMe > conftest.dir/file
- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+ [m4_case([$1],
+ [ustar],
+ [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+ # There is notably a 21 bits limit for the UID and the GID. In fact,
+ # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+ # and bug#13588).
+ am_max_uid=2097151 # 2^21 - 1
+ am_max_gid=$am_max_uid
+ # The $UID and $GID variables are not portable, so we need to resort
+ # to the POSIX-mandated id(1) utility. Errors in the 'id' calls
+ # below are definitely unexpected, so allow the users to see them
+ # (that is, avoid stderr redirection).
+ am_uid=`id -u || echo unknown`
+ am_gid=`id -g || echo unknown`
+ AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+ if test $am_uid -le $am_max_uid; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ _am_tools=none
+ fi
+ AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+ if test $am_gid -le $am_max_gid; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ _am_tools=none
+ fi],
+
+ [pax],
+ [],
+
+ [m4_fatal([Unknown tar format])])
+
+ AC_MSG_CHECKING([how to create a $1 tar archive])
+
+ # Go ahead even if we have the value already cached. We do so because we
+ # need to set the values for the 'am__tar' and 'am__untar' variables.
+ _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+ for _am_tool in $_am_tools; do
+ case $_am_tool in
+ gnutar)
+ for _am_tar in tar gnutar gtar; do
+ AM_RUN_LOG([$_am_tar --version]) && break
+ done
+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+ am__untar="$_am_tar -xf -"
+ ;;
+ plaintar)
+ # Must skip GNU tar: if it does not support --format= it doesn't create
+ # ustar tarball either.
+ (tar --version) >/dev/null 2>&1 && continue
+ am__tar='tar chf - "$$tardir"'
+ am__tar_='tar chf - "$tardir"'
+ am__untar='tar xf -'
+ ;;
+ pax)
+ am__tar='pax -L -x $1 -w "$$tardir"'
+ am__tar_='pax -L -x $1 -w "$tardir"'
+ am__untar='pax -r'
+ ;;
+ cpio)
+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+ am__untar='cpio -i -H $1 -d'
+ ;;
+ none)
+ am__tar=false
+ am__tar_=false
+ am__untar=false
+ ;;
+ esac
+
+ # If the value was cached, stop now. We just wanted to have am__tar
+ # and am__untar set.
+ test -n "${am_cv_prog_tar_$1}" && break
+
+ # tar/untar a dummy directory, and stop if the command works.
+ rm -rf conftest.dir
+ mkdir conftest.dir
+ echo GrepMe > conftest.dir/file
+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+ rm -rf conftest.dir
+ if test -s conftest.tar; then
+ AM_RUN_LOG([$am__untar /dev/null 2>&1 && break
+ fi
+ done
rm -rf conftest.dir
- if test -s conftest.tar; then
- AM_RUN_LOG([$am__untar /dev/null 2>&1 && break
- fi
-done
-rm -rf conftest.dir
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+ AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+ AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
diff -Nru anjuta-3.8.4/anjuta.desktop.in.in anjuta-3.10.2/anjuta.desktop.in.in
--- anjuta-3.8.4/anjuta.desktop.in.in 2013-02-27 00:19:09.000000000 +0000
+++ anjuta-3.10.2/anjuta.desktop.in.in 2013-11-03 18:57:08.000000000 +0000
@@ -10,7 +10,7 @@
Type=Application
Categories=GNOME;GTK;Development;IDE;
StartupNotify=true
-MimeType=application/x-anjuta;application/x-anjuta-project-template;x-anjuta-compressed-project-template;inode/directory;
+MimeType=application/x-anjuta;application/x-anjuta-project-template;application/x-anjuta-compressed-project-template;inode/directory;
X-GNOME-DocPath=anjuta/anjuta-manual.xml
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=anjuta
diff -Nru anjuta-3.8.4/compile anjuta-3.10.2/compile
--- anjuta-3.8.4/compile 2013-04-30 21:53:35.000000000 +0000
+++ anjuta-3.10.2/compile 2013-11-14 21:21:09.000000000 +0000
@@ -1,10 +1,9 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2012-03-05.13; # UTC
+scriptversion=2012-10-14.11; # UTC
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
# Written by Tom Tromey .
#
# This program is free software; you can redistribute it and/or modify
@@ -113,6 +112,11 @@
lib=$dir/$lib.lib
break
fi
+ if test -f "$dir/lib$lib.a"; then
+ found=yes
+ lib=$dir/lib$lib.a
+ break
+ fi
done
IFS=$save_IFS
diff -Nru anjuta-3.8.4/config.guess anjuta-3.10.2/config.guess
--- anjuta-3.8.4/config.guess 2013-04-30 21:53:35.000000000 +0000
+++ anjuta-3.10.2/config.guess 2013-11-14 21:21:09.000000000 +0000
@@ -1,14 +1,12 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011, 2012 Free Software Foundation, Inc.
+# Copyright 1992-2013 Free Software Foundation, Inc.
-timestamp='2012-02-10'
+timestamp='2013-06-10'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
@@ -22,19 +20,17 @@
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner. Please send patches (context
-# diff format) to and include a ChangeLog
-# entry.
+# the same distribution terms that you use for the rest of that
+# program. This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
#
-# This script attempts to guess a canonical system name similar to
-# config.sub. If it succeeds, it prints the system name on stdout, and
-# exits with 0. Otherwise, it exits with 1.
+# Originally written by Per Bothner.
#
# You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+
me=`echo "$0" | sed -e 's,.*/,,'`
@@ -54,9 +50,7 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -138,6 +132,27 @@
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+ # If the system lacks a compiler, then just pick glibc.
+ # We could probably try harder.
+ LIBC=gnu
+
+ eval $set_cc_for_build
+ cat <<-EOF > $dummy.c
+ #include
+ #if defined(__UCLIBC__)
+ LIBC=uclibc
+ #elif defined(__dietlibc__)
+ LIBC=dietlibc
+ #else
+ LIBC=gnu
+ #endif
+ EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+ ;;
+esac
+
# Note: order is significant - the case branches are not exclusive.
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -200,6 +215,10 @@
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "${machine}-${os}${release}"
exit ;;
+ *:Bitrig:*:*)
+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+ exit ;;
*:OpenBSD:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -302,7 +321,7 @@
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
exit ;;
- arm:riscos:*:*|arm:RISCOS:*:*)
+ arm*:riscos:*:*|arm*:RISCOS:*:*)
echo arm-unknown-riscos
exit ;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -801,6 +820,9 @@
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
+ *:MINGW64*:*)
+ echo ${UNAME_MACHINE}-pc-mingw64
+ exit ;;
*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
@@ -852,21 +874,21 @@
exit ;;
*:GNU:*:*)
# the GNU system
- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit ;;
*:GNU/*:*:*)
# other systems with GNU libc and userland
- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
exit ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
aarch64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
aarch64_be:Linux:*:*)
UNAME_MACHINE=aarch64_be
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -879,59 +901,54 @@
EV68*) UNAME_MACHINE=alphaev68 ;;
esac
objdump --private-headers /bin/sh | grep -q ld.so.1
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ arc:Linux:*:* | arceb:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
arm*:Linux:*:*)
eval $set_cc_for_build
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_EABI__
then
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
else
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_PCS_VFP
then
- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
else
- echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
fi
fi
exit ;;
avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
cris:Linux:*:*)
- echo ${UNAME_MACHINE}-axis-linux-gnu
+ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
exit ;;
crisv32:Linux:*:*)
- echo ${UNAME_MACHINE}-axis-linux-gnu
+ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
exit ;;
frv:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
hexagon:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
i*86:Linux:*:*)
- LIBC=gnu
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #ifdef __dietlibc__
- LIBC=dietlibc
- #endif
-EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ echo ${UNAME_MACHINE}-pc-linux-${LIBC}
exit ;;
ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
m32r*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
mips:Linux:*:* | mips64:Linux:*:*)
eval $set_cc_for_build
@@ -950,54 +967,63 @@
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
;;
+ or1k:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
or32:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
padre:Linux:*:*)
- echo sparc-unknown-linux-gnu
+ echo sparc-unknown-linux-${LIBC}
exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-gnu
+ echo hppa64-unknown-linux-${LIBC}
exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
- PA7*) echo hppa1.1-unknown-linux-gnu ;;
- PA8*) echo hppa2.0-unknown-linux-gnu ;;
- *) echo hppa-unknown-linux-gnu ;;
+ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+ *) echo hppa-unknown-linux-${LIBC} ;;
esac
exit ;;
ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-gnu
+ echo powerpc64-unknown-linux-${LIBC}
exit ;;
ppc:Linux:*:*)
- echo powerpc-unknown-linux-gnu
+ echo powerpc-unknown-linux-${LIBC}
+ exit ;;
+ ppc64le:Linux:*:*)
+ echo powerpc64le-unknown-linux-${LIBC}
+ exit ;;
+ ppcle:Linux:*:*)
+ echo powerpcle-unknown-linux-${LIBC}
exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-ibm-linux
+ echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
exit ;;
sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
tile*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
vax:Linux:*:*)
- echo ${UNAME_MACHINE}-dec-linux-gnu
+ echo ${UNAME_MACHINE}-dec-linux-${LIBC}
exit ;;
x86_64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1201,6 +1227,9 @@
BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
echo i586-pc-haiku
exit ;;
+ x86_64:Haiku:*:*)
+ echo x86_64-unknown-haiku
+ exit ;;
SX-4:SUPER-UX:*:*)
echo sx4-nec-superux${UNAME_RELEASE}
exit ;;
@@ -1227,19 +1256,21 @@
exit ;;
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
- case $UNAME_PROCESSOR in
- i386)
- eval $set_cc_for_build
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
- grep IS_64BIT_ARCH >/dev/null
- then
- UNAME_PROCESSOR="x86_64"
- fi
- fi ;;
- unknown) UNAME_PROCESSOR=powerpc ;;
- esac
+ eval $set_cc_for_build
+ if test "$UNAME_PROCESSOR" = unknown ; then
+ UNAME_PROCESSOR=powerpc
+ fi
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+ then
+ case $UNAME_PROCESSOR in
+ i386) UNAME_PROCESSOR=x86_64 ;;
+ powerpc) UNAME_PROCESSOR=powerpc64 ;;
+ esac
+ fi
+ fi
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
@@ -1256,7 +1287,7 @@
NEO-?:NONSTOP_KERNEL:*:*)
echo neo-tandem-nsk${UNAME_RELEASE}
exit ;;
- NSE-?:NONSTOP_KERNEL:*:*)
+ NSE-*:NONSTOP_KERNEL:*:*)
echo nse-tandem-nsk${UNAME_RELEASE}
exit ;;
NSR-?:NONSTOP_KERNEL:*:*)
@@ -1330,9 +1361,6 @@
exit ;;
esac
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
eval $set_cc_for_build
cat >$dummy.c <.
@@ -26,11 +20,12 @@
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# the same distribution terms that you use for the rest of that
+# program. This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
-# Please send patches to . Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
@@ -73,9 +68,7 @@
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -123,7 +116,7 @@
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
- linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
knetbsd*-gnu* | netbsd*-gnu* | \
kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
@@ -156,7 +149,7 @@
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis | -knuth | -cray | -microblaze)
+ -apple | -axis | -knuth | -cray | -microblaze*)
os=
basic_machine=$1
;;
@@ -259,8 +252,10 @@
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
- | be32 | be64 \
+ | arc | arceb \
+ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+ | avr | avr32 \
+ | be32 | be64 \
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
@@ -273,7 +268,7 @@
| le32 | le64 \
| lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore | mep | metag \
+ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -291,16 +286,17 @@
| mipsisa64r2 | mipsisa64r2el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
+ | mipsr5900 | mipsr5900el \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
| moxie \
| mt \
| msp430 \
| nds32 | nds32le | nds32be \
- | nios | nios2 \
+ | nios | nios2 | nios2eb | nios2el \
| ns16k | ns32k \
| open8 \
- | or32 \
+ | or1k | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
@@ -370,7 +366,7 @@
| aarch64-* | aarch64_be-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
| be32-* | be64-* \
@@ -389,7 +385,8 @@
| lm32-* \
| m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+ | microblaze-* | microblazeel-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
@@ -407,12 +404,13 @@
| mipsisa64r2-* | mipsisa64r2el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+ | mipsr5900-* | mipsr5900el-* \
| mipstx39-* | mipstx39el-* \
| mmix-* \
| mt-* \
| msp430-* \
| nds32-* | nds32le-* | nds32be-* \
- | nios-* | nios2-* \
+ | nios-* | nios2-* | nios2eb-* | nios2el-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| open8-* \
| orion-* \
@@ -788,9 +786,13 @@
basic_machine=ns32k-utek
os=-sysv
;;
- microblaze)
+ microblaze*)
basic_machine=microblaze-xilinx
;;
+ mingw64)
+ basic_machine=x86_64-pc
+ os=-mingw64
+ ;;
mingw32)
basic_machine=i386-pc
os=-mingw32
@@ -1004,7 +1006,7 @@
;;
ppc64) basic_machine=powerpc64-unknown
;;
- ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppc64le | powerpc64little | ppc64-le | powerpc64-little)
basic_machine=powerpc64le-unknown
@@ -1019,7 +1021,11 @@
basic_machine=i586-unknown
os=-pw32
;;
- rdos)
+ rdos | rdos64)
+ basic_machine=x86_64-pc
+ os=-rdos
+ ;;
+ rdos32)
basic_machine=i386-pc
os=-rdos
;;
@@ -1346,21 +1352,21 @@
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- | -sym* | -kopensolaris* \
+ | -sym* | -kopensolaris* | -plan9* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
- | -openbsd* | -solidbsd* \
+ | -bitrig* | -openbsd* | -solidbsd* \
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-android* \
- | -linux-newlib* | -linux-uclibc* \
+ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+ | -linux-newlib* | -linux-musl* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1492,9 +1498,6 @@
-aros*)
os=-aros
;;
- -kaos*)
- os=-kaos
- ;;
-zvmoe)
os=-zvmoe
;;
@@ -1586,6 +1589,9 @@
mips*-*)
os=-elf
;;
+ or1k-*)
+ os=-elf
+ ;;
or32-*)
os=-coff
;;
diff -Nru anjuta-3.8.4/configure anjuta-3.10.2/configure
--- anjuta-3.8.4/configure 2013-06-03 21:24:28.000000000 +0000
+++ anjuta-3.10.2/configure 2013-11-14 21:21:08.000000000 +0000
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Anjuta 3.8.4.
+# Generated by GNU Autoconf 2.69 for Anjuta 3.10.2.
#
# Report bugs to .
#
@@ -591,8 +591,8 @@
# Identity of this package.
PACKAGE_NAME='Anjuta'
PACKAGE_TARNAME='anjuta'
-PACKAGE_VERSION='3.8.4'
-PACKAGE_STRING='Anjuta 3.8.4'
+PACKAGE_VERSION='3.10.2'
+PACKAGE_STRING='Anjuta 3.10.2'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=anjuta'
PACKAGE_URL='http://www.anjuta.org/'
@@ -639,6 +639,7 @@
LTLIBOBJS
LIBOBJS
AUTOM4TE
+SHM_LIBS
SYMBOL_DB_SHM
SVN_CFLAGS
SVN_LIB
@@ -755,6 +756,10 @@
LIBVALA
VALA_LIBS
VALA_CFLAGS
+HAVE_SQLITE_FALSE
+HAVE_SQLITE_TRUE
+SQLITE_LIBS
+SQLITE_CFLAGS
SOURCEVIEW_LIBS
SOURCEVIEW_CFLAGS
ENABLE_GLADE_CATALOG_FALSE
@@ -769,9 +774,11 @@
HAVE_PLUGIN_DEVHELP_TRUE
PLUGIN_DEVHELP_LIBS
PLUGIN_DEVHELP_CFLAGS
+HAVE_PLUGIN_TERMINAL_FALSE
+HAVE_PLUGIN_TERMINAL_TRUE
+PLUGIN_TERMINAL_LIBS
+PLUGIN_TERMINAL_CFLAGS
AUTOGEN_PATH
-VTE_LIBS
-VTE_CFLAGS
GDA_LIBS
GDA_CFLAGS
GDL_LIBS
@@ -863,13 +870,13 @@
LDFLAGS
CFLAGS
CC
+MAINT
+MAINTAINER_MODE_FALSE
+MAINTAINER_MODE_TRUE
AM_BACKSLASH
AM_DEFAULT_VERBOSITY
AM_DEFAULT_V
AM_V
-MAINT
-MAINTAINER_MODE_FALSE
-MAINTAINER_MODE_TRUE
am__untar
am__tar
AMTAR
@@ -939,8 +946,8 @@
ac_subst_files=''
ac_user_opts='
enable_option_checking
-enable_maintainer_mode
enable_silent_rules
+enable_maintainer_mode
enable_dependency_tracking
enable_compile_warnings
enable_iso_c
@@ -955,6 +962,7 @@
with_sysroot
enable_libtool_lock
enable_introspection
+enable_plugin_terminal
enable_plugin_devhelp
enable_plugin_glade
enable_glade_catalog
@@ -1001,14 +1009,16 @@
GDL_LIBS
GDA_CFLAGS
GDA_LIBS
-VTE_CFLAGS
-VTE_LIBS
+PLUGIN_TERMINAL_CFLAGS
+PLUGIN_TERMINAL_LIBS
PLUGIN_DEVHELP_CFLAGS
PLUGIN_DEVHELP_LIBS
PLUGIN_GLADE_CFLAGS
PLUGIN_GLADE_LIBS
SOURCEVIEW_CFLAGS
SOURCEVIEW_LIBS
+SQLITE_CFLAGS
+SQLITE_LIBS
VALA_CFLAGS
VALA_LIBS
PYTHON
@@ -1562,7 +1572,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Anjuta 3.8.4 to adapt to many kinds of systems.
+\`configure' configures Anjuta 3.10.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1632,7 +1642,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Anjuta 3.8.4:";;
+ short | recursive ) echo "Configuration of Anjuta 3.10.2:";;
esac
cat <<\_ACEOF
@@ -1640,12 +1650,15 @@
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --disable-maintainer-mode disable make rules and dependencies not useful
- (and sometimes confusing) to the casual installer
- --enable-silent-rules less verbose build output (undo: `make V=1')
- --disable-silent-rules verbose build output (undo: `make V=0')
- --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors
+ --enable-silent-rules less verbose build output (undo: "make V=1")
+ --disable-silent-rules verbose build output (undo: "make V=0")
+ --disable-maintainer-mode
+ disable make rules and dependencies not useful (and
+ sometimes confusing) to the casual installer
+ --enable-dependency-tracking
+ do not reject slow dependency extractors
+ --disable-dependency-tracking
+ speeds up one-time build
--enable-compile-warnings=[no/minimum/yes/maximum/error]
Turn on compiler warnings
--enable-iso-c Try to warn if code is not ISO C
@@ -1659,6 +1672,8 @@
--disable-libtool-lock avoid locking (might break parallel builds)
--enable-introspection=[no/auto/yes]
Enable introspection for this build
+ --disable-plugin-terminal
+ Disable terminal plugin support in Anjuta.
--disable-plugin-devhelp
Disable devhelp plugin support in Anjuta.
--disable-plugin-glade Disable glade plugin support in Anjuta.
@@ -1730,8 +1745,10 @@
GDL_LIBS linker flags for GDL, overriding pkg-config
GDA_CFLAGS C compiler flags for GDA, overriding pkg-config
GDA_LIBS linker flags for GDA, overriding pkg-config
- VTE_CFLAGS C compiler flags for VTE, overriding pkg-config
- VTE_LIBS linker flags for VTE, overriding pkg-config
+ PLUGIN_TERMINAL_CFLAGS
+ C compiler flags for PLUGIN_TERMINAL, overriding pkg-config
+ PLUGIN_TERMINAL_LIBS
+ linker flags for PLUGIN_TERMINAL, overriding pkg-config
PLUGIN_DEVHELP_CFLAGS
C compiler flags for PLUGIN_DEVHELP, overriding pkg-config
PLUGIN_DEVHELP_LIBS
@@ -1744,6 +1761,9 @@
C compiler flags for SOURCEVIEW, overriding pkg-config
SOURCEVIEW_LIBS
linker flags for SOURCEVIEW, overriding pkg-config
+ SQLITE_CFLAGS
+ C compiler flags for SQLITE, overriding pkg-config
+ SQLITE_LIBS linker flags for SQLITE, overriding pkg-config
VALA_CFLAGS C compiler flags for VALA, overriding pkg-config
VALA_LIBS linker flags for VALA, overriding pkg-config
PYTHON the Python interpreter
@@ -1829,7 +1849,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Anjuta configure 3.8.4
+Anjuta configure 3.10.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2474,7 +2494,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Anjuta $as_me 3.8.4, which was
+It was created by Anjuta $as_me 3.10.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2836,39 +2856,40 @@
ANJUTA_MAJOR_VERSION=3
-$as_echo "#define ANJUTA_MINOR_VERSION 8" >>confdefs.h
+$as_echo "#define ANJUTA_MINOR_VERSION 10" >>confdefs.h
-ANJUTA_MINOR_VERSION=8
+ANJUTA_MINOR_VERSION=10
-$as_echo "#define ANJUTA_MICRO_VERSION 4" >>confdefs.h
+$as_echo "#define ANJUTA_MICRO_VERSION 2" >>confdefs.h
-ANJUTA_MICRO_VERSION=4
+ANJUTA_MICRO_VERSION=2
-$as_echo "#define ANJUTA_VERSION 3.8.4" >>confdefs.h
+$as_echo "#define ANJUTA_VERSION 3.10.2" >>confdefs.h
-ANJUTA_VERSION=3.8.4
+ANJUTA_VERSION=3.10.2
-BUGZILLA_VERSION=3.8.4
+BUGZILLA_VERSION=3.10.2
-GLIB_REQUIRED=2.32.0
-GTK_REQUIRED=3.4.0
+GLIB_REQUIRED=2.34.0
+GTK_REQUIRED=3.6.0
GTHREAD_REQUIRED=2.22.0
GDK_PIXBUF_REQUIRED=2.0.0
GDA4_REQUIRED=4.2.0
GDA5_REQUIRED=5.0.0
-VTE_REQUIRED=0.27.6
LIBXML_REQUIRED=2.4.23
GDL_REQUIRED=3.5.5
LIBWNCK_REQUIRED=2.12
GTKSOURCEVIEW_REQUIRED=3.0.0
+VTE_REQUIRED=0.27.6
+
LIBDEVHELP_REQUIRED=3.7.4
GLADEUI_REQUIRED=3.12.0
@@ -2881,7 +2902,7 @@
SVN_PATCH=0
SUBVERSION_REQUIRED=$SVN_MAJOR.$SVN_MINOR.$SVN_PATCH
-am__api_version='1.11'
+am__api_version='1.13'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -3007,9 +3028,6 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
$as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
# Reject unsafe characters in $srcdir or the absolute working directory
# name. Accept space and tab only in the latter.
am_lf='
@@ -3020,32 +3038,40 @@
esac
case $srcdir in
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+ as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
esac
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$*" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- rm -f conftest.file
- if test "$*" != "X $srcdir/configure conftest.file" \
- && test "$*" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
-alias in your environment" "$LINENO" 5
- fi
+ am_has_slept=no
+ for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$*" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ if test "$*" != "X $srcdir/configure conftest.file" \
+ && test "$*" != "X conftest.file $srcdir/configure"; then
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
+ alias in your environment" "$LINENO" 5
+ fi
+ if test "$2" = conftest.file || test $am_try -eq 2; then
+ break
+ fi
+ # Just in case.
+ sleep 1
+ am_has_slept=yes
+ done
test "$2" = conftest.file
)
then
@@ -3057,6 +3083,16 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+ ( sleep 1 ) &
+ am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
# Use a double $ so make ignores it.
@@ -3079,12 +3115,12 @@
esac
fi
# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+ am_missing_run="$MISSING "
else
am_missing_run=
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
if test x"${install_sh}" != xset; then
@@ -3096,10 +3132,10 @@
esac
fi
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip". However 'strip' might not be the right
# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
+# will honor the 'STRIP' environment variable to overrule this program.
if test "$cross_compiling" != no; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
@@ -3238,12 +3274,6 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
$as_echo "$MKDIR_P" >&6; }
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
- [\\/$]* | ?:[\\/]*) ;;
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -3326,6 +3356,45 @@
fi
rmdir .tst 2>/dev/null
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+ enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+ *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+ @$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+ am_cv_make_support_nested_variables=yes
+else
+ am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
if test "`cd $srcdir && pwd`" != "`pwd`"; then
# Use -I$(srcdir) only when $(srcdir) != ., so that make's output
# is not polluted with repeated "-I."
@@ -3348,7 +3417,7 @@
# Define the identity of the package.
PACKAGE='anjuta'
- VERSION='3.8.4'
+ VERSION='3.10.2'
cat >>confdefs.h <<_ACEOF
@@ -3376,12 +3445,22 @@
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+# For better backward compatibility. To be removed once Automake 1.9.x
+# dies out for good. For more background, see:
+#
+#
+mkdir_p='$(MKDIR_P)'
+
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AMTAR='$${TAR-tar}'
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar pax cpio none'
+
am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
@@ -3389,6 +3468,7 @@
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
@@ -3417,10 +3497,10 @@
enableval=$enable_silent_rules;
fi
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no) AM_DEFAULT_VERBOSITY=1;;
-*) AM_DEFAULT_VERBOSITY=0;;
+case $enable_silent_rules in # (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+ *) AM_DEFAULT_VERBOSITY=0;;
esac
am_make=${MAKE-make}
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
@@ -4259,7 +4339,7 @@
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
case `$am_make -s -f confmf 2> /dev/null` in #(
*the\ am__doit\ target*)
am__include=include
@@ -4315,8 +4395,8 @@
# We make a subdir and do the tests there. Otherwise we can end up
# making bogus files that we don't know about and never remove. For
# instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
+ # making a dummy file named 'D' -- because '-MD' means "put the output
+ # in D".
rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
@@ -4351,16 +4431,16 @@
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
# mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
am__obj=sub/conftest.${OBJEXT-o}
am__minus_obj="-o $am__obj"
case $depmode in
@@ -4369,8 +4449,8 @@
test "$am__universal" = false || continue
;;
nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
if test "x$enable_dependency_tracking" = xyes; then
continue
else
@@ -4378,7 +4458,7 @@
fi
;;
msvc7 | msvc7msys | msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
+ # This compiler won't grok '-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
am__obj=conftest.${OBJEXT-o}
@@ -5058,8 +5138,8 @@
# We make a subdir and do the tests there. Otherwise we can end up
# making bogus files that we don't know about and never remove. For
# instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
+ # making a dummy file named 'D' -- because '-MD' means "put the output
+ # in D".
rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
@@ -5094,16 +5174,16 @@
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
# mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
am__obj=sub/conftest.${OBJEXT-o}
am__minus_obj="-o $am__obj"
case $depmode in
@@ -5112,8 +5192,8 @@
test "$am__universal" = false || continue
;;
nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
if test "x$enable_dependency_tracking" = xyes; then
continue
else
@@ -5121,7 +5201,7 @@
fi
;;
msvc7 | msvc7msys | msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
+ # This compiler won't grok '-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
am__obj=conftest.${OBJEXT-o}
@@ -6718,8 +6798,7 @@
;;
*)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len" && \
- test undefined != "$lt_cv_sys_max_cmd_len"; then
+ if test -n "$lt_cv_sys_max_cmd_len"; then
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
else
@@ -7120,6 +7199,10 @@
fi
;;
+gnu*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
haiku*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -7158,11 +7241,11 @@
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd* | netbsdelf*-gnu)
+netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
@@ -8255,14 +8338,7 @@
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
- case `/usr/bin/file conftest.o` in
- *x86-64*)
- LD="${LD-ld} -m elf32_x86_64"
- ;;
- *)
- LD="${LD-ld} -m elf_i386"
- ;;
- esac
+ LD="${LD-ld} -m elf_i386"
;;
ppc64-*linux*|powerpc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
@@ -9963,7 +10039,7 @@
lt_prog_compiler_static='-non_shared'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
@@ -10441,9 +10517,6 @@
openbsd*)
with_gnu_ld=no
;;
- linux* | k*bsd*-gnu | gnu*)
- link_all_deplibs=no
- ;;
esac
ld_shlibs=yes
@@ -10665,7 +10738,7 @@
fi
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -10842,7 +10915,6 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
- link_all_deplibs=no
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -11296,7 +11368,7 @@
link_all_deplibs=yes
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -12133,6 +12205,17 @@
esac
;;
+gnu*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+
haiku*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
@@ -12249,7 +12332,7 @@
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
@@ -12298,10 +12381,14 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # Add ABI-specific directories to the system library path.
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -12313,18 +12400,6 @@
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -14072,6 +14147,9 @@
ld_shlibs_CXX=yes
;;
+ gnu*)
+ ;;
+
haiku*)
archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
link_all_deplibs_CXX=yes
@@ -14233,7 +14311,7 @@
inherit_rpath_CXX=yes
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -15093,7 +15171,7 @@
;;
esac
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -15157,7 +15235,7 @@
;;
esac
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -15528,9 +15606,6 @@
;;
esac
;;
- linux* | k*bsd*-gnu | gnu*)
- link_all_deplibs_CXX=no
- ;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -15965,6 +16040,17 @@
esac
;;
+gnu*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+
haiku*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
@@ -16081,7 +16167,7 @@
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
@@ -16130,10 +16216,14 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # Add ABI-specific directories to the system library path.
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -16145,18 +16235,6 @@
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -17157,13 +17235,81 @@
fi
+# Extract the first word of "autogen", so it can be a program name with args.
+set dummy autogen; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_AUTOGEN_PATH+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $AUTOGEN_PATH in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_AUTOGEN_PATH="$AUTOGEN_PATH" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_AUTOGEN_PATH="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_AUTOGEN_PATH" && ac_cv_path_AUTOGEN_PATH="no"
+ ;;
+esac
+fi
+AUTOGEN_PATH=$ac_cv_path_AUTOGEN_PATH
+if test -n "$AUTOGEN_PATH"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AUTOGEN_PATH" >&5
+$as_echo "$AUTOGEN_PATH" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+if test x$AUTOGEN_PATH = xno; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Couldn't find autogen. You will be able to build anjuta without autogen \
+ but several things won't work. You can get it from http://autogen.sourceforge.net/" >&5
+$as_echo "$as_me: WARNING: Couldn't find autogen. You will be able to build anjuta without autogen \
+ but several things won't work. You can get it from http://autogen.sourceforge.net/" >&2;}
+fi
+
+
+# Check whether --enable-plugin-terminal was given.
+if test "${enable_plugin_terminal+set}" = set; then :
+ enableval=$enable_plugin_terminal; if test "$enableval" = "no"; then
+ user_disabled_terminal=1
+ fi
+else
+ user_disabled_terminal=0
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if terminal plugin is disabled" >&5
+$as_echo_n "checking if terminal plugin is disabled... " >&6; }
+if test "$user_disabled_terminal" = 1; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ terminal_enabled="no"
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VTE" >&5
-$as_echo_n "checking for VTE... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PLUGIN_TERMINAL" >&5
+$as_echo_n "checking for PLUGIN_TERMINAL... " >&6; }
-if test -n "$VTE_CFLAGS"; then
- pkg_cv_VTE_CFLAGS="$VTE_CFLAGS"
+if test -n "$PLUGIN_TERMINAL_CFLAGS"; then
+ pkg_cv_PLUGIN_TERMINAL_CFLAGS="$PLUGIN_TERMINAL_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vte-2.90 >= \$VTE_REQUIRED\""; } >&5
@@ -17171,7 +17317,7 @@
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_VTE_CFLAGS=`$PKG_CONFIG --cflags "vte-2.90 >= $VTE_REQUIRED" 2>/dev/null`
+ pkg_cv_PLUGIN_TERMINAL_CFLAGS=`$PKG_CONFIG --cflags "vte-2.90 >= $VTE_REQUIRED" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -17179,8 +17325,8 @@
else
pkg_failed=untried
fi
-if test -n "$VTE_LIBS"; then
- pkg_cv_VTE_LIBS="$VTE_LIBS"
+if test -n "$PLUGIN_TERMINAL_LIBS"; then
+ pkg_cv_PLUGIN_TERMINAL_LIBS="$PLUGIN_TERMINAL_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vte-2.90 >= \$VTE_REQUIRED\""; } >&5
@@ -17188,7 +17334,7 @@
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_VTE_LIBS=`$PKG_CONFIG --libs "vte-2.90 >= $VTE_REQUIRED" 2>/dev/null`
+ pkg_cv_PLUGIN_TERMINAL_LIBS=`$PKG_CONFIG --libs "vte-2.90 >= $VTE_REQUIRED" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -17209,95 +17355,43 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- VTE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "vte-2.90 >= $VTE_REQUIRED" 2>&1`
+ PLUGIN_TERMINAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "vte-2.90 >= $VTE_REQUIRED" 2>&1`
else
- VTE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "vte-2.90 >= $VTE_REQUIRED" 2>&1`
+ PLUGIN_TERMINAL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "vte-2.90 >= $VTE_REQUIRED" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
- echo "$VTE_PKG_ERRORS" >&5
-
- as_fn_error $? "Package requirements (vte-2.90 >= $VTE_REQUIRED) were not met:
+ echo "$PLUGIN_TERMINAL_PKG_ERRORS" >&5
-$VTE_PKG_ERRORS
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
+ terminal_enabled=no
-Alternatively, you may set the environment variables VTE_CFLAGS
-and VTE_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-Alternatively, you may set the environment variables VTE_CFLAGS
-and VTE_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
+ terminal_enabled=no
-To get pkg-config, see .
-See \`config.log' for more details" "$LINENO" 5; }
else
- VTE_CFLAGS=$pkg_cv_VTE_CFLAGS
- VTE_LIBS=$pkg_cv_VTE_LIBS
+ PLUGIN_TERMINAL_CFLAGS=$pkg_cv_PLUGIN_TERMINAL_CFLAGS
+ PLUGIN_TERMINAL_LIBS=$pkg_cv_PLUGIN_TERMINAL_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
-fi
+ terminal_enabled=yes
-# Extract the first word of "autogen", so it can be a program name with args.
-set dummy autogen; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_AUTOGEN_PATH+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $AUTOGEN_PATH in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_AUTOGEN_PATH="$AUTOGEN_PATH" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_AUTOGEN_PATH="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_AUTOGEN_PATH" && ac_cv_path_AUTOGEN_PATH="no"
- ;;
-esac
fi
-AUTOGEN_PATH=$ac_cv_path_AUTOGEN_PATH
-if test -n "$AUTOGEN_PATH"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AUTOGEN_PATH" >&5
-$as_echo "$AUTOGEN_PATH" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
fi
-
-if test x$AUTOGEN_PATH = xno; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Couldn't find autogen. You will be able to build anjuta without autogen \
- but several things won't work. You can get it from http://autogen.sourceforge.net/" >&5
-$as_echo "$as_me: WARNING: Couldn't find autogen. You will be able to build anjuta without autogen \
- but several things won't work. You can get it from http://autogen.sourceforge.net/" >&2;}
+ if test x$terminal_enabled = xyes; then
+ HAVE_PLUGIN_TERMINAL_TRUE=
+ HAVE_PLUGIN_TERMINAL_FALSE='#'
+else
+ HAVE_PLUGIN_TERMINAL_TRUE='#'
+ HAVE_PLUGIN_TERMINAL_FALSE=
fi
+
# Check whether --enable-plugin-devhelp was given.
if test "${enable_plugin_devhelp+set}" = set; then :
enableval=$enable_plugin_devhelp; if test "$enableval" = "no"; then
@@ -17657,6 +17751,88 @@
fi
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLITE" >&5
+$as_echo_n "checking for SQLITE... " >&6; }
+
+if test -n "$SQLITE_CFLAGS"; then
+ pkg_cv_SQLITE_CFLAGS="$SQLITE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "sqlite3") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_SQLITE_CFLAGS=`$PKG_CONFIG --cflags "sqlite3" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$SQLITE_LIBS"; then
+ pkg_cv_SQLITE_LIBS="$SQLITE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "sqlite3") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_SQLITE_LIBS=`$PKG_CONFIG --libs "sqlite3" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ SQLITE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sqlite3" 2>&1`
+ else
+ SQLITE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sqlite3" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$SQLITE_PKG_ERRORS" >&5
+
+ sqlite3_found=no
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ sqlite3_found=no
+else
+ SQLITE_CFLAGS=$pkg_cv_SQLITE_CFLAGS
+ SQLITE_LIBS=$pkg_cv_SQLITE_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ sqlite3_found=yes
+fi
+ if test x$sqlite3_found = xyes; then
+ HAVE_SQLITE_TRUE=
+ HAVE_SQLITE_FALSE='#'
+else
+ HAVE_SQLITE_TRUE='#'
+ HAVE_SQLITE_FALSE=
+fi
+
+
+
+
# Check whether --enable-vala was given.
if test "${enable_vala+set}" = set; then :
enableval=$enable_vala; if test "$enableval" = "no"; then
@@ -17679,25 +17855,30 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libvala is available" >&5
$as_echo_n "checking if libvala is available... " >&6; }
if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libvala-0.18 \""; } >&5
+ ($PKG_CONFIG --exists --print-errors " libvala-0.18 ") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ valaver="-0.18"
+fi
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libvala-0.20 \""; } >&5
($PKG_CONFIG --exists --print-errors " libvala-0.20 ") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
valaver="-0.20"
-else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libvala-0.18 \""; } >&5
- ($PKG_CONFIG --exists --print-errors " libvala-0.18 ") 2>&5
+fi
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libvala-0.22 \""; } >&5
+ ($PKG_CONFIG --exists --print-errors " libvala-0.22 ") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- valaver="-0.18"
-else
- valaver=""
+ valaver="-0.22"
fi
-fi
if test "x$valaver" != "x"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -17871,7 +18052,7 @@
# Find any Python interpreter.
if test -z "$PYTHON"; then
- 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
+ for ac_prog in python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -17957,6 +18138,25 @@
PYTHON_PLATFORM=$am_cv_python_platform
+ # Just factor out some code duplication.
+ am_python_setup_sysconfig="\
+import sys
+# Prefer sysconfig over distutils.sysconfig, for better compatibility
+# with python 3.x. See automake bug#10227.
+try:
+ import sysconfig
+except ImportError:
+ can_use_sysconfig = 0
+else:
+ can_use_sysconfig = 1
+# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs:
+#
+try:
+ from platform import python_implementation
+ if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
+ can_use_sysconfig = 0
+except ImportError:
+ pass"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
@@ -17970,7 +18170,14 @@
else
am_py_prefix=$prefix
fi
- 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`
+ am_cv_python_pythondir=`$PYTHON -c "
+$am_python_setup_sysconfig
+if can_use_sysconfig:
+ sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})
+else:
+ from distutils import sysconfig
+ sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
+sys.stdout.write(sitedir)"`
case $am_cv_python_pythondir in
$am_py_prefix*)
am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
@@ -18007,7 +18214,14 @@
else
am_py_exec_prefix=$exec_prefix
fi
- 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`
+ am_cv_python_pyexecdir=`$PYTHON -c "
+$am_python_setup_sysconfig
+if can_use_sysconfig:
+ sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'})
+else:
+ from distutils import sysconfig
+ sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix')
+sys.stdout.write(sitedir)"`
case $am_cv_python_pyexecdir in
$am_py_exec_prefix*)
am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
@@ -18732,6 +18946,13 @@
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+ [\\/$]* | ?:[\\/]*) ;;
+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+
+
GETTEXT_MACRO_VERSION=0.17
@@ -20876,31 +21097,11 @@
# Put the nasty error message in config.log where it belongs
echo "$GTKDOC_DEPS_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0) were not met:
-
-$GTKDOC_DEPS_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS
-and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
+ :
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS
-and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see .
-See \`config.log' for more details" "$LINENO" 5; }
+ :
else
GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS
GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS
@@ -20935,6 +21136,10 @@
enable_gtk_doc_pdf=no
fi
+ if test -z "$AM_DEFAULT_VERBOSITY"; then
+ AM_DEFAULT_VERBOSITY=1
+ fi
+
if test x$enable_gtk_doc = xyes; then
ENABLE_GTK_DOC_TRUE=
@@ -22292,13 +22497,75 @@
+bck_LIBS="$LIBS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing shm_open" >&5
+$as_echo_n "checking for library containing shm_open... " >&6; }
+if ${ac_cv_search_shm_open+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shm_open ();
+int
+main ()
+{
+return shm_open ();
+ ;
+ return 0;
+}
+_ACEOF
+for ac_lib in '' rt; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+ ac_res=-l$ac_lib
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ fi
+ if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_search_shm_open=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if ${ac_cv_search_shm_open+:} false; then :
+ break
+fi
+done
+if ${ac_cv_search_shm_open+:} false; then :
+
+else
+ ac_cv_search_shm_open=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_shm_open" >&5
+$as_echo "$ac_cv_search_shm_open" >&6; }
+ac_res=$ac_cv_search_shm_open
+if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+ SHM_LIBS="$LIBS"
+else
+ as_fn_error $? "Failed to find library with shm_open()" "$LINENO" 5
+fi
+
+
+LIBS="$bck_LIBS"
+
ac_config_commands="$ac_config_commands plugins/am-project/tests/atconfig"
AUTOM4TE=${AUTOM4TE-"${am_missing_run}autom4te"}
-ac_config_files="$ac_config_files Makefile po/Makefile.in libanjuta/Makefile libanjuta/tests/Makefile libanjuta/interfaces/Makefile libanjuta/libanjuta-3.0.pc libanjuta/anjuta-version.h src/Makefile pixmaps/Makefile pixmaps/16x16/Makefile pixmaps/22x22/Makefile pixmaps/24x24/Makefile pixmaps/32x32/Makefile pixmaps/48x48/Makefile pixmaps/scalable/Makefile data/Makefile data/welcome.txt data/templates/Makefile doc/anjuta.1 doc/anjuta-launcher.1 doc/Makefile scripts/Makefile launcher/Makefile plugins/Makefile plugins/class-gen/Makefile plugins/class-gen/templates/Makefile plugins/patch/Makefile plugins/document-manager/Makefile plugins/document-manager/images/Makefile plugins/message-view/Makefile plugins/gdb/Makefile plugins/gdb/images/Makefile plugins/debug-manager/Makefile plugins/debug-manager/images/Makefile plugins/devhelp/Makefile plugins/devhelp/images/Makefile plugins/glade/Makefile plugins/glade/images/Makefile plugins/js-debugger/Makefile plugins/file-manager/Makefile plugins/file-loader/Makefile plugins/file-wizard/Makefile plugins/build-basic-autotools/Makefile plugins/project-manager/Makefile plugins/symbol-db/benchmark/Makefile plugins/symbol-db/benchmark/symbol-db/Makefile plugins/symbol-db/benchmark/libgda/Makefile plugins/symbol-db/benchmark/sqlite/Makefile plugins/symbol-db/images/Makefile plugins/symbol-db/Makefile plugins/symbol-db/anjuta-tags/Makefile plugins/project-wizard/Makefile plugins/snippets-manager/Makefile plugins/cvs-plugin/Makefile plugins/subversion/Makefile plugins/git/Makefile plugins/git/images/Makefile plugins/sourceview/Makefile plugins/terminal/Makefile plugins/tools/Makefile plugins/tools/scripts/Makefile plugins/language-manager/Makefile plugins/project-import/Makefile plugins/project-wizard/templates/Makefile plugins/project-wizard/templates/mkfile/Makefile plugins/project-wizard/templates/mkfile/src/Makefile plugins/project-wizard/templates/mkfile/po/Makefile plugins/project-wizard/templates/minimal/Makefile plugins/project-wizard/templates/js_minimal/Makefile plugins/project-wizard/templates/js_minimal/src/Makefile plugins/project-wizard/templates/terminal/Makefile plugins/project-wizard/templates/terminal/src/Makefile plugins/project-wizard/templates/terminal/po/Makefile plugins/project-wizard/templates/cpp/Makefile plugins/project-wizard/templates/cpp/src/Makefile plugins/project-wizard/templates/cpp/po/Makefile plugins/project-wizard/templates/gtk/Makefile plugins/project-wizard/templates/gtk/src/Makefile plugins/project-wizard/templates/gtk/po/Makefile plugins/project-wizard/templates/gtkapplication/Makefile plugins/project-wizard/templates/gtkapplication/src/Makefile plugins/project-wizard/templates/gtkapplication/po/Makefile plugins/project-wizard/templates/anjuta-plugin/Makefile plugins/project-wizard/templates/anjuta-plugin/src/Makefile plugins/project-wizard/templates/anjuta-plugin/po/Makefile plugins/project-wizard/templates/gtkmm/Makefile plugins/project-wizard/templates/gtkmm/src/Makefile plugins/project-wizard/templates/gtkmm/po/Makefile plugins/project-wizard/templates/gcj/Makefile plugins/project-wizard/templates/gcj/src/Makefile plugins/project-wizard/templates/java/Makefile plugins/project-wizard/templates/java/src/Makefile plugins/project-wizard/templates/java/po/Makefile plugins/project-wizard/templates/python/Makefile plugins/project-wizard/templates/python/src/Makefile plugins/project-wizard/templates/python/po/Makefile plugins/project-wizard/templates/pygtk/Makefile plugins/project-wizard/templates/pygtk/src/Makefile plugins/project-wizard/templates/pygtk/po/Makefile plugins/project-wizard/templates/vala-gtk/Makefile plugins/project-wizard/templates/vala-gtk/src/Makefile plugins/project-wizard/templates/wxwin/Makefile plugins/project-wizard/templates/wxwin/src/Makefile plugins/project-wizard/templates/wxwin/po/Makefile plugins/project-wizard/templates/xlib/Makefile plugins/project-wizard/templates/xlib/src/Makefile plugins/project-wizard/templates/xlib/po/Makefile plugins/project-wizard/templates/xlib-dock/Makefile plugins/project-wizard/templates/xlib-dock/src/Makefile plugins/project-wizard/templates/xlib-dock/po/Makefile plugins/project-wizard/templates/sdl/Makefile plugins/project-wizard/templates/sdl/src/Makefile plugins/project-wizard/templates/sdl/po/Makefile plugins/project-wizard/templates/library/Makefile plugins/project-wizard/templates/library/src/Makefile plugins/project-wizard/templates/library/po/Makefile plugins/project-wizard/templates/directory/Makefile plugins/project-wizard/templates/m4/Makefile plugins/project-wizard/templates/gnome-shell-extension/Makefile plugins/project-wizard/templates/gnome-shell-extension/src/Makefile plugins/am-project/Makefile plugins/am-project/tests/atlocal plugins/am-project/tests/Makefile plugins/mk-project/Makefile plugins/dir-project/Makefile plugins/language-support-cpp-java/Makefile plugins/run-program/Makefile plugins/starter/Makefile plugins/indentation-c-style/Makefile plugins/indentation-python-style/Makefile plugins/language-support-js/Makefile plugins/language-support-vala/Makefile plugins/language-support-python/Makefile plugins/parser-cxx/Makefile plugins/parser-cxx/cxxparser/Makefile plugins/python-loader/Makefile plugins/jhbuild/Makefile plugins/quick-open/Makefile anjuta.desktop.in manuals/Makefile manuals/reference/Makefile manuals/reference/libanjuta/Makefile manuals/reference/libanjuta/version.xml manuals/anjuta-manual/Makefile manuals/anjuta-faqs/Makefile manuals/anjuta-build-tutorial/Makefile mime/Makefile"
+ac_config_files="$ac_config_files Makefile po/Makefile.in libanjuta/Makefile libanjuta/tests/Makefile libanjuta/interfaces/Makefile libanjuta/libanjuta-3.0.pc libanjuta/anjuta-version.h src/Makefile pixmaps/Makefile pixmaps/hicolor/Makefile pixmaps/hicolor/16x16/Makefile pixmaps/hicolor/22x22/Makefile pixmaps/hicolor/24x24/Makefile pixmaps/hicolor/32x32/Makefile pixmaps/hicolor/48x48/Makefile pixmaps/hicolor/scalable/Makefile pixmaps/HighContrast/Makefile pixmaps/HighContrast/16x16/Makefile pixmaps/HighContrast/22x22/Makefile pixmaps/HighContrast/24x24/Makefile pixmaps/HighContrast/32x32/Makefile pixmaps/HighContrast/48x48/Makefile pixmaps/HighContrast/256x256/Makefile data/Makefile data/welcome.txt data/templates/Makefile doc/anjuta.1 doc/anjuta-launcher.1 doc/Makefile scripts/Makefile launcher/Makefile plugins/Makefile plugins/class-gen/Makefile plugins/class-gen/templates/Makefile plugins/patch/Makefile plugins/document-manager/Makefile plugins/document-manager/images/Makefile plugins/message-view/Makefile plugins/gdb/Makefile plugins/gdb/images/Makefile plugins/debug-manager/Makefile plugins/debug-manager/images/Makefile plugins/devhelp/Makefile plugins/devhelp/images/Makefile plugins/glade/Makefile plugins/glade/images/Makefile plugins/js-debugger/Makefile plugins/file-manager/Makefile plugins/file-loader/Makefile plugins/file-wizard/Makefile plugins/build-basic-autotools/Makefile plugins/project-manager/Makefile plugins/symbol-db/benchmark/Makefile plugins/symbol-db/benchmark/symbol-db/Makefile plugins/symbol-db/benchmark/libgda/Makefile plugins/symbol-db/benchmark/sqlite/Makefile plugins/symbol-db/images/Makefile plugins/symbol-db/Makefile plugins/symbol-db/anjuta-tags/Makefile plugins/project-wizard/Makefile plugins/snippets-manager/Makefile plugins/cvs-plugin/Makefile plugins/subversion/Makefile plugins/git/Makefile plugins/git/images/Makefile plugins/sourceview/Makefile plugins/terminal/Makefile plugins/tools/Makefile plugins/tools/scripts/Makefile plugins/language-manager/Makefile plugins/project-import/Makefile plugins/project-wizard/templates/Makefile plugins/project-wizard/templates/mkfile/Makefile plugins/project-wizard/templates/mkfile/src/Makefile plugins/project-wizard/templates/mkfile/po/Makefile plugins/project-wizard/templates/minimal/Makefile plugins/project-wizard/templates/js_minimal/Makefile plugins/project-wizard/templates/js_minimal/src/Makefile plugins/project-wizard/templates/terminal/Makefile plugins/project-wizard/templates/terminal/src/Makefile plugins/project-wizard/templates/terminal/po/Makefile plugins/project-wizard/templates/cpp/Makefile plugins/project-wizard/templates/cpp/src/Makefile plugins/project-wizard/templates/cpp/po/Makefile plugins/project-wizard/templates/gtk/Makefile plugins/project-wizard/templates/gtk/src/Makefile plugins/project-wizard/templates/gtk/po/Makefile plugins/project-wizard/templates/gtkapplication/Makefile plugins/project-wizard/templates/gtkapplication/src/Makefile plugins/project-wizard/templates/gtkapplication/po/Makefile plugins/project-wizard/templates/anjuta-plugin/Makefile plugins/project-wizard/templates/anjuta-plugin/src/Makefile plugins/project-wizard/templates/anjuta-plugin/po/Makefile plugins/project-wizard/templates/gtkmm/Makefile plugins/project-wizard/templates/gtkmm/src/Makefile plugins/project-wizard/templates/gtkmm/po/Makefile plugins/project-wizard/templates/gcj/Makefile plugins/project-wizard/templates/gcj/src/Makefile plugins/project-wizard/templates/java/Makefile plugins/project-wizard/templates/java/src/Makefile plugins/project-wizard/templates/java/po/Makefile plugins/project-wizard/templates/python/Makefile plugins/project-wizard/templates/python/src/Makefile plugins/project-wizard/templates/python/po/Makefile plugins/project-wizard/templates/pygtk/Makefile plugins/project-wizard/templates/pygtk/src/Makefile plugins/project-wizard/templates/pygtk/po/Makefile plugins/project-wizard/templates/vala-gtk/Makefile plugins/project-wizard/templates/vala-gtk/src/Makefile plugins/project-wizard/templates/wxwin/Makefile plugins/project-wizard/templates/wxwin/src/Makefile plugins/project-wizard/templates/wxwin/po/Makefile plugins/project-wizard/templates/xlib/Makefile plugins/project-wizard/templates/xlib/src/Makefile plugins/project-wizard/templates/xlib/po/Makefile plugins/project-wizard/templates/xlib-dock/Makefile plugins/project-wizard/templates/xlib-dock/src/Makefile plugins/project-wizard/templates/xlib-dock/po/Makefile plugins/project-wizard/templates/sdl/Makefile plugins/project-wizard/templates/sdl/src/Makefile plugins/project-wizard/templates/sdl/po/Makefile plugins/project-wizard/templates/library/Makefile plugins/project-wizard/templates/library/src/Makefile plugins/project-wizard/templates/library/po/Makefile plugins/project-wizard/templates/directory/Makefile plugins/project-wizard/templates/m4/Makefile plugins/project-wizard/templates/gnome-shell-extension/Makefile plugins/project-wizard/templates/gnome-shell-extension/src/Makefile plugins/am-project/Makefile plugins/am-project/tests/atlocal plugins/am-project/tests/Makefile plugins/mk-project/Makefile plugins/dir-project/Makefile plugins/language-support-cpp-java/Makefile plugins/run-program/Makefile plugins/starter/Makefile plugins/indentation-c-style/Makefile plugins/indentation-python-style/Makefile plugins/language-support-js/Makefile plugins/language-support-vala/Makefile plugins/language-support-python/Makefile plugins/parser-cxx/Makefile plugins/parser-cxx/cxxparser/Makefile plugins/python-loader/Makefile plugins/jhbuild/Makefile plugins/quick-open/Makefile anjuta.desktop.in manuals/Makefile manuals/reference/Makefile manuals/reference/libanjuta/Makefile manuals/reference/libanjuta/version.xml manuals/anjuta-manual/Makefile manuals/anjuta-faqs/Makefile manuals/anjuta-build-tutorial/Makefile mime/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -22409,6 +22676,14 @@
LTLIBOBJS=$ac_ltlibobjs
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+ if test -n "$am_sleep_pid"; then
+ # Hide warnings about reused PIDs.
+ wait $am_sleep_pid 2>/dev/null
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
if test -n "$EXEEXT"; then
am__EXEEXT_TRUE=
am__EXEEXT_FALSE='#'
@@ -22437,6 +22712,10 @@
as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${HAVE_PLUGIN_TERMINAL_TRUE}" && test -z "${HAVE_PLUGIN_TERMINAL_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_PLUGIN_TERMINAL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${HAVE_PLUGIN_DEVHELP_TRUE}" && test -z "${HAVE_PLUGIN_DEVHELP_FALSE}"; then
as_fn_error $? "conditional \"HAVE_PLUGIN_DEVHELP\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -22449,6 +22728,10 @@
as_fn_error $? "conditional \"ENABLE_GLADE_CATALOG\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${HAVE_SQLITE_TRUE}" && test -z "${HAVE_SQLITE_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_SQLITE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${ENABLE_VALA_TRUE}" && test -z "${ENABLE_VALA_FALSE}"; then
as_fn_error $? "conditional \"ENABLE_VALA\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -22882,7 +23165,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Anjuta $as_me 3.8.4, which was
+This file was extended by Anjuta $as_me 3.10.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22949,7 +23232,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Anjuta config.status 3.8.4
+Anjuta config.status 3.10.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -23475,12 +23758,20 @@
"libanjuta/anjuta-version.h") CONFIG_FILES="$CONFIG_FILES libanjuta/anjuta-version.h" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/Makefile" ;;
- "pixmaps/16x16/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/16x16/Makefile" ;;
- "pixmaps/22x22/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/22x22/Makefile" ;;
- "pixmaps/24x24/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/24x24/Makefile" ;;
- "pixmaps/32x32/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/32x32/Makefile" ;;
- "pixmaps/48x48/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/48x48/Makefile" ;;
- "pixmaps/scalable/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/scalable/Makefile" ;;
+ "pixmaps/hicolor/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/hicolor/Makefile" ;;
+ "pixmaps/hicolor/16x16/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/hicolor/16x16/Makefile" ;;
+ "pixmaps/hicolor/22x22/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/hicolor/22x22/Makefile" ;;
+ "pixmaps/hicolor/24x24/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/hicolor/24x24/Makefile" ;;
+ "pixmaps/hicolor/32x32/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/hicolor/32x32/Makefile" ;;
+ "pixmaps/hicolor/48x48/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/hicolor/48x48/Makefile" ;;
+ "pixmaps/hicolor/scalable/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/hicolor/scalable/Makefile" ;;
+ "pixmaps/HighContrast/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/HighContrast/Makefile" ;;
+ "pixmaps/HighContrast/16x16/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/HighContrast/16x16/Makefile" ;;
+ "pixmaps/HighContrast/22x22/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/HighContrast/22x22/Makefile" ;;
+ "pixmaps/HighContrast/24x24/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/HighContrast/24x24/Makefile" ;;
+ "pixmaps/HighContrast/32x32/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/HighContrast/32x32/Makefile" ;;
+ "pixmaps/HighContrast/48x48/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/HighContrast/48x48/Makefile" ;;
+ "pixmaps/HighContrast/256x256/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/HighContrast/256x256/Makefile" ;;
"data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
"data/welcome.txt") CONFIG_FILES="$CONFIG_FILES data/welcome.txt" ;;
"data/templates/Makefile") CONFIG_FILES="$CONFIG_FILES data/templates/Makefile" ;;
@@ -24210,7 +24501,7 @@
case $ac_file$ac_mode in
"depfiles":C) test x"$AMDEP_TRUE" != x"" || {
- # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
case $CONFIG_FILES in
@@ -24223,7 +24514,7 @@
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
+ # We used to match only the files named 'Makefile.in', but
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
@@ -24257,21 +24548,19 @@
continue
fi
# Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
+ # from the Makefile without running 'make'.
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue
am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
+ test -z "$am__include" && continue
am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
# Find all dependency output files, they are included files with
# $(DEPDIR) in their names. We invoke sed twice because it is the
# simplest approach to changing $(DEPDIR) to its actual value in the
# expansion.
for file in `sed -n "
s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
fdir=`$as_dirname -- "$file" ||
@@ -25322,6 +25611,14 @@
echo "Building devhelp plugin: ...............................NO"
echo " Requires libdevhelp-3.0 (>= $LIBDEVHELP_REQUIRED)"
fi
+
+if test x$terminal_enabled = xyes ; then
+ echo "Building terminal plugin: ..............................YES"
+else
+ echo "Building terminal plugin: ..............................NO"
+ echo " Requires vte-2.90 (>= $VTE_REQUIRED)"
+fi
+
if test x$enable_vala = xyes ; then
echo "Building Vala support: .................................YES"
else
diff -Nru anjuta-3.8.4/configure.ac anjuta-3.10.2/configure.ac
--- anjuta-3.8.4/configure.ac 2013-06-03 21:05:43.000000000 +0000
+++ anjuta-3.10.2/configure.ac 2013-11-12 21:17:07.000000000 +0000
@@ -2,9 +2,9 @@
AC_PREREQ(2.65)
-m4_define(anjuta_major_version, 3)
-m4_define(anjuta_minor_version, 8)
-m4_define(anjuta_micro_version, 4)
+m4_define(anjuta_major_version, 3)
+m4_define(anjuta_minor_version, 10)
+m4_define(anjuta_micro_version, 2)
m4_define(anjuta_version, anjuta_major_version.anjuta_minor_version.anjuta_micro_version)
m4_define(bugzilla_version, anjuta_major_version.anjuta_minor_version.anjuta_micro_version)
@@ -31,13 +31,12 @@
AC_SUBST(BUGZILLA_VERSION)
dnl Anjuta core
-GLIB_REQUIRED=2.32.0
-GTK_REQUIRED=3.4.0
+GLIB_REQUIRED=2.34.0
+GTK_REQUIRED=3.6.0
GTHREAD_REQUIRED=2.22.0
GDK_PIXBUF_REQUIRED=2.0.0
GDA4_REQUIRED=4.2.0
GDA5_REQUIRED=5.0.0
-VTE_REQUIRED=0.27.6
LIBXML_REQUIRED=2.4.23
GDL_REQUIRED=3.5.5
LIBWNCK_REQUIRED=2.12
@@ -45,6 +44,9 @@
dnl GtkSourceView
GTKSOURCEVIEW_REQUIRED=3.0.0
+dnl Terminal
+VTE_REQUIRED=0.27.6
+
dnl Devhelp
LIBDEVHELP_REQUIRED=3.7.4
@@ -161,9 +163,6 @@
[libgda-5.0 >= $GDA5_REQUIRED],,
[PKG_CHECK_MODULES([GDA],
[libgda-4.0 >= $GDA4_REQUIRED])])
-
-PKG_CHECK_MODULES([VTE],
- [vte-2.90 >= $VTE_REQUIRED])
dnl Check for autogen
dnl -----------------
@@ -173,6 +172,32 @@
but several things won't work. You can get it from http://autogen.sourceforge.net/])
fi
+dnl Check for Terminal
+dnl ---------------------
+
+AC_ARG_ENABLE(plugin-terminal,
+ AS_HELP_STRING([--disable-plugin-terminal],[Disable terminal plugin support in Anjuta.]),
+ [ if test "$enableval" = "no"; then
+ user_disabled_terminal=1
+ fi ],
+ [ user_disabled_terminal=0 ] )
+
+AC_MSG_CHECKING(if terminal plugin is disabled)
+if test "$user_disabled_terminal" = 1; then
+ AC_MSG_RESULT(yes)
+ terminal_enabled="no"
+else
+ AC_MSG_RESULT(no)
+ PKG_CHECK_MODULES(PLUGIN_TERMINAL, [vte-2.90 >= $VTE_REQUIRED],
+ [
+ terminal_enabled=yes
+ ], [
+ terminal_enabled=no
+ ])
+fi
+
+AM_CONDITIONAL(HAVE_PLUGIN_TERMINAL, [test x$terminal_enabled = xyes])
+
dnl Check for Devhelp
dnl -----------------
@@ -268,6 +293,13 @@
PKG_CHECK_MODULES(SOURCEVIEW,
[gtksourceview-3.0 >= $GTKSOURCEVIEW_REQUIRED])
+
+dnl Check for libsqlite3 used in symbol-db benchmarks
+dnl -------------------------------------------------------------
+PKG_CHECK_MODULES(SQLITE, sqlite3, sqlite3_found=yes, sqlite3_found=no)
+AM_CONDITIONAL(HAVE_SQLITE, [test x$sqlite3_found = xyes])
+
+
dnl Check for vala
dnl -------------------------------------------------------------
@@ -285,11 +317,9 @@
else
AC_MSG_RESULT(no)
AC_MSG_CHECKING(if libvala is available)
- PKG_CHECK_EXISTS([ libvala-0.20 ],
- [ valaver="-0.20" ],
- [ PKG_CHECK_EXISTS([ libvala-0.18 ],
- [ valaver="-0.18" ],
- [ valaver="" ])
+ m4_foreach([VERSION], [[0.18], [0.20], [0.22]],
+ [PKG_CHECK_EXISTS([ libvala-VERSION ],
+ [ valaver="-VERSION" ])
])
if test "x$valaver" != "x"; then
AC_MSG_RESULT(yes)
@@ -733,6 +763,12 @@
AC_SUBST(SYMBOL_DB_SHM)
+dnl On Linux, need librt for shm_open/shm_unlink
+bck_LIBS="$LIBS"
+AC_SEARCH_LIBS(shm_open, rt, [SHM_LIBS="$LIBS"], [AC_MSG_ERROR([Failed to find library with shm_open()])])
+AC_SUBST(SHM_LIBS)
+LIBS="$bck_LIBS"
+
dnl Test using autotest
dnl -----------------------------
AC_CONFIG_TESTDIR(plugins/am-project/tests)
@@ -748,12 +784,20 @@
libanjuta/anjuta-version.h
src/Makefile
pixmaps/Makefile
-pixmaps/16x16/Makefile
-pixmaps/22x22/Makefile
-pixmaps/24x24/Makefile
-pixmaps/32x32/Makefile
-pixmaps/48x48/Makefile
-pixmaps/scalable/Makefile
+pixmaps/hicolor/Makefile
+pixmaps/hicolor/16x16/Makefile
+pixmaps/hicolor/22x22/Makefile
+pixmaps/hicolor/24x24/Makefile
+pixmaps/hicolor/32x32/Makefile
+pixmaps/hicolor/48x48/Makefile
+pixmaps/hicolor/scalable/Makefile
+pixmaps/HighContrast/Makefile
+pixmaps/HighContrast/16x16/Makefile
+pixmaps/HighContrast/22x22/Makefile
+pixmaps/HighContrast/24x24/Makefile
+pixmaps/HighContrast/32x32/Makefile
+pixmaps/HighContrast/48x48/Makefile
+pixmaps/HighContrast/256x256/Makefile
data/Makefile
data/welcome.txt
data/templates/Makefile
@@ -915,6 +959,14 @@
echo "Building devhelp plugin: ...............................NO"
echo " Requires libdevhelp-3.0 (>= $LIBDEVHELP_REQUIRED)"
fi
+
+if [ test x$terminal_enabled = xyes ]; then
+ echo "Building terminal plugin: ..............................YES"
+else
+ echo "Building terminal plugin: ..............................NO"
+ echo " Requires vte-2.90 (>= $VTE_REQUIRED)"
+fi
+
if [ test x$enable_vala = xyes ]; then
echo "Building Vala support: .................................YES"
else
diff -Nru anjuta-3.8.4/data/Makefile.am anjuta-3.10.2/data/Makefile.am
--- anjuta-3.8.4/data/Makefile.am 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/data/Makefile.am 2013-07-08 21:06:37.000000000 +0000
@@ -9,10 +9,9 @@
anjuta_datadir = $(anjuta_data_dir)
anjuta_profiledir = $(anjuta_data_dir)/profiles
-anjuta_data_DATA = welcome.txt
+dist_anjuta_data_DATA = welcome.txt
-anjuta_profile_DATA = default.profile
-
-EXTRA_DIST = $(anjuta_data_DATA) $(anjuta_profile_DATA)
+dist_anjuta_profile_DATA = default.profile \
+ editor.profile
-include $(top_srcdir)/git.mk
diff -Nru anjuta-3.8.4/data/Makefile.in anjuta-3.10.2/data/Makefile.in
--- anjuta-3.8.4/data/Makefile.in 2013-06-03 21:24:28.000000000 +0000
+++ anjuta-3.10.2/data/Makefile.in 2013-11-14 21:21:09.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
@SET_MAKE@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
esac; \
- test $$am__dry = yes; \
- }
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -52,8 +79,9 @@
build_triplet = @build@
host_triplet = @host@
subdir = data
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/welcome.txt.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(srcdir)/welcome.txt.in $(dist_anjuta_data_DATA) \
+ $(dist_anjuta_profile_DATA)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
@@ -71,21 +99,28 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = welcome.txt
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
AM_V_GEN = $(am__v_GEN_@AM_V@)
am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
AM_V_at = $(am__v_at_@AM_V@)
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- install-dvi-recursive install-exec-recursive \
- install-html-recursive install-info-recursive \
- install-pdf-recursive install-ps-recursive install-recursive \
- installcheck-recursive installdirs-recursive pdf-recursive \
- ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+ ctags-recursive dvi-recursive html-recursive info-recursive \
+ install-data-recursive install-dvi-recursive \
+ install-exec-recursive install-html-recursive \
+ install-info-recursive install-pdf-recursive \
+ install-ps-recursive install-recursive installcheck-recursive \
+ installdirs-recursive pdf-recursive ps-recursive \
+ tags-recursive uninstall-recursive
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -120,12 +155,32 @@
}
am__installdirs = "$(DESTDIR)$(anjuta_datadir)" \
"$(DESTDIR)$(anjuta_profiledir)"
-DATA = $(anjuta_data_DATA) $(anjuta_profile_DATA)
+DATA = $(dist_anjuta_data_DATA) $(dist_anjuta_profile_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+ $(RECURSIVE_TARGETS) \
+ $(RECURSIVE_CLEAN_TARGETS) \
+ $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@@ -302,6 +357,8 @@
PLUGIN_DEVHELP_LIBS = @PLUGIN_DEVHELP_LIBS@
PLUGIN_GLADE_CFLAGS = @PLUGIN_GLADE_CFLAGS@
PLUGIN_GLADE_LIBS = @PLUGIN_GLADE_LIBS@
+PLUGIN_TERMINAL_CFLAGS = @PLUGIN_TERMINAL_CFLAGS@
+PLUGIN_TERMINAL_LIBS = @PLUGIN_TERMINAL_LIBS@
POSUB = @POSUB@
PREF_SUFFIX = @PREF_SUFFIX@
PYTHON = @PYTHON@
@@ -316,8 +373,11 @@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+SHM_LIBS = @SHM_LIBS@
SOURCEVIEW_CFLAGS = @SOURCEVIEW_CFLAGS@
SOURCEVIEW_LIBS = @SOURCEVIEW_LIBS@
+SQLITE_CFLAGS = @SQLITE_CFLAGS@
+SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
SVNCONFIG = @SVNCONFIG@
SVN_CFLAGS = @SVN_CFLAGS@
@@ -329,8 +389,6 @@
VALA_CFLAGS = @VALA_CFLAGS@
VALA_LIBS = @VALA_LIBS@
VERSION = @VERSION@
-VTE_CFLAGS = @VTE_CFLAGS@
-VTE_LIBS = @VTE_LIBS@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
@@ -409,9 +467,10 @@
SUBDIRS = templates
anjuta_datadir = $(anjuta_data_dir)
anjuta_profiledir = $(anjuta_data_dir)/profiles
-anjuta_data_DATA = welcome.txt
-anjuta_profile_DATA = default.profile
-EXTRA_DIST = $(anjuta_data_DATA) $(anjuta_profile_DATA)
+dist_anjuta_data_DATA = welcome.txt
+dist_anjuta_profile_DATA = default.profile \
+ editor.profile
+
all: all-recursive
.SUFFIXES:
@@ -453,9 +512,9 @@
clean-libtool:
-rm -rf .libs _libs
-install-anjuta_dataDATA: $(anjuta_data_DATA)
+install-dist_anjuta_dataDATA: $(dist_anjuta_data_DATA)
@$(NORMAL_INSTALL)
- @list='$(anjuta_data_DATA)'; test -n "$(anjuta_datadir)" || list=; \
+ @list='$(dist_anjuta_data_DATA)'; test -n "$(anjuta_datadir)" || list=; \
if test -n "$$list"; then \
echo " $(MKDIR_P) '$(DESTDIR)$(anjuta_datadir)'"; \
$(MKDIR_P) "$(DESTDIR)$(anjuta_datadir)" || exit 1; \
@@ -469,14 +528,14 @@
$(INSTALL_DATA) $$files "$(DESTDIR)$(anjuta_datadir)" || exit $$?; \
done
-uninstall-anjuta_dataDATA:
+uninstall-dist_anjuta_dataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(anjuta_data_DATA)'; test -n "$(anjuta_datadir)" || list=; \
+ @list='$(dist_anjuta_data_DATA)'; test -n "$(anjuta_datadir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(anjuta_datadir)'; $(am__uninstall_files_from_dir)
-install-anjuta_profileDATA: $(anjuta_profile_DATA)
+install-dist_anjuta_profileDATA: $(dist_anjuta_profile_DATA)
@$(NORMAL_INSTALL)
- @list='$(anjuta_profile_DATA)'; test -n "$(anjuta_profiledir)" || list=; \
+ @list='$(dist_anjuta_profile_DATA)'; test -n "$(anjuta_profiledir)" || list=; \
if test -n "$$list"; then \
echo " $(MKDIR_P) '$(DESTDIR)$(anjuta_profiledir)'"; \
$(MKDIR_P) "$(DESTDIR)$(anjuta_profiledir)" || exit 1; \
@@ -490,29 +549,32 @@
$(INSTALL_DATA) $$files "$(DESTDIR)$(anjuta_profiledir)" || exit $$?; \
done
-uninstall-anjuta_profileDATA:
+uninstall-dist_anjuta_profileDATA:
@$(NORMAL_UNINSTALL)
- @list='$(anjuta_profile_DATA)'; test -n "$(anjuta_profiledir)" || list=; \
+ @list='$(dist_anjuta_profile_DATA)'; test -n "$(anjuta_profiledir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(anjuta_profiledir)'; $(am__uninstall_files_from_dir)
# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-# (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+# (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+ @fail=; \
+ if $(am__make_keepgoing); then \
+ failcom='fail=yes'; \
+ else \
+ failcom='exit 1'; \
+ fi; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ for subdir in $$list; do \
echo "Making $$target in $$subdir"; \
if test "$$subdir" = "."; then \
dot_seen=yes; \
@@ -527,57 +589,12 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -593,12 +610,7 @@
set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@ -610,15 +622,11 @@
$$unique; \
fi; \
fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@ -627,6 +635,21 @@
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -744,7 +767,8 @@
info-am:
-install-data-am: install-anjuta_dataDATA install-anjuta_profileDATA
+install-data-am: install-dist_anjuta_dataDATA \
+ install-dist_anjuta_profileDATA
install-dvi: install-dvi-recursive
@@ -788,26 +812,26 @@
ps-am:
-uninstall-am: uninstall-anjuta_dataDATA uninstall-anjuta_profileDATA
+uninstall-am: uninstall-dist_anjuta_dataDATA \
+ uninstall-dist_anjuta_profileDATA
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
- install-am install-strip tags-recursive
+.MAKE: $(am__recursive_targets) install-am install-strip
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am check check-am clean clean-generic clean-libtool \
- ctags ctags-recursive distclean distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am \
- install-anjuta_dataDATA install-anjuta_profileDATA \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs installdirs-am \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am \
- uninstall-anjuta_dataDATA uninstall-anjuta_profileDATA
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+ check-am clean clean-generic clean-libtool cscopelist-am ctags \
+ ctags-am distclean distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am \
+ install-dist_anjuta_dataDATA install-dist_anjuta_profileDATA \
+ install-dvi install-dvi-am install-exec install-exec-am \
+ install-html install-html-am install-info install-info-am \
+ install-man install-pdf install-pdf-am install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+ uninstall-am uninstall-dist_anjuta_dataDATA \
+ uninstall-dist_anjuta_profileDATA
-include $(top_srcdir)/git.mk
diff -Nru anjuta-3.8.4/data/editor.profile anjuta-3.10.2/data/editor.profile
--- anjuta-3.8.4/data/editor.profile 1970-01-01 00:00:00.000000000 +0000
+++ anjuta-3.10.2/data/editor.profile 2013-07-08 21:06:37.000000000 +0000
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nru anjuta-3.8.4/data/templates/Makefile.am anjuta-3.10.2/data/templates/Makefile.am
--- anjuta-3.8.4/data/templates/Makefile.am 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/data/templates/Makefile.am 2013-07-08 21:06:37.000000000 +0000
@@ -1,10 +1,10 @@
# Templates
template_datadir = $(anjuta_data_dir)/templates
-template_data_DATA = \
+dist_template_data_DATA = \
indent.tpl
licenses_datadir = $(template_datadir)/licenses
-licenses_data_DATA = \
+dist_licenses_data_DATA = \
licenses/gpl.txt \
licenses/gpl.tpl \
licenses/lgpl.txt \
@@ -14,8 +14,4 @@
licenses/none.txt \
licenses/none.tpl
-EXTRA_DIST = \
- $(template_data_DATA) \
- $(licenses_data_DATA)
-
-include $(top_srcdir)/git.mk
diff -Nru anjuta-3.8.4/data/templates/Makefile.in anjuta-3.10.2/data/templates/Makefile.in
--- anjuta-3.8.4/data/templates/Makefile.in 2013-06-03 21:24:28.000000000 +0000
+++ anjuta-3.10.2/data/templates/Makefile.in 2013-11-14 21:21:09.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
@SET_MAKE@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
esac; \
- test $$am__dry = yes; \
- }
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,8 @@
build_triplet = @build@
host_triplet = @host@
subdir = data/templates
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(dist_licenses_data_DATA) $(dist_template_data_DATA)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
@@ -70,12 +98,18 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
AM_V_GEN = $(am__v_GEN_@AM_V@)
am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
AM_V_at = $(am__v_at_@AM_V@)
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
am__can_run_installinfo = \
@@ -112,7 +146,8 @@
}
am__installdirs = "$(DESTDIR)$(licenses_datadir)" \
"$(DESTDIR)$(template_datadir)"
-DATA = $(licenses_data_DATA) $(template_data_DATA)
+DATA = $(dist_licenses_data_DATA) $(dist_template_data_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -261,6 +296,8 @@
PLUGIN_DEVHELP_LIBS = @PLUGIN_DEVHELP_LIBS@
PLUGIN_GLADE_CFLAGS = @PLUGIN_GLADE_CFLAGS@
PLUGIN_GLADE_LIBS = @PLUGIN_GLADE_LIBS@
+PLUGIN_TERMINAL_CFLAGS = @PLUGIN_TERMINAL_CFLAGS@
+PLUGIN_TERMINAL_LIBS = @PLUGIN_TERMINAL_LIBS@
POSUB = @POSUB@
PREF_SUFFIX = @PREF_SUFFIX@
PYTHON = @PYTHON@
@@ -275,8 +312,11 @@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+SHM_LIBS = @SHM_LIBS@
SOURCEVIEW_CFLAGS = @SOURCEVIEW_CFLAGS@
SOURCEVIEW_LIBS = @SOURCEVIEW_LIBS@
+SQLITE_CFLAGS = @SQLITE_CFLAGS@
+SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
SVNCONFIG = @SVNCONFIG@
SVN_CFLAGS = @SVN_CFLAGS@
@@ -288,8 +328,6 @@
VALA_CFLAGS = @VALA_CFLAGS@
VALA_LIBS = @VALA_LIBS@
VERSION = @VERSION@
-VTE_CFLAGS = @VTE_CFLAGS@
-VTE_LIBS = @VTE_LIBS@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
@@ -368,11 +406,11 @@
# Templates
template_datadir = $(anjuta_data_dir)/templates
-template_data_DATA = \
+dist_template_data_DATA = \
indent.tpl
licenses_datadir = $(template_datadir)/licenses
-licenses_data_DATA = \
+dist_licenses_data_DATA = \
licenses/gpl.txt \
licenses/gpl.tpl \
licenses/lgpl.txt \
@@ -382,10 +420,6 @@
licenses/none.txt \
licenses/none.tpl
-EXTRA_DIST = \
- $(template_data_DATA) \
- $(licenses_data_DATA)
-
all: all-am
.SUFFIXES:
@@ -425,9 +459,9 @@
clean-libtool:
-rm -rf .libs _libs
-install-licenses_dataDATA: $(licenses_data_DATA)
+install-dist_licenses_dataDATA: $(dist_licenses_data_DATA)
@$(NORMAL_INSTALL)
- @list='$(licenses_data_DATA)'; test -n "$(licenses_datadir)" || list=; \
+ @list='$(dist_licenses_data_DATA)'; test -n "$(licenses_datadir)" || list=; \
if test -n "$$list"; then \
echo " $(MKDIR_P) '$(DESTDIR)$(licenses_datadir)'"; \
$(MKDIR_P) "$(DESTDIR)$(licenses_datadir)" || exit 1; \
@@ -441,14 +475,14 @@
$(INSTALL_DATA) $$files "$(DESTDIR)$(licenses_datadir)" || exit $$?; \
done
-uninstall-licenses_dataDATA:
+uninstall-dist_licenses_dataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(licenses_data_DATA)'; test -n "$(licenses_datadir)" || list=; \
+ @list='$(dist_licenses_data_DATA)'; test -n "$(licenses_datadir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(licenses_datadir)'; $(am__uninstall_files_from_dir)
-install-template_dataDATA: $(template_data_DATA)
+install-dist_template_dataDATA: $(dist_template_data_DATA)
@$(NORMAL_INSTALL)
- @list='$(template_data_DATA)'; test -n "$(template_datadir)" || list=; \
+ @list='$(dist_template_data_DATA)'; test -n "$(template_datadir)" || list=; \
if test -n "$$list"; then \
echo " $(MKDIR_P) '$(DESTDIR)$(template_datadir)'"; \
$(MKDIR_P) "$(DESTDIR)$(template_datadir)" || exit 1; \
@@ -462,16 +496,16 @@
$(INSTALL_DATA) $$files "$(DESTDIR)$(template_datadir)" || exit $$?; \
done
-uninstall-template_dataDATA:
+uninstall-dist_template_dataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(template_data_DATA)'; test -n "$(template_datadir)" || list=; \
+ @list='$(dist_template_data_DATA)'; test -n "$(template_datadir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(template_datadir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -561,7 +595,8 @@
info-am:
-install-data-am: install-licenses_dataDATA install-template_dataDATA
+install-data-am: install-dist_licenses_dataDATA \
+ install-dist_template_dataDATA
install-dvi: install-dvi-am
@@ -605,22 +640,25 @@
ps-am:
-uninstall-am: uninstall-licenses_dataDATA uninstall-template_dataDATA
+uninstall-am: uninstall-dist_licenses_dataDATA \
+ uninstall-dist_template_dataDATA
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-licenses_dataDATA \
+ cscopelist-am ctags-am distclean distclean-generic \
+ distclean-libtool distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am \
+ install-dist_licenses_dataDATA install-dist_template_dataDATA \
+ install-dvi install-dvi-am install-exec install-exec-am \
+ install-html install-html-am install-info install-info-am \
install-man install-pdf install-pdf-am install-ps \
- install-ps-am install-strip install-template_dataDATA \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-licenses_dataDATA uninstall-template_dataDATA
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+ ps ps-am tags-am uninstall uninstall-am \
+ uninstall-dist_licenses_dataDATA \
+ uninstall-dist_template_dataDATA
-include $(top_srcdir)/git.mk
diff -Nru anjuta-3.8.4/data/welcome.txt anjuta-3.10.2/data/welcome.txt
--- anjuta-3.8.4/data/welcome.txt 2013-06-03 21:24:34.000000000 +0000
+++ anjuta-3.10.2/data/welcome.txt 2013-11-14 21:21:28.000000000 +0000
@@ -1,4 +1,4 @@
-Anjuta IDE Version 3.8.4
+Anjuta IDE Version 3.10.2
Copyright (C) Naba Kumar
This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
diff -Nru anjuta-3.8.4/debian/changelog anjuta-3.10.2/debian/changelog
--- anjuta-3.8.4/debian/changelog 2013-07-31 22:12:30.000000000 +0000
+++ anjuta-3.10.2/debian/changelog 2014-01-17 06:55:26.000000000 +0000
@@ -1,3 +1,18 @@
+anjuta (2:3.10.2-0ubuntu1+saucy1) saucy; urgency=medium
+
+ * Copied from trusty
+ * Rebuild against new glade
+
+ -- Rico Tzschichholz Fri, 17 Jan 2014 07:54:12 +0100
+
+anjuta (2:3.10.2-0ubuntu1) trusty; urgency=medium
+
+ * New upstream release (LP: #1266037)
+ - Updated Build-Depends of libgtk-3-dev (>= 3.6.0),
+ libglib2.0-dev (>= 2.34.0)
+
+ -- Steve Ovens Fri, 03 Jan 2014 21:06:06 -0500
+
anjuta (2:3.8.4-1) unstable; urgency=low
[ Thomas Bechtold ]
diff -Nru anjuta-3.8.4/debian/control anjuta-3.10.2/debian/control
--- anjuta-3.8.4/debian/control 2013-07-31 22:22:13.000000000 +0000
+++ anjuta-3.10.2/debian/control 2014-01-17 06:55:32.000000000 +0000
@@ -2,20 +2,20 @@
#
# Modifications should be made to debian/control.in instead.
# This file is regenerated automatically in the clean target.
-
Source: anjuta
Section: gnome
Priority: optional
-Maintainer: Debian GNOME Maintainers
-Uploaders: Jordi Mallach , Michael Biebl
+Maintainer: Ubuntu Developers
+XSBC-Original-Maintainer: Debian GNOME Maintainers
+Uploaders: Debian GNOME Maintainers , Jordi Mallach , Michael Biebl
Build-Depends: debhelper (>= 8),
cdbs (>= 0.4.90),
dh-autoreconf,
flex,
bison,
gnome-pkg-tools (>= 0.11),
- libglib2.0-dev (>= 2.32.0),
- libgtk-3-dev (>= 3.0.0),
+ libglib2.0-dev (>= 2.34.0),
+ libgtk-3-dev (>= 3.6.0),
libgdk-pixbuf2.0-dev (>= 2.0.0),
libgda-5.0-dev (>= 5.0.0),
libvte-2.90-dev (>= 1:0.27.6),
diff -Nru anjuta-3.8.4/debian/control.in anjuta-3.10.2/debian/control.in
--- anjuta-3.8.4/debian/control.in 2013-07-31 22:03:05.000000000 +0000
+++ anjuta-3.10.2/debian/control.in 2014-01-15 12:40:40.000000000 +0000
@@ -1,7 +1,8 @@
Source: anjuta
Section: gnome
Priority: optional
-Maintainer: Debian GNOME Maintainers
+Maintainer: Ubuntu Developers
+XSBC-Original-Maintainer: Debian GNOME Maintainers
Uploaders: @GNOME_TEAM@
Build-Depends: debhelper (>= 8),
cdbs (>= 0.4.90),
@@ -9,8 +10,8 @@
flex,
bison,
gnome-pkg-tools (>= 0.11),
- libglib2.0-dev (>= 2.32.0),
- libgtk-3-dev (>= 3.0.0),
+ libglib2.0-dev (>= 2.34.0),
+ libgtk-3-dev (>= 3.6.0),
libgdk-pixbuf2.0-dev (>= 2.0.0),
libgda-5.0-dev (>= 5.0.0),
libvte-2.90-dev (>= 1:0.27.6),
diff -Nru anjuta-3.8.4/depcomp anjuta-3.10.2/depcomp
--- anjuta-3.8.4/depcomp 2013-04-30 21:53:40.000000000 +0000
+++ anjuta-3.10.2/depcomp 2013-11-14 21:21:20.000000000 +0000
@@ -1,10 +1,9 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2012-03-27.16; # UTC
+scriptversion=2013-05-30.07; # UTC
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
-# 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -28,9 +27,9 @@
case $1 in
'')
- echo "$0: No command. Try '$0 --help' for more information." 1>&2
- exit 1;
- ;;
+ echo "$0: No command. Try '$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
-h | --h*)
cat <<\EOF
Usage: depcomp [--help] [--version] PROGRAM [ARGS]
@@ -57,11 +56,65 @@
;;
esac
+# Get the directory component of the given path, and save it in the
+# global variables '$dir'. Note that this directory component will
+# be either empty or ending with a '/' character. This is deliberate.
+set_dir_from ()
+{
+ case $1 in
+ */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
+ *) dir=;;
+ esac
+}
+
+# Get the suffix-stripped basename of the given path, and save it the
+# global variable '$base'.
+set_base_from ()
+{
+ base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
+}
+
+# If no dependency file was actually created by the compiler invocation,
+# we still have to create a dummy depfile, to avoid errors with the
+# Makefile "include basename.Plo" scheme.
+make_dummy_depfile ()
+{
+ echo "#dummy" > "$depfile"
+}
+
+# Factor out some common post-processing of the generated depfile.
+# Requires the auxiliary global variable '$tmpdepfile' to be set.
+aix_post_process_depfile ()
+{
+ # If the compiler actually managed to produce a dependency file,
+ # post-process it.
+ if test -f "$tmpdepfile"; then
+ # Each line is of the form 'foo.o: dependency.h'.
+ # Do two passes, one to just change these to
+ # $object: dependency.h
+ # and one to simply output
+ # dependency.h:
+ # which is needed to avoid the deleted-header problem.
+ { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
+ sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
+ } > "$depfile"
+ rm -f "$tmpdepfile"
+ else
+ make_dummy_depfile
+ fi
+}
+
# A tabulation character.
tab=' '
# A newline character.
nl='
'
+# Character ranges might be problematic outside the C locale.
+# These definitions help.
+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+lower=abcdefghijklmnopqrstuvwxyz
+digits=0123456789
+alpha=${upper}${lower}
if test -z "$depmode" || test -z "$source" || test -z "$object"; then
echo "depcomp: Variables source, object and depmode must be set" 1>&2
@@ -75,6 +128,9 @@
rm -f "$tmpdepfile"
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
# Some modes work just like other modes, but use different flags. We
# parameterize here, but still list the modes in the big case below,
# to make depend.m4 easier to write. Note that we *cannot* use a case
@@ -86,32 +142,32 @@
fi
if test "$depmode" = dashXmstdout; then
- # This is just like dashmstdout with a different argument.
- dashmflag=-xM
- depmode=dashmstdout
+ # This is just like dashmstdout with a different argument.
+ dashmflag=-xM
+ depmode=dashmstdout
fi
cygpath_u="cygpath -u -f -"
if test "$depmode" = msvcmsys; then
- # This is just like msvisualcpp but w/o cygpath translation.
- # Just convert the backslash-escaped backslashes to single forward
- # slashes to satisfy depend.m4
- cygpath_u='sed s,\\\\,/,g'
- depmode=msvisualcpp
+ # This is just like msvisualcpp but w/o cygpath translation.
+ # Just convert the backslash-escaped backslashes to single forward
+ # slashes to satisfy depend.m4
+ cygpath_u='sed s,\\\\,/,g'
+ depmode=msvisualcpp
fi
if test "$depmode" = msvc7msys; then
- # This is just like msvc7 but w/o cygpath translation.
- # Just convert the backslash-escaped backslashes to single forward
- # slashes to satisfy depend.m4
- cygpath_u='sed s,\\\\,/,g'
- depmode=msvc7
+ # This is just like msvc7 but w/o cygpath translation.
+ # Just convert the backslash-escaped backslashes to single forward
+ # slashes to satisfy depend.m4
+ cygpath_u='sed s,\\\\,/,g'
+ depmode=msvc7
fi
if test "$depmode" = xlc; then
- # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
- gccflag=-qmakedep=gcc,-MF
- depmode=gcc
+ # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+ gccflag=-qmakedep=gcc,-MF
+ depmode=gcc
fi
case "$depmode" in
@@ -134,8 +190,7 @@
done
"$@"
stat=$?
- if test $stat -eq 0; then :
- else
+ if test $stat -ne 0; then
rm -f "$tmpdepfile"
exit $stat
fi
@@ -143,13 +198,17 @@
;;
gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
## There are various ways to get dependency output from gcc. Here's
## why we pick this rather obscure method:
## - Don't want to use -MD because we'd like the dependencies to end
## up in a subdir. Having to rename by hand is ugly.
## (We might end up doing this anyway to support other compilers.)
## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-## -MM, not -M (despite what the docs say).
+## -MM, not -M (despite what the docs say). Also, it might not be
+## supported by the other compilers which use the 'gcc' depmode.
## - Using -M directly means running the compiler twice (even worse
## than renaming).
if test -z "$gccflag"; then
@@ -157,15 +216,14 @@
fi
"$@" -Wp,"$gccflag$tmpdepfile"
stat=$?
- if test $stat -eq 0; then :
- else
+ if test $stat -ne 0; then
rm -f "$tmpdepfile"
exit $stat
fi
rm -f "$depfile"
echo "$object : \\" > "$depfile"
- alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
+ # The second -e expression handles DOS-style file names with drive
+ # letters.
sed -e 's/^[^:]*: / /' \
-e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
## This next piece of magic avoids the "deleted header file" problem.
@@ -174,15 +232,15 @@
## typically no way to rebuild the header). We avoid this by adding
## dummy dependencies for each header file. Too bad gcc doesn't do
## this for us directly.
- tr ' ' "$nl" < "$tmpdepfile" |
## Some versions of gcc put a space before the ':'. On the theory
## that the space means something, we add a space to the output as
## well. hp depmode also adds that space, but also prefixes the VPATH
## to the object. Take care to not repeat it in the output.
## Some versions of the HPUX 10.20 sed can't process this invocation
## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
- | sed -e 's/$/ :/' >> "$depfile"
+ tr ' ' "$nl" < "$tmpdepfile" \
+ | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+ | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
@@ -200,8 +258,7 @@
"$@" -MDupdate "$tmpdepfile"
fi
stat=$?
- if test $stat -eq 0; then :
- else
+ if test $stat -ne 0; then
rm -f "$tmpdepfile"
exit $stat
fi
@@ -209,7 +266,6 @@
if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
echo "$object : \\" > "$depfile"
-
# Clip off the initial element (the dependent). Don't try to be
# clever and replace this with sed code, as IRIX sed won't handle
# lines with more than a fixed number of characters (4096 in
@@ -217,19 +273,15 @@
# the IRIX cc adds comments like '#:fec' to the end of the
# dependency line.
tr ' ' "$nl" < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
- tr "$nl" ' ' >> "$depfile"
+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+ | tr "$nl" ' ' >> "$depfile"
echo >> "$depfile"
-
# The second pass generates a dummy entry for each header file.
tr ' ' "$nl" < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
- >> "$depfile"
+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+ >> "$depfile"
else
- # The sourcefile does not contain any dependencies, so just
- # store a dummy comment line, to avoid errors with the Makefile
- # "include basename.Plo" scheme.
- echo "#dummy" > "$depfile"
+ make_dummy_depfile
fi
rm -f "$tmpdepfile"
;;
@@ -247,9 +299,8 @@
# current directory. Also, the AIX compiler puts '$object:' at the
# start of each line; $object doesn't have directory information.
# Version 6 uses the directory in both cases.
- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
- test "x$dir" = "x$object" && dir=
- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+ set_dir_from "$object"
+ set_base_from "$object"
if test "$libtool" = yes; then
tmpdepfile1=$dir$base.u
tmpdepfile2=$base.u
@@ -262,9 +313,7 @@
"$@" -M
fi
stat=$?
-
- if test $stat -eq 0; then :
- else
+ if test $stat -ne 0; then
rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
exit $stat
fi
@@ -273,65 +322,113 @@
do
test -f "$tmpdepfile" && break
done
- if test -f "$tmpdepfile"; then
- # Each line is of the form 'foo.o: dependent.h'.
- # Do two passes, one to just change these to
- # '$object: dependent.h' and one to simply 'dependent.h:'.
- sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
- sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
- else
- # The sourcefile does not contain any dependencies, so just
- # store a dummy comment line, to avoid errors with the Makefile
- # "include basename.Plo" scheme.
- echo "#dummy" > "$depfile"
+ aix_post_process_depfile
+ ;;
+
+tcc)
+ # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+ # FIXME: That version still under development at the moment of writing.
+ # Make that this statement remains true also for stable, released
+ # versions.
+ # It will wrap lines (doesn't matter whether long or short) with a
+ # trailing '\', as in:
+ #
+ # foo.o : \
+ # foo.c \
+ # foo.h \
+ #
+ # It will put a trailing '\' even on the last line, and will use leading
+ # spaces rather than leading tabs (at least since its commit 0394caf7
+ # "Emit spaces for -MD").
+ "$@" -MD -MF "$tmpdepfile"
+ stat=$?
+ if test $stat -ne 0; then
+ rm -f "$tmpdepfile"
+ exit $stat
fi
+ rm -f "$depfile"
+ # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
+ # We have to change lines of the first kind to '$object: \'.
+ sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
+ # And for each line of the second kind, we have to emit a 'dep.h:'
+ # dummy dependency, to avoid the deleted-header problem.
+ sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
rm -f "$tmpdepfile"
;;
-icc)
- # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
- # However on
- # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
- # ICC 7.0 will fill foo.d with something like
- # foo.o: sub/foo.c
- # foo.o: sub/foo.h
- # which is wrong. We want
- # sub/foo.o: sub/foo.c
- # sub/foo.o: sub/foo.h
- # sub/foo.c:
- # sub/foo.h:
- # ICC 7.1 will output
+## The order of this option in the case statement is important, since the
+## shell code in configure will try each of these formats in the order
+## listed in this file. A plain '-MD' option would be understood by many
+## compilers, so we must ensure this comes after the gcc and icc options.
+pgcc)
+ # Portland's C compiler understands '-MD'.
+ # Will always output deps to 'file.d' where file is the root name of the
+ # source file under compilation, even if file resides in a subdirectory.
+ # The object file name does not affect the name of the '.d' file.
+ # pgcc 10.2 will output
# foo.o: sub/foo.c sub/foo.h
- # and will wrap long lines using '\':
+ # and will wrap long lines using '\' :
# foo.o: sub/foo.c ... \
# sub/foo.h ... \
# ...
- # tcc 0.9.26 (FIXME still under development at the moment of writing)
- # will emit a similar output, but also prepend the continuation lines
- # with horizontal tabulation characters.
- "$@" -MD -MF "$tmpdepfile"
- stat=$?
- if test $stat -eq 0; then :
- else
+ set_dir_from "$object"
+ # Use the source, not the object, to determine the base name, since
+ # that's sadly what pgcc will do too.
+ set_base_from "$source"
+ tmpdepfile=$base.d
+
+ # For projects that build the same source file twice into different object
+ # files, the pgcc approach of using the *source* file root name can cause
+ # problems in parallel builds. Use a locking strategy to avoid stomping on
+ # the same $tmpdepfile.
+ lockdir=$base.d-lock
+ trap "
+ echo '$0: caught signal, cleaning up...' >&2
+ rmdir '$lockdir'
+ exit 1
+ " 1 2 13 15
+ numtries=100
+ i=$numtries
+ while test $i -gt 0; do
+ # mkdir is a portable test-and-set.
+ if mkdir "$lockdir" 2>/dev/null; then
+ # This process acquired the lock.
+ "$@" -MD
+ stat=$?
+ # Release the lock.
+ rmdir "$lockdir"
+ break
+ else
+ # If the lock is being held by a different process, wait
+ # until the winning process is done or we timeout.
+ while test -d "$lockdir" && test $i -gt 0; do
+ sleep 1
+ i=`expr $i - 1`
+ done
+ fi
+ i=`expr $i - 1`
+ done
+ trap - 1 2 13 15
+ if test $i -le 0; then
+ echo "$0: failed to acquire lock after $numtries attempts" >&2
+ echo "$0: check lockdir '$lockdir'" >&2
+ exit 1
+ fi
+
+ if test $stat -ne 0; then
rm -f "$tmpdepfile"
exit $stat
fi
rm -f "$depfile"
- # Each line is of the form 'foo.o: dependent.h',
- # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
+ # Each line is of the form `foo.o: dependent.h',
+ # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
# Do two passes, one to just change these to
- # '$object: dependent.h' and one to simply 'dependent.h:'.
- sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \
- < "$tmpdepfile" > "$depfile"
- sed '
- s/[ '"$tab"'][ '"$tab"']*/ /g
- s/^ *//
- s/ *\\*$//
- s/^[^:]*: *//
- /^$/d
- /:$/d
- s/$/ :/
- ' < "$tmpdepfile" >> "$depfile"
+ # `$object: dependent.h' and one to simply `dependent.h:'.
+ sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+ # Some versions of the HPUX 10.20 sed can't process this invocation
+ # correctly. Breaking it into two sed invocations is a workaround.
+ sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
+ | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
@@ -342,9 +439,8 @@
# 'foo.d', which lands next to the object file, wherever that
# happens to be.
# Much of this is similar to the tru64 case; see comments there.
- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
- test "x$dir" = "x$object" && dir=
- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+ set_dir_from "$object"
+ set_base_from "$object"
if test "$libtool" = yes; then
tmpdepfile1=$dir$base.d
tmpdepfile2=$dir.libs/$base.d
@@ -355,8 +451,7 @@
"$@" +Maked
fi
stat=$?
- if test $stat -eq 0; then :
- else
+ if test $stat -ne 0; then
rm -f "$tmpdepfile1" "$tmpdepfile2"
exit $stat
fi
@@ -366,76 +461,61 @@
test -f "$tmpdepfile" && break
done
if test -f "$tmpdepfile"; then
- sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+ sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
# Add 'dependent.h:' lines.
sed -ne '2,${
- s/^ *//
- s/ \\*$//
- s/$/:/
- p
- }' "$tmpdepfile" >> "$depfile"
+ s/^ *//
+ s/ \\*$//
+ s/$/:/
+ p
+ }' "$tmpdepfile" >> "$depfile"
else
- echo "#dummy" > "$depfile"
+ make_dummy_depfile
fi
rm -f "$tmpdepfile" "$tmpdepfile2"
;;
tru64)
- # The Tru64 compiler uses -MD to generate dependencies as a side
- # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
- # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
- # dependencies in 'foo.d' instead, so we check for that too.
- # Subdirectories are respected.
- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
- test "x$dir" = "x$object" && dir=
- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
- if test "$libtool" = yes; then
- # With Tru64 cc, shared objects can also be used to make a
- # static library. This mechanism is used in libtool 1.4 series to
- # handle both shared and static libraries in a single compilation.
- # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
- #
- # With libtool 1.5 this exception was removed, and libtool now
- # generates 2 separate objects for the 2 libraries. These two
- # compilations output dependencies in $dir.libs/$base.o.d and
- # in $dir$base.o.d. We have to check for both files, because
- # one of the two compilations can be disabled. We should prefer
- # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
- # automatically cleaned when .libs/ is deleted, while ignoring
- # the former would cause a distcleancheck panic.
- tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
- tmpdepfile2=$dir$base.o.d # libtool 1.5
- tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
- tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
- "$@" -Wc,-MD
- else
- tmpdepfile1=$dir$base.o.d
- tmpdepfile2=$dir$base.d
- tmpdepfile3=$dir$base.d
- tmpdepfile4=$dir$base.d
- "$@" -MD
- fi
+ # The Tru64 compiler uses -MD to generate dependencies as a side
+ # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+ # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+ # dependencies in 'foo.d' instead, so we check for that too.
+ # Subdirectories are respected.
+ set_dir_from "$object"
+ set_base_from "$object"
+
+ if test "$libtool" = yes; then
+ # Libtool generates 2 separate objects for the 2 libraries. These
+ # two compilations output dependencies in $dir.libs/$base.o.d and
+ # in $dir$base.o.d. We have to check for both files, because
+ # one of the two compilations can be disabled. We should prefer
+ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+ # automatically cleaned when .libs/ is deleted, while ignoring
+ # the former would cause a distcleancheck panic.
+ tmpdepfile1=$dir$base.o.d # libtool 1.5
+ tmpdepfile2=$dir.libs/$base.o.d # Likewise.
+ tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504
+ "$@" -Wc,-MD
+ else
+ tmpdepfile1=$dir$base.d
+ tmpdepfile2=$dir$base.d
+ tmpdepfile3=$dir$base.d
+ "$@" -MD
+ fi
+
+ stat=$?
+ if test $stat -ne 0; then
+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+ exit $stat
+ fi
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
- exit $stat
- fi
-
- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
- do
- test -f "$tmpdepfile" && break
- done
- if test -f "$tmpdepfile"; then
- sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
- sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
- else
- echo "#dummy" > "$depfile"
- fi
- rm -f "$tmpdepfile"
- ;;
+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+ do
+ test -f "$tmpdepfile" && break
+ done
+ # Same post-processing that is required for AIX mode.
+ aix_post_process_depfile
+ ;;
msvc7)
if test "$libtool" = yes; then
@@ -446,8 +526,7 @@
"$@" $showIncludes > "$tmpdepfile"
stat=$?
grep -v '^Note: including file: ' "$tmpdepfile"
- if test "$stat" = 0; then :
- else
+ if test $stat -ne 0; then
rm -f "$tmpdepfile"
exit $stat
fi
@@ -473,6 +552,7 @@
G
p
}' >> "$depfile"
+ echo >> "$depfile" # make sure the fragment doesn't end with a backslash
rm -f "$tmpdepfile"
;;
@@ -524,13 +604,14 @@
# in the target name. This is to cope with DOS-style filenames:
# a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
"$@" $dashmflag |
- sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
+ sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
rm -f "$depfile"
cat < "$tmpdepfile" > "$depfile"
- tr ' ' "$nl" < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+ # Some versions of the HPUX 10.20 sed can't process this sed invocation
+ # correctly. Breaking it into two sed invocations is a workaround.
+ tr ' ' "$nl" < "$tmpdepfile" \
+ | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+ | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
@@ -583,10 +664,12 @@
# makedepend may prepend the VPATH from the source file name to the object.
# No need to regex-escape $object, excess matching of '.' is harmless.
sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
- sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+ # Some versions of the HPUX 10.20 sed can't process the last invocation
+ # correctly. Breaking it into two sed invocations is a workaround.
+ sed '1,2d' "$tmpdepfile" \
+ | tr ' ' "$nl" \
+ | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+ | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile" "$tmpdepfile".bak
;;
@@ -622,10 +705,10 @@
esac
done
- "$@" -E |
- sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
- -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
- sed '$ s: \\$::' > "$tmpdepfile"
+ "$@" -E \
+ | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+ -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+ | sed '$ s: \\$::' > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
cat < "$tmpdepfile" >> "$depfile"
@@ -657,15 +740,15 @@
shift
;;
"-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
- set fnord "$@"
- shift
- shift
- ;;
+ set fnord "$@"
+ shift
+ shift
+ ;;
*)
- set fnord "$@" "$arg"
- shift
- shift
- ;;
+ set fnord "$@" "$arg"
+ shift
+ shift
+ ;;
esac
done
"$@" -E 2>/dev/null |
diff -Nru anjuta-3.8.4/doc/Makefile.am anjuta-3.10.2/doc/Makefile.am
--- anjuta-3.8.4/doc/Makefile.am 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/doc/Makefile.am 2013-07-08 21:06:37.000000000 +0000
@@ -4,15 +4,11 @@
## If you don't want it to overwrite it,
## Please disable it in the Anjuta project configuration
-anjuta_docdir = $(docdir)
-
-anjuta_doc_DATA = \
+dist_doc_DATA = \
ScintillaDoc.html
-man_MANS = \
+dist_man_MANS = \
anjuta.1 \
anjuta-launcher.1
-EXTRA_DIST = $(anjuta_doc_DATA) $(man_MANS)
-
-include $(top_srcdir)/git.mk
diff -Nru anjuta-3.8.4/doc/Makefile.in anjuta-3.10.2/doc/Makefile.in
--- anjuta-3.8.4/doc/Makefile.in 2013-06-03 21:24:28.000000000 +0000
+++ anjuta-3.10.2/doc/Makefile.in 2013-11-14 21:21:09.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
@SET_MAKE@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
esac; \
- test $$am__dry = yes; \
- }
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -52,8 +79,9 @@
build_triplet = @build@
host_triplet = @host@
subdir = doc
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/anjuta-launcher.1.in $(srcdir)/anjuta.1.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(srcdir)/anjuta.1.in $(srcdir)/anjuta-launcher.1.in \
+ $(dist_man_MANS) $(dist_doc_DATA)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
@@ -71,12 +99,18 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = anjuta.1 anjuta-launcher.1
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
AM_V_GEN = $(am__v_GEN_@AM_V@)
am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
AM_V_at = $(am__v_at_@AM_V@)
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
am__can_run_installinfo = \
@@ -112,10 +146,11 @@
$(am__cd) "$$dir" && rm -f $$files; }; \
}
man1dir = $(mandir)/man1
-am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(anjuta_docdir)"
+am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(docdir)"
NROFF = nroff
-MANS = $(man_MANS)
-DATA = $(anjuta_doc_DATA)
+MANS = $(dist_man_MANS)
+DATA = $(dist_doc_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -264,6 +299,8 @@
PLUGIN_DEVHELP_LIBS = @PLUGIN_DEVHELP_LIBS@
PLUGIN_GLADE_CFLAGS = @PLUGIN_GLADE_CFLAGS@
PLUGIN_GLADE_LIBS = @PLUGIN_GLADE_LIBS@
+PLUGIN_TERMINAL_CFLAGS = @PLUGIN_TERMINAL_CFLAGS@
+PLUGIN_TERMINAL_LIBS = @PLUGIN_TERMINAL_LIBS@
POSUB = @POSUB@
PREF_SUFFIX = @PREF_SUFFIX@
PYTHON = @PYTHON@
@@ -278,8 +315,11 @@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+SHM_LIBS = @SHM_LIBS@
SOURCEVIEW_CFLAGS = @SOURCEVIEW_CFLAGS@
SOURCEVIEW_LIBS = @SOURCEVIEW_LIBS@
+SQLITE_CFLAGS = @SQLITE_CFLAGS@
+SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
SVNCONFIG = @SVNCONFIG@
SVN_CFLAGS = @SVN_CFLAGS@
@@ -291,8 +331,6 @@
VALA_CFLAGS = @VALA_CFLAGS@
VALA_LIBS = @VALA_LIBS@
VERSION = @VERSION@
-VTE_CFLAGS = @VTE_CFLAGS@
-VTE_LIBS = @VTE_LIBS@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
@@ -368,15 +406,13 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-anjuta_docdir = $(docdir)
-anjuta_doc_DATA = \
+dist_doc_DATA = \
ScintillaDoc.html
-man_MANS = \
+dist_man_MANS = \
anjuta.1 \
anjuta-launcher.1
-EXTRA_DIST = $(anjuta_doc_DATA) $(man_MANS)
all: all-am
.SUFFIXES:
@@ -420,10 +456,10 @@
clean-libtool:
-rm -rf .libs _libs
-install-man1: $(man_MANS)
+install-man1: $(dist_man_MANS)
@$(NORMAL_INSTALL)
@list1=''; \
- list2='$(man_MANS)'; \
+ list2='$(dist_man_MANS)'; \
test -n "$(man1dir)" \
&& test -n "`echo $$list1$$list2`" \
|| exit 0; \
@@ -458,53 +494,40 @@
@$(NORMAL_UNINSTALL)
@list=''; test -n "$(man1dir)" || exit 0; \
files=`{ for i in $$list; do echo "$$i"; done; \
- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+ l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
sed -n '/\.1[a-z]*$$/p'; \
} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
-install-anjuta_docDATA: $(anjuta_doc_DATA)
+install-dist_docDATA: $(dist_doc_DATA)
@$(NORMAL_INSTALL)
- @list='$(anjuta_doc_DATA)'; test -n "$(anjuta_docdir)" || list=; \
+ @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(anjuta_docdir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(anjuta_docdir)" || exit 1; \
+ echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \
fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
done | $(am__base_list) | \
while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(anjuta_docdir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(anjuta_docdir)" || exit $$?; \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
done
-uninstall-anjuta_docDATA:
+uninstall-dist_docDATA:
@$(NORMAL_UNINSTALL)
- @list='$(anjuta_doc_DATA)'; test -n "$(anjuta_docdir)" || list=; \
+ @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- dir='$(DESTDIR)$(anjuta_docdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
- @list='$(MANS)'; if test -n "$$list"; then \
- list=`for p in $$list; do \
- if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
- if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
- if test -n "$$list" && \
- grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
- echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
- grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \
- echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \
- echo " typically \`make maintainer-clean' will remove them" >&2; \
- exit 1; \
- else :; fi; \
- else :; fi
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -538,7 +561,7 @@
check: check-am
all-am: Makefile $(MANS) $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(anjuta_docdir)"; do \
+ for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(docdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -591,7 +614,7 @@
info-am:
-install-data-am: install-anjuta_docDATA install-man
+install-data-am: install-dist_docDATA install-man
install-dvi: install-dvi-am
@@ -635,24 +658,25 @@
ps-am:
-uninstall-am: uninstall-anjuta_docDATA uninstall-man
+uninstall-am: uninstall-dist_docDATA uninstall-man
uninstall-man: uninstall-man1
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-anjuta_docDATA install-data install-data-am \
- install-dvi install-dvi-am install-exec install-exec-am \
- install-html install-html-am install-info install-info-am \
- install-man install-man1 install-pdf install-pdf-am install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
- ps ps-am uninstall uninstall-am uninstall-anjuta_docDATA \
- uninstall-man uninstall-man1
+ cscopelist-am ctags-am distclean distclean-generic \
+ distclean-libtool distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am \
+ install-dist_docDATA install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-man1 install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+ uninstall-am uninstall-dist_docDATA uninstall-man \
+ uninstall-man1
-include $(top_srcdir)/git.mk
diff -Nru anjuta-3.8.4/doc/anjuta-launcher.1 anjuta-3.10.2/doc/anjuta-launcher.1
--- anjuta-3.8.4/doc/anjuta-launcher.1 2013-06-03 21:24:34.000000000 +0000
+++ anjuta-3.10.2/doc/anjuta-launcher.1 2013-11-14 21:21:28.000000000 +0000
@@ -1,4 +1,4 @@
-.TH "anjuta-launcher" "1" "3.8.4" "Jens Georg" ""
+.TH "anjuta-launcher" "1" "3.10.2" "Jens Georg" ""
.SH "NAME"
.LP
anjuta-launcher \- GNOME Integrated Development Environment
diff -Nru anjuta-3.8.4/doc/anjuta.1 anjuta-3.10.2/doc/anjuta.1
--- anjuta-3.8.4/doc/anjuta.1 2013-06-03 21:24:34.000000000 +0000
+++ anjuta-3.10.2/doc/anjuta.1 2013-11-14 21:21:28.000000000 +0000
@@ -1,4 +1,4 @@
-.TH "Anjuta" "1" "3.8.4" "Jens Georg" ""
+.TH "Anjuta" "1" "3.10.2" "Jens Georg" ""
.SH "NAME"
.LP
anjuta \- GNOME Integrated Development Environment
diff -Nru anjuta-3.8.4/gtk-doc.make anjuta-3.10.2/gtk-doc.make
--- anjuta-3.8.4/gtk-doc.make 2013-01-28 07:13:59.000000000 +0000
+++ anjuta-3.10.2/gtk-doc.make 2013-05-26 12:37:34.000000000 +0000
@@ -74,33 +74,42 @@
#### setup ####
+GTK_DOC_V_SETUP=$(GTK_DOC_V_SETUP_$(V))
+GTK_DOC_V_SETUP_=$(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SETUP_0=@echo " DOC Preparing build";
+
setup-build.stamp:
- -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
- echo ' DOC Preparing build'; \
+ -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
if test "x$$files" != "x" ; then \
for file in $$files ; do \
test -f $(abs_srcdir)/$$file && \
- cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \
+ cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
done; \
fi; \
test -d $(abs_srcdir)/tmpl && \
{ cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \
chmod -R u+w $(abs_builddir)/tmpl; } \
fi
- @touch setup-build.stamp
+ $(AM_V_at)touch setup-build.stamp
#### scan ####
+GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_$(V))
+GTK_DOC_V_SCAN_=$(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SCAN_0=@echo " DOC Scanning header files";
+
+GTK_DOC_V_INTROSPECT=$(GTK_DOC_V_INTROSPECT_$(V))
+GTK_DOC_V_INTROSPECT_=$(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_INTROSPECT_0=@echo " DOC Introspecting gobjects";
+
scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
- @echo ' DOC Scanning header files'
- @_source_dir='' ; \
+ $(GTK_DOC_V_SCAN)_source_dir='' ; \
for i in $(DOC_SOURCE_DIR) ; do \
_source_dir="$${_source_dir} --source-dir=$$i" ; \
done ; \
gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
- @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
- echo " DOC Introspecting gobjects"; \
+ $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
scanobj_options=""; \
gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \
if test "$(?)" = "0"; then \
@@ -115,22 +124,25 @@
test -f $$i || touch $$i ; \
done \
fi
- @touch scan-build.stamp
+ $(AM_V_at)touch scan-build.stamp
$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
@true
#### templates ####
+GTK_DOC_V_TMPL=$(GTK_DOC_V_TMPL_$(V))
+GTK_DOC_V_TMPL_=$(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_TMPL_0=@echo " DOC Rebuilding template files";
+
tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
- @echo ' DOC Rebuilding template files'
- @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
- @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+ $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+ $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
if test -w $(abs_srcdir) ; then \
cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \
fi \
fi
- @touch tmpl-build.stamp
+ $(AM_V_at)touch tmpl-build.stamp
tmpl.stamp: tmpl-build.stamp
@true
@@ -140,26 +152,34 @@
#### xml ####
+GTK_DOC_V_XML=$(GTK_DOC_V_XML_$(V))
+GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XML_0=@echo " DOC Building XML";
+
sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
- @echo ' DOC Building XML'
- @-chmod -R u+w $(srcdir)
- @_source_dir='' ; \
+ $(GTK_DOC_V_XML)-chmod -R u+w $(srcdir) && _source_dir='' ; \
for i in $(DOC_SOURCE_DIR) ; do \
_source_dir="$${_source_dir} --source-dir=$$i" ; \
done ; \
gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
- @touch sgml-build.stamp
+ $(AM_V_at)touch sgml-build.stamp
sgml.stamp: sgml-build.stamp
@true
#### html ####
+GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_$(V))
+GTK_DOC_V_HTML_=$(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_HTML_0=@echo " DOC Building HTML";
+
+GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_$(V))
+GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XREF_0=@echo " DOC Fixing cross-references";
+
html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
- @echo ' DOC Building HTML'
- @rm -rf html
- @mkdir html
- @mkhtml_options=""; \
+ $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
+ mkhtml_options=""; \
gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \
if test "$(?)" = "0"; then \
if test "x$(V)" = "x1"; then \
@@ -180,16 +200,18 @@
cp $(abs_builddir)/$$file $(abs_builddir)/html; \
fi; \
done;
- @echo ' DOC Fixing cross-references'
- @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
- @touch html-build.stamp
+ $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+ $(AM_V_at)touch html-build.stamp
#### pdf ####
+GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_$(V))
+GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_PDF_0=@echo " DOC Building PDF";
+
pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
- @echo ' DOC Building PDF'
- @rm -f $(DOC_MODULE).pdf
- @mkpdf_options=""; \
+ $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \
+ mkpdf_options=""; \
gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \
if test "$(?)" = "0"; then \
if test "x$(V)" = "x1"; then \
@@ -206,7 +228,7 @@
done; \
fi; \
gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
- @touch pdf-build.stamp
+ $(AM_V_at)touch pdf-build.stamp
##############
@@ -222,7 +244,7 @@
rm -rf tmpl; \
fi
-maintainer-clean-local: clean
+maintainer-clean-local:
@rm -rf xml html
install-data-local:
@@ -259,7 +281,7 @@
# Require gtk-doc when making dist
#
if ENABLE_GTK_DOC
-dist-check-gtkdoc:
+dist-check-gtkdoc: docs
else
dist-check-gtkdoc:
@echo "*** gtk-doc must be installed and enabled in order to make dist"
diff -Nru anjuta-3.8.4/install-sh anjuta-3.10.2/install-sh
--- anjuta-3.8.4/install-sh 2013-04-30 21:53:35.000000000 +0000
+++ anjuta-3.10.2/install-sh 2013-11-14 21:21:09.000000000 +0000
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2011-01-19.21; # UTC
+scriptversion=2011-11-20.07; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,7 +35,7 @@
# FSF changes to this file are in the public domain.
#
# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
+# 'make' implicit rules from creating a file called install from it
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
@@ -156,7 +156,7 @@
-s) stripcmd=$stripprog;;
-t) dst_arg=$2
- # Protect names problematic for `test' and other utilities.
+ # Protect names problematic for 'test' and other utilities.
case $dst_arg in
-* | [=\(\)!]) dst_arg=./$dst_arg;;
esac
@@ -190,7 +190,7 @@
fi
shift # arg
dst_arg=$arg
- # Protect names problematic for `test' and other utilities.
+ # Protect names problematic for 'test' and other utilities.
case $dst_arg in
-* | [=\(\)!]) dst_arg=./$dst_arg;;
esac
@@ -202,7 +202,7 @@
echo "$0: no input file specified." >&2
exit 1
fi
- # It's OK to call `install-sh -d' without argument.
+ # It's OK to call 'install-sh -d' without argument.
# This can happen when creating conditional directories.
exit 0
fi
@@ -240,7 +240,7 @@
for src
do
- # Protect names problematic for `test' and other utilities.
+ # Protect names problematic for 'test' and other utilities.
case $src in
-* | [=\(\)!]) src=./$src;;
esac
@@ -354,7 +354,7 @@
if test -z "$dir_arg" || {
# Check for POSIX incompatibilities with -m.
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
- # other-writeable bit of parent directory when it shouldn't.
+ # other-writable bit of parent directory when it shouldn't.
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
ls_ld_tmpdir=`ls -ld "$tmpdir"`
case $ls_ld_tmpdir in
diff -Nru anjuta-3.8.4/launcher/Makefile.in anjuta-3.10.2/launcher/Makefile.in
--- anjuta-3.8.4/launcher/Makefile.in 2013-06-03 21:24:28.000000000 +0000
+++ anjuta-3.10.2/launcher/Makefile.in 2013-11-14 21:21:10.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
@SET_MAKE@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
esac; \
- test $$am__dry = yes; \
- }
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -53,7 +80,8 @@
host_triplet = @host@
bin_PROGRAMS = anjuta-launcher$(EXEEXT)
subdir = launcher
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
@@ -80,6 +108,19 @@
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
+am__v_lt_1 =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -92,20 +133,16 @@
$(AM_CFLAGS) $(CFLAGS)
AM_V_CC = $(am__v_CC_@AM_V@)
am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo " CC " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 =
CCLD = $(CC)
LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo " CCLD " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 =
SOURCES = anjuta-launcher.c
DIST_SOURCES = anjuta-launcher.c
am__can_run_installinfo = \
@@ -113,6 +150,23 @@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -263,6 +317,8 @@
PLUGIN_DEVHELP_LIBS = @PLUGIN_DEVHELP_LIBS@
PLUGIN_GLADE_CFLAGS = @PLUGIN_GLADE_CFLAGS@
PLUGIN_GLADE_LIBS = @PLUGIN_GLADE_LIBS@
+PLUGIN_TERMINAL_CFLAGS = @PLUGIN_TERMINAL_CFLAGS@
+PLUGIN_TERMINAL_LIBS = @PLUGIN_TERMINAL_LIBS@
POSUB = @POSUB@
PREF_SUFFIX = @PREF_SUFFIX@
PYTHON = @PYTHON@
@@ -277,8 +333,11 @@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+SHM_LIBS = @SHM_LIBS@
SOURCEVIEW_CFLAGS = @SOURCEVIEW_CFLAGS@
SOURCEVIEW_LIBS = @SOURCEVIEW_LIBS@
+SQLITE_CFLAGS = @SQLITE_CFLAGS@
+SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
SVNCONFIG = @SVNCONFIG@
SVN_CFLAGS = @SVN_CFLAGS@
@@ -290,8 +349,6 @@
VALA_CFLAGS = @VALA_CFLAGS@
VALA_LIBS = @VALA_LIBS@
VERSION = @VERSION@
-VTE_CFLAGS = @VTE_CFLAGS@
-VTE_LIBS = @VTE_LIBS@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
@@ -412,10 +469,12 @@
fi; \
for p in $$list; do echo "$$p $$p"; done | \
sed 's/$(EXEEXT)$$//' | \
- while read p p1; do if test -f $$p || test -f $$p1; \
- then echo "$$p"; echo "$$p"; else :; fi; \
+ while read p p1; do if test -f $$p \
+ || test -f $$p1 \
+ ; then echo "$$p"; echo "$$p"; else :; fi; \
done | \
- sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+ sed -e 'p;s,.*/,,;n;h' \
+ -e 's|.*|.|' \
-e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
sed 'N;N;N;s,\n, ,g' | \
$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -436,7 +495,8 @@
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
files=`for p in $$list; do echo "$$p"; done | \
sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
- -e 's/$$/$(EXEEXT)/' `; \
+ -e 's/$$/$(EXEEXT)/' \
+ `; \
test -n "$$list" || exit 0; \
echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -449,6 +509,7 @@
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
+
anjuta-launcher$(EXEEXT): $(anjuta_launcher_OBJECTS) $(anjuta_launcher_DEPENDENCIES) $(EXTRA_anjuta_launcher_DEPENDENCIES)
@rm -f anjuta-launcher$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(anjuta_launcher_OBJECTS) $(anjuta_launcher_LDADD) $(LIBS)
@@ -488,26 +549,15 @@
clean-libtool:
-rm -rf .libs _libs
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@ -519,15 +569,11 @@
$$unique; \
fi; \
fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@ -536,6 +582,21 @@
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -679,19 +740,19 @@
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
- clean-generic clean-libtool ctags distclean distclean-compile \
- distclean-generic distclean-libtool distclean-tags distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-binPROGRAMS install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-am \
- uninstall-binPROGRAMS
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+ clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
+ ctags ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-binPROGRAMS \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-am uninstall uninstall-am uninstall-binPROGRAMS
-include $(top_srcdir)/git.mk
diff -Nru anjuta-3.8.4/libanjuta/Makefile.am anjuta-3.10.2/libanjuta/Makefile.am
--- anjuta-3.8.4/libanjuta/Makefile.am 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/Makefile.am 2013-11-03 18:57:08.000000000 +0000
@@ -134,7 +134,13 @@
anjuta-autogen.h \
anjuta-autogen.c \
anjuta-completion.h \
- anjuta-completion.c
+ anjuta-completion.c \
+ anjuta-close-button.c \
+ anjuta-close-button.h \
+ anjuta-modeline.c \
+ anjuta-modeline.h \
+ anjuta-cell-renderer-diff.c \
+ anjuta-cell-renderer-diff.h
# Glade module
if ENABLE_GLADE_CATALOG
@@ -202,7 +208,17 @@
anjuta-file-drop-entry.h \
anjuta-entry.h \
anjuta-token.h \
- anjuta-pkg-config-chooser.h
+ anjuta-autogen.h \
+ anjuta-cell-renderer-captioned-image.h \
+ anjuta-completion.h \
+ anjuta-environment-editor.h \
+ anjuta-language-provider.h \
+ anjuta-token-file.h \
+ anjuta-token-list.h \
+ anjuta-token-stream.h \
+ anjuta-tree-combo.h \
+ anjuta-close-button.h \
+ anjuta-modeline.h
libanjutainclude_HEADERS = \
$(libanjuta_include) \
@@ -255,7 +271,7 @@
EXTRA_DIST = \
libanjuta-3.0.pc.in \
- anjuta-marshal.list
+ anjuta-marshal.list
DISTCLEANFILES = \
anjuta-enum-types.h \
@@ -272,7 +288,7 @@
ianjuta_introspection_sources = $(libanjuta_source_files) $(libanjuta_header_files)
Anjuta-3.0.gir: libanjuta-3.la
-Anjuta_3_0_gir_INCLUDES = GObject-2.0 Gtk-3.0
+Anjuta_3_0_gir_INCLUDES = GObject-2.0 Gtk-3.0 Gdl-3
Anjuta_3_0_gir_CFLAGS = $(ANJUTA_CFLAGS) $(XML_CFLAGS) $(GDL_CFLAGS) -I$(top_srcdir)
Anjuta_3_0_gir_LIBS = libanjuta-3.la
Anjuta_3_0_gir_FILES = $(anjuta_introspection_sources)
diff -Nru anjuta-3.8.4/libanjuta/Makefile.in anjuta-3.10.2/libanjuta/Makefile.in
--- anjuta-3.8.4/libanjuta/Makefile.in 2013-06-03 21:24:28.000000000 +0000
+++ anjuta-3.10.2/libanjuta/Makefile.in 2013-11-14 21:21:10.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -18,23 +17,51 @@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
esac; \
- test $$am__dry = yes; \
- }
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -53,11 +80,11 @@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-DIST_COMMON = $(am__dist_catalog_DATA_DIST) \
- $(libanjutainclude_HEADERS) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/anjuta-version.h.in \
- $(srcdir)/interfaces/Makefile.am.gir \
- $(srcdir)/libanjuta-3.0.pc.in
+DIST_COMMON = $(srcdir)/interfaces/Makefile.am.gir \
+ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(srcdir)/libanjuta-3.0.pc.in $(srcdir)/anjuta-version.h.in \
+ $(top_srcdir)/depcomp $(am__dist_catalog_DATA_DIST) \
+ $(libanjutainclude_HEADERS)
@HAVE_INTROSPECTION_TRUE@am__append_1 = Anjuta-3.0.gir IAnjuta-3.0.gir
subdir = libanjuta
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -134,11 +161,13 @@
anjuta-pkg-scanner.lo anjuta-column-text-view.lo \
anjuta-file-drop-entry.lo anjuta-entry.lo \
anjuta-environment-editor.lo anjuta-tree-combo.lo \
- anjuta-autogen.lo anjuta-completion.lo
+ anjuta-autogen.lo anjuta-completion.lo anjuta-close-button.lo \
+ anjuta-modeline.lo anjuta-cell-renderer-diff.lo
libanjuta_3_la_OBJECTS = $(am_libanjuta_3_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
+am__v_lt_1 =
libanjuta_3_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(AM_CFLAGS) $(CFLAGS) $(libanjuta_3_la_LDFLAGS) $(LDFLAGS) -o \
@@ -155,6 +184,18 @@
-o $@
@ENABLE_GLADE_CATALOG_TRUE@am_libgladeanjuta_la_rpath = -rpath \
@ENABLE_GLADE_CATALOG_TRUE@ $(gladeanjutadir)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -167,30 +208,27 @@
$(AM_CFLAGS) $(CFLAGS)
AM_V_CC = $(am__v_CC_@AM_V@)
am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo " CC " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 =
CCLD = $(CC)
LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo " CCLD " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 =
SOURCES = $(libanjuta_3_la_SOURCES) $(libgladeanjuta_la_SOURCES)
DIST_SOURCES = $(libanjuta_3_la_SOURCES) \
$(am__libgladeanjuta_la_SOURCES_DIST)
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- install-dvi-recursive install-exec-recursive \
- install-html-recursive install-info-recursive \
- install-pdf-recursive install-ps-recursive install-recursive \
- installcheck-recursive installdirs-recursive pdf-recursive \
- ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+ ctags-recursive dvi-recursive html-recursive info-recursive \
+ install-data-recursive install-dvi-recursive \
+ install-exec-recursive install-html-recursive \
+ install-info-recursive install-pdf-recursive \
+ install-ps-recursive install-recursive installcheck-recursive \
+ installdirs-recursive pdf-recursive ps-recursive \
+ tags-recursive uninstall-recursive
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -202,9 +240,29 @@
HEADERS = $(libanjutainclude_HEADERS)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+ $(RECURSIVE_TARGETS) \
+ $(RECURSIVE_CLEAN_TARGETS) \
+ $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@@ -381,6 +439,8 @@
PLUGIN_DEVHELP_LIBS = @PLUGIN_DEVHELP_LIBS@
PLUGIN_GLADE_CFLAGS = @PLUGIN_GLADE_CFLAGS@
PLUGIN_GLADE_LIBS = @PLUGIN_GLADE_LIBS@
+PLUGIN_TERMINAL_CFLAGS = @PLUGIN_TERMINAL_CFLAGS@
+PLUGIN_TERMINAL_LIBS = @PLUGIN_TERMINAL_LIBS@
POSUB = @POSUB@
PREF_SUFFIX = @PREF_SUFFIX@
PYTHON = @PYTHON@
@@ -395,8 +455,11 @@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+SHM_LIBS = @SHM_LIBS@
SOURCEVIEW_CFLAGS = @SOURCEVIEW_CFLAGS@
SOURCEVIEW_LIBS = @SOURCEVIEW_LIBS@
+SQLITE_CFLAGS = @SQLITE_CFLAGS@
+SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
SVNCONFIG = @SVNCONFIG@
SVN_CFLAGS = @SVN_CFLAGS@
@@ -408,8 +471,6 @@
VALA_CFLAGS = @VALA_CFLAGS@
VALA_LIBS = @VALA_LIBS@
VERSION = @VERSION@
-VTE_CFLAGS = @VTE_CFLAGS@
-VTE_LIBS = @VTE_LIBS@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
@@ -520,6 +581,7 @@
interfaces/ianjuta-file-loader.c\
interfaces/ianjuta-file-manager.c\
interfaces/ianjuta-file-savable.c\
+ interfaces/ianjuta-glade.c\
interfaces/ianjuta-help.c\
interfaces/ianjuta-indenter.c\
interfaces/ianjuta-indicable.c\
@@ -587,6 +649,7 @@
interfaces/ianjuta-file-loader.h\
interfaces/ianjuta-file-manager.h\
interfaces/ianjuta-file-savable.h\
+ interfaces/ianjuta-glade.h\
interfaces/ianjuta-help.h\
interfaces/ianjuta-indenter.h\
interfaces/ianjuta-indicable.h\
@@ -753,7 +816,13 @@
anjuta-autogen.h \
anjuta-autogen.c \
anjuta-completion.h \
- anjuta-completion.c
+ anjuta-completion.c \
+ anjuta-close-button.c \
+ anjuta-close-button.h \
+ anjuta-modeline.c \
+ anjuta-modeline.h \
+ anjuta-cell-renderer-diff.c \
+ anjuta-cell-renderer-diff.h
# Glade module
@@ -814,7 +883,17 @@
anjuta-file-drop-entry.h \
anjuta-entry.h \
anjuta-token.h \
- anjuta-pkg-config-chooser.h
+ anjuta-autogen.h \
+ anjuta-cell-renderer-captioned-image.h \
+ anjuta-completion.h \
+ anjuta-environment-editor.h \
+ anjuta-language-provider.h \
+ anjuta-token-file.h \
+ anjuta-token-list.h \
+ anjuta-token-stream.h \
+ anjuta-tree-combo.h \
+ anjuta-close-button.h \
+ anjuta-modeline.h
libanjutainclude_HEADERS = \
$(libanjuta_include) \
@@ -826,7 +905,7 @@
pkgconfig_DATA = libanjuta-3.0.pc
EXTRA_DIST = \
libanjuta-3.0.pc.in \
- anjuta-marshal.list
+ anjuta-marshal.list
DISTCLEANFILES = \
anjuta-enum-types.h \
@@ -838,7 +917,7 @@
INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
@HAVE_INTROSPECTION_TRUE@anjuta_introspection_sources = $(libanjuta_3_la_SOURCES)
@HAVE_INTROSPECTION_TRUE@ianjuta_introspection_sources = $(libanjuta_source_files) $(libanjuta_header_files)
-@HAVE_INTROSPECTION_TRUE@Anjuta_3_0_gir_INCLUDES = GObject-2.0 Gtk-3.0
+@HAVE_INTROSPECTION_TRUE@Anjuta_3_0_gir_INCLUDES = GObject-2.0 Gtk-3.0 Gdl-3
@HAVE_INTROSPECTION_TRUE@Anjuta_3_0_gir_CFLAGS = $(ANJUTA_CFLAGS) $(XML_CFLAGS) $(GDL_CFLAGS) -I$(top_srcdir)
@HAVE_INTROSPECTION_TRUE@Anjuta_3_0_gir_LIBS = libanjuta-3.la
@HAVE_INTROSPECTION_TRUE@Anjuta_3_0_gir_FILES = $(anjuta_introspection_sources)
@@ -893,6 +972,7 @@
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
anjuta-version.h: $(top_builddir)/config.status $(srcdir)/anjuta-version.h.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
install-gladeanjutaLTLIBRARIES: $(gladeanjuta_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(gladeanjuta_LTLIBRARIES)'; test -n "$(gladeanjutadir)" || list=; \
@@ -919,12 +999,15 @@
clean-gladeanjutaLTLIBRARIES:
-test -z "$(gladeanjuta_LTLIBRARIES)" || rm -f $(gladeanjuta_LTLIBRARIES)
- @list='$(gladeanjuta_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(gladeanjuta_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
@@ -951,14 +1034,18 @@
clean-libLTLIBRARIES:
-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(lib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
libanjuta-3.la: $(libanjuta_3_la_OBJECTS) $(libanjuta_3_la_DEPENDENCIES) $(EXTRA_libanjuta_3_la_DEPENDENCIES)
$(AM_V_CCLD)$(libanjuta_3_la_LINK) -rpath $(libdir) $(libanjuta_3_la_OBJECTS) $(libanjuta_3_la_LIBADD) $(LIBS)
+
libgladeanjuta.la: $(libgladeanjuta_la_OBJECTS) $(libgladeanjuta_la_DEPENDENCIES) $(EXTRA_libgladeanjuta_la_DEPENDENCIES)
$(AM_V_CCLD)$(libgladeanjuta_la_LINK) $(am_libgladeanjuta_la_rpath) $(libgladeanjuta_la_OBJECTS) $(libgladeanjuta_la_LIBADD) $(LIBS)
@@ -974,6 +1061,8 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/anjuta-c-module.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/anjuta-c-plugin-factory.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/anjuta-cell-renderer-captioned-image.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/anjuta-cell-renderer-diff.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/anjuta-close-button.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/anjuta-column-text-view.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/anjuta-command-bar.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/anjuta-command-queue.Plo@am__quote@
@@ -993,6 +1082,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/anjuta-language-provider.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/anjuta-launcher.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/anjuta-marshal.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/anjuta-modeline.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/anjuta-pkg-config-chooser.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/anjuta-pkg-config.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/anjuta-pkg-scanner.Plo@am__quote@
@@ -1156,22 +1246,25 @@
dir='$(DESTDIR)$(libanjutaincludedir)'; $(am__uninstall_files_from_dir)
# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-# (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+# (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+ @fail=; \
+ if $(am__make_keepgoing); then \
+ failcom='fail=yes'; \
+ else \
+ failcom='exit 1'; \
+ fi; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ for subdir in $$list; do \
echo "Making $$target in $$subdir"; \
if test "$$subdir" = "."; then \
dot_seen=yes; \
@@ -1186,57 +1279,12 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -1252,12 +1300,7 @@
set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@ -1269,15 +1312,11 @@
$$unique; \
fi; \
fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@ -1286,6 +1325,21 @@
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -1464,19 +1518,17 @@
uninstall-libanjutaincludeHEADERS uninstall-pkgconfigDATA \
uninstall-typelibDATA
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
- ctags-recursive install install-am install-strip \
- tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am check check-am clean clean-generic \
- clean-gladeanjutaLTLIBRARIES clean-libLTLIBRARIES \
- clean-libtool ctags ctags-recursive distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am \
- install-dist_catalogDATA install-dvi install-dvi-am \
- install-exec install-exec-am install-girDATA \
+.MAKE: $(am__recursive_targets) all check install install-am \
+ install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+ check-am clean clean-generic clean-gladeanjutaLTLIBRARIES \
+ clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dist_catalogDATA install-dvi \
+ install-dvi-am install-exec install-exec-am install-girDATA \
install-gladeanjutaLTLIBRARIES install-html install-html-am \
install-info install-info-am install-libLTLIBRARIES \
install-libanjutaincludeHEADERS install-man install-pdf \
@@ -1485,11 +1537,10 @@
installdirs installdirs-am maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am \
- uninstall-dist_catalogDATA uninstall-girDATA \
- uninstall-gladeanjutaLTLIBRARIES uninstall-libLTLIBRARIES \
- uninstall-libanjutaincludeHEADERS uninstall-pkgconfigDATA \
- uninstall-typelibDATA
+ tags tags-am uninstall uninstall-am uninstall-dist_catalogDATA \
+ uninstall-girDATA uninstall-gladeanjutaLTLIBRARIES \
+ uninstall-libLTLIBRARIES uninstall-libanjutaincludeHEADERS \
+ uninstall-pkgconfigDATA uninstall-typelibDATA
anjuta-marshal.h: anjuta-marshal.list
diff -Nru anjuta-3.8.4/libanjuta/anjuta-async-notify.c anjuta-3.10.2/libanjuta/anjuta-async-notify.c
--- anjuta-3.8.4/libanjuta/anjuta-async-notify.c 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-async-notify.c 2013-07-08 21:06:37.000000000 +0000
@@ -115,7 +115,6 @@
/**
* anjuta_async_notify_get_error:
- *
* @self: An #AnjutaAsyncNotify object
* @error: Return location for the error set by the called interface to which
* this object was passed. If no error is set, @error is set to NULL.
diff -Nru anjuta-3.8.4/libanjuta/anjuta-c-module.c anjuta-3.10.2/libanjuta/anjuta-c-module.c
--- anjuta-3.8.4/libanjuta/anjuta-c-module.c 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-c-module.c 2013-07-08 21:06:37.000000000 +0000
@@ -195,7 +195,7 @@
*
* Receives the error that occured when the module was loaded
*
- * Returns: TRUE if there was an Error, FALSE otherwise
+ * Returns: %TRUE if there was an Error, %FALSE otherwise
*/
gboolean
anjuta_c_module_get_last_error (AnjutaCModule *module, GError** err)
diff -Nru anjuta-3.8.4/libanjuta/anjuta-cell-renderer-diff.c anjuta-3.10.2/libanjuta/anjuta-cell-renderer-diff.c
--- anjuta-3.8.4/libanjuta/anjuta-cell-renderer-diff.c 1970-01-01 00:00:00.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-cell-renderer-diff.c 2013-11-03 18:57:08.000000000 +0000
@@ -0,0 +1,269 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * anjuta-cell-renderer-diff.c
+ * Copyright (C) 2013 James Liggett
+ *
+ * anjuta is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * anjuta is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
+
+#include "anjuta-cell-renderer-diff.h"
+
+struct _AnjutaCellRendererDiffPrivate
+{
+ GtkCellRenderer *text_cell;
+};
+
+
+enum
+{
+ PROP_0,
+
+ PROP_DIFF
+};
+
+
+/* Line types */
+typedef enum
+{
+ LINE_TYPE_HEADER,
+ LINE_TYPE_HUNK_HEADER,
+ LINE_TYPE_ADD,
+ LINE_TYPE_DELETE,
+ LINE_TYPE_CONTEXT
+} LineType;
+
+G_DEFINE_TYPE (AnjutaCellRendererDiff, anjuta_cell_renderer_diff, GTK_TYPE_CELL_RENDERER);
+
+static void
+anjuta_cell_renderer_diff_init (AnjutaCellRendererDiff *self)
+{
+ self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, ANJUTA_TYPE_CELL_RENDERER_DIFF,
+ AnjutaCellRendererDiffPrivate);
+
+ self->priv->text_cell = gtk_cell_renderer_text_new ();
+}
+
+static void
+anjuta_cell_renderer_diff_finalize (GObject *object)
+{
+ AnjutaCellRendererDiff *self;
+
+ self = ANJUTA_CELL_RENDERER_DIFF (object);
+
+ g_object_unref (self->priv->text_cell);
+
+ G_OBJECT_CLASS (anjuta_cell_renderer_diff_parent_class)->finalize (object);
+}
+
+static void
+anjuta_cell_renderer_diff_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+{
+ g_return_if_fail (ANJUTA_IS_CELL_RENDERER_DIFF (object));
+
+ switch (prop_id)
+ {
+ case PROP_DIFF:
+ anjuta_cell_renderer_diff_set_diff (ANJUTA_CELL_RENDERER_DIFF (object),
+ g_value_get_string (value));
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
+
+static void
+anjuta_cell_renderer_diff_render (GtkCellRenderer *cell,
+ cairo_t *cr,
+ GtkWidget *widget,
+ const GdkRectangle *background_area,
+ const GdkRectangle *cell_area,
+ GtkCellRendererState flags)
+{
+ AnjutaCellRendererDiff *self;
+
+ self = ANJUTA_CELL_RENDERER_DIFF (cell);
+
+ gtk_cell_renderer_render (self->priv->text_cell, cr, widget,
+ background_area, cell_area, flags);
+}
+
+static void
+anjuta_cell_renderer_diff_get_preferred_width (GtkCellRenderer *cell,
+ GtkWidget *widget,
+ gint *minimum,
+ gint *natural)
+{
+ AnjutaCellRendererDiff *self;
+
+ self = ANJUTA_CELL_RENDERER_DIFF (cell);
+
+ gtk_cell_renderer_get_preferred_width (self->priv->text_cell, widget,
+ minimum, natural);
+}
+
+static void
+anjuta_cell_renderer_diff_get_preferred_height (GtkCellRenderer *cell,
+ GtkWidget *widget,
+ gint *minimum,
+ gint *natural)
+{
+ AnjutaCellRendererDiff *self;
+
+ self = ANJUTA_CELL_RENDERER_DIFF (cell);
+
+ gtk_cell_renderer_get_preferred_height (self->priv->text_cell, widget,
+ minimum, natural);
+}
+
+static void
+anjuta_cell_renderer_diff_class_init (AnjutaCellRendererDiffClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GtkCellRendererClass *parent_class = GTK_CELL_RENDERER_CLASS (klass);
+
+ g_type_class_add_private (klass, sizeof (AnjutaCellRendererDiffPrivate));
+
+ object_class->finalize = anjuta_cell_renderer_diff_finalize;
+ object_class->set_property = anjuta_cell_renderer_diff_set_property;
+ parent_class->render = anjuta_cell_renderer_diff_render;
+ parent_class->get_preferred_width = anjuta_cell_renderer_diff_get_preferred_width;;
+ parent_class->get_preferred_height = anjuta_cell_renderer_diff_get_preferred_height;
+
+ g_object_class_install_property (object_class,
+ PROP_DIFF,
+ g_param_spec_string ("diff",
+ "diff",
+ "Diff to render",
+ "",
+ G_PARAM_WRITABLE));
+}
+
+
+static PangoAttrList *
+create_attribute_list (const gchar *diff)
+{
+ PangoAttrList *list;
+ LineType type;
+
+ list = pango_attr_list_new ();
+
+ /* Make all of the text monospace */
+ pango_attr_list_insert (list, pango_attr_family_new ("Monospace"));
+
+ /* Assume that diff points to one line of a unified diff */
+ type = LINE_TYPE_CONTEXT;
+
+ if (diff && diff[0])
+ {
+ if (*diff != ' ')
+ {
+ if (diff[0] == '@' && diff[1] == '@')
+ type = LINE_TYPE_HUNK_HEADER;
+ else if (diff[0] == '+')
+ {
+ if (g_str_has_prefix (diff, "+++ "))
+ type = LINE_TYPE_HEADER;
+ else
+ type = LINE_TYPE_ADD;
+ }
+ else if (diff[0] == '-')
+ {
+ if (g_str_has_prefix (diff, "--- "))
+ type = LINE_TYPE_HEADER;
+ else
+ type = LINE_TYPE_DELETE;
+ }
+ else
+ type = LINE_TYPE_HEADER;
+ }
+ }
+
+ switch (type)
+ {
+ case LINE_TYPE_HEADER:
+ /* Make file headers easier to see by making them bold */
+ pango_attr_list_insert (list,
+ pango_attr_weight_new (PANGO_WEIGHT_BOLD));
+ break;
+ case LINE_TYPE_HUNK_HEADER:
+ /* Dark blue */
+ pango_attr_list_insert (list,
+ pango_attr_foreground_new (0, 0, 0x8000));
+ break;
+ case LINE_TYPE_ADD:
+ /* Dark green */
+ pango_attr_list_insert (list,
+ pango_attr_foreground_new (0, 0x8000, 0));
+ break;
+ case LINE_TYPE_DELETE:
+ /* Red */
+ pango_attr_list_insert (list,
+ pango_attr_foreground_new (0xffff, 0, 0));
+ break;
+ default:
+ break;
+ };
+
+ return list;
+}
+
+void
+anjuta_cell_renderer_diff_set_diff (AnjutaCellRendererDiff *self,
+ const gchar *diff)
+{
+ PangoAttrList *attributes = NULL;
+ gchar *newline;
+ gchar *diff_without_newline = NULL;
+
+ if (diff)
+ {
+ newline = strchr (diff, '\n');
+
+ if (newline)
+ {
+ diff_without_newline = g_strndup (diff, newline - diff);
+ g_object_set (G_OBJECT (self->priv->text_cell),
+ "text", diff_without_newline,
+ NULL);
+ g_free (diff_without_newline);
+ }
+ else
+ {
+ g_object_set (G_OBJECT (self->priv->text_cell),
+ "text", diff,
+ NULL);
+ }
+
+ attributes = create_attribute_list (diff);
+
+ g_object_set (G_OBJECT (self->priv->text_cell),
+ "attributes", attributes,
+ NULL);
+
+ pango_attr_list_unref (attributes);
+ }
+ else
+ {
+ g_object_set (G_OBJECT (self->priv->text_cell),
+ "text", "", NULL);
+ }
+}
+
+GtkCellRenderer *
+anjuta_cell_renderer_diff_new (void)
+{
+ return g_object_new (ANJUTA_TYPE_CELL_RENDERER_DIFF, NULL);
+}
+
diff -Nru anjuta-3.8.4/libanjuta/anjuta-cell-renderer-diff.h anjuta-3.10.2/libanjuta/anjuta-cell-renderer-diff.h
--- anjuta-3.8.4/libanjuta/anjuta-cell-renderer-diff.h 1970-01-01 00:00:00.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-cell-renderer-diff.h 2013-11-03 18:57:08.000000000 +0000
@@ -0,0 +1,61 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * anjuta-cell-renderer-diff.h
+ * Copyright (C) 2013 James Liggett
+ *
+ * anjuta is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * anjuta is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
+
+#ifndef _ANJUTA_CELL_RENDERER_DIFF_H_
+#define _ANJUTA_CELL_RENDERER_DIFF_H_
+
+#include
+#include
+#include
+
+G_BEGIN_DECLS
+
+#define ANJUTA_TYPE_CELL_RENDERER_DIFF (anjuta_cell_renderer_diff_get_type ())
+#define ANJUTA_CELL_RENDERER_DIFF(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ANJUTA_TYPE_CELL_RENDERER_DIFF, AnjutaCellRendererDiff))
+#define ANJUTA_CELL_RENDERER_DIFF_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ANJUTA_TYPE_CELL_RENDERER_DIFF, AnjutaCellRendererDiffClass))
+#define ANJUTA_IS_CELL_RENDERER_DIFF(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ANJUTA_TYPE_CELL_RENDERER_DIFF))
+#define ANJUTA_IS_CELL_RENDERER_DIFF_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ANJUTA_TYPE_CELL_RENDERER_DIFF))
+#define ANJUTA_CELL_RENDERER_DIFF_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ANJUTA_TYPE_CELL_RENDERER_DIFF, AnjutaCellRendererDiffClass))
+
+typedef struct _AnjutaCellRendererDiffClass AnjutaCellRendererDiffClass;
+typedef struct _AnjutaCellRendererDiff AnjutaCellRendererDiff;
+typedef struct _AnjutaCellRendererDiffPrivate AnjutaCellRendererDiffPrivate;
+
+
+struct _AnjutaCellRendererDiffClass
+{
+ GtkCellRendererClass parent_class;
+};
+
+struct _AnjutaCellRendererDiff
+{
+ GtkCellRenderer parent_instance;
+
+ AnjutaCellRendererDiffPrivate *priv;
+};
+
+GType anjuta_cell_renderer_diff_get_type (void) G_GNUC_CONST;
+void anjuta_cell_renderer_diff_set_diff (AnjutaCellRendererDiff *self,
+ const gchar *diff);
+GtkCellRenderer *anjuta_cell_renderer_diff_new (void);
+
+G_END_DECLS
+
+#endif /* _ANJUTA_CELL_RENDERER_DIFF_H_ */
+
diff -Nru anjuta-3.8.4/libanjuta/anjuta-close-button.c anjuta-3.10.2/libanjuta/anjuta-close-button.c
--- anjuta-3.8.4/libanjuta/anjuta-close-button.c 1970-01-01 00:00:00.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-close-button.c 2013-07-08 21:06:37.000000000 +0000
@@ -0,0 +1,81 @@
+/*
+ * anjuta-close-button.c
+ *
+ * Copyright (C) 2010 - Paolo Borelli
+ * Copyright (C) 2011 - Ignacio Casal Quinteiro
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "anjuta-close-button.h"
+
+struct _AnjutaCloseButtonClassPrivate
+{
+ GtkCssProvider *css;
+};
+
+G_DEFINE_TYPE_WITH_CODE (AnjutaCloseButton, anjuta_close_button, GTK_TYPE_BUTTON,
+ g_type_add_class_private (g_define_type_id, sizeof (AnjutaCloseButtonClassPrivate)))
+
+static void
+anjuta_close_button_class_init (AnjutaCloseButtonClass *klass)
+{
+ static const gchar button_style[] =
+ "* {\n"
+ "-GtkButton-default-border : 0;\n"
+ "-GtkButton-default-outside-border : 0;\n"
+ "-GtkButton-inner-border: 0;\n"
+ "-GtkWidget-focus-line-width : 0;\n"
+ "-GtkWidget-focus-padding : 0;\n"
+ "padding: 0;\n"
+ "}";
+
+ klass->priv = G_TYPE_CLASS_GET_PRIVATE (klass, ANJUTA_TYPE_CLOSE_BUTTON, AnjutaCloseButtonClassPrivate);
+
+ klass->priv->css = gtk_css_provider_new ();
+ gtk_css_provider_load_from_data (klass->priv->css, button_style, -1, NULL);
+}
+
+static void
+anjuta_close_button_init (AnjutaCloseButton *button)
+{
+ GtkStyleContext *context;
+ GtkWidget *image;
+ GIcon *icon;
+
+ icon = g_themed_icon_new_with_default_fallbacks ("window-close-symbolic");
+ image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image);
+ g_object_unref (icon);
+
+ gtk_container_add (GTK_CONTAINER (button), image);
+
+ /* make it small */
+ context = gtk_widget_get_style_context (GTK_WIDGET (button));
+ gtk_style_context_add_provider (context,
+ GTK_STYLE_PROVIDER (ANJUTA_CLOSE_BUTTON_GET_CLASS (button)->priv->css),
+ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+}
+
+GtkWidget *
+anjuta_close_button_new ()
+{
+ return GTK_WIDGET (g_object_new (ANJUTA_TYPE_CLOSE_BUTTON,
+ "relief", GTK_RELIEF_NONE,
+ "focus-on-click", FALSE,
+ NULL));
+}
+
+/* ex:set ts=8 noet: */
diff -Nru anjuta-3.8.4/libanjuta/anjuta-close-button.h anjuta-3.10.2/libanjuta/anjuta-close-button.h
--- anjuta-3.8.4/libanjuta/anjuta-close-button.h 1970-01-01 00:00:00.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-close-button.h 2013-07-08 21:06:37.000000000 +0000
@@ -0,0 +1,59 @@
+/*
+ * anjuta-close-button.h
+ *
+ * Copyright (C) 2010 - Paolo Borelli
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef __ANJUTA_CLOSE_BUTTON_H__
+#define __ANJUTA_CLOSE_BUTTON_H__
+
+#include
+
+G_BEGIN_DECLS
+
+#define ANJUTA_TYPE_CLOSE_BUTTON (anjuta_close_button_get_type ())
+#define ANJUTA_CLOSE_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ANJUTA_TYPE_CLOSE_BUTTON, AnjutaCloseButton))
+#define ANJUTA_CLOSE_BUTTON_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ANJUTA_TYPE_CLOSE_BUTTON, AnjutaCloseButton const))
+#define ANJUTA_CLOSE_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ANJUTA_TYPE_CLOSE_BUTTON, AnjutaCloseButtonClass))
+#define ANJUTA_IS_CLOSE_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ANJUTA_TYPE_CLOSE_BUTTON))
+#define ANJUTA_IS_CLOSE_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ANJUTA_TYPE_CLOSE_BUTTON))
+#define ANJUTA_CLOSE_BUTTON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ANJUTA_TYPE_CLOSE_BUTTON, AnjutaCloseButtonClass))
+
+typedef struct _AnjutaCloseButton AnjutaCloseButton;
+typedef struct _AnjutaCloseButtonClass AnjutaCloseButtonClass;
+typedef struct _AnjutaCloseButtonClassPrivate AnjutaCloseButtonClassPrivate;
+
+struct _AnjutaCloseButton
+{
+ GtkButton parent;
+};
+
+struct _AnjutaCloseButtonClass
+{
+ GtkButtonClass parent_class;
+
+ AnjutaCloseButtonClassPrivate *priv;
+};
+
+GType anjuta_close_button_get_type (void) G_GNUC_CONST;
+
+GtkWidget *anjuta_close_button_new (void);
+
+G_END_DECLS
+
+#endif /* __ANJUTA_CLOSE_BUTTON_H__ */
+/* ex:set ts=8 noet: */
diff -Nru anjuta-3.8.4/libanjuta/anjuta-column-text-view.c anjuta-3.10.2/libanjuta/anjuta-column-text-view.c
--- anjuta-3.8.4/libanjuta/anjuta-column-text-view.c 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-column-text-view.c 2013-07-08 21:06:37.000000000 +0000
@@ -25,7 +25,7 @@
GtkWidget *column_label;
};
-G_DEFINE_TYPE (AnjutaColumnTextView, anjuta_column_text_view, GTK_TYPE_VBOX);
+G_DEFINE_TYPE (AnjutaColumnTextView, anjuta_column_text_view, GTK_TYPE_BOX);
static void
set_text_view_column_label (GtkTextBuffer *buffer,
@@ -50,6 +50,10 @@
GtkWidget *scrolled_window;
GtkTextBuffer *text_buffer;
+ /* Set properties */
+ g_object_set (G_OBJECT (self), "orientation", GTK_ORIENTATION_VERTICAL,
+ NULL);
+
self->priv = g_new0 (AnjutaColumnTextViewPriv, 1);
/* Text view */
diff -Nru anjuta-3.8.4/libanjuta/anjuta-command-bar.c anjuta-3.10.2/libanjuta/anjuta-command-bar.c
--- anjuta-3.8.4/libanjuta/anjuta-command-bar.c 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-command-bar.c 2013-11-03 18:57:08.000000000 +0000
@@ -19,6 +19,9 @@
#include "anjuta-command-bar.h"
+/* Reasonable default */
+#define DEFAULT_MAX_TEXT_WIDTH 25
+
/**
* SECTION: anjuta-command-bar
* @short_description: Widget that lays out commands in a vertical row of
@@ -37,6 +40,15 @@
{
GHashTable *action_groups;
GHashTable *widgets;
+
+ gint max_text_width;
+};
+
+enum
+{
+ PROP_0,
+ PROP_MAX_TEXT_WIDTH,
+ PROP_LAST
};
static void
@@ -69,11 +81,58 @@
}
static void
+anjuta_command_bar_get_property (GObject* object, guint prop_id, GValue* value,
+ GParamSpec* pspec)
+{
+ AnjutaCommandBar* self = ANJUTA_COMMAND_BAR (object);
+
+ switch (prop_id)
+ {
+ case PROP_MAX_TEXT_WIDTH:
+ g_value_set_int (value,
+ self->priv->max_text_width);
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ }
+}
+
+static void
+anjuta_command_bar_set_property (GObject* object, guint prop_id,
+ const GValue* value, GParamSpec* pspec)
+{
+ AnjutaCommandBar* self = ANJUTA_COMMAND_BAR (object);
+
+ switch (prop_id)
+ {
+ case PROP_MAX_TEXT_WIDTH:
+ self->priv->max_text_width = g_value_get_int (value);
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ }
+}
+
+static void
anjuta_command_bar_class_init (AnjutaCommandBarClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
object_class->finalize = anjuta_command_bar_finalize;
+ object_class->set_property = anjuta_command_bar_set_property;
+ object_class->get_property = anjuta_command_bar_get_property;
+
+ g_object_class_install_property (object_class,
+ PROP_MAX_TEXT_WIDTH,
+ g_param_spec_int ("max-text-width",
+ "",
+ "",
+ 10,
+ 1000,
+ DEFAULT_MAX_TEXT_WIDTH,
+ G_PARAM_WRITABLE|G_PARAM_READABLE|G_PARAM_CONSTRUCT_ONLY));
}
/**
@@ -92,7 +151,7 @@
* anjuta_command_bar_add_action_group:
* @self: An AnjutaCommandBar
* @group_name: A unique name for this group of entries
- * @entries: A list of entries to add
+ * @entries: (array length=num_entries): A list of entries to add
* @num_entries: The number of items pointed to by entries
* @user_data: User data to pass to the entry callback
*
@@ -105,21 +164,18 @@
int num_entries, gpointer user_data)
{
GtkWidget *vbox;
+ GtkWidget *scrolled_window;
GtkWidget *current_vbox;
GtkActionGroup *action_group;
int i;
- GtkAction *action;
- GtkWidget *button;
- GtkWidget *button_image;
- gchar *frame_label_text;
- GtkWidget *frame_label;
- GtkWidget *frame;
- GtkWidget *frame_vbox;
-
+
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+ scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
g_hash_table_insert (self->priv->widgets, (gchar *) group_name,
- vbox);
+ scrolled_window);
action_group = gtk_action_group_new (group_name);
@@ -136,16 +192,30 @@
{
if (entries[i].type == ANJUTA_COMMAND_BAR_ENTRY_BUTTON)
{
+ GtkAction *action;
+ GtkWidget *button;
+ GtkWidget *button_label;
+
action = gtk_action_new (entries[i].action_name, _(entries[i].label),
_(entries[i].tooltip), entries[i].stock_icon);
- button = gtk_button_new();
+ button = gtk_button_new_with_label (_(entries[i].label));
+
gtk_action_group_add_action (action_group, action);
gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
+ button_label = gtk_bin_get_child (GTK_BIN (button));
+ gtk_label_set_width_chars (GTK_LABEL (button_label), self->priv->max_text_width);
+ gtk_label_set_line_wrap (GTK_LABEL (button_label), TRUE);
+
+ /* Left-align button contents */
+ gtk_misc_set_alignment (GTK_MISC (button_label), 0.0, 0.5);
+ g_object_set (G_OBJECT (button), "xalign", 0.0, NULL);
if (entries[i].stock_icon)
{
+ GtkWidget *button_image;
+
button_image = gtk_action_create_icon (action,
GTK_ICON_SIZE_BUTTON);
gtk_button_set_image (GTK_BUTTON (button), button_image);
@@ -153,21 +223,24 @@
gtk_activatable_set_related_action (GTK_ACTIVATABLE (button),
action);
- gtk_activatable_set_use_action_appearance (GTK_ACTIVATABLE (button),
- TRUE);
+ gtk_widget_show_all (button);
+
g_signal_connect (G_OBJECT (action), "activate",
entries[i].callback,
user_data);
- /* Left-align button contents */
- g_object_set (G_OBJECT (button), "xalign", 0.0, NULL);
gtk_box_pack_start (GTK_BOX (current_vbox), button, FALSE, FALSE,
2);
}
else
{
+ gchar *frame_label_text;
+ GtkWidget *frame_label;
+ GtkWidget *frame;
+ GtkWidget *frame_vbox;
+
frame_label_text = g_strdup_printf ("%s", _(entries[i].label));
frame_label = gtk_label_new (NULL);
frame = gtk_frame_new (NULL);
@@ -189,8 +262,10 @@
}
}
- gtk_widget_show_all (vbox);
- gtk_notebook_append_page (GTK_NOTEBOOK (self), vbox, NULL);
+ gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window),
+ vbox);
+ gtk_widget_show_all (scrolled_window);
+ gtk_notebook_append_page (GTK_NOTEBOOK (self), scrolled_window, NULL);
}
/**
@@ -256,7 +331,7 @@
* @self An AnjutaCommandBar
* @group_name: The name of the action group
*
- * Returns the #GtkActionGroup with the given @group_name
+ * Returns: The #GtkActionGroup with the given @group_name
*/
GtkActionGroup *
anjuta_command_bar_get_action_group (AnjutaCommandBar *self,
diff -Nru anjuta-3.8.4/libanjuta/anjuta-command.c anjuta-3.10.2/libanjuta/anjuta-command.c
--- anjuta-3.8.4/libanjuta/anjuta-command.c 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-command.c 2013-07-08 21:06:37.000000000 +0000
@@ -347,8 +347,8 @@
* normally used from a ::command-finished handler to report errors to the user
* when a command finishes.
*
- * Return value: Error message string that must be freed when no longer needed.
- * If no error is set, return %NULL.
+ * Return value: (transfer full) (allow-none): Error message string that must
+ * be freed when no longer needed. If no error is set, return %NULL.
*/
gchar *
anjuta_command_get_error_message (AnjutaCommand *self)
diff -Nru anjuta-3.8.4/libanjuta/anjuta-completion.c anjuta-3.10.2/libanjuta/anjuta-completion.c
--- anjuta-3.8.4/libanjuta/anjuta-completion.c 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-completion.c 2013-07-08 21:06:37.000000000 +0000
@@ -273,7 +273,7 @@
/**
* anjuta_completion_set_item_destroy_func:
* @self: a #AnjutaCompletion
- * @item_destroy_func: (allow none): the function to be called on
+ * @item_destroy_func: (allow-none): the function to be called on
* the added items when the #AnjutaCompletion object is destroyed.
*/
void
diff -Nru anjuta-3.8.4/libanjuta/anjuta-debug.h anjuta-3.10.2/libanjuta/anjuta-debug.h
--- anjuta-3.8.4/libanjuta/anjuta-debug.h 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-debug.h 2013-07-08 21:06:37.000000000 +0000
@@ -18,6 +18,9 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#ifndef __ANJUTA_DEBUG__
+#define __ANJUTA_DEBUG__
+
/**
* SECTION:anjuta-debug
* @title: Debugging
@@ -39,9 +42,6 @@
* will display debug messages from Gtk, Anjuta and gdb plugin only.
*/
-#ifndef __ANJUTA_DEBUG__
-#define __ANJUTA_DEBUG__
-
/**
* DEBUG_PRINT:
*
diff -Nru anjuta-3.8.4/libanjuta/anjuta-dock-pane.c anjuta-3.10.2/libanjuta/anjuta-dock-pane.c
--- anjuta-3.8.4/libanjuta/anjuta-dock-pane.c 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-dock-pane.c 2013-07-08 21:06:37.000000000 +0000
@@ -143,7 +143,7 @@
param_spec);
/**
- * AnjutaDockPane::single-selection-changed
+ * AnjutaDockPane::single-selection-changed:
* @pane: An AnjutaDockPane
*
* This signal is emitted by pane subclasses to notify clients that
@@ -162,7 +162,7 @@
0);
/**
- * AnjutaDockPane::multiple-selection-changed
+ * AnjutaDockPane::multiple-selection-changed:
* @pane: An AnjutaDockPane
*
* This signal is emitted by pane subclasses to notify clients that the set
@@ -203,7 +203,7 @@
* anjuta_dock_pane_get_widget:
* @self: An AnjutaDockPane
*
- * Returns the widget associated with the given pane. The returned widget is
+ * Returns: The widget associated with the given pane. The returned widget is
* owned by the pane and should not be destroyed or modified.
*/
GtkWidget *
@@ -217,7 +217,7 @@
* anjuta_dock_pane_get_plugin:
* @self: An AnjutaDockPane
*
- * Returns the plugin object associated with this pane.
+ * Returns: The plugin object associated with this pane.
*/
AnjutaPlugin *
anjuta_dock_pane_get_plugin (AnjutaDockPane *self)
diff -Nru anjuta-3.8.4/libanjuta/anjuta-dock.c anjuta-3.10.2/libanjuta/anjuta-dock.c
--- anjuta-3.8.4/libanjuta/anjuta-dock.c 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-dock.c 2013-07-08 21:06:37.000000000 +0000
@@ -144,7 +144,8 @@
* @stock_icon: Stock icon to display in this pane's grip
* @placement: A #GdlDockPlacement value indicating where the pane should be
* placed
- * @entries: #AnjutaCommandBar entries for this pane. Can be %NULL
+ * @entries: (allow-none) (array length=num_entries): #AnjutaCommandBar entries
+ * for this pane. Can be %NULL
* @num_entries: The number of entries pointed to by entries, or 0.
* @user_data: User data to pass to the entry callback
*
@@ -184,7 +185,8 @@
* the pane object.
* @placement: A #GdlDockPlacement value indicating where the pane should be
* placed
- * @entries: #AnjutaCommandBar entries for this pane. Can be %NULL
+ * @entries: (allow-none) (array length=num_entries): #AnjutaCommandBar entries
+ * for this pane. Can be %NULL
* @num_entries: The number of entries pointed to by entries, or 0.
* @user_data: User data to pass to the entry callback
* @behavior: Any combination of #GdlDockItemBehavior flags
@@ -258,7 +260,8 @@
* @stock_icon: Stock icon to display in this pane's grip
* @placement: A #GdlDockPlacement value indicating where the pane should be
* placed
- * @entries: #AnjutaCommandBar entries for this pane. Can be %NULL
+ * @entries: (allow-none) (array length=num_entries): #AnjutaCommandBar entries
+ * for this pane. Can be %NULL
* @num_entries: The number of entries pointed to by entries, or 0.
* @user_data: User data to pass to the entry callback
*
@@ -322,7 +325,7 @@
/**
* anjuta_dock_show_pane:
* @self: An AnjutaDock
- * @pane_name: Name of the pane to show
+ * @pane: Name of the pane to show
*
* Makes the given pane visible
*/
@@ -364,7 +367,7 @@
}
/**
- * anjuta_dock_show_pane:
+ * anjuta_dock_present_pane:
* @self: An AnjutaDock
* @pane: Pane to present
*
@@ -407,10 +410,11 @@
* anjuta_dock_get_command_bar:
* @self: An AnjutaDock
*
- * Returns: the #AnjutaCommandBar associated with this dock or %NULL.
+ * Returns: (transfer none) (allow-none): the #AnjutaCommandBar associated with
+ * this dock or %NULL.
*/
AnjutaCommandBar *
anjuta_dock_get_command_bar (AnjutaDock *self)
{
return ANJUTA_COMMAND_BAR (self->priv->command_bar);
-}
\ No newline at end of file
+}
diff -Nru anjuta-3.8.4/libanjuta/anjuta-entry.c anjuta-3.10.2/libanjuta/anjuta-entry.c
--- anjuta-3.8.4/libanjuta/anjuta-entry.c 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-entry.c 2013-07-08 21:06:37.000000000 +0000
@@ -56,9 +56,10 @@
static void
anjuta_entry_set_mode (AnjutaEntry *self, AnjutaEntryMode mode)
{
- GtkStyle *style;
+ GtkStyleContext *style_context;
+ GdkRGBA insensitive_color;
- style = gtk_widget_get_style (GTK_WIDGET (self));
+ style_context = gtk_widget_get_style_context (GTK_WIDGET (self));
switch (mode)
{
@@ -67,7 +68,8 @@
if (self->priv->showing_help_text)
gtk_entry_set_text (GTK_ENTRY (self), "");
- gtk_widget_modify_text (GTK_WIDGET (self), GTK_STATE_NORMAL, NULL);
+ gtk_widget_override_color (GTK_WIDGET (self), GTK_STATE_NORMAL,
+ NULL);
self->priv->showing_help_text = FALSE;
@@ -78,9 +80,17 @@
else
gtk_entry_set_text (GTK_ENTRY (self), "");
- gtk_widget_modify_text (GTK_WIDGET (self),
- GTK_STATE_NORMAL,
- &(style->text[GTK_STATE_INSENSITIVE]));
+ /* FIXME: Ideally we should be using CSS here, but some themes,
+ * like Ubuntu's, don't define insensitive_fg_color. The help text
+ * renders white on these themes, which is unreadable in many cases.
+ *
+ * This should make the help text readable on all themes, but the
+ * color won't change if the theme changes while Anjuta is running.
+ */
+ gtk_style_context_get_color (style_context, GTK_STATE_FLAG_INSENSITIVE,
+ &insensitive_color);
+ gtk_widget_override_color (GTK_WIDGET (self), GTK_STATE_NORMAL,
+ &insensitive_color);
self->priv->showing_help_text = TRUE;
@@ -255,7 +265,7 @@
* anjuta_entry_get_text:
* @self: An AnjutaEntry
*
- * Returns the contents of the entry. If the entry is empty, the help text will
+ * Returns: The contents of the entry. If the entry is empty, the help text will
* be displayed and an empty string will be returned.
*/
const gchar *
@@ -269,9 +279,9 @@
* anjuta_entry_dup_text:
* @self: An AnjutaEntry
*
- * Returns a copy of the contents of the entry. If the entry is empty, the
- * returned string will be empty. The returned string must be freed when no
- * longer needed.
+ * Returns: (transfer full): A copy of the contents of the entry. If the entry
+ * is empty, the returned string will be empty. The returned string must be
+ * freed when no longer needed.
*/
gchar *
anjuta_entry_dup_text (AnjutaEntry *self)
@@ -301,7 +311,7 @@
* anjuta_entry_is_showing_help_text:
* @self: An AnjutaEntry
*
- * Returns whether the entry is showing its help text. In practice, if this
+ * Returns: Whether the entry is showing its help text. In practice, if this
* method returns %TRUE, it means that the user has not entered anything.
*/
gboolean
diff -Nru anjuta-3.8.4/libanjuta/anjuta-enum-types.c anjuta-3.10.2/libanjuta/anjuta-enum-types.c
--- anjuta-3.8.4/libanjuta/anjuta-enum-types.c 2013-06-03 21:24:36.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-enum-types.c 2013-11-15 17:11:31.000000000 +0000
@@ -92,8 +92,9 @@
static GType etype = 0;
if (etype == 0) {
static const GEnumValue values[] = {
- { ANJUTA_PROFILE_ERROR_URI_READ_FAILED, "ANJUTA_PROFILE_ERROR_URI_READ_FAILED", "read-failed" },
- { ANJUTA_PROFILE_ERROR_URI_WRITE_FAILED, "ANJUTA_PROFILE_ERROR_URI_WRITE_FAILED", "write-failed" },
+ { ANJUTA_PROFILE_ERROR_URI_READ_FAILED, "ANJUTA_PROFILE_ERROR_URI_READ_FAILED", "uri-read-failed" },
+ { ANJUTA_PROFILE_ERROR_URI_WRITE_FAILED, "ANJUTA_PROFILE_ERROR_URI_WRITE_FAILED", "uri-write-failed" },
+ { ANJUTA_PROFILE_ERROR_PLUGIN_MISSING, "ANJUTA_PROFILE_ERROR_PLUGIN_MISSING", "plugin-missing" },
{ 0, NULL, NULL }
};
etype = g_enum_register_static (g_intern_static_string ("AnjutaProfileError"), values);
diff -Nru anjuta-3.8.4/libanjuta/anjuta-file-list.c anjuta-3.10.2/libanjuta/anjuta-file-list.c
--- anjuta-3.8.4/libanjuta/anjuta-file-list.c 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-file-list.c 2013-11-03 18:57:08.000000000 +0000
@@ -58,7 +58,7 @@
GtkTreeIter placeholder;
};
-G_DEFINE_TYPE (AnjutaFileList, anjuta_file_list, GTK_TYPE_VBOX);
+G_DEFINE_TYPE (AnjutaFileList, anjuta_file_list, GTK_TYPE_BOX);
static void
anjuta_file_list_append_placeholder (AnjutaFileList *self)
@@ -79,24 +79,27 @@
GtkTreeView *list_view)
{
gchar *path;
- GtkStyle *style;
+ GtkStyleContext *context;
+ GdkRGBA fg_color;
gtk_tree_model_get (model, iter, COL_PATH, &path, -1);
- style = gtk_widget_get_style (GTK_WIDGET (list_view));
+ context = gtk_widget_get_style_context (GTK_WIDGET (list_view));
/* NULL path means this is the placeholder */
if (path)
{
+ gtk_style_context_get_color (context, GTK_STATE_FLAG_NORMAL, &fg_color);
g_object_set (G_OBJECT (renderer),
- "foreground-gdk", &(style->text[GTK_STATE_NORMAL]),
+ "foreground-rgba", &fg_color,
"style", PANGO_STYLE_NORMAL,
"text", path,
NULL);
}
else
{
+ gtk_style_context_get_color (context, GTK_STATE_FLAG_INSENSITIVE, &fg_color);
g_object_set (G_OBJECT (renderer),
- "foreground-gdk", &(style->text[GTK_STATE_INSENSITIVE]),
+ "foreground-rgba", &fg_color,
"style", PANGO_STYLE_ITALIC,
"text", _("Drop a file or enter a path here"),
NULL);
@@ -351,6 +354,10 @@
GtkTreeViewColumn *column;
GtkCellRenderer *renderer;
+
+ /* Set properties */
+ g_object_set (self, "orientation", GTK_ORIENTATION_VERTICAL, NULL);
+
self->priv = g_new0 (AnjutaFileListPriv, 1);
self->priv->list_view = gtk_tree_view_new ();
self->priv->list_model = gtk_list_store_new (NUM_COLS, G_TYPE_STRING);
diff -Nru anjuta-3.8.4/libanjuta/anjuta-glade-catalog.c anjuta-3.10.2/libanjuta/anjuta-glade-catalog.c
--- anjuta-3.8.4/libanjuta/anjuta-glade-catalog.c 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-glade-catalog.c 2013-07-08 21:06:37.000000000 +0000
@@ -9,3 +9,8 @@
#include
#include
+/* Link to at least one function of libanjuta to keep it as a dependency */
+static void anjuta_glade_unused (void)
+{
+ anjuta_file_list_new();
+}
diff -Nru anjuta-3.8.4/libanjuta/anjuta-glade.xml anjuta-3.10.2/libanjuta/anjuta-glade.xml
--- anjuta-3.8.4/libanjuta/anjuta-glade.xml 2012-09-26 20:53:46.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-glade.xml 2013-11-03 18:57:08.000000000 +0000
@@ -79,6 +79,9 @@
generic-name="view" parent="GtkTreeView">
+
+
diff -Nru anjuta-3.8.4/libanjuta/anjuta-language-provider.c anjuta-3.10.2/libanjuta/anjuta-language-provider.c
--- anjuta-3.8.4/libanjuta/anjuta-language-provider.c 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-language-provider.c 2013-07-08 21:06:37.000000000 +0000
@@ -111,7 +111,7 @@
* @iter: (type GObject): Iter to start searching at
*
* Returns: (type GObject): The position of the brace, if the next non-whitespace character is a
- * opening brace, NULL otherwise
+ * opening brace, %NULL otherwise
*/
static IAnjutaIterable*
anjuta_language_provider_find_next_brace (IAnjutaIterable* iter)
@@ -135,8 +135,8 @@
* anjuta_language_provider_find_whitespace:
* @iter: (type GObject): Iter to start searching at
*
- * Returns: TRUE if the next character is a whitespace character,
- * FALSE otherwise
+ * Returns: %TRUE if the next character is a whitespace character,
+ * %FALSE otherwise
*/
static gboolean
anjuta_language_provider_find_whitespace (IAnjutaIterable* iter)
@@ -179,7 +179,7 @@
}
/**
- * anjuta_language_provider_get_scope_context
+ * anjuta_language_provider_get_scope_context:
* @editor: (type GObject): current editor
* @iter: Current cursor position
* @scope_context_ch: language-specific context characters
@@ -246,7 +246,7 @@
*
* Searches for a calltip context
*
- * Returns: name of the method to show a calltip for or NULL
+ * Returns: name of the method to show a calltip for or %NULL
*/
gchar*
anjuta_language_provider_get_calltip_context (AnjutaLanguageProvider* lang_prov,
@@ -295,7 +295,8 @@
*
* Search for the current typed word
*
- * Returns: The current word (needs to be freed) or NULL if no word was found
+ * Returns: (transfer full) (allow-none): The current word (needs to be freed)
+ * or %NULL if no word was found
*/
gchar*
anjuta_language_provider_get_pre_word (AnjutaLanguageProvider* lang_prov,
@@ -351,7 +352,7 @@
* Creates a calltip if there is something to show a tip for
* Calltips are queried async
*
- * Returns: TRUE if a calltips was queried, FALSE otherwise
+ * Returns: %TRUE if a calltips was queried, %FALSE otherwise
*/
static gboolean
anjuta_language_provider_calltip (AnjutaLanguageProvider* lang_prov,
@@ -531,7 +532,7 @@
* @cursor: (type GObject): the text iter where the provider should be populated
*
* Show completion for the context at position @iter. The provider should
- * call ianjuta_editor_assist_proposals here to add proposals to the list.
+ * call anjuta_language_provider_proposals here to add proposals to the list.
*/
void
anjuta_language_provider_populate (AnjutaLanguageProvider* lang_prov,
@@ -586,6 +587,39 @@
}
/**
+ * anjuta_language_provider_proposals:
+ * @lang_prov: Self
+ * @iprov: (type GObject): IAnjutaProvider object
+ * @proposals: (element-type IAnjutaEditorAssistProposal): a list of IAnjutaProposals
+ * @pre_word: the word before the cursor
+ * @finished: whether is was the last call in an async operation
+ *
+ * Add the list of proposals for the current population. You can add
+ * proposals async as long as the last call sets finished to TRUE. That
+ * is usually called by the IAnjutaLanguageProvider after it was triggered by
+ * ianjuta_language_provider_populate_completions()
+ */
+void
+anjuta_language_provider_proposals (AnjutaLanguageProvider* lang_prov,
+ IAnjutaProvider* iprov,
+ GList* proposals,
+ const gchar* pre_word,
+ gboolean finished)
+{
+ /* Hide if the only suggestion is exactly the typed word */
+ if (pre_word && proposals && g_list_length (proposals) == 1)
+ {
+ IAnjutaEditorAssistProposal* proposal = proposals->data;
+ AnjutaLanguageProposalData* data = proposal->data;
+ if (g_str_equal (pre_word, data->name))
+ proposals = NULL;
+ }
+
+ ianjuta_editor_assist_proposals (lang_prov->priv->iassist, iprov, proposals,
+ pre_word, finished, NULL);
+}
+
+/**
* anjuta_language_provider_get_start_iter:
* @lang_prov: Self
*
@@ -628,7 +662,7 @@
* anjuta_language_proposal_data_new:
* @name: Name of the object
*
- * Returns: Creates a new AnjutaLanguageProposalData object
+ * Returns: (transfer full): Creates a new AnjutaLanguageProposalData object
*/
AnjutaLanguageProposalData*
anjuta_language_proposal_data_new (gchar* name)
diff -Nru anjuta-3.8.4/libanjuta/anjuta-language-provider.h anjuta-3.10.2/libanjuta/anjuta-language-provider.h
--- anjuta-3.8.4/libanjuta/anjuta-language-provider.h 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-language-provider.h 2013-07-08 21:06:37.000000000 +0000
@@ -107,6 +107,13 @@
anjuta_language_provider_populate (AnjutaLanguageProvider* lang_prov,
IAnjutaProvider* iprov,
IAnjutaIterable* cursor);
+void
+anjuta_language_provider_proposals (AnjutaLanguageProvider* lang_prov,
+ IAnjutaProvider* iprov,
+ GList* proposals,
+ const gchar* pre_word,
+ gboolean finished);
+
IAnjutaIterable*
anjuta_language_provider_get_start_iter (AnjutaLanguageProvider* lang_prov);
diff -Nru anjuta-3.8.4/libanjuta/anjuta-launcher.c anjuta-3.10.2/libanjuta/anjuta-launcher.c
--- anjuta-3.8.4/libanjuta/anjuta-launcher.c 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-launcher.c 2013-07-08 21:06:37.000000000 +0000
@@ -295,7 +295,7 @@
parent_class = g_type_class_peek_parent (klass);
/**
- * AnjutaLauncher::child-exited
+ * AnjutaLauncher::child-exited:
* @launcher: a #AnjutaLancher object.
* @child_pid: process ID of the child
* @status: status as returned by waitpid function
@@ -319,13 +319,13 @@
G_TYPE_INT, G_TYPE_ULONG);
/**
- * AnjutaLauncher::busy
+ * AnjutaLauncher::busy:
* @launcher: a #AnjutaLancher object.
- * @busy: TRUE is a child is currently running
+ * @busy: %TRUE is a child is currently running
*
* Emitted when a child starts after a call to one execute function
- * (busy is TRUE) or when a child exits and all i/o channels are
- * closed (busy is FALSE).
+ * (busy is %TRUE) or when a child exits and all i/o channels are
+ * closed (busy is %FALSE).
**/
launcher_signals[BUSY_SIGNAL] =
g_signal_new ("busy",
@@ -355,7 +355,7 @@
*
* Tells if the laucher is currently executing any command.
*
- * Return value: TRUE if launcher is busy, otherwisee FALSE.
+ * Return value: %TRUE if launcher is busy, otherwise %FALSE.
*/
gboolean
anjuta_launcher_is_busy (AnjutaLauncher *launcher)
@@ -389,7 +389,7 @@
}
/**
- * anjuta_launcher_send_stdin:
+ * anjuta_launcher_send_stdin_eof:
* @launcher: a #AnjutaLancher object.
*
* Sends a EOF to Standard input of the process currently being executed.
@@ -1247,7 +1247,7 @@
/**
* anjuta_launcher_execute_v:
* @launcher: a #AnjutaLancher object.
- * @dir: Working directory or NULL.
+ * @dir: Working directory or %NULL.
* @argv: Command args.
* @envp: Additional environment variable.
* @callback: The callback for delivering output from the process.
@@ -1256,7 +1256,7 @@
* The first of the @args is the command itself. The rest are sent to the
* as it's arguments. This function works similar to anjuta_launcher_execute().
*
- * Return value: TRUE if successfully launched, otherwise FALSE.
+ * Return value: %TRUE if successfully launched, otherwise %FALSE.
*/
gboolean
anjuta_launcher_execute_v (AnjutaLauncher *launcher, gchar *const dir,
@@ -1301,7 +1301,7 @@
* it. Please note that not all formats of the password are recognized. Those
* with the standard 'assword:' substring in the prompt should work well.
*
- * Return value: TRUE if successfully launched, otherwise FALSE.
+ * Return value: %TRUE if successfully launched, otherwise %FALSE.
*/
gboolean
anjuta_launcher_execute (AnjutaLauncher *launcher, const gchar *command_str,
diff -Nru anjuta-3.8.4/libanjuta/anjuta-modeline.c anjuta-3.10.2/libanjuta/anjuta-modeline.c
--- anjuta-3.8.4/libanjuta/anjuta-modeline.c 1970-01-01 00:00:00.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-modeline.c 2013-07-08 21:06:37.000000000 +0000
@@ -0,0 +1,371 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * anjuta-modeline.c
+ * Copyright (C) Sébastien Granjoux 2013
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
+
+/**
+ * SECTION:anjuta-modeline
+ * @short_description: Parse editor mode line
+ * @see_also:
+ * @stability: Unstable
+ * @include: libanjuta/anjuta-modeline.h
+ *
+ */
+
+#include "anjuta-modeline.h"
+
+#include "anjuta-debug.h"
+
+#include
+
+#include
+#include
+
+/* Types declarations
+ *---------------------------------------------------------------------------*/
+
+enum {
+ SET_USE_SPACES = 1 << 0,
+ SET_STATEMENT_INDENTATION = 1 << 1,
+ SET_TAB_SIZE = 1 << 2,
+ CHECK_NEXT = 1 << 4
+};
+
+typedef struct {
+ gint settings;
+
+ gint use_spaces;
+ gint statement_indentation;
+ gint tab_size;
+} IndentationParams;
+
+
+/* Helpers functions
+ *---------------------------------------------------------------------------*/
+
+/* Private functions
+ *---------------------------------------------------------------------------*/
+
+static gchar *
+get_editor_line (IAnjutaEditor *editor, gint line)
+{
+ IAnjutaIterable *start;
+ IAnjutaIterable *end;
+ gchar *content = NULL;
+
+ if (line < 0)
+ {
+ gint last;
+
+ end = ianjuta_editor_get_end_position(editor, NULL);
+ last = ianjuta_editor_get_line_from_position (editor, end, NULL);
+ line = last + line;
+ g_object_unref (end);
+ }
+ if (line > 0)
+ {
+ start = ianjuta_editor_get_line_begin_position (editor, line, NULL);
+ end = ianjuta_editor_get_line_end_position (editor, line, NULL);
+ content = ianjuta_editor_get_text (editor, start, end, NULL);
+ g_object_unref (start);
+ g_object_unref (end);
+ }
+
+ return content;
+}
+
+static void
+set_vim_params (IndentationParams *params, const gchar *key, const gchar *value)
+{
+ //DEBUG_PRINT ("Setting indent param: %s = %s", key, value);
+ if ((strcmp (key, "expandtab") == 0) ||
+ (strcmp (key, "et") == 0))
+ {
+ params->use_spaces = 1;
+ params->settings |= SET_USE_SPACES;
+ }
+ else if ((strcmp (key, "noexpandtab") == 0) ||
+ (strcmp (key, "noet") == 0))
+ {
+ params->use_spaces = 0;
+ params->settings |= SET_USE_SPACES;
+ }
+ else if ((strcmp (key, "shiftwidth") == 0) ||
+ (strcmp (key, "sw") == 0))
+ {
+ params->statement_indentation = atoi (value);
+ params->settings |= SET_STATEMENT_INDENTATION;
+ }
+ else if ((strcmp (key, "softtabstop") == 0) ||
+ (strcmp (key, "sts") == 0) ||
+ (strcmp (key, "tabstop") == 0) ||
+ (strcmp (key, "ts") == 0))
+ {
+ params->tab_size = atoi (value);
+ params->settings |= SET_TAB_SIZE;
+ }
+}
+
+static gboolean
+parse_vim_modeline (IndentationParams *params, const gchar *line, gint linenum)
+{
+ gchar *ptr;
+ gchar *end;
+ gchar *key;
+ gchar *value;
+
+ /* Check the first 5 and last 5 lines */
+ if ((linenum < -5) || (linenum == 0) || (linenum > 5))
+ {
+ return FALSE;
+ }
+
+ ptr = strstr (line, "vim:");
+ if (ptr == NULL)
+ {
+ if ((linenum != -5) && (linenum != 5)) params->settings = CHECK_NEXT;
+ return FALSE;
+ }
+ ptr += 4;
+ while (g_ascii_isspace (*ptr)) ptr++;
+ if (strncmp (ptr, "set", 3) != 0)
+ {
+ if ((linenum != -5) && (linenum != 5)) params->settings = CHECK_NEXT;
+ return FALSE;
+ }
+ ptr += 3;
+
+ for (end = ptr;; end++)
+ {
+ if ((*end == ':') && (*(end-1) != '\\')) break;
+ }
+ *end = '\0';
+
+ while (*ptr != '\0')
+ {
+ gchar sep;
+
+ while (g_ascii_isspace (*ptr)) ptr++;
+ if (*ptr == '\0') break;
+
+ /* Get key */
+ key = ptr++;
+ value = NULL;
+ while ((*ptr != '\0') && (*ptr != '=') && !g_ascii_isspace(*ptr)) ptr++;
+ sep = *ptr;
+ *ptr = '\0';
+
+ if (sep == '=')
+ {
+ /* Get value */
+ value = ++ptr;
+ while ((*ptr != '\0') && !g_ascii_isspace(*ptr)) ptr++;
+ sep = *ptr;
+ *ptr = '\0';
+
+ if (sep != '\0') ptr++;
+ }
+
+ set_vim_params (params, key, value);
+ }
+
+ return TRUE;
+}
+
+static void
+set_emacs_params (IndentationParams *params, const gchar *key, const gchar *value)
+{
+ //DEBUG_PRINT ("Setting indent param: %s = %s", key, value);
+ if (strcmp (key, "indent-tabs-mode") == 0)
+ {
+ if (strcmp (value, "t") == 0)
+ {
+ params->use_spaces = 0;
+ params->settings |= SET_USE_SPACES;
+ }
+ else if (strcmp (value, "nil") == 0)
+ {
+ params->use_spaces = 1;
+ params->settings |= SET_USE_SPACES;
+ }
+ }
+ else if ((strcmp (key, "c-basic-offset") == 0) ||
+ (strcmp (key, "indent-offset") == 0))
+ {
+ params->statement_indentation = atoi (value);
+ params->settings |= SET_STATEMENT_INDENTATION;
+ }
+ else if (strcasecmp (key, "tab-width") == 0)
+ {
+ params->tab_size = atoi (value);
+ params->settings |= SET_TAB_SIZE;
+ }
+}
+
+static gboolean
+parse_emacs_modeline (IndentationParams *params, gchar *line, gint linenum)
+{
+ gchar *ptr;
+ gchar *end;
+ gchar *key;
+ gchar *value;
+
+ if (linenum == 1)
+ {
+ /* If first line is a shebang, check second line */
+ if ((line[0] == '#') && (line[1] =='!'))
+ {
+ params->settings |= CHECK_NEXT;
+ return FALSE;
+ }
+ }
+ else if (linenum != 2)
+ {
+ /* Check only the 2 first lines */
+ return FALSE;
+ }
+
+ ptr = strstr (line, "-*-");
+ if (ptr == NULL) return FALSE;
+ ptr += 3;
+ end = strstr (ptr, "-*-");
+ if (end == NULL) return FALSE;
+ *end = '\0';
+
+ while (*ptr != '\0')
+ {
+ gchar sep;
+
+ while (g_ascii_isspace (*ptr)) ptr++;
+ if (*ptr == '\0') break;
+
+ /* Get key */
+ key = ptr++;
+ value = NULL;
+ while ((*ptr != '\0') && (*ptr != ':') && (*ptr != ';')) ptr++;
+ sep = *ptr;
+
+ end = ptr - 1;
+ while (g_ascii_isspace (*end)) end--;
+ *(end + 1) = '\0';
+
+ if (sep == ':')
+ {
+ /* Get value */
+ ptr++;
+ while (g_ascii_isspace (*ptr)) ptr++;
+ if (*ptr != '\0')
+ {
+ value = ptr;
+ while ((*ptr != '\0') && (*ptr != ';')) ptr++;
+ sep = *ptr;
+
+ end = ptr - 1;
+ while (g_ascii_isspace (*end)) end--;
+ *(end + 1) = '\0';
+
+ if (sep == ';') ptr++;
+ }
+ }
+
+ set_emacs_params (params, key, value);
+ }
+
+ return TRUE;
+}
+
+
+static gboolean
+set_indentation (IAnjutaEditor *editor, IndentationParams *params)
+{
+ if (params->settings == 0) return FALSE;
+
+ if (params->settings & SET_USE_SPACES)
+ ianjuta_editor_set_use_spaces (editor, params->use_spaces, NULL);
+
+ if (params->settings & SET_STATEMENT_INDENTATION)
+ ianjuta_editor_set_indentsize (editor, params->statement_indentation, NULL);
+
+ if (params->settings & SET_TAB_SIZE)
+ ianjuta_editor_set_tabsize (editor, params->tab_size, NULL);
+
+ return TRUE;
+}
+
+
+/* Public functions
+ *---------------------------------------------------------------------------*/
+
+
+/**
+ * anjuta_apply_modeline:
+ * @editor: #IAnjutaEditor object
+ *
+ * Check the editor buffer to find a mode line and update the indentation
+ * settings if found.
+ *
+ * The mode line is special line used by the text editor to define settings for
+ * the current file, typically indentation. Anjuta currently recognize two kinds
+ * of mode line:
+ *
+ * Emacs mode line, on the first or the second line if the first one is a
+ * shebang (#!) with the following format:
+ * -*- key1: value1; key2: value2 -*-
+ *
+ * Vim mode line, one the first 5 or the last 5 lines with the following format:
+ * vim:set key1=value1 key2=value2
+ *
+ * Returns: %TRUE if a mode line has been found and applied.
+ */
+gboolean
+anjuta_apply_modeline (IAnjutaEditor *editor)
+{
+ IndentationParams params = {CHECK_NEXT,0,0,0};
+ gint line;
+ gchar *content = NULL;
+
+ g_return_val_if_fail (IANJUTA_IS_EDITOR (editor), FALSE);
+
+ /* Check the first lines */
+ for (line = 1; params.settings == CHECK_NEXT; line++)
+ {
+ g_free (content);
+ content = get_editor_line (editor, line);
+ if (content == NULL) return FALSE;
+
+ params.settings = 0;
+ if (parse_vim_modeline (¶ms, content, line)) break;
+ if (parse_emacs_modeline (¶ms, content, line)) break;
+ }
+
+ /* Check the last lines */
+ if (params.settings == 0) params.settings = CHECK_NEXT;
+ for (line = -1;params.settings == CHECK_NEXT; line--)
+ {
+ g_free (content);
+ content = get_editor_line (editor, line);
+ if (content == NULL) return FALSE;
+
+ params.settings = 0;
+ if (parse_vim_modeline (¶ms, content, line)) break;
+ if (parse_emacs_modeline (¶ms, content, line)) break;
+ }
+ g_free (content);
+
+ /* Set indentation settings */
+ return set_indentation (editor, ¶ms);
+}
diff -Nru anjuta-3.8.4/libanjuta/anjuta-modeline.h anjuta-3.10.2/libanjuta/anjuta-modeline.h
--- anjuta-3.8.4/libanjuta/anjuta-modeline.h 1970-01-01 00:00:00.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-modeline.h 2013-07-08 21:06:37.000000000 +0000
@@ -0,0 +1,33 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * anjuta-modeline.h
+ * Copyright (C) Sébastien Granjoux 2013
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
+
+#ifndef _ANJUTA_MODELINE_H_
+#define _ANJUTA_MODELINE_H_
+
+#include
+
+#include
+
+G_BEGIN_DECLS
+
+gboolean anjuta_apply_modeline (IAnjutaEditor *editor);
+
+G_END_DECLS
+
+#endif
diff -Nru anjuta-3.8.4/libanjuta/anjuta-pkg-config.c anjuta-3.10.2/libanjuta/anjuta-pkg-config.c
--- anjuta-3.8.4/libanjuta/anjuta-pkg-config.c 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-pkg-config.c 2013-07-08 21:06:37.000000000 +0000
@@ -152,7 +152,7 @@
*
* This does sync io, call from a thread if necessary
*
- * Returns: (transfer full) the version of the package or NULL
+ * Returns: (transfer full) the version of the package or %NULL
*/
gchar* anjuta_pkg_config_get_version (const gchar* package)
{
diff -Nru anjuta-3.8.4/libanjuta/anjuta-pkg-scanner.c anjuta-3.10.2/libanjuta/anjuta-pkg-scanner.c
--- anjuta-3.8.4/libanjuta/anjuta-pkg-scanner.c 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-pkg-scanner.c 2013-07-08 21:06:37.000000000 +0000
@@ -223,17 +223,36 @@
return ANJUTA_COMMAND (object);
}
+/*
+ * anjuta_pkg_scanner_get_files:
+ * @scanner: PkgScanner object
+ *
+ * Returns: Name of the package to scan.
+ */
const gchar*
anjuta_pkg_scanner_get_package (AnjutaPkgScanner* scanner)
{
return scanner->priv->package;
}
+
+/*
+ * anjuta_pkg_scanner_get_files:
+ * @scanner: PkgScanner object
+ *
+ * Returns: Version of the package to scan.
+ */
const gchar*
anjuta_pkg_scanner_get_version (AnjutaPkgScanner* scanner)
{
return scanner->priv->version;
}
+/*
+ * anjuta_pkg_scanner_get_files:
+ * @scanner: PkgScanner object
+ *
+ * Returns: (element-type GFile*): List of files to scan.
+ */
GList*
anjuta_pkg_scanner_get_files (AnjutaPkgScanner* scanner)
{
diff -Nru anjuta-3.8.4/libanjuta/anjuta-plugin-description.c anjuta-3.10.2/libanjuta/anjuta-plugin-description.c
--- anjuta-3.8.4/libanjuta/anjuta-plugin-description.c 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-plugin-description.c 2013-07-08 21:06:37.000000000 +0000
@@ -1,3 +1,4 @@
+/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 4 -*- */
/*
* AnjutaPluginDescription - Plugin meta data
* anjuta-plugin-description.c Copyright (C) 2002 Red Hat, Inc.
@@ -41,6 +42,7 @@
struct _AnjutaPluginDescriptionSection {
GQuark section_name; /* 0 means just a comment block (before any section) */
gint n_lines;
+ gint n_allocated;
AnjutaPluginDescriptionLine *lines;
};
@@ -48,10 +50,12 @@
GQuark key; /* 0 means comment or blank line in value */
char *locale;
gchar *value;
+ GList *override; /* A list of previous value */
};
struct _AnjutaPluginDescription {
gint n_sections;
+ gint n_allocated;
AnjutaPluginDescriptionSection *sections;
char *current_locale[2];
};
@@ -59,8 +63,6 @@
struct _AnjutaPluginDescriptionParser {
AnjutaPluginDescription *df;
gint current_section;
- gint n_allocated_lines;
- gint n_allocated_sections;
gint line_nr;
char *line;
};
@@ -118,6 +120,7 @@
static void
anjuta_plugin_description_line_free (AnjutaPluginDescriptionLine *line)
{
+ g_list_free_full (line->override, (GDestroyNotify)g_free);
g_free (line->locale);
g_free (line->value);
}
@@ -145,6 +148,7 @@
int i;
for (i = 0; i < df->n_sections; i++)
+ for (i = 0; i < df->n_sections; i++)
anjuta_plugin_description_section_free (&df->sections[i]);
g_free (df->sections);
g_free (df->current_locale[0]);
@@ -154,36 +158,33 @@
}
static void
-grow_lines (AnjutaPluginDescriptionParser *parser)
+grow_lines (AnjutaPluginDescriptionSection *section)
{
int new_n_lines;
- AnjutaPluginDescriptionSection *section;
- if (parser->n_allocated_lines == 0)
+ if (section->n_allocated == 0)
new_n_lines = 1;
else
- new_n_lines = parser->n_allocated_lines*2;
-
- section = &parser->df->sections[parser->current_section];
+ new_n_lines = section->n_allocated*2;
section->lines = g_realloc (section->lines,
sizeof (AnjutaPluginDescriptionLine) * new_n_lines);
- parser->n_allocated_lines = new_n_lines;
+ section->n_allocated = new_n_lines;
}
static void
-grow_sections (AnjutaPluginDescriptionParser *parser)
+grow_sections (AnjutaPluginDescription *df)
{
int new_n_sections;
- if (parser->n_allocated_sections == 0)
+ if (df->n_allocated == 0)
new_n_sections = 1;
else
- new_n_sections = parser->n_allocated_sections*2;
+ new_n_sections = df->n_allocated*2;
- parser->df->sections = g_realloc (parser->df->sections,
- sizeof (AnjutaPluginDescriptionSection) * new_n_sections);
- parser->n_allocated_sections = new_n_sections;
+ df->sections = g_realloc (df->sections,
+ sizeof (AnjutaPluginDescriptionSection) * new_n_sections);
+ df->n_allocated = new_n_sections;
}
static gchar *
@@ -306,52 +307,51 @@
}
-static void
-open_section (AnjutaPluginDescriptionParser *parser,
- const char *name)
-{
- int n;
-
- if (parser->n_allocated_sections == parser->df->n_sections)
- grow_sections (parser);
-
- if (parser->current_section == 0 &&
- parser->df->sections[0].section_name == 0 &&
- parser->df->sections[0].n_lines == 0)
+static gint
+create_section (AnjutaPluginDescription *df,
+ const char *name,
+ gboolean first)
+{
+ gint n;
+
+ if (df->n_allocated == df->n_sections)
+ grow_sections (df);
+
+ if (first &&
+ df->sections[0].section_name == 0 &&
+ df->sections[0].n_lines == 0)
{
if (!name)
- g_warning ("non-initial NULL section\n");
+ g_warning ("non-initial NULL section\n");
/* The initial section was empty. Piggyback on it. */
- parser->df->sections[0].section_name = g_quark_from_string (name);
+ df->sections[0].section_name = g_quark_from_string (name);
- return;
+ return 0;
}
- n = parser->df->n_sections++;
+ n = df->n_sections++;
if (name)
- parser->df->sections[n].section_name = g_quark_from_string (name);
+ df->sections[n].section_name = g_quark_from_string (name);
else
- parser->df->sections[n].section_name = 0;
- parser->df->sections[n].n_lines = 0;
- parser->df->sections[n].lines = NULL;
-
- parser->current_section = n;
- parser->n_allocated_lines = 0;
- grow_lines (parser);
+ df->sections[n].section_name = 0;
+ df->sections[n].n_lines = 0;
+ df->sections[n].n_allocated = 0;
+ df->sections[n].lines = NULL;
+
+ grow_lines (&df->sections[n]);
+
+ return n;
}
static AnjutaPluginDescriptionLine *
-new_line (AnjutaPluginDescriptionParser *parser)
+new_line (AnjutaPluginDescriptionSection *section)
{
- AnjutaPluginDescriptionSection *section;
AnjutaPluginDescriptionLine *line;
- section = &parser->df->sections[parser->current_section];
-
- if (parser->n_allocated_lines == section->n_lines)
- grow_lines (parser);
+ if (section->n_allocated == section->n_lines)
+ grow_lines (section);
line = §ion->lines[section->n_lines++];
@@ -387,8 +387,7 @@
if (line_end == NULL)
line_end = parser->line + strlen (parser->line);
- line = new_line (parser);
-
+ line = new_line (&parser->df->sections[parser->current_section]);
line->value = g_strndup (parser->line, line_end - parser->line);
parser->line = (line_end) ? line_end + 1 : NULL;
@@ -422,8 +421,8 @@
return FALSE;
}
- open_section (parser, section_name);
-
+ parser->current_section = create_section (parser->df, section_name, parser->current_section == 0);
+
parser->line = (line_end) ? line_end + 1 : NULL;
parser->line_nr++;
@@ -517,7 +516,7 @@
return FALSE;
}
- line = new_line (parser);
+ line = new_line (&parser->df->sections[parser->current_section]);
key = g_strndup (key_start, key_end - key_start);
line->key = g_quark_from_string (key);
g_free (key);
@@ -598,28 +597,25 @@
parser.df = g_new0 (AnjutaPluginDescription, 1);
parser.current_section = -1;
- parser.n_allocated_lines = 0;
- parser.n_allocated_sections = 0;
parser.line_nr = 1;
-
parser.line = data;
- /* Put any initial comments in a NULL segment */
- open_section (&parser, NULL);
- while (parser.line != NULL && strlen(parser.line))
- {
- if (*parser.line == '[') {
- if (!parse_section_start (&parser, error))
- return NULL;
- } else if (is_blank_line (&parser) ||
- *parser.line == '#')
- parse_comment_or_blank (&parser);
- else
- {
- if (!parse_key_value (&parser, error))
- return NULL;
- }
- }
+ /* Put any initial comments in a NULL segment */
+ parser.current_section = create_section (parser.df, NULL, FALSE);
+ while (parser.line != NULL && strlen(parser.line))
+ {
+ if (*parser.line == '[') {
+ if (!parse_section_start (&parser, error))
+ return NULL;
+ } else if (is_blank_line (&parser) ||
+ *parser.line == '#')
+ parse_comment_or_blank (&parser);
+ else
+ {
+ if (!parse_key_value (&parser, error))
+ return NULL;
+ }
+ }
return parser.df;
}
@@ -631,8 +627,8 @@
* Converts the description detains into string format, usually for
* saving it in a file.
*
- * Return value: The string representation of the description. The
- * returned values must be freed after use.
+ * Return value: (transfer full) (allow-none): The string representation of the description.
+ * The returned values must be freed after use.
*/
char *
anjuta_plugin_description_to_string (AnjutaPluginDescription *df)
@@ -743,12 +739,12 @@
* @section_name: Name of the section.
* @keyname: Name of the key.
* @locale: The locale for which the value is to be retrieved.
- * @val: Pointer to the variable to store the string value.
+ * @val: (out) (transfer full) (allow-none): Pointer to the variable to store the string value.
*
* Retrieves the value of a key (in the given section) for the given locale.
* The value returned in @val must be freed after use.
*
- * Return value: TRUE if sucessful, otherwise FALSE.
+ * Return value: %TRUE if sucessful, otherwise %FALSE.
*/
gboolean
anjuta_plugin_description_get_raw (AnjutaPluginDescription *df,
@@ -813,8 +809,8 @@
* @user_data: User data to pass to @func.
*
* Calls @func for each of the keys in the given section. @include_localized,
- * if set to TRUE will make it call @func for the localized keys also, otherwise
- * only one call is made for the key in current locale.
+ * if set to %TRUE will make it call @func for the localized keys also,
+ * otherwise only one call is made for the key in current locale.
*/
void
anjuta_plugin_description_foreach_key (AnjutaPluginDescription *df,
@@ -884,7 +880,7 @@
*
* Returns the value of key in the given section in current locale.
*
- * Return value: TRUE if sucessful, otherwise FALSE.
+ * Return value: %TRUE if sucessful, otherwise %FALSE.
*/
gboolean
anjuta_plugin_description_get_locale_string (AnjutaPluginDescription *df,
@@ -925,7 +921,7 @@
*
* Returns the value of key in the given section.
*
- * Return value: TRUE if sucessful, otherwise FALSE.
+ * Return value: %TRUE if sucessful, otherwise %FALSE.
*/
gboolean
anjuta_plugin_description_get_string (AnjutaPluginDescription *df,
@@ -945,7 +941,7 @@
*
* Returns the value of key as integer in the given section.
*
- * Return value: TRUE if sucessful, otherwise FALSE.
+ * Return value: %TRUE if sucessful, otherwise %FALSE.
*/
gboolean
anjuta_plugin_description_get_integer (AnjutaPluginDescription *df,
@@ -979,7 +975,7 @@
*
* Returns the value of key as boolean in the given section.
*
- * Return value: TRUE if sucessful, otherwise FALSE.
+ * Return value: %TRUE if sucessful, otherwise %FALSE.
*/
gboolean
anjuta_plugin_description_get_boolean (AnjutaPluginDescription *df,
@@ -1016,3 +1012,94 @@
return res;
}
+
+/**
+ * anjuta_plugin_description_override:
+ * @df: an #AnjutaPluginDescription object.
+ * @section_name: Section name.
+ * @keyname: Key name.
+ * @val: Pointer to value to store retured value.
+ *
+ * Override the value of a key in the description. This can be removed using
+ * the function anjuta_plugin_description_remove().
+ *
+ * Return value: TRUE if sucessful, otherwise FALSE.
+ */
+gboolean anjuta_plugin_description_override (AnjutaPluginDescription *df,
+ const gchar *section_name,
+ const gchar *keyname,
+ const gchar*val)
+{
+ AnjutaPluginDescriptionSection *section;
+ AnjutaPluginDescriptionLine *line;
+
+ section = lookup_section (df, section_name);
+ if (!section)
+ {
+ gint n;
+
+ n = create_section (df, section_name, FALSE);
+ if (n == 0) return FALSE;
+ section = &df->sections[n];
+ }
+
+ line = lookup_line (df,
+ section,
+ keyname,
+ NULL);
+ if (line)
+ {
+ line->override = g_list_prepend (line->override, line->value);
+ }
+ else
+ {
+ line = new_line (section);
+ line->key = g_quark_from_string (keyname);
+ }
+ line->value = g_strdup (val);
+
+ return TRUE;
+}
+
+/**
+ * anjuta_plugin_description_remove:
+ * @df: an #AnjutaPluginDescription object.
+ * @section_name: Section name.
+ * @keyname: Key name.
+ *
+ * Remove a key from the description.
+ *
+ * Return value: TRUE if sucessful, otherwise FALSE.
+ */
+gboolean anjuta_plugin_description_remove (AnjutaPluginDescription *df,
+ const gchar *section_name,
+ const gchar *keyname)
+{
+ AnjutaPluginDescriptionSection *section;
+ AnjutaPluginDescriptionLine *line;
+
+ section = lookup_section (df, section_name);
+ if (!section)
+ return FALSE;
+
+ line = lookup_line (df,
+ section,
+ keyname,
+ NULL);
+
+ if (!line)
+ return FALSE;
+
+ g_free (line->value);
+ if (line->override == NULL)
+ {
+ line->value = NULL;
+ }
+ else
+ {
+ line->value = (gchar *)(line->override->data);
+ line->override = g_list_delete_link (line->override, line->override);
+ }
+
+ return TRUE;
+}
diff -Nru anjuta-3.8.4/libanjuta/anjuta-plugin-description.h anjuta-3.10.2/libanjuta/anjuta-plugin-description.h
--- anjuta-3.8.4/libanjuta/anjuta-plugin-description.h 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-plugin-description.h 2013-07-08 21:06:37.000000000 +0000
@@ -111,6 +111,15 @@
const gchar *section,
const gchar *keyname,
gchar **val);
+
+gboolean anjuta_plugin_description_override (AnjutaPluginDescription *df,
+ const gchar *section_name,
+ const gchar *keyname,
+ const gchar*val);
+
+gboolean anjuta_plugin_description_remove (AnjutaPluginDescription *df,
+ const gchar *section_name,
+ const gchar *keyname);
G_END_DECLS
#endif /* ANJUTA_PLUGIN_PARSER_H */
diff -Nru anjuta-3.8.4/libanjuta/anjuta-plugin-handle.c anjuta-3.10.2/libanjuta/anjuta-plugin-handle.c
--- anjuta-3.8.4/libanjuta/anjuta-plugin-handle.c 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-plugin-handle.c 2013-07-08 21:06:37.000000000 +0000
@@ -53,6 +53,7 @@
PROP_DEPENDENTS,
PROP_INTERFACES,
PROP_CAN_LOAD,
+ PROP_CAN_UNLOAD,
PROP_CHECKED,
PROP_RESOLVE_PASS,
PROP_PATH
@@ -86,6 +87,7 @@
GHashTable *dependents;
gboolean can_load;
+ gboolean can_unload;
gboolean checked;
/* The pass on which the module was resolved, or -1 if
@@ -101,6 +103,7 @@
object->priv = g_new0 (AnjutaPluginHandlePriv, 1);
object->priv->resolve_pass = -1;
+ object->priv->can_unload = TRUE;
object->priv->dependencies = g_hash_table_new (g_direct_hash,
g_direct_equal);
@@ -195,6 +198,9 @@
case PROP_CAN_LOAD:
/* TODO: Add setter for "can-load" property here */
break;
+ case PROP_CAN_UNLOAD:
+ /* TODO: Add setter for "can-unload" property here */
+ break;
case PROP_CHECKED:
/* TODO: Add setter for "checked" property here */
break;
@@ -260,6 +266,9 @@
case PROP_CAN_LOAD:
g_value_set_boolean (value, priv->can_load);
break;
+ case PROP_CAN_UNLOAD:
+ g_value_set_boolean (value, priv->can_unload);
+ break;
case PROP_CHECKED:
g_value_set_boolean (value, priv->checked);
break;
@@ -390,6 +399,14 @@
G_PARAM_READABLE));
g_object_class_install_property (object_class,
+ PROP_CAN_UNLOAD,
+ g_param_spec_boolean ("can-unload",
+ "Can UnLoad",
+ "If the plugin can be unloaded",
+ TRUE,
+ G_PARAM_READABLE));
+
+ g_object_class_install_property (object_class,
PROP_CHECKED,
g_param_spec_boolean ("checked",
"Checked",
@@ -674,6 +691,13 @@
}
gboolean
+anjuta_plugin_handle_get_can_unload (AnjutaPluginHandle *plugin_handle)
+{
+ g_return_val_if_fail (ANJUTA_IS_PLUGIN_HANDLE (plugin_handle), FALSE);
+ return plugin_handle->priv->can_unload;
+}
+
+gboolean
anjuta_plugin_handle_get_checked (AnjutaPluginHandle *plugin_handle)
{
g_return_val_if_fail (ANJUTA_IS_PLUGIN_HANDLE (plugin_handle), FALSE);
@@ -696,6 +720,14 @@
}
void
+anjuta_plugin_handle_set_can_unload (AnjutaPluginHandle *plugin_handle,
+ gboolean can_unload)
+{
+ g_return_if_fail (ANJUTA_IS_PLUGIN_HANDLE (plugin_handle));
+ plugin_handle->priv->can_unload = can_unload;
+}
+
+void
anjuta_plugin_handle_set_checked (AnjutaPluginHandle *plugin_handle,
gboolean checked)
{
diff -Nru anjuta-3.8.4/libanjuta/anjuta-plugin-handle.h anjuta-3.10.2/libanjuta/anjuta-plugin-handle.h
--- anjuta-3.8.4/libanjuta/anjuta-plugin-handle.h 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-plugin-handle.h 2013-07-08 21:06:37.000000000 +0000
@@ -64,10 +64,13 @@
GHashTable* anjuta_plugin_handle_get_dependents (AnjutaPluginHandle *plugin_handle);
GList* anjuta_plugin_handle_get_interfaces (AnjutaPluginHandle *plugin_handle);
gboolean anjuta_plugin_handle_get_can_load (AnjutaPluginHandle *plugin_handle);
+gboolean anjuta_plugin_handle_get_can_unload (AnjutaPluginHandle *plugin_handle);
gboolean anjuta_plugin_handle_get_checked (AnjutaPluginHandle *plugin_handle);
gint anjuta_plugin_handle_get_resolve_pass (AnjutaPluginHandle *plugin_handle);
void anjuta_plugin_handle_set_can_load (AnjutaPluginHandle *plugin_handle,
gboolean can_load);
+void anjuta_plugin_handle_set_can_unload (AnjutaPluginHandle *plugin_handle,
+ gboolean can_unload);
void anjuta_plugin_handle_set_checked (AnjutaPluginHandle *plugin_handle,
gboolean checked);
void anjuta_plugin_handle_set_resolve_pass (AnjutaPluginHandle *plugin_handle,
diff -Nru anjuta-3.8.4/libanjuta/anjuta-plugin-manager.c anjuta-3.10.2/libanjuta/anjuta-plugin-manager.c
--- anjuta-3.8.4/libanjuta/anjuta-plugin-manager.c 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-plugin-manager.c 2013-07-08 21:06:37.000000000 +0000
@@ -88,6 +88,9 @@
/* Remember plugin selection */
GHashTable *remember_plugins;
+
+ /* disable plugins */
+ GHashTable *disable_plugins;
};
/* Available plugins page treeview */
@@ -501,7 +504,7 @@
g_hash_table_remove (priv->plugins_cache, plugin);
g_signal_emit_by_name (plugin_manager, "plugin-activated",
- anjuta_plugin_handle_get_description (plugin),
+ plugin,
plugin_object);
}
@@ -522,7 +525,7 @@
g_hash_table_remove (priv->activated_plugins, plugin);
g_signal_emit_by_name (plugin_manager, "plugin-deactivated",
- anjuta_plugin_handle_get_description (plugin),
+ plugin,
plugin_object);
}
@@ -955,11 +958,12 @@
gboolean enable = FALSE;
if (g_hash_table_lookup (activated_plugins, plugin))
enable = TRUE;
-
+
if (anjuta_plugin_handle_get_name (plugin) &&
- anjuta_plugin_handle_get_description (plugin) &&
- (anjuta_plugin_handle_get_user_activatable (plugin) ||
- show_all))
+ anjuta_plugin_handle_get_description (plugin) &&
+ (anjuta_plugin_handle_get_user_activatable (plugin) ||
+ show_all) &&
+ (g_hash_table_lookup (plugin_manager->priv->disable_plugins, plugin) == NULL))
{
GtkTreeIter iter;
gchar *text;
@@ -1029,33 +1033,30 @@
static void
foreach_remembered_plugin (gpointer key, gpointer value, gpointer user_data)
{
- AnjutaPluginDescription *desc = (AnjutaPluginDescription *) value;
+ AnjutaPluginHandle *handle = (AnjutaPluginHandle *) value;
GtkListStore *store = GTK_LIST_STORE (user_data);
AnjutaPluginManager *manager = g_object_get_data (G_OBJECT (store),
"plugin-manager");
- AnjutaPluginHandle *plugin =
- g_hash_table_lookup (manager->priv->plugins_by_description, desc);
- g_return_if_fail (plugin != NULL);
- if (anjuta_plugin_handle_get_name (plugin) &&
- anjuta_plugin_handle_get_description (plugin))
+ if (anjuta_plugin_handle_get_name (handle) &&
+ anjuta_plugin_handle_get_description (handle))
{
GtkTreeIter iter;
gchar *text;
text = g_markup_printf_escaped ("%s\n%s",
- anjuta_plugin_handle_get_name (plugin),
- anjuta_plugin_handle_get_about (plugin));
+ anjuta_plugin_handle_get_name (handle),
+ anjuta_plugin_handle_get_about (handle));
gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter,
COL_REM_NAME, text,
COL_REM_PLUGIN_KEY, key,
-1);
- if (anjuta_plugin_handle_get_icon_path (plugin))
+ if (anjuta_plugin_handle_get_icon_path (handle))
{
GdkPixbuf *icon;
- icon = gdk_pixbuf_new_from_file_at_size (anjuta_plugin_handle_get_icon_path (plugin),
+ icon = gdk_pixbuf_new_from_file_at_size (anjuta_plugin_handle_get_icon_path (handle),
32, 32, NULL);
if (icon) {
gtk_list_store_set (store, &iter,
@@ -1343,20 +1344,20 @@
{
/* Prompt the user to select one of these plugins */
- GList *descs = NULL;
+ GList *handles = NULL;
node = valid_plugins;
while (node)
{
plugin = node->data;
- descs = g_list_prepend (descs, anjuta_plugin_handle_get_description (plugin));
+ handles = g_list_prepend (handles, plugin);
node = g_list_next (node);
}
- descs = g_list_reverse (descs);
+ handles = g_list_reverse (handles);
obj = anjuta_plugin_manager_select_and_activate (plugin_manager,
dgettext (GETTEXT_PACKAGE, "Select a plugin"),
dgettext (GETTEXT_PACKAGE, "Please select a plugin to activate"),
- descs);
- g_list_free (descs);
+ handles);
+ g_list_free (handles);
}
g_list_free (valid_plugins);
@@ -1404,7 +1405,7 @@
* Searches if a currently loaded plugins implements
* the given interface.
*
- * Return value: True is the plugin is currently loaded.
+ * Return value: %TRUE is the plugin is currently loaded.
*/
gboolean
@@ -1442,10 +1443,10 @@
*
* Notice that this function takes the interface name string as string, unlike
* anjuta_plugins_get_interface() which takes the type directly.
- * If no plugin implementing this interface can be found, returns NULL.
+ * If no plugin implementing this interface can be found, returns %NULL.
*
* Return value: The plugin object (subclass of #AnjutaPlugin) which implements
- * the given interface or NULL. See #AnjutaPlugin for more detail on interfaces
+ * the given interface or %NULL. See #AnjutaPlugin for more detail on interfaces
* implemented by plugins.
*/
GObject *
@@ -1476,13 +1477,31 @@
return obj;
node = g_list_next (node);
}
+
+ /* Filter disable plugins */
+ valid_plugins = g_list_copy (valid_plugins);
+ node = valid_plugins;
+ while (node)
+ {
+ GList *next = g_list_next (node);
+
+ if ((g_hash_table_lookup (priv->disable_plugins, node->data) != NULL) &&
+ (g_hash_table_lookup (priv->activated_plugins, node->data) == NULL))
+
+ {
+ valid_plugins = g_list_delete_link (valid_plugins, node);
+ }
+ node = next;
+ }
/* If no plugin is installed yet, do something */
- if (valid_plugins && g_list_length (valid_plugins) == 1)
+ if (valid_plugins &&
+ (g_list_length (valid_plugins) == 1))
{
/* If there is just one plugin, consider it selected */
GObject *obj;
plugin = valid_plugins->data;
+ g_list_free (valid_plugins);
/* Install and return it */
plugin_set_update (plugin_manager, plugin, TRUE);
@@ -1494,20 +1513,11 @@
{
/* Prompt the user to select one of these plugins */
GObject *obj;
- GList *descs = NULL;
- node = valid_plugins;
- while (node)
- {
- plugin = node->data;
- descs = g_list_prepend (descs, anjuta_plugin_handle_get_description (plugin));
- node = g_list_next (node);
- }
- descs = g_list_reverse (descs);
obj = anjuta_plugin_manager_select_and_activate (plugin_manager,
dgettext (GETTEXT_PACKAGE, "Select a plugin"),
dgettext (GETTEXT_PACKAGE, "Please select a plugin to activate"),
- descs);
- g_list_free (descs);
+ valid_plugins);
+ g_list_free (valid_plugins);
return obj;
}
@@ -1516,44 +1526,35 @@
}
/**
- * anjuta_plugin_manager_get_plugin_by_id:
+ * anjuta_plugin_manager_get_plugin_by_handle:
* @plugin_manager: A #AnjutaPluginManager object
- * @plugin_id: The plugin id
+ * @handle: A #AnjutaPluginHandle
*
* Searches the currently available plugins to find the one with the
- * specified identifier. If the plugin is not yet loaded, it will be loaded
+ * specified handle. If the plugin is not yet loaded, it will be loaded
* and activated.
*
* Return value: The plugin object (subclass of #AnjutaPlugin)
*/
GObject *
-anjuta_plugin_manager_get_plugin_by_id (AnjutaPluginManager *plugin_manager,
- const gchar *plugin_id)
+anjuta_plugin_manager_get_plugin_by_handle (AnjutaPluginManager *plugin_manager,
+ AnjutaPluginHandle *handle)
{
AnjutaPluginManagerPriv *priv;
- AnjutaPluginHandle *plugin;
-
+ GObject *obj;
+
g_return_val_if_fail (ANJUTA_IS_PLUGIN_MANAGER (plugin_manager), NULL);
- g_return_val_if_fail (plugin_id != NULL, NULL);
-
+ g_return_val_if_fail (handle != NULL, NULL);
+
priv = plugin_manager->priv;
- plugin = g_hash_table_lookup (priv->plugins_by_name, plugin_id);
- if (plugin)
+ obj = g_hash_table_lookup (priv->activated_plugins, handle);
+ if (obj == NULL)
{
- GObject *obj;
- obj = g_hash_table_lookup (priv->activated_plugins, plugin);
- if (obj)
- {
- return obj;
- } else
- {
- plugin_set_update (plugin_manager, plugin, TRUE);
- obj = g_hash_table_lookup (priv->activated_plugins, plugin);
- return obj;
- }
+ plugin_set_update (plugin_manager, handle, TRUE);
+ obj = g_hash_table_lookup (priv->activated_plugins, handle);
}
- g_warning ("No plugin found with id \"%s\".", plugin_id);
- return NULL;
+
+ return obj;
}
static void
@@ -1562,7 +1563,7 @@
AnjutaPluginHandle *plugin = ANJUTA_PLUGIN_HANDLE (key);
GList **active_plugins = (GList **)user_data;
*active_plugins = g_list_prepend (*active_plugins,
- anjuta_plugin_handle_get_description (plugin));
+ plugin);
}
static void
@@ -1598,41 +1599,30 @@
}
/**
- * anjuta_plugin_manager_unload_plugin_by_id:
+ * anjuta_plugin_manager_unload_plugin_by_handle:
* @plugin_manager: A #AnjutaPluginManager object
- * @plugin_id: The plugin identifier
+ * @handle: A #AnjutaPluginHandle
*
- * Unload the plugin corresponding to the given identifier. If the plugin is
+ * Unload the plugin corresponding to the given handle. If the plugin is
* already unloaded, nothing will be done.
*
* Return value: %TRUE is the plugin is unloaded. %FALSE if a corresponding
* plugin does not exist or if the plugin cannot be unloaded.
*/
gboolean
-anjuta_plugin_manager_unload_plugin_by_id (AnjutaPluginManager *plugin_manager,
- const gchar *plugin_id)
+anjuta_plugin_manager_unload_plugin_by_handle (AnjutaPluginManager *plugin_manager,
+ AnjutaPluginHandle *handle)
{
AnjutaPluginManagerPriv *priv;
- AnjutaPluginHandle *plugin;
-
+
g_return_val_if_fail (ANJUTA_IS_PLUGIN_MANAGER (plugin_manager), FALSE);
- g_return_val_if_fail (plugin_id != NULL, FALSE);
+ g_return_val_if_fail (handle != NULL, FALSE);
priv = plugin_manager->priv;
-
- plugin = g_hash_table_lookup (priv->plugins_by_name, plugin_id);
- if (plugin)
- {
- plugin_set_update (plugin_manager, plugin, FALSE);
-
- /* Check if the plugin has been indeed unloaded */
- if (!g_hash_table_lookup (priv->activated_plugins, plugin))
- return TRUE;
- else
- return FALSE;
- }
- g_warning ("No plugin found with id \"%s\".", plugin_id);
- return FALSE;
+ plugin_set_update (plugin_manager, handle, FALSE);
+
+ /* Check if the plugin has been indeed unloaded */
+ return g_hash_table_lookup (priv->activated_plugins, handle) == NULL;
}
static gboolean
@@ -1713,9 +1703,9 @@
while (available)
{
AnjutaPluginHandle *plugin = available->data;
- AnjutaPluginDescription *desc =
- anjuta_plugin_handle_get_description (plugin);
- selected_plugins = g_list_prepend (selected_plugins, desc);
+ if ((g_hash_table_lookup (plugin_manager->priv->disable_plugins, plugin) == NULL) ||
+ (g_hash_table_lookup (plugin_manager->priv->activated_plugins, plugin) != NULL))
+ selected_plugins = g_list_prepend (selected_plugins, plugin);
available = g_list_next (available);
}
return g_list_reverse (selected_plugins);
@@ -1725,7 +1715,7 @@
g_return_val_if_fail (anames != NULL, NULL);
g_return_val_if_fail (avalues != NULL, NULL);
- while (available)
+ for (;available; available = g_list_next (available))
{
GList* s_node = secs;
GList* n_node = anames;
@@ -1737,6 +1727,10 @@
AnjutaPluginDescription *desc =
anjuta_plugin_handle_get_description (plugin);
+ if ((g_hash_table_lookup (plugin_manager->priv->disable_plugins, plugin) != NULL) &&
+ (g_hash_table_lookup (plugin_manager->priv->activated_plugins, plugin) == NULL))
+ continue;
+
while (s_node)
{
gchar *val;
@@ -1807,11 +1801,10 @@
}
if (satisfied)
{
- selected_plugins = g_list_prepend (selected_plugins, desc);
+ selected_plugins = g_list_prepend (selected_plugins, plugin);
/* DEBUG_PRINT ("Satisfied, Adding %s",
anjuta_plugin_handle_get_name (plugin));*/
}
- available = g_list_next (available);
}
return g_list_reverse (selected_plugins);
@@ -1889,7 +1882,7 @@
enum {
PIXBUF_COLUMN,
PLUGIN_COLUMN,
- PLUGIN_DESCRIPTION_COLUMN,
+ PLUGIN_HANDLE_COLUMN,
N_COLUMNS
};
@@ -1942,19 +1935,19 @@
* @plugin_manager: #AnjutaPluginManager object
* @title: Title of the dialog
* @description: label shown on the dialog
- * @plugin_descriptions: List of #AnjutaPluginDescription
+ * @plugin_handles: List of #AnjutaPluginHandle
*
* Show a dialog where the user can choose between the given plugins
*
- * Returns: The chosen plugin description
+ * Returns: The chosen plugin handle
*/
-AnjutaPluginDescription *
+AnjutaPluginHandle *
anjuta_plugin_manager_select (AnjutaPluginManager *plugin_manager,
gchar *title, gchar *description,
- GList *plugin_descriptions)
+ GList *plugin_handles)
{
- AnjutaPluginDescription *desc;
AnjutaPluginManagerPriv *priv;
+ AnjutaPluginHandle *handle;
GtkWidget *dlg;
GtkTreeModel *model;
GtkWidget *view;
@@ -1974,11 +1967,11 @@
g_return_val_if_fail (title != NULL, NULL);
g_return_val_if_fail (description != NULL, NULL);
- g_return_val_if_fail (plugin_descriptions != NULL, NULL);
+ g_return_val_if_fail (plugin_handles != NULL, NULL);
priv = plugin_manager->priv;
- if (g_list_length (plugin_descriptions) <= 0)
+ if (g_list_length (plugin_handles) <= 0)
return NULL;
dlg = gtk_dialog_new_with_buttons (title, GTK_WINDOW (priv->shell),
@@ -2049,90 +2042,73 @@
gtk_box_pack_start (GTK_BOX (content_area), remember_checkbox,
FALSE, FALSE, 0);
- node = plugin_descriptions;
+ node = plugin_handles;
while (node)
{
+ const gchar *filename;
GdkPixbuf *icon_pixbuf = NULL;
- gchar *plugin_name = NULL;
- gchar *plugin_desc = NULL;
- gchar *icon_filename = NULL;
- gchar *location = NULL;
-
- desc = (AnjutaPluginDescription*)node->data;
-
- if (anjuta_plugin_description_get_string (desc,
- "Anjuta Plugin",
- "Icon",
- &icon_filename))
- {
- gchar *icon_path = NULL;
- icon_path = g_strconcat (PACKAGE_PIXMAPS_DIR"/",
- icon_filename, NULL);
- g_free (icon_filename);
- /* DEBUG_PRINT ("Icon: %s", icon_path); */
- icon_pixbuf =
- gdk_pixbuf_new_from_file (icon_path, NULL);
- if (icon_pixbuf == NULL)
- {
- g_warning ("Plugin pixmap not found: %s", plugin_name);
- }
- g_free (icon_path);
+ const gchar *name = NULL;
+ AnjutaPluginDescription *desc;
+
+ handle = (AnjutaPluginHandle*)node->data;
+
+ filename = anjuta_plugin_handle_get_icon_path (handle);
+ if (filename != NULL)
+ {
+ icon_pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
+ if (!icon_pixbuf)
+ g_warning ("Plugin does not define Icon: No such file %s",
+ filename);
}
else
{
g_warning ("Plugin does not define Icon attribute");
}
- if (!anjuta_plugin_description_get_locale_string (desc,
- "Anjuta Plugin",
- "Name",
- &plugin_name))
- {
- g_warning ("Plugin does not define Name attribute");
- }
- if (!anjuta_plugin_description_get_locale_string (desc,
- "Anjuta Plugin",
- "Description",
- &plugin_desc))
- {
- g_warning ("Plugin does not define Description attribute");
- }
- if (plugin_name && plugin_desc)
+
+ name = anjuta_plugin_handle_get_name (handle);
+ desc = anjuta_plugin_handle_get_description (handle);
+ if ((name != NULL) && (desc != NULL))
{
+ gchar *plugin_desc;
GtkTreeIter iter;
gchar *text;
- if (!anjuta_plugin_description_get_string (desc,
- "Anjuta Plugin",
- "Location",
- &location))
+ if (!anjuta_plugin_description_get_locale_string (desc,
+ "Anjuta Plugin",
+ "Description",
+ &plugin_desc))
{
- g_warning ("Plugin does not define Location attribute");
+ g_warning ("Plugin does not define Description attribute");
}
-
-
- text = g_markup_printf_escaped ("%s\n%s", plugin_name, plugin_desc);
+ text = g_markup_printf_escaped ("%s\n%s", name, plugin_desc);
+ g_free (plugin_desc);
gtk_list_store_append (GTK_LIST_STORE (model), &iter);
gtk_list_store_set (GTK_LIST_STORE (model), &iter,
PLUGIN_COLUMN, text,
- PLUGIN_DESCRIPTION_COLUMN, desc, -1);
+ PLUGIN_HANDLE_COLUMN, handle, -1);
if (icon_pixbuf) {
gtk_list_store_set (GTK_LIST_STORE (model), &iter,
PIXBUF_COLUMN, icon_pixbuf, -1);
- g_object_unref (icon_pixbuf);
}
g_free (text);
-
- selection_ids = g_list_prepend (selection_ids, location);
+
+ selection_ids = g_list_prepend (selection_ids, (gpointer)anjuta_plugin_handle_get_id (handle));
+ }
+ else
+ {
+ g_warning ("Plugin does not define Name attribute");
}
- g_free (plugin_name);
- g_free (plugin_desc);
+
+ if (icon_pixbuf)
+ g_object_unref (icon_pixbuf);
+
node = g_list_next (node);
}
/* Prepare remembering key */
selection_ids = g_list_sort (selection_ids,
- (GCompareFunc)strcmp);
+ (GCompareFunc)strcmp);
node = selection_ids;
while (node)
{
@@ -2140,16 +2116,15 @@
g_string_append (remember_key, ",");
node = g_list_next (node);
}
- g_list_foreach (selection_ids, (GFunc) g_free, NULL);
g_list_free (selection_ids);
/* Find if the selection is remembered */
- desc = g_hash_table_lookup (priv->remember_plugins, remember_key->str);
- if (desc)
+ handle = g_hash_table_lookup (priv->remember_plugins, remember_key->str);
+ if (handle)
{
g_string_free (remember_key, TRUE);
gtk_widget_destroy (dlg);
- return desc;
+ return handle;
}
/* Prompt dialog */
@@ -2162,8 +2137,8 @@
&selected))
{
gtk_tree_model_get (model, &selected,
- PLUGIN_DESCRIPTION_COLUMN, &desc, -1);
- if (desc)
+ PLUGIN_HANDLE_COLUMN, &handle, -1);
+ if (handle)
{
/* Remember selection */
if (gtk_toggle_button_get_active
@@ -2172,11 +2147,11 @@
/* DEBUG_PRINT ("Remembering selection '%s'",
remember_key->str);*/
g_hash_table_insert (priv->remember_plugins,
- g_strdup (remember_key->str), desc);
+ g_strdup (remember_key->str), handle);
}
g_string_free (remember_key, TRUE);
gtk_widget_destroy (dlg);
- return desc;
+ return handle;
}
}
break;
@@ -2190,45 +2165,33 @@
anjuta_plugin_manager_select_and_activate (AnjutaPluginManager *plugin_manager,
gchar *title,
gchar *description,
- GList *plugin_descriptions)
+ GList *plugin_handles)
{
- AnjutaPluginDescription *d;
+ AnjutaPluginHandle *handle;
+ GObject *plugin = NULL;
g_return_val_if_fail (ANJUTA_IS_PLUGIN_MANAGER (plugin_manager), NULL);
-
- d = anjuta_plugin_manager_select (plugin_manager, title, description,
- plugin_descriptions);
- if (d)
- {
- GObject *plugin = NULL;
- gchar *location = NULL;
-
- anjuta_plugin_description_get_string (d,
- "Anjuta Plugin",
- "Location",
- &location);
- g_return_val_if_fail (location != NULL, NULL);
- plugin =
- anjuta_plugin_manager_get_plugin_by_id (plugin_manager, location);
- g_free (location);
- return plugin;
- }
- return NULL;
+
+ handle = anjuta_plugin_manager_select (plugin_manager, title, description,
+ plugin_handles);
+ plugin = anjuta_plugin_manager_get_plugin_by_handle (plugin_manager, handle);
+
+ return plugin;
}
/*
- * anjuta_plugin_manager_get_plugin_description:
+ * anjuta_plugin_manager_get_plugin_handle:
* @plugin_manager: #AnjutaPluginManager object
* @plugin: #AnjutaPlugin object
*
- * Get the description corresponding to the plugin or %NULL if the plugin is not
+ * Get the handle corresponding to the plugin or %NULL if the plugin is not
* activated.
*
- * Returns: A #AnjutaPluginDescription or %NULL.
+ * Returns: (transfer none) (allow-none): A #AnjutaPluginHandle or %NULL.
*/
-AnjutaPluginDescription*
-anjuta_plugin_manager_get_plugin_description (AnjutaPluginManager *plugin_manager,
- GObject *plugin)
+AnjutaPluginHandle*
+anjuta_plugin_manager_get_plugin_handle (AnjutaPluginManager *plugin_manager,
+ GObject *plugin)
{
GHashTableIter iter;
gpointer key, value;
@@ -2238,7 +2201,7 @@
{
if (G_OBJECT(value) == plugin)
{
- return anjuta_plugin_handle_get_description (ANJUTA_PLUGIN_HANDLE (key));
+ return ANJUTA_PLUGIN_HANDLE (key);
}
}
@@ -2265,7 +2228,9 @@
NULL, g_object_unref);
object->priv->remember_plugins = g_hash_table_new_full (g_str_hash,
g_str_equal,
- g_free, NULL);
+ NULL, NULL);
+ object->priv->disable_plugins = g_hash_table_new (g_direct_hash,
+ g_direct_equal);
}
static void
@@ -2290,6 +2255,11 @@
g_hash_table_destroy (priv->plugins_cache);
priv->plugins_cache = NULL;
}
+ if (priv->disable_plugins)
+ {
+ g_hash_table_destroy (priv->disable_plugins);
+ priv->disable_plugins = NULL;
+ }
if (priv->plugins_by_name)
{
g_hash_table_destroy (priv->plugins_by_name);
@@ -2374,7 +2344,7 @@
}
static void
anjuta_plugin_manager_plugin_activated (AnjutaPluginManager *self,
- AnjutaPluginDescription* plugin_desc,
+ AnjutaPluginHandle* handle,
GObject *plugin)
{
/* TODO: Add default signal handler implementation here */
@@ -2382,7 +2352,7 @@
static void
anjuta_plugin_manager_plugin_deactivated (AnjutaPluginManager *self,
- AnjutaPluginDescription* plugin_desc,
+ AnjutaPluginHandle* handle,
GObject *plugin)
{
/* TODO: Add default signal handler implementation here */
@@ -2552,7 +2522,6 @@
GList *plugins_to_activate)
{
AnjutaPluginManagerPriv *priv;
- GdkPixbuf *icon_pixbuf;
GList *node;
priv = plugin_manager->priv;
@@ -2567,40 +2536,27 @@
node = plugins_to_activate;
while (node)
{
- AnjutaPluginDescription *d;
- gchar *plugin_id;
- gchar *icon_filename, *label;
- gchar *icon_path = NULL;
-
- d = node->data;
-
- icon_pixbuf = NULL;
- label = NULL;
- if (anjuta_plugin_description_get_string (d, "Anjuta Plugin",
- "Icon",
- &icon_filename))
- {
- gchar *title /*, *description */;
- anjuta_plugin_description_get_locale_string (d, "Anjuta Plugin",
- "Name",
- &title);
- /*
- anjuta_plugin_description_get_locale_string (d, "Anjuta Plugin",
- "Description",
- &description);
- */
- icon_path = g_strconcat (PACKAGE_PIXMAPS_DIR"/",
- icon_filename, NULL);
- /* DEBUG_PRINT ("Icon: %s", icon_path); */
- /* Avoid space in translated string */
- label = g_strconcat (dgettext (GETTEXT_PACKAGE, "Loading:"), " ", title, "...", NULL);
- icon_pixbuf = gdk_pixbuf_new_from_file (icon_path, NULL);
+ AnjutaPluginHandle *handle;
+ const gchar *filename;
+ GdkPixbuf *icon_pixbuf = NULL;
+ const gchar *name;
+ gchar*label= NULL;
+
+ handle = node->data;
+
+ filename = anjuta_plugin_handle_get_icon_path (handle);
+ if (filename != NULL)
+ {
+ icon_pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
if (!icon_pixbuf)
g_warning ("Plugin does not define Icon: No such file %s",
- icon_path);
- g_free (icon_path);
- g_free (icon_filename);
- g_free (title);
+ filename);
+ }
+
+ name = anjuta_plugin_handle_get_name (handle);
+ if (name != NULL)
+ {
+ label = g_strconcat (dgettext (GETTEXT_PACKAGE, "Loading:"), " ", name, "...", NULL);
}
anjuta_status_progress_tick (ANJUTA_STATUS (priv->status),
@@ -2608,15 +2564,9 @@
g_free (label);
if (icon_pixbuf)
g_object_unref (icon_pixbuf);
-
- if (anjuta_plugin_description_get_string (d, "Anjuta Plugin",
- "Location", &plugin_id))
- {
- /* Activate the plugin */
- anjuta_plugin_manager_get_plugin_by_id (plugin_manager,
- plugin_id);
- g_free (plugin_id);
- }
+
+ /* Activate the plugin */
+ anjuta_plugin_manager_get_plugin_by_handle (plugin_manager, handle);
node = g_list_next (node);
}
@@ -2628,15 +2578,13 @@
static void
on_collect (gpointer key, gpointer value, gpointer user_data)
{
- gchar *id;
+ const gchar *id;
gchar *query = (gchar*) key;
- AnjutaPluginDescription *desc = (AnjutaPluginDescription *) value;
+ AnjutaPluginHandle *handle = (AnjutaPluginHandle *) value;
GString *write_buffer = (GString *) user_data;
- anjuta_plugin_description_get_string (desc, "Anjuta Plugin", "Location",
- &id);
+ id = anjuta_plugin_handle_get_id (handle);
g_string_append_printf (write_buffer, "%s=%s;", query, id);
- g_free (id);
}
/**
@@ -2649,7 +2597,8 @@
* The list format is returned as a string with the format detailed in
* anjuta_plugin_manager_set_remembered_plugins().
*
- * Return value: a newly-allocated string that must be freed with g_free().
+ * Return value: (transfer full): a newly-allocated string that must be freed
+ * with g_free().
*/
gchar*
@@ -2706,20 +2655,13 @@
strv_keyvals = g_strsplit (*line_idx, "=", -1);
if (strv_keyvals && strv_keyvals[0] && strv_keyvals[1])
{
- AnjutaPluginHandle *plugin;
- plugin = g_hash_table_lookup (priv->plugins_by_name,
+ AnjutaPluginHandle *handle;
+ handle = g_hash_table_lookup (priv->plugins_by_name,
strv_keyvals[1]);
- if (plugin)
+ if (handle)
{
- AnjutaPluginDescription *desc;
- desc = anjuta_plugin_handle_get_description (plugin);
- /*
- DEBUG_PRINT ("Restoring remember plugin: %s=%s",
- strv_keyvals[0],
- strv_keyvals[1]);
- */
g_hash_table_insert (priv->remember_plugins,
- g_strdup (strv_keyvals[0]), desc);
+ g_strdup (strv_keyvals[0]), handle);
}
g_strfreev (strv_keyvals);
}
@@ -2727,3 +2669,35 @@
}
g_strfreev (strv_lines);
}
+
+/**
+ * anjuta_plugin_manager_set_disable_plugins:
+ * @plugin_manager: A #AnjutaPluginManager object
+ * @plugins_list: A list of plugins to disable or reenable
+ * @hide: %TRUE to disable, %FALSE to re-enable plugins in the list
+ *
+ * Disable or re-enable plugins. By default, all plugins are enabled but they
+ * can be disabled and they will not be proposed when a plugin is requested.
+ */
+void
+anjuta_plugin_manager_set_disable_plugins (AnjutaPluginManager *plugin_manager,
+ GList *plugin_handles,
+ gboolean disable)
+{
+ GList *item;
+
+ if (disable)
+ {
+ for (item = g_list_first (plugin_handles); item != NULL; item = g_list_next (item))
+ {
+ g_hash_table_add (plugin_manager->priv->disable_plugins, item->data);
+ }
+ }
+ else
+ {
+ for (item = g_list_first (plugin_handles); item != NULL; item = g_list_next (item))
+ {
+ g_hash_table_remove (plugin_manager->priv->disable_plugins, item->data);
+ }
+ }
+}
diff -Nru anjuta-3.8.4/libanjuta/anjuta-plugin-manager.h anjuta-3.10.2/libanjuta/anjuta-plugin-manager.h
--- anjuta-3.8.4/libanjuta/anjuta-plugin-manager.h 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-plugin-manager.h 2013-07-08 21:06:37.000000000 +0000
@@ -23,7 +23,7 @@
#include
#include
-#include
+#include
G_BEGIN_DECLS
@@ -57,10 +57,10 @@
/* Signals */
void(* plugin_activated) (AnjutaPluginManager *self,
- AnjutaPluginDescription* plugin_desc,
+ AnjutaPluginHandle* handle,
GObject *plugin);
void(* plugin_deactivated) (AnjutaPluginManager *self,
- AnjutaPluginDescription* plugin_desc,
+ AnjutaPluginHandle* handle,
GObject *plugin);
};
@@ -81,12 +81,12 @@
const gchar *iface_name);
GObject* anjuta_plugin_manager_get_plugin (AnjutaPluginManager *plugin_manager,
const gchar *iface_name);
-GObject* anjuta_plugin_manager_get_plugin_by_id (AnjutaPluginManager *plugin_manager,
- const gchar *plugin_id);
+GObject* anjuta_plugin_manager_get_plugin_by_handle (AnjutaPluginManager *plugin_manager,
+ AnjutaPluginHandle *handle);
gboolean anjuta_plugin_manager_unload_plugin (AnjutaPluginManager *plugin_manager,
- GObject *plugin);
-gboolean anjuta_plugin_manager_unload_plugin_by_id (AnjutaPluginManager *plugin_manager,
- const gchar *plugin_id);
+ GObject *plugin_object);
+gboolean anjuta_plugin_manager_unload_plugin_by_handle (AnjutaPluginManager *plugin_manager,
+ AnjutaPluginHandle *handle);
GList* anjuta_plugin_manager_get_active_plugins (AnjutaPluginManager *plugin_manager);
GList* anjuta_plugin_manager_get_active_plugin_objects (AnjutaPluginManager *plugin_manager);
@@ -107,26 +107,29 @@
GList *attribute_values);
/* Returns the plugin description that has been selected from the list */
-AnjutaPluginDescription* anjuta_plugin_manager_select (AnjutaPluginManager *plugin_manager,
- gchar *title, gchar *description,
- GList *plugin_descriptions);
+AnjutaPluginHandle* anjuta_plugin_manager_select (AnjutaPluginManager *plugin_manager,
+ gchar *title, gchar *description,
+ GList *plugin_handles);
GObject* anjuta_plugin_manager_select_and_activate (AnjutaPluginManager *plugin_manager,
- gchar *title, gchar *description,
- GList *plugin_descriptions);
+ gchar *title, gchar *description,
+ GList *plugin_handles);
-AnjutaPluginDescription* anjuta_plugin_manager_get_plugin_description (AnjutaPluginManager *plugin_manager,
- GObject *plugin);
+AnjutaPluginHandle* anjuta_plugin_manager_get_plugin_handle (AnjutaPluginManager *plugin_manager,
+ GObject *plugin);
void anjuta_plugin_manager_activate_plugins (AnjutaPluginManager *plugin_manager,
- GList *plugin_descs);
+ GList *plugin_handles);
void anjuta_plugin_manager_unload_all_plugins (AnjutaPluginManager *plugin_manager);
gchar* anjuta_plugin_manager_get_remembered_plugins (AnjutaPluginManager *plugin_manager);
void anjuta_plugin_manager_set_remembered_plugins (AnjutaPluginManager *plugin_manager,
const gchar *remembered_plugins);
+void anjuta_plugin_manager_set_disable_plugins (AnjutaPluginManager *plugin_manager,
+ GList *plugin_handles,
+ gboolean disable);
/**
* anjuta_plugin_manager_get_interface:
diff -Nru anjuta-3.8.4/libanjuta/anjuta-plugin.c anjuta-3.10.2/libanjuta/anjuta-plugin.c
--- anjuta-3.8.4/libanjuta/anjuta-plugin.c 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-plugin.c 2013-07-08 21:06:37.000000000 +0000
@@ -105,7 +105,7 @@
*
* Query the shell for a plugin implemeting the primary interface
* using anjuta_shell_get_interface(). It will return an
- * implemetation of the interface (or NULL if not found).
+ * implemetation of the interface (or %NULL if not found).
* Do not save this object for longer use, because the implementor
* plugin can change anytime and a different plugin implementing
* the same primary interface may be activated.
@@ -513,7 +513,7 @@
* If the plugin implements IAnjutaPreferences, it is prompted to install
* it's preferences.
*
- * Return value: TRUE if sucessfully activated, FALSE otherwise.
+ * Return value: %TRUE if sucessfully activated, %FALSE otherwise.
*/
gboolean
anjuta_plugin_activate (AnjutaPlugin *plugin)
@@ -543,7 +543,7 @@
* should derive their classes from this virtual class and implement this
* method.
*
- * Return value: TRUE if sucessfully activated, FALSE otherwise.
+ * Return value: %TRUE if sucessfully activated, %FALSE otherwise.
*/
gboolean
anjuta_plugin_deactivate (AnjutaPlugin *plugin)
@@ -569,9 +569,9 @@
* anjuta_plugin_is_active:
* @plugin: a #AnjutaPlugin derived class object.
*
- * Returns TRUE if the plugin has been activated.
+ * Returns %TRUE if the plugin has been activated.
*
- * Return value: TRUE if activated, FALSE otherwise.
+ * Return value: %TRUE if activated, %FALSE otherwise.
*/
gboolean
anjuta_plugin_is_active (AnjutaPlugin *plugin)
@@ -583,7 +583,7 @@
* anjuta_plugin_get_shell:
* @plugin: a #AnjutaPlugin
*
- * Returns: The #AnjutaShell object associated with this plugin
+ * Returns: (transfer none): The #AnjutaShell object associated with this plugin
*/
AnjutaShell *
anjuta_plugin_get_shell (AnjutaPlugin* plugin)
diff -Nru anjuta-3.8.4/libanjuta/anjuta-plugin.h anjuta-3.10.2/libanjuta/anjuta-plugin.h
--- anjuta-3.8.4/libanjuta/anjuta-plugin.h 2012-09-26 20:53:46.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-plugin.h 2013-11-11 17:24:11.000000000 +0000
@@ -153,7 +153,8 @@
type = g_type_module_register_type (module, \
ANJUTA_TYPE_PLUGIN, \
#class_name, \
- &type_info, 0);
+ &type_info, \
+ (GTypeFlags) 0);
/**
* ANJUTA_PLUGIN_END:
*
diff -Nru anjuta-3.8.4/libanjuta/anjuta-preferences-dialog.c anjuta-3.10.2/libanjuta/anjuta-preferences-dialog.c
--- anjuta-3.8.4/libanjuta/anjuta-preferences-dialog.c 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-preferences-dialog.c 2013-07-08 21:06:37.000000000 +0000
@@ -161,7 +161,7 @@
gtk_container_set_border_width (GTK_CONTAINER(dlg), 6);
- hbox = g_object_new(GTK_TYPE_HBOX,
+ hbox = g_object_new(GTK_TYPE_BOX,
"border-width", 6,
"spacing", 6,
"visible", TRUE,
diff -Nru anjuta-3.8.4/libanjuta/anjuta-preferences.c anjuta-3.10.2/libanjuta/anjuta-preferences.c
--- anjuta-3.8.4/libanjuta/anjuta-preferences.c 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-preferences.c 2013-07-08 21:06:37.000000000 +0000
@@ -137,7 +137,7 @@
* The widget needs to fulfill the properties described in
* #anjuta_preferences_add_page documentation.
*
- * Return value: TRUE if sucessful.
+ * Return value: %TRUE if sucessful.
*/
gboolean
anjuta_preferences_register_property (AnjutaPreferences *pr,
diff -Nru anjuta-3.8.4/libanjuta/anjuta-profile-manager.c anjuta-3.10.2/libanjuta/anjuta-profile-manager.c
--- anjuta-3.8.4/libanjuta/anjuta-profile-manager.c 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-profile-manager.c 2013-07-08 21:06:37.000000000 +0000
@@ -25,10 +25,11 @@
* @stability: Unstable
* @include: libanjuta/anjuta-profile-manager.h
*
- * Anjuta uses up to two profiles. A "no project" profile is used when no
- * project is loaded a project profile when one is loaded.
+ * Anjuta uses up to three profiles. A system profile which contains mandatory
+ * plugins which are never unloaded. A user profile is used when no project is
+ * loaded and a project profile when one is loaded.
* If a second project is loaded, it is loaded in another instance of Anjuta.
- * When a project is closed, Anjuta goes back to the "no project" profile.
+ * When a project is closed, Anjuta goes back to the user profile.
*
* The profile manager can be in a frozen state where you can push or
* pop a profile from the stack without triggering a change of the profile.
@@ -51,8 +52,6 @@
{
PROFILE_PUSHED,
PROFILE_POPPED,
- PROFILE_DESCOPED,
- PROFILE_SCOPED,
LAST_SIGNAL
};
@@ -72,45 +71,6 @@
static guint profile_manager_signals[LAST_SIGNAL] = { 0 };
static void
-on_plugin_activated (AnjutaPluginManager *plugin_manager,
- AnjutaPluginDescription *plugin_desc,
- GObject *plugin_object,
- AnjutaProfileManager *profile_manager)
-{
- AnjutaProfileManagerPriv *priv;
- priv = profile_manager->priv;
-
- if (priv->profiles)
- {
- /* Add it current profile */
- gboolean exclude;
-
- if (!anjuta_plugin_description_get_boolean (plugin_desc, "Anjuta Plugin", "ExcludeFromSession", &exclude) || !exclude)
- {
- anjuta_profile_add_plugin (ANJUTA_PROFILE (priv->profiles->data),
- plugin_desc);
- }
- }
-}
-
-static void
-on_plugin_deactivated (AnjutaPluginManager *plugin_manager,
- AnjutaPluginDescription *plugin_desc,
- GObject *plugin_object,
- AnjutaProfileManager *profile_manager)
-{
- AnjutaProfileManagerPriv *priv;
- priv = profile_manager->priv;
-
- if (priv->profiles)
- {
- /* Remove from current profile */
- anjuta_profile_remove_plugin (ANJUTA_PROFILE (priv->profiles->data),
- plugin_desc);
- }
-}
-
-static void
anjuta_profile_manager_init (AnjutaProfileManager *object)
{
object->priv = g_new0 (AnjutaProfileManagerPriv, 1);
@@ -144,10 +104,6 @@
case PROP_PLUGIN_MANAGER:
g_return_if_fail (ANJUTA_IS_PLUGIN_MANAGER (g_value_get_object (value)));
priv->plugin_manager = g_value_get_object (value);
- g_signal_connect (priv->plugin_manager, "plugin-activated",
- G_CALLBACK (on_plugin_activated), object);
- g_signal_connect (priv->plugin_manager, "plugin-deactivated",
- G_CALLBACK (on_plugin_deactivated), object);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -236,41 +192,6 @@
G_TYPE_NONE, 1,
ANJUTA_TYPE_PROFILE);
- /**
- * AnjutaProfileManager::profile-descoped:
- * @profile_manager: a #AnjutaProfileManager object.
- * @profile: the old unloaded #AnjutaProfile.
- *
- * Emitted when a profile will be unloaded.
- */
- profile_manager_signals[PROFILE_DESCOPED] =
- g_signal_new ("profile-descoped",
- G_OBJECT_CLASS_TYPE (klass),
- G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (AnjutaProfileManagerClass,
- profile_descoped),
- NULL, NULL,
- anjuta_cclosure_marshal_VOID__OBJECT,
- G_TYPE_NONE, 1,
- ANJUTA_TYPE_PROFILE);
-
- /**
- * AnjutaProfileManager::profile-scoped:
- * @profile_manager: a #AnjutaProfileManager object.
- * @profile: the current loaded #AnjutaProfile.
- *
- * Emitted when a new profile is loaded.
- */
- profile_manager_signals[PROFILE_SCOPED] =
- g_signal_new ("profile-scoped",
- G_OBJECT_CLASS_TYPE (klass),
- G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (AnjutaProfileManagerClass,
- profile_scoped),
- NULL, NULL,
- anjuta_cclosure_marshal_VOID__OBJECT,
- G_TYPE_NONE, 1,
- ANJUTA_TYPE_PROFILE);
}
GType
@@ -320,133 +241,35 @@
}
static gboolean
-anjuta_profile_manager_load_profile (AnjutaProfileManager *profile_manager,
- AnjutaProfile *profile,
- AnjutaProfile *previous_profile,
- GError **error)
+anjuta_profile_manager_load_profiles (AnjutaProfileManager *profile_manager, GError **error)
{
AnjutaProfileManagerPriv *priv;
- GList *active_plugins, *node;
- GList *plugins_to_activate, *plugins_to_deactivate;
- GList *selected_plugins;
-
- GHashTable *active_plugins_hash, *plugins_to_activate_hash;
-
+ gboolean loaded = FALSE;
+
priv = profile_manager->priv;
-
- /* Disable profile synchronization while the profile is being activated */
- g_signal_handlers_block_by_func (priv->plugin_manager,
- G_CALLBACK (on_plugin_activated),
- profile_manager);
- g_signal_handlers_block_by_func (priv->plugin_manager,
- G_CALLBACK (on_plugin_deactivated),
- profile_manager);
-
- /* Emit pre-change for the last profile */
- if (previous_profile)
- {
- g_signal_emit_by_name (profile_manager, "profile-descoped",
- previous_profile);
- }
-
- /* Prepare plugins to activate */
- plugins_to_activate_hash = g_hash_table_new (g_direct_hash, g_direct_equal);
-
- /* Select plugins in the profile */
- if (profile)
- selected_plugins = anjuta_profile_get_plugins (profile);
- else
- selected_plugins = NULL;
-
- node = selected_plugins;
- while (node)
- {
- g_hash_table_insert (plugins_to_activate_hash, node->data, node->data);
- node = g_list_next (node);
- }
-
- /* Prepare active plugins hash */
- active_plugins =
- anjuta_plugin_manager_get_active_plugins (priv->plugin_manager);
- active_plugins_hash = g_hash_table_new (g_direct_hash, g_direct_equal);
- node = active_plugins;
- while (node)
- {
- g_hash_table_insert (active_plugins_hash, node->data, node->data);
- node = g_list_next (node);
- }
-
- plugins_to_deactivate = NULL;
-
- /* Prepare plugins to deactiveate that are already active, but are
- * not requested to be active
- */
- node = active_plugins;
- while (node)
- {
- if (!g_hash_table_lookup (plugins_to_activate_hash, node->data))
- {
- plugins_to_deactivate = g_list_prepend (plugins_to_deactivate,
- node->data);
- }
- node = g_list_next (node);
- }
- plugins_to_deactivate = g_list_reverse (plugins_to_deactivate);
- /* Deactivate plugins */
- node = plugins_to_deactivate;
- while (node)
- {
- AnjutaPluginDescription *desc;
- gchar *plugin_id = NULL;
-
- desc = (AnjutaPluginDescription *)node->data;
- anjuta_plugin_description_get_string (desc, "Anjuta Plugin",
- "Location", &plugin_id);
- g_assert (plugin_id != NULL);
-
- /* DEBUG_PRINT ("Profile: deactivating %s", plugin_id); */
-
- anjuta_plugin_manager_unload_plugin_by_id (priv->plugin_manager,
- plugin_id);
- node = g_list_next (node);
- }
-
- /* Prepare the plugins to activate */
- plugins_to_activate = NULL;
- node = selected_plugins;
- while (node)
- {
- if (!g_hash_table_lookup (active_plugins_hash, node->data))
- plugins_to_activate = g_list_prepend (plugins_to_activate,
- node->data);
- node = g_list_next (node);
- }
-
- /* Now activate the plugins */
- if (plugins_to_activate)
+ /* If there is no freeze load profile now */
+ while ((priv->freeze_count <= 0) && (priv->profiles_queue != NULL))
{
- /* Activate them */
- plugins_to_activate = g_list_reverse (plugins_to_activate);
- anjuta_plugin_manager_activate_plugins (priv->plugin_manager,
- plugins_to_activate);
+ AnjutaProfile *previous_profile = NULL;
+ GList *node;
+
+ /* We need to load each profile one by one because a "system" profile
+ * contains plugins which are never unloaded. */
+ if (priv->profiles)
+ previous_profile = priv->profiles->data;
+ node = g_list_last (priv->profiles_queue);
+ priv->profiles_queue = g_list_remove_link (priv->profiles_queue, node);
+ priv->profiles = g_list_concat (node, priv->profiles);
+
+ /* Load profile. Note that loading a profile can trigger the load of
+ * additional profile. Typically loading the default profile will
+ * trigger the load of the last project profile. */
+ if (previous_profile != NULL) anjuta_profile_unload (previous_profile, NULL);
+ loaded = anjuta_profile_load (ANJUTA_PROFILE (node->data), error);
}
-
- g_list_free (plugins_to_activate);
- g_list_free (active_plugins);
-
- g_hash_table_destroy (plugins_to_activate_hash);
- g_hash_table_destroy (active_plugins_hash);
- /* Enable profile synchronization */
- g_signal_handlers_unblock_by_func (priv->plugin_manager,
- G_CALLBACK (on_plugin_activated),
- profile_manager);
- g_signal_handlers_unblock_by_func (priv->plugin_manager,
- G_CALLBACK (on_plugin_deactivated),
- profile_manager);
- g_signal_emit_by_name (profile_manager, "profile-scoped", profile);
- return TRUE;
+ return loaded;
}
static gboolean
@@ -457,29 +280,11 @@
AnjutaProfileManagerPriv *priv;
priv = profile_manager->priv;
- priv->profiles_queue = g_list_prepend (priv->profiles_queue,
- profile);
+
+ priv->profiles_queue = g_list_prepend (priv->profiles_queue, profile);
+
/* If there is no freeze load profile now */
- if (priv->freeze_count <= 0)
- {
- AnjutaProfile *previous_profile = NULL;
-
- if (priv->profiles)
- previous_profile = priv->profiles->data;
-
- /* Push queued profiles in stack */
- priv->profiles = g_list_concat (priv->profiles_queue, priv->profiles);
- priv->profiles_queue = NULL;
-
- return anjuta_profile_manager_load_profile (profile_manager,
- ANJUTA_PROFILE (priv->profiles->data),
- previous_profile,
- error);
- }
- else
- {
- return FALSE;
- }
+ return anjuta_profile_manager_load_profiles (profile_manager, error);
}
/**
@@ -492,7 +297,7 @@
* manager is not frozen, this new profile will be loaded immediatly and
* become the current profile.
*
- * Return value: TRUE on success, FALSE otherwise.
+ * Return value: %TRUE on success, %FALSE otherwise.
*/
gboolean
anjuta_profile_manager_push (AnjutaProfileManager *profile_manager,
@@ -511,7 +316,7 @@
/**
* anjuta_profile_manager_pop:
* @profile_manager: the #AnjutaProfileManager object.
- * @profile_name: the name of the profile to remove.
+ * @profile: the #AnjutaProfile to remove.
* @error: error propagation and reporting.
*
* Remove a profile from the profile manager stack. If the manager is not
@@ -520,14 +325,13 @@
* If the manager is frozen, the current profile or the last pushed profile
* can be removed.
*
- * Return value: TRUE on success, FALSE otherwise.
+ * Return value: %TRUE on success, %FALSE otherwise.
*/
gboolean
anjuta_profile_manager_pop (AnjutaProfileManager *profile_manager,
- const gchar *profile_name, GError **error)
+ AnjutaProfile *profile, GError **error)
{
AnjutaProfileManagerPriv *priv;
- AnjutaProfile *profile;
g_return_val_if_fail (ANJUTA_IS_PROFILE_MANAGER (profile_manager), FALSE);
priv = profile_manager->priv;
@@ -535,9 +339,7 @@
/* First check in the queue */
if (priv->profiles_queue)
{
- profile = priv->profiles_queue->data;
- g_return_val_if_fail (strcmp (anjuta_profile_get_name (profile),
- profile_name) == 0, FALSE);
+ g_return_val_if_fail (priv->profiles_queue->data == profile, FALSE);
priv->profiles_queue = g_list_remove (priv->profiles_queue, profile);
g_signal_emit_by_name (profile_manager, "profile-popped",
@@ -550,29 +352,20 @@
/* Then check in the current stack */
if (priv->profiles)
{
- profile = priv->profiles->data;
- g_return_val_if_fail (strcmp (anjuta_profile_get_name (profile),
- profile_name) == 0, FALSE);
+ g_return_val_if_fail (priv->profiles->data == profile, FALSE);
priv->profiles = g_list_remove (priv->profiles, profile);
g_signal_emit_by_name (profile_manager, "profile-popped",
profile);
/* Restore the next profile in the stack */
+ anjuta_profile_unload (profile, NULL);
+ g_object_unref (profile);
if (priv->profiles)
{
- return anjuta_profile_manager_load_profile (profile_manager,
- ANJUTA_PROFILE (priv->profiles->data),
- profile,
- error);
- }
- else
- {
- return anjuta_profile_manager_load_profile (profile_manager,
- NULL, profile,
- error);
+ return anjuta_profile_load (ANJUTA_PROFILE (priv->profiles->data), error);
}
- g_object_unref (profile);
+ return TRUE;
}
return FALSE;
@@ -606,7 +399,7 @@
* anjuta_profile_manager_freeze(). It will load a new profile if one has been
* added while the manager was frozen.
*
- * Return value: TRUE on success, FALSE otherwise.
+ * Return value: %TRUE on success, %FALSE otherwise.
*/
gboolean
anjuta_profile_manager_thaw (AnjutaProfileManager *profile_manager,
@@ -619,28 +412,8 @@
if (priv->freeze_count > 0)
priv->freeze_count--;
-
- if (priv->freeze_count <= 0 && priv->profiles_queue)
- {
- AnjutaProfile *previous_profile = NULL;
-
- if (priv->profiles)
- previous_profile = priv->profiles->data;
-
- /* Push queued profiles in stack */
- priv->profiles = g_list_concat (priv->profiles_queue, priv->profiles);
- priv->profiles_queue = NULL;
-
- /* Load the profile */
- return anjuta_profile_manager_load_profile (profile_manager,
- ANJUTA_PROFILE (priv->profiles->data),
- previous_profile,
- error);
- }
- else
- {
- return FALSE;
- }
+
+ return anjuta_profile_manager_load_profiles (profile_manager, error);
}
/**
@@ -649,7 +422,8 @@
*
* Return the current profile.
*
- * Return value: a #AnjutaProfile object or NULL if the profile stack is empty.
+ * Return value: (transfer none) (allow-none): a #AnjutaProfile object or %NULL
+ * if the profile stack is empty.
*/
AnjutaProfile*
anjuta_profile_manager_get_current (AnjutaProfileManager *profile_manager)
@@ -668,7 +442,7 @@
* anjuta_profile_manager_close:
* @profile_manager: A #AnjutaProfileManager object.
*
- * Close the #AnjutaProfileManager causing "profile-descoped" to be emitted and
+ * Close the #AnjutaProfileManager causing "descoped" to be emitted and
* all queued and previous profiles to be released. This function is to be used
* when destroying an Anjuta instance.
*/
@@ -681,19 +455,13 @@
priv = profile_manager->priv;
- g_signal_handlers_disconnect_by_func (priv->plugin_manager,
- on_plugin_activated, profile_manager);
- g_signal_handlers_disconnect_by_func (priv->plugin_manager,
- on_plugin_deactivated, profile_manager);
-
if (priv->profiles)
{
AnjutaProfile *profile = ANJUTA_PROFILE (priv->profiles->data);
- /* Emit "profile-descoped" so that other parts of anjuta can store
+ /* Emit "descoped" so that other parts of anjuta can store
* information about the currently loaded profile. */
- g_signal_emit_by_name (profile_manager, "profile-descoped",
- profile);
+ anjuta_profile_unload (profile, NULL);
g_list_free_full (priv->profiles, g_object_unref);
priv->profiles = NULL;
diff -Nru anjuta-3.8.4/libanjuta/anjuta-profile-manager.h anjuta-3.10.2/libanjuta/anjuta-profile-manager.h
--- anjuta-3.8.4/libanjuta/anjuta-profile-manager.h 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-profile-manager.h 2013-07-08 21:06:37.000000000 +0000
@@ -45,10 +45,6 @@
AnjutaProfile* profile);
void(* profile_popped) (AnjutaProfileManager *self,
AnjutaProfile* profile);
- void(* profile_descoped) (AnjutaProfileManager *self,
- AnjutaProfile* profile);
- void(* profile_scoped) (AnjutaProfileManager *self,
- AnjutaProfile* profile);
};
/**
@@ -69,7 +65,7 @@
gboolean anjuta_profile_manager_push (AnjutaProfileManager *profile_manager,
AnjutaProfile *profile, GError **error);
gboolean anjuta_profile_manager_pop (AnjutaProfileManager *profile_manager,
- const gchar *profile_name, GError **error);
+ AnjutaProfile *profile, GError **error);
void anjuta_profile_manager_freeze (AnjutaProfileManager *profile_manager);
gboolean anjuta_profile_manager_thaw (AnjutaProfileManager *profile_manager,
diff -Nru anjuta-3.8.4/libanjuta/anjuta-profile.c anjuta-3.10.2/libanjuta/anjuta-profile.c
--- anjuta-3.8.4/libanjuta/anjuta-profile.c 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-profile.c 2013-07-08 21:06:37.000000000 +0000
@@ -37,9 +37,10 @@
* $prefix/share/anjuta/profiles/default.profile
*
*
- * This contains the system plugins. It is loaded in every profile and
- * contains mandatory plugins for Anjuta. These plugins cannot be
- * unloaded.
+ * This contains the system plugins. It is loaded in special system
+ * profile and contains mandatory plugins for Anjuta. These plugins
+ * cannot be unloaded. Anjuta can load a different profile using the -P
+ * command line option.
*
*
*
@@ -84,7 +85,6 @@
PROP_0,
PROP_PLUGIN_MANAGER,
PROP_PROFILE_NAME,
- PROP_PROFILE_PLUGINS,
PROP_SYNC_FILE,
};
@@ -93,17 +93,33 @@
PLUGIN_ADDED,
PLUGIN_REMOVED,
CHANGED,
+ DESCOPED,
+ SCOPED,
LAST_SIGNAL
};
+typedef struct _AnjutaProfileXml AnjutaProfileXml;
+
+struct _AnjutaProfileXml
+{
+ GFile *file;
+ xmlDocPtr doc;
+ gboolean exclude_from_sync;
+ AnjutaProfileXml *next;
+};
+
+
struct _AnjutaProfilePriv
{
gchar *name;
AnjutaPluginManager *plugin_manager;
- GList *plugins;
- GHashTable *plugins_hash;
+ GHashTable *plugins_to_load;
GHashTable *plugins_to_exclude_from_sync;
+ GList *plugins_to_disable;
+ GList *configuration;
+ GList *config_keys;
GFile *sync_file;
+ AnjutaProfileXml *xml;
};
static GObjectClass* parent_class = NULL;
@@ -125,10 +141,10 @@
anjuta_profile_init (AnjutaProfile *object)
{
object->priv = g_new0 (AnjutaProfilePriv, 1);
- object->priv->plugins_hash = g_hash_table_new (g_direct_hash,
- g_direct_equal);
- object->priv->plugins_to_exclude_from_sync =
- g_hash_table_new (g_direct_hash, g_direct_equal);
+ object->priv->plugins_to_load = g_hash_table_new (g_direct_hash,
+ g_direct_equal);
+ object->priv->plugins_to_exclude_from_sync = g_hash_table_new (g_direct_hash,
+ g_direct_equal);
}
static void
@@ -136,11 +152,22 @@
{
AnjutaProfilePriv *priv = ANJUTA_PROFILE (object)->priv;
g_free (priv->name);
- if (priv->plugins)
- g_list_free (priv->plugins);
- g_hash_table_destroy (priv->plugins_hash);
+ g_hash_table_destroy (priv->plugins_to_load);
g_hash_table_destroy (priv->plugins_to_exclude_from_sync);
-
+ g_list_free (priv->plugins_to_disable);
+ g_list_free_full (priv->config_keys, (GDestroyNotify)g_free);
+ g_list_free (priv->configuration);
+
+ while (priv->xml != NULL)
+ {
+ AnjutaProfileXml *next;
+
+ next = priv->xml->next;
+ g_object_unref (priv->xml->file);
+ g_free (priv->xml);
+ priv->xml = next;
+ }
+
G_OBJECT_CLASS (parent_class)->finalize (object);
}
@@ -162,14 +189,6 @@
g_free (priv->name);
priv->name = g_strdup (g_value_get_string (value));
break;
- case PROP_PROFILE_PLUGINS:
- if (priv->plugins)
- g_list_free (priv->plugins);
- if (g_value_get_pointer (value))
- priv->plugins = g_list_copy (g_value_get_pointer (value));
- else
- priv->plugins = NULL;
- break;
case PROP_SYNC_FILE:
if (priv->sync_file)
g_object_unref (priv->sync_file);
@@ -197,9 +216,6 @@
case PROP_PROFILE_NAME:
g_value_set_string (value, priv->name);
break;
- case PROP_PROFILE_PLUGINS:
- g_value_set_pointer (value, priv->plugins);
- break;
case PROP_SYNC_FILE:
g_value_set_object (value, priv->sync_file);
break;
@@ -211,18 +227,18 @@
static void
anjuta_profile_plugin_added (AnjutaProfile *self,
- AnjutaPluginDescription *plugin)
+ AnjutaPluginHandle *plugin)
{
}
static void
anjuta_profile_plugin_removed (AnjutaProfile *self,
- AnjutaPluginDescription *plugin)
+ AnjutaPluginHandle *plugin)
{
}
static void
-anjuta_profile_changed (AnjutaProfile *self, GList *plugins)
+anjuta_profile_changed (AnjutaProfile *self)
{
GError *error = NULL;
anjuta_profile_sync (self, &error);
@@ -267,14 +283,6 @@
G_PARAM_WRITABLE |
G_PARAM_CONSTRUCT));
g_object_class_install_property (object_class,
- PROP_PROFILE_PLUGINS,
- g_param_spec_pointer ("plugins",
- _("Profile Plugins"),
- _("List of plugins for this profile"),
- G_PARAM_READABLE |
- G_PARAM_WRITABLE |
- G_PARAM_CONSTRUCT));
- g_object_class_install_property (object_class,
PROP_SYNC_FILE,
g_param_spec_object ("sync-file",
_("Synchronization file"),
@@ -287,7 +295,7 @@
/**
* AnjutaProfile::plugin-added:
* @profile: a #AnjutaProfile object.
- * @plugin: the new plugin as a #AnjutaPluginDescription.
+ * @plugin: the new plugin as a #AnjutaPluginHandle.
*
* Emitted when a plugin is added in the list.
*/
@@ -304,7 +312,7 @@
/**
* AnjutaProfile::plugin-removed:
* @profile: a #AnjutaProfile object.
- * @plugin: the removed plugin as a #AnjutaPluginDescription.
+ * @plugin: the removed plugin as a #AnjutaPluginHandle.
*
* Emitted when a plugin is removed from the list.
*/
@@ -321,7 +329,6 @@
/**
* AnjutaProfile::changed:
* @profile: a #AnjutaProfile object.
- * @plugin_list: the new plugins list.
*
* Emitted when a plugin is added or removed from the list.
*/
@@ -332,8 +339,40 @@
G_STRUCT_OFFSET (AnjutaProfileClass, changed),
NULL, NULL,
anjuta_cclosure_marshal_VOID__POINTER,
- G_TYPE_NONE, 1,
- G_TYPE_POINTER);
+ G_TYPE_NONE, 0);
+
+ /**
+ * AnjutaProfile::profile-descoped:
+ * @profile: the old unloaded #AnjutaProfile
+ *
+ * Emitted when a profile will be unloaded.
+ */
+ profile_signals[DESCOPED] =
+ g_signal_new ("descoped",
+ G_OBJECT_CLASS_TYPE (klass),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (AnjutaProfileClass,
+ descoped),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
+
+ /**
+ * AnjutaProfileManager::profile-scoped:
+ * @profile_manager: a #AnjutaProfileManager object.
+ * @profile: the current loaded #AnjutaProfile.
+ *
+ * Emitted when a new profile is loaded.
+ */
+ profile_signals[SCOPED] =
+ g_signal_new ("scoped",
+ G_OBJECT_CLASS_TYPE (klass),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (AnjutaProfileClass,
+ scoped),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
}
GType
@@ -364,6 +403,33 @@
return our_type;
}
+static void
+on_plugin_activated (AnjutaPluginManager *plugin_manager,
+ AnjutaPluginHandle *plugin_handle,
+ GObject *plugin_object,
+ AnjutaProfile *profile)
+{
+ /* Add it current profile */
+ gboolean exclude;
+ AnjutaPluginDescription *desc;
+
+ desc = anjuta_plugin_handle_get_description (plugin_handle);
+ if (!anjuta_plugin_description_get_boolean (desc, "Anjuta Plugin", "ExcludeFromSession", &exclude) || !exclude)
+ {
+ anjuta_profile_add_plugin (profile, plugin_handle);
+ }
+}
+
+static void
+on_plugin_deactivated (AnjutaPluginManager *plugin_manager,
+ AnjutaPluginHandle *plugin_handle,
+ GObject *plugin_object,
+ AnjutaProfile *profile)
+{
+ /* Remove from current profile */
+ anjuta_profile_remove_plugin (profile, plugin_handle);
+}
+
/**
* anjuta_profile_new:
* @name: the new profile name.
@@ -402,93 +468,151 @@
/**
* anjuta_profile_add_plugin:
* @profile: a #AnjutaProfile object.
- * @plugin: a #AnjutaPluginDescription.
+ * @plugin: a #AnjutaPluginHandle.
*
* Add one plugin into the profile plugin list.
*/
void
anjuta_profile_add_plugin (AnjutaProfile *profile,
- AnjutaPluginDescription *plugin)
+ AnjutaPluginHandle *plugin)
{
AnjutaProfilePriv *priv;
g_return_if_fail (ANJUTA_IS_PROFILE (profile));
g_return_if_fail (plugin != NULL);
priv = ANJUTA_PROFILE (profile)->priv;
- if (priv->plugins == NULL || g_list_find (priv->plugins, plugin) == NULL)
+ if (g_hash_table_lookup (priv->plugins_to_load, plugin) == NULL)
{
- priv->plugins = g_list_prepend (priv->plugins, plugin);
+ g_hash_table_add (priv->plugins_to_load, plugin);
g_signal_emit_by_name (profile, "plugin-added", plugin);
- g_signal_emit_by_name (profile, "changed", priv->plugins);
+ g_signal_emit_by_name (profile, "changed");
}
}
/**
* anjuta_profile_remove_plugin:
* @profile: a #AnjutaProfile object.
- * @plugin: a #AnjutaPluginDescription.
+ * @plugin: a #AnjutaPluginHandle.
*
* Remove one plugin from the profile plugin list.
*/
void
anjuta_profile_remove_plugin (AnjutaProfile *profile,
- AnjutaPluginDescription *plugin)
+ AnjutaPluginHandle *plugin)
{
AnjutaProfilePriv *priv;
g_return_if_fail (ANJUTA_IS_PROFILE (profile));
g_return_if_fail (plugin != NULL);
priv = ANJUTA_PROFILE (profile)->priv;
- if (priv->plugins && g_list_find (priv->plugins, plugin) != NULL)
+ if (g_hash_table_remove (priv->plugins_to_load, plugin))
{
- priv->plugins = g_list_remove (priv->plugins, plugin);
+ g_hash_table_remove (priv->plugins_to_exclude_from_sync, plugin);
g_signal_emit_by_name (profile, "plugin-removed", plugin);
- g_signal_emit_by_name (profile, "changed", priv->plugins);
+ g_signal_emit_by_name (profile, "changed");
}
}
/**
* anjuta_profile_has_plugin:
* @profile: a #AnjutaProfile object
- * @plugin: a #AnjutaPluginDescription
+ * @plugin: a #AnjutaPluginHandle
*
* Check if a plugin is included in the profile plugin list.
*
- * Return value: TRUE if the plugin is included in the list.
+ * Return value: %TRUE if the plugin is included in the list.
*/
gboolean
anjuta_profile_has_plugin (AnjutaProfile *profile,
- AnjutaPluginDescription *plugin)
+ AnjutaPluginHandle *plugin)
{
AnjutaProfilePriv *priv;
g_return_val_if_fail (ANJUTA_IS_PROFILE (profile), FALSE);
g_return_val_if_fail (plugin != NULL, FALSE);
priv = ANJUTA_PROFILE (profile)->priv;
- return (priv->plugins != NULL &&
- g_list_find (priv->plugins, plugin) != NULL);
+
+ return g_hash_table_lookup (priv->plugins_to_load, plugin) != NULL;
}
-/**
- * anjuta_profile_get_plugins:
- * @profile: a #AnjutaProfile object.
- *
- * Get the profile current plugins list.
- *
- * Return value: the plugins list.
- */
-GList*
-anjuta_profile_get_plugins (AnjutaProfile *profile)
+static gboolean
+anjuta_profile_configure_plugins (AnjutaProfile *profile,
+ GList *handles_list,
+ GList *config_list)
{
AnjutaProfilePriv *priv;
+ GList *item;
+ GList *config;
+
g_return_val_if_fail (ANJUTA_IS_PROFILE (profile), FALSE);
+
priv = ANJUTA_PROFILE (profile)->priv;
- return priv->plugins;
+ for (config = config_list, item = handles_list; item != NULL; item = g_list_next (item), config = g_list_next (config))
+ {
+ GList *plugin;
+ GList *set;
+
+ for (plugin = g_list_first ((GList *)item->data); plugin != NULL; plugin = g_list_next (plugin))
+ {
+ AnjutaPluginHandle *handle = ANJUTA_PLUGIN_HANDLE (plugin->data);
+ AnjutaPluginDescription *desc;
+
+ desc = anjuta_plugin_handle_get_description (handle);
+ for (set = g_list_first ((GList *)config->data); set != NULL; set = g_list_next (set))
+ {
+ gchar *group = (gchar *)set->data;
+ gchar *key = group + strlen (group) + 1;
+ gchar *value = key + strlen (key) + 1;
+
+ anjuta_plugin_description_override (desc, group, key, value);
+ priv->configuration = g_list_prepend (priv->configuration, group);
+ priv->configuration = g_list_prepend (priv->configuration, handle);
+ }
+ }
+ for (set = g_list_first ((GList *)config->data); set != NULL; set = g_list_delete_link (set, set))
+ {
+ priv->config_keys = g_list_prepend (priv->config_keys, set->data);
+ }
+ }
+ g_list_free (config_list);
+
+ return TRUE;
+}
+
+
+static gboolean
+anjuta_profile_unconfigure_plugins (AnjutaProfile *profile)
+{
+ AnjutaProfilePriv *priv;
+ GList *item;
+
+ g_return_val_if_fail (ANJUTA_IS_PROFILE (profile), FALSE);
+
+ priv = ANJUTA_PROFILE (profile)->priv;
+ for (item = g_list_first (priv->configuration); item != NULL; item = g_list_delete_link (item, item))
+ {
+ AnjutaPluginHandle *handle = ANJUTA_PLUGIN_HANDLE (item->data);
+ AnjutaPluginDescription *desc;
+ gchar *group;
+ gchar *key;
+
+ item = g_list_delete_link (item, item);
+ group = (gchar *)(item->data);
+ key = group + strlen (group) + 1;
+
+ desc = anjuta_plugin_handle_get_description (handle);
+ anjuta_plugin_description_remove (desc, group, key);
+ }
+ priv->configuration = NULL;
+ g_list_free_full (priv->config_keys, (GDestroyNotify)g_free);
+ priv->config_keys = NULL;
+
+ return TRUE;
}
static GList*
anjuta_profile_select_plugins (AnjutaProfile *profile,
- GList *descs_list)
+ GList *handles_list)
{
GList *selected_plugins = NULL;
- GList *node = descs_list;
+ GList *node = handles_list;
AnjutaProfilePriv *priv;
priv = profile->priv;
@@ -502,31 +626,46 @@
}
else
{
- AnjutaPluginDescription* d;
- d = anjuta_plugin_manager_select (priv->plugin_manager,
- _("Select a plugin"),
- _("Please select a plugin from the list"),
- descs);
- if (d)
- selected_plugins = g_list_prepend (selected_plugins, d);
+ AnjutaPluginHandle* handle;
+ handle = anjuta_plugin_manager_select (priv->plugin_manager,
+ _("Select a plugin"),
+ _("Please select a plugin from the list"),
+ descs);
+ if (handle)
+ selected_plugins = g_list_prepend (selected_plugins, handle);
}
node = g_list_next (node);
}
return g_list_reverse (selected_plugins);
}
-static GList *
-anjuta_profile_read_plugins_from_xml (AnjutaProfile *profile,
- GFile *file,
- GError **error)
+
+/* Read profile from XML
+ *---------------------------------------------------------------------------*/
+
+/* Error during parsing */
+static gboolean
+set_parse_error (GError **error, GFile*file)
+{
+ gchar *uri = g_file_get_uri (file);
+
+ g_error_free (*error);
+ *error = g_error_new (ANJUTA_PROFILE_ERROR,
+ ANJUTA_PROFILE_ERROR_URI_READ_FAILED,
+ _("Failed to read '%s': XML parse error. "
+ "Invalid or corrupted Anjuta plugins profile."),
+ uri);
+ g_free (uri);
+
+ return FALSE;
+}
+
+static xmlDocPtr
+load_profile_from_xml (GFile *file, GError **error)
{
gchar *read_buf;
gsize size;
xmlDocPtr xml_doc;
- GList *descs_list = NULL;
- GList *not_found_names = NULL;
- GList *not_found_urls = NULL;
- gboolean parse_error;
/* Read xml file */
if (!g_file_load_contents (file, NULL, &read_buf, &size, NULL, error))
@@ -535,7 +674,6 @@
}
/* Parse xml file */
- parse_error = TRUE;
xml_doc = xmlParseMemory (read_buf, size);
g_free (read_buf);
if (xml_doc != NULL)
@@ -543,140 +681,260 @@
xmlNodePtr xml_root;
xml_root = xmlDocGetRootElement(xml_doc);
- if (xml_root &&
- (xml_root->name) &&
+ if (xml_root ||
+ (xml_root->name) ||
xmlStrEqual(xml_root->name, (const xmlChar *)"anjuta"))
{
- xmlNodePtr xml_node;
-
- parse_error = FALSE;
- for (xml_node = xml_root->xmlChildrenNode; xml_node; xml_node = xml_node->next)
- {
- GList *groups = NULL;
- GList *attribs = NULL;
- GList *values = NULL;
- xmlChar *name, *url, *mandatory_text;
- xmlNodePtr xml_require_node;
- gboolean mandatory;
-
- if (!xml_node->name ||
- !xmlStrEqual (xml_node->name, (const xmlChar*)"plugin"))
- {
- continue;
- }
-
- name = xmlGetProp (xml_node, (const xmlChar*)"name");
- url = xmlGetProp (xml_node, (const xmlChar*)"url");
-
- /* Ensure that both name is given */
- if (!name)
- {
- g_warning ("XML error: Plugin name should be present in plugin tag");
- parse_error = TRUE;
- break;
- }
- if (!url)
- url = xmlCharStrdup ("http://anjuta.org/plugins/");
-
- /* Check if the plugin is mandatory */
- mandatory_text = xmlGetProp (xml_node, (const xmlChar*)"mandatory");
- mandatory = mandatory_text && (xmlStrcasecmp (mandatory_text, (const xmlChar *)"yes") == 0);
- xmlFree(mandatory_text);
-
- /* For all plugin attribute conditions */
- for (xml_require_node = xml_node->xmlChildrenNode;
- xml_require_node;
- xml_require_node = xml_require_node->next)
- {
- xmlChar *group;
- xmlChar *attrib;
- xmlChar *value;
-
- if (!xml_require_node->name ||
- !xmlStrEqual (xml_require_node->name,
- (const xmlChar*)"require"))
- {
- continue;
- }
- group = xmlGetProp (xml_require_node,
- (const xmlChar *)"group");
- attrib = xmlGetProp(xml_require_node,
- (const xmlChar *)"attribute");
- value = xmlGetProp(xml_require_node,
- (const xmlChar *)"value");
-
- if (group && attrib && value)
- {
- groups = g_list_prepend (groups, group);
- attribs = g_list_prepend (attribs, attrib);
- values = g_list_prepend (values, value);
- }
- else
- {
- if (group) xmlFree (group);
- if (attrib) xmlFree (attrib);
- if (value) xmlFree (value);
- parse_error = TRUE;
- g_warning ("XML parse error: group, attribute and value should be defined in require");
- break;
- }
- }
-
- if (!parse_error)
- {
- if (g_list_length (groups) == 0)
- {
- parse_error = TRUE;
- g_warning ("XML Error: No attributes to match given");
- }
- else
- {
- GList *plugin_descs;
-
- plugin_descs =
- anjuta_plugin_manager_list_query (profile->priv->plugin_manager,
- groups,
- attribs,
- values);
- if (plugin_descs)
- {
- descs_list = g_list_prepend (descs_list, plugin_descs);
- }
- else if (mandatory)
- {
- not_found_names = g_list_prepend (not_found_names, g_strdup ((const gchar *)name));
- not_found_urls = g_list_prepend (not_found_urls, g_strdup ((const gchar *)url));
- }
- }
- }
- g_list_foreach (groups, (GFunc)xmlFree, NULL);
- g_list_foreach (attribs, (GFunc)xmlFree, NULL);
- g_list_foreach (values, (GFunc)xmlFree, NULL);
- g_list_free (groups);
- g_list_free (attribs);
- g_list_free (values);
- xmlFree (name);
- xmlFree (url);
- }
+ return xml_doc;
}
xmlFreeDoc(xml_doc);
}
+ set_parse_error (error, file);
+
+ return NULL;
+}
+
+static GList *
+parse_set (xmlNodePtr xml_node, GFile *file, GError **error)
+{
+ GList *config = NULL;
+ gboolean parse_error = FALSE;
+ xmlNodePtr xml_require_node;
+
+ /* Read attribute conditions */
+ for (xml_require_node = xml_node->xmlChildrenNode;
+ xml_require_node;
+ xml_require_node = xml_require_node->next)
+ {
+ xmlChar *group;
+ xmlChar *attrib;
+ xmlChar *value;
+
+ if (!xml_require_node->name ||
+ !xmlStrEqual (xml_require_node->name,
+ (const xmlChar*)"set"))
+ {
+ continue;
+ }
+ group = xmlGetProp (xml_require_node,
+ (const xmlChar *)"group");
+ attrib = xmlGetProp(xml_require_node,
+ (const xmlChar *)"attribute");
+ value = xmlGetProp(xml_require_node,
+ (const xmlChar *)"value");
+
+ if (group && attrib && value)
+ {
+ GString *str;
+
+ str = g_string_new ((const gchar *)group);
+ g_string_append_c (str, '\0');
+ g_string_append (str, (const gchar *)attrib);
+ g_string_append_c (str, '\0');
+ g_string_append (str, (const gchar *)value);
+
+ config = g_list_prepend (config, g_string_free (str, FALSE));
+ }
+ else
+ {
+ parse_error = TRUE;
+ g_warning ("XML parse error: group, attribute and value should be defined in set");
+ }
+ if (group) xmlFree (group);
+ if (attrib) xmlFree (attrib);
+ if (value) xmlFree (value);
+ if (parse_error) break;
+ }
+
+ if (parse_error)
+ {
+ set_parse_error (error, file);
+ }
+
+ return g_list_reverse (config);
+}
+
+
+static GList *
+parse_requires (xmlNodePtr xml_node, AnjutaPluginManager *plugin_manager, GFile *file, GError **error)
+{
+ GList *plugin_handles = NULL;
+ GList *groups = NULL;
+ GList *attribs = NULL;
+ GList *values = NULL;
+ gboolean parse_error = FALSE;
+ xmlNodePtr xml_require_node;
+
+ /* Read attribute conditions */
+ for (xml_require_node = xml_node->xmlChildrenNode;
+ xml_require_node;
+ xml_require_node = xml_require_node->next)
+ {
+ xmlChar *group;
+ xmlChar *attrib;
+ xmlChar *value;
+
+ if (!xml_require_node->name ||
+ !xmlStrEqual (xml_require_node->name,
+ (const xmlChar*)"require"))
+ {
+ continue;
+ }
+ group = xmlGetProp (xml_require_node,
+ (const xmlChar *)"group");
+ attrib = xmlGetProp(xml_require_node,
+ (const xmlChar *)"attribute");
+ value = xmlGetProp(xml_require_node,
+ (const xmlChar *)"value");
+
+ if (group && attrib && value)
+ {
+ groups = g_list_prepend (groups, group);
+ attribs = g_list_prepend (attribs, attrib);
+ values = g_list_prepend (values, value);
+ }
+ else
+ {
+ if (group) xmlFree (group);
+ if (attrib) xmlFree (attrib);
+ if (value) xmlFree (value);
+ parse_error = TRUE;
+ g_warning ("XML parse error: group, attribute and value should be defined in require");
+ break;
+ }
+ }
if (parse_error)
{
- /* Error during parsing */
- gchar *uri = g_file_get_uri (file);
+ set_parse_error (error, file);
+ }
+ else
+ {
+ if (g_list_length (groups) == 0)
+ {
+ parse_error = TRUE;
+ g_warning ("XML Error: No attributes to match given");
+ }
+ else
+ {
+ plugin_handles =
+ anjuta_plugin_manager_list_query (plugin_manager,
+ groups,
+ attribs,
+ values);
+ }
+ }
+ g_list_free_full (groups, (GDestroyNotify)xmlFree);
+ g_list_free_full (attribs, (GDestroyNotify)xmlFree);
+ g_list_free_full (values, (GDestroyNotify)xmlFree);
- g_set_error (error, ANJUTA_PROFILE_ERROR,
- ANJUTA_PROFILE_ERROR_URI_READ_FAILED,
- _("Failed to read '%s': XML parse error. "
- "Invalid or corrupted Anjuta plugins profile."),
- uri);
- g_free (uri);
+
+ return plugin_handles;
+}
+
+/* Read filter */
+static GList*
+parse_filter (GList **set_list, xmlNodePtr xml_root, AnjutaPluginManager *plugin_manager, GFile *file, GError **error)
+{
+ xmlNodePtr xml_node;
+ GError *parse_error = NULL;
+ GList *handles_list = NULL;
+
+ for (xml_node = xml_root->xmlChildrenNode; xml_node; xml_node = xml_node->next)
+ {
+ GList *plugin_handles = NULL;
+ GList *set;
+
+ if (!xml_node->name ||
+ !xmlStrEqual (xml_node->name, (const xmlChar*)"filter"))
+ {
+ continue;
+ }
+
+ /* Get all plugins fullfiling filter requirements */
+ plugin_handles = parse_requires (xml_node, plugin_manager, file, &parse_error);
+ if (parse_error != NULL)
+ {
+ g_propagate_error (error, parse_error);
+ break;
+ }
+ handles_list = g_list_prepend (handles_list, plugin_handles);
+
+ set = parse_set (xml_node, file, &parse_error);
+ if (parse_error != NULL)
+ {
+ g_propagate_error (error, parse_error);
+ break;
+ }
+ *set_list = g_list_prepend (*set_list, set);
+ }
+
+ return handles_list;
+}
+
+/* Read plugins, return a list of plugin list */
+static GList *
+parse_plugins (GList **set_list, xmlNodePtr xml_root, AnjutaPluginManager *plugin_manager, GFile *file, GError **error)
+{
+ xmlNodePtr xml_node;
+ GError *parse_error = NULL;
+ GList *handles_list = NULL;
+ GList *not_found_names = NULL;
+ GList *not_found_urls = NULL;
+
+ /* Read plugin list */
+ for (xml_node = xml_root->xmlChildrenNode; xml_node; xml_node = xml_node->next)
+ {
+ xmlChar *name, *url, *mandatory_text;
+ gboolean mandatory;
+ GList *plugin_handles = NULL;
+
+ if (!xml_node->name ||
+ !xmlStrEqual (xml_node->name, (const xmlChar*)"plugin"))
+ {
+ continue;
+ }
+
+ name = xmlGetProp (xml_node, (const xmlChar*)"name");
+ url = xmlGetProp (xml_node, (const xmlChar*)"url");
- g_list_foreach (descs_list, (GFunc)g_list_free, NULL);
- g_list_free (descs_list);
- descs_list = NULL;
+ /* Ensure that both name is given */
+ if (!name)
+ {
+ g_warning ("XML error: Plugin name should be present in plugin tag");
+ set_parse_error (&parse_error, file);
+ break;
+ }
+ if (!url)
+ url = xmlCharStrdup ("http://anjuta.org/plugins/");
+
+ /* Check if the plugin is mandatory */
+ mandatory_text = xmlGetProp (xml_node, (const xmlChar*)"mandatory");
+ mandatory = mandatory_text && (xmlStrcasecmp (mandatory_text, (const xmlChar *)"yes") == 0);
+ xmlFree(mandatory_text);
+
+ plugin_handles = parse_requires (xml_node, plugin_manager, file, &parse_error);
+ if (parse_error != NULL) break;
+ if (plugin_handles)
+ {
+ GList *set = parse_set (xml_node, file, &parse_error);
+ if (parse_error != NULL) break;
+
+ handles_list = g_list_prepend (handles_list, plugin_handles);
+ *set_list = g_list_prepend (*set_list, set);
+ }
+ else if (mandatory)
+ {
+ not_found_names = g_list_prepend (not_found_names, g_strdup ((const gchar *)name));
+ not_found_urls = g_list_prepend (not_found_urls, g_strdup ((const gchar *)url));
+ }
+ }
+
+ if (parse_error != NULL)
+ {
+ g_propagate_error (error, parse_error);
+ g_list_free_full (handles_list, (GDestroyNotify)g_list_free);
+ handles_list = NULL;
}
else if (not_found_names)
{
@@ -686,7 +944,6 @@
*/
GList *node_name, *node_url;
GString *mesg = g_string_new ("");
- gchar *uri = g_file_get_uri (file);
not_found_names = g_list_reverse (not_found_names);
not_found_urls = g_list_reverse (not_found_urls);
@@ -703,34 +960,161 @@
node_url = g_list_next (node_url);
}
g_set_error (error, ANJUTA_PROFILE_ERROR,
- ANJUTA_PROFILE_ERROR_URI_READ_FAILED,
- _("Failed to read '%s': Following mandatory plugins are missing:\n%s"),
- uri, mesg->str);
- g_free (uri);
+ ANJUTA_PROFILE_ERROR_PLUGIN_MISSING,
+ _("Failed to read '%s': Following mandatory plugins are missing"),
+ mesg->str);
g_string_free (mesg, TRUE);
+
+ g_list_foreach (not_found_names, (GFunc)g_free, NULL);
+ g_list_free (not_found_names);
+ g_list_foreach (not_found_urls, (GFunc)g_free, NULL);
+ g_list_free (not_found_urls);
+
+ g_list_free_full (handles_list, (GDestroyNotify)g_list_free);
+ handles_list = NULL;
+ }
+
+ return handles_list;
+}
+
+static gboolean
+anjuta_profile_read_xml (AnjutaProfile *profile,
+ GError **error)
+{
+ AnjutaProfilePriv *priv;
+ AnjutaProfileXml *xml;
+ xmlNodePtr xml_root;
+ GError *parse_error = NULL;
+ GList *disable_list;
+ GHashTable *disable_hash;
+ gboolean filter = FALSE;
+
+ /* Check if there are new XML files */
+ priv = profile->priv;
+ if (priv->xml == NULL) return TRUE;
+
+ /* Read all xml file */
+ for (xml = priv->xml; xml != NULL; xml = xml->next)
+ {
+ xml->doc = load_profile_from_xml (xml->file, &parse_error);
+ if (parse_error != NULL)
+ {
+ g_propagate_error (error, parse_error);
+
+ return FALSE;
+ }
+ }
+
+ /* Get all plugins to load */
+ for (xml = priv->xml; xml != NULL; xml = xml->next)
+ {
+ GList *handles_list;
+ GList *plugin_list;
+ GList *set_list = NULL;
- g_list_foreach (descs_list, (GFunc)g_list_free, NULL);
- g_list_free (descs_list);
- descs_list = NULL;
- }
- g_list_foreach (not_found_names, (GFunc)g_free, NULL);
- g_list_free (not_found_names);
- g_list_foreach (not_found_urls, (GFunc)g_free, NULL);
- g_list_free (not_found_urls);
+ /* Parse plugin in xml file */
+ xml_root = xmlDocGetRootElement(xml->doc);
+ handles_list = parse_plugins (&set_list, xml_root, priv->plugin_manager, xml->file, &parse_error);
+ if (parse_error != NULL) break;
+
+ anjuta_profile_configure_plugins (profile, handles_list, set_list);
+
+ plugin_list = anjuta_profile_select_plugins (profile, handles_list);
+ g_list_foreach (handles_list, (GFunc)g_list_free, NULL);
+ g_list_free (handles_list);
+ for (; plugin_list != NULL; plugin_list = g_list_delete_link (plugin_list, plugin_list))
+ {
+ g_hash_table_add (priv->plugins_to_load, plugin_list->data);
+ if (xml->exclude_from_sync) g_hash_table_add (priv->plugins_to_exclude_from_sync, plugin_list->data);
+ }
+ }
+
+ /* Get all disable plugins */
+ if (priv->plugins_to_disable == NULL)
+ {
+ disable_list = anjuta_plugin_manager_list_query (priv->plugin_manager, NULL, NULL, NULL);
+ }
+ else
+ {
+ disable_list = priv->plugins_to_disable;
+ }
+ disable_hash = g_hash_table_new (g_direct_hash, g_direct_equal);
+ for (; disable_list != NULL; disable_list = g_list_delete_link (disable_list, disable_list))
+ {
+ g_hash_table_add (disable_hash, disable_list->data);
+ }
+ for (xml = priv->xml; xml != NULL; xml = xml->next)
+ {
+ GList *handles_list;
+ GList *plugin_list;
+ GList *set_list = NULL;
+
+ /* Parse filter in xml file */
+ xml_root = xmlDocGetRootElement(xml->doc);
+ handles_list = parse_filter (&set_list, xml_root, priv->plugin_manager, xml->file, &parse_error);
+ if (parse_error != NULL) break;
+
+ anjuta_profile_configure_plugins (profile, handles_list, set_list);
- return descs_list;
+ filter = filter || (handles_list != NULL);
+ for (plugin_list = g_list_first (handles_list); plugin_list != NULL; plugin_list = g_list_next (plugin_list))
+ {
+ GList *node;
+ for (node = g_list_first ((GList *)plugin_list->data); node != NULL; node = g_list_next (node))
+ {
+ g_hash_table_remove (disable_hash, node->data);
+ }
+ }
+ g_list_foreach (handles_list, (GFunc)g_list_free, NULL);
+ g_list_free (handles_list);
+ }
+ if (filter)
+ {
+ /* Filter some plugins */
+ priv->plugins_to_disable = g_hash_table_get_keys (disable_hash);
+ anjuta_plugin_manager_set_disable_plugins (priv->plugin_manager, priv->plugins_to_disable, TRUE);
+ }
+ else
+ {
+ /* No filter, keep all plugins */
+ priv->plugins_to_disable = NULL;
+ }
+ g_hash_table_destroy (disable_hash);
+ if (parse_error != NULL) return FALSE;
+
+
+ /* Remove xml object */
+ while (priv->xml != NULL)
+ {
+ AnjutaProfileXml *next;
+
+ next = priv->xml->next;
+ g_object_unref (priv->xml->file);
+ xmlFreeDoc(priv->xml->doc);
+ g_free (priv->xml);
+ priv->xml = next;
+ }
+
+ if (parse_error != NULL) g_propagate_error (error, parse_error);
+
+ return parse_error == NULL;
}
+
+
+/* Public functions
+ *---------------------------------------------------------------------------*/
+
/**
* anjuta_profile_add_plugins_from_xml:
* @profile: a #AnjutaProfile object.
* @profile_xml_file: xml file containing plugin list.
- * @exclude_from_sync: TRUE if these plugins shouldn't be saved in user session.
+ * @exclude_from_sync: %TRUE if these plugins shouldn't be saved in user session.
* @error: error propagation and reporting.
*
* Add all plugins inscribed in the xml file into the profile plugin list.
*
- * Return value: TRUE on success, FALSE otherwise.
+ * Return value: %TRUE on success, %FALSE otherwise.
*/
gboolean
anjuta_profile_add_plugins_from_xml (AnjutaProfile *profile,
@@ -739,47 +1123,25 @@
GError **error)
{
AnjutaProfilePriv *priv;
- GList *descs_list = NULL;
+ AnjutaProfileXml *xml;
+ AnjutaProfileXml **last;
g_return_val_if_fail (ANJUTA_IS_PROFILE (profile), FALSE);
priv = profile->priv;
- descs_list = anjuta_profile_read_plugins_from_xml (profile, profile_xml_file, error);
-
- if (descs_list)
- {
- GList *selected_plugins = NULL;
- GList *node;
-
- /* Now everything okay. Select the plugins */
- descs_list = g_list_reverse (descs_list);
- selected_plugins =
- anjuta_profile_select_plugins (profile, descs_list);
- g_list_foreach (descs_list, (GFunc)g_list_free, NULL);
- g_list_free (descs_list);
-
- node = selected_plugins;
- while (node)
- {
- if (exclude_from_sync)
- {
- g_hash_table_insert (priv->plugins_to_exclude_from_sync,
- node->data, node->data);
- }
-
- /* Insure no duplicate plugins are added */
- if (g_hash_table_lookup (priv->plugins_hash, node->data) == NULL)
- {
- priv->plugins = g_list_append (priv->plugins, node->data);
- g_hash_table_insert (priv->plugins_hash,
- node->data, node->data);
- }
- node = g_list_next (node);
- }
- g_list_free (selected_plugins);
- }
-
- return descs_list != NULL;
+
+ /* Just save the file name, the xml wil be loaded later after unloading the
+ * previous profile if needed */
+
+ xml = g_new (AnjutaProfileXml, 1);
+ xml->file = g_object_ref (profile_xml_file);
+ xml->doc = NULL;
+ xml->exclude_from_sync = exclude_from_sync;
+ xml->next = NULL;
+ for (last = &(priv->xml); *last != NULL; last = &((*last)->next));
+ *last = xml;
+
+ return TRUE;
}
/**
@@ -788,7 +1150,7 @@
*
* Return a string in xml format containing the list of saved plugins.
*
- * Return value: a newly-allocated string that must be freed with g_free().
+ * Return value: (transfer full): a newly-allocated string that must be freed with g_free().
*/
static gchar*
anjuta_profile_to_xml (AnjutaProfile *profile)
@@ -801,8 +1163,9 @@
priv = profile->priv;
str = g_string_new ("\n\n");
- for (node = priv->plugins; node != NULL; node = g_list_next (node))
+ for (node = g_hash_table_get_keys (priv->plugins_to_load); node != NULL; node = g_list_delete_link (node, node))
{
+ AnjutaPluginHandle *handle;
AnjutaPluginDescription *desc;
gboolean user_activatable = TRUE;
gchar *name = NULL, *plugin_id = NULL;
@@ -812,8 +1175,8 @@
/* Do not save plugin in the exclude list */
continue;
}
-
- desc = (AnjutaPluginDescription *)node->data;
+ handle = (AnjutaPluginHandle *)node->data;
+ desc = anjuta_plugin_handle_get_description(handle);
if (anjuta_plugin_description_get_boolean (desc, "Anjuta Plugin",
"UserActivatable", &user_activatable)
&& !user_activatable)
@@ -882,7 +1245,7 @@
*
* Save the current plugins list in the xml file set with anjuta_profile_set_sync_file().
*
- * Return value: TRUE on success, FALSE otherwise.
+ * Return value: %TRUE on success, %FALSE otherwise.
*/
gboolean
anjuta_profile_sync (AnjutaProfile *profile, GError **error)
@@ -920,3 +1283,131 @@
return ok;
}
+
+/**
+ * anjuta_profile_load:
+ * @profile: a #AnjutaProfile object.
+ * @error: error propagation and reporting.
+ *
+ * Load the profile
+ *
+ * Return value: TRUE on success, FALSE otherwise.
+ */
+gboolean
+anjuta_profile_load (AnjutaProfile *profile, GError **error)
+{
+ AnjutaProfilePriv *priv;
+ GList *active_plugins, *node;
+ GHashTable *active_hash;
+
+ /* Read XML file if needed */
+ if (!anjuta_profile_read_xml (profile, error)) return FALSE;
+ priv = profile->priv;
+
+ /* Deactivate plugins that are already active, but are not requested to be
+ * active */
+ active_plugins = anjuta_plugin_manager_get_active_plugins (priv->plugin_manager);
+ for (node = active_plugins; node != NULL; node = g_list_next (node))
+ {
+ AnjutaPluginHandle *handle = (AnjutaPluginHandle *)node->data;
+
+ if (anjuta_plugin_handle_get_can_unload (handle) &&
+ !g_hash_table_lookup (priv->plugins_to_load, handle))
+ {
+ anjuta_plugin_manager_unload_plugin_by_handle (priv->plugin_manager,
+ handle);
+ }
+ }
+
+ /* Prepare active plugins hash */
+ active_hash = g_hash_table_new (g_direct_hash, g_direct_equal);
+ for (node = active_plugins; node != NULL; node = g_list_next (node))
+ {
+ g_hash_table_add (active_hash, node->data);
+ }
+ g_list_free (active_plugins);
+
+ /* Prepare the plugins to activate */
+ active_plugins = g_hash_table_get_keys (priv->plugins_to_load);
+ for (node = active_plugins; node != NULL;)
+ {
+ AnjutaPluginHandle *handle = (AnjutaPluginHandle *)node->data;
+ GList *next = g_list_next (node);
+
+ if (g_hash_table_lookup (active_hash, handle) != NULL)
+ {
+ active_plugins = g_list_delete_link (active_plugins, node);
+ }
+ node = next;
+ }
+ g_hash_table_destroy (active_hash);
+
+ /* For system profile, marks its plugin to keep them activated */
+ if (strcmp (priv->name, ANJUTA_SYSTEM_PROFILE_NAME) == 0)
+ {
+ for (node = g_list_first (active_plugins); node != NULL; node = g_list_next (node))
+ {
+ anjuta_plugin_handle_set_can_unload (ANJUTA_PLUGIN_HANDLE (node->data), FALSE);
+ }
+ }
+
+ /* Now activate the plugins */
+ if (active_plugins != NULL)
+ {
+ anjuta_plugin_manager_activate_plugins (priv->plugin_manager,
+ active_plugins);
+ g_list_free (active_plugins);
+ }
+
+ /* Enable profile synchronization */
+ g_signal_connect (priv->plugin_manager, "plugin-activated",
+ G_CALLBACK (on_plugin_activated), profile);
+ g_signal_connect (priv->plugin_manager, "plugin-deactivated",
+ G_CALLBACK (on_plugin_deactivated), profile);
+
+ g_signal_emit_by_name (profile, "scoped");
+
+
+ return TRUE;
+}
+
+/**
+ * anjuta_profile_load:
+ * @profile: a #AnjutaProfile object.
+ * @error: error propagation and reporting.
+ *
+ * Unload the profile
+ *
+ * Return value: TRUE on success, FALSE otherwise.
+ */
+gboolean
+anjuta_profile_unload (AnjutaProfile *profile, GError **error)
+{
+ AnjutaProfilePriv *priv;
+
+ /* Disable profile synchronization while the profile is being activated */
+ priv = profile->priv;
+ g_signal_handlers_disconnect_by_func (priv->plugin_manager,
+ G_CALLBACK (on_plugin_activated),
+ profile);
+ g_signal_handlers_disconnect_by_func (priv->plugin_manager,
+ G_CALLBACK (on_plugin_deactivated),
+ profile);
+
+ /* Do not unload system profile */
+ if (strcmp (priv->name, ANJUTA_SYSTEM_PROFILE_NAME) == 0) return TRUE;
+
+ /* Remove profile configuration */
+ anjuta_profile_unconfigure_plugins (profile);
+
+ /* Re-enable disabled plugins */
+ anjuta_plugin_manager_set_disable_plugins (priv->plugin_manager, priv->plugins_to_disable, FALSE);
+
+ /* Emit pre-change for the last profile */
+ if (profile)
+ {
+ g_signal_emit_by_name (profile, "descoped");
+ }
+
+ return TRUE;
+}
diff -Nru anjuta-3.8.4/libanjuta/anjuta-profile.h anjuta-3.10.2/libanjuta/anjuta-profile.h
--- anjuta-3.8.4/libanjuta/anjuta-profile.h 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-profile.h 2013-07-08 21:06:37.000000000 +0000
@@ -23,7 +23,7 @@
#include
#include
-#include
+#include
#include
G_BEGIN_DECLS
@@ -45,6 +45,14 @@
#define ANJUTA_PROFILE_ERROR (anjuta_profile_error_quark())
/**
+ * ANJUTA_SYSTEM_PROFILE_ERROR:
+ *
+ * Special name for a system profile. The content of such profile is never
+ * unloaded.
+ */
+#define ANJUTA_SYSTEM_PROFILE_NAME "system"
+
+/**
* AnjutaProfileError:
* @ANJUTA_PROFILE_ERROR_URI_READ_FAILED: Fail to read xml plugins list file.
* @ANJUTA_PROFILE_ERROR_URI_WRITE_FAILED: Fail to write xml plugins list file.
@@ -55,7 +63,8 @@
typedef enum
{
ANJUTA_PROFILE_ERROR_URI_READ_FAILED,
- ANJUTA_PROFILE_ERROR_URI_WRITE_FAILED
+ ANJUTA_PROFILE_ERROR_URI_WRITE_FAILED,
+ ANJUTA_PROFILE_ERROR_PLUGIN_MISSING
} AnjutaProfileError;
typedef struct _AnjutaProfileClass AnjutaProfileClass;
@@ -68,10 +77,12 @@
/* Signals */
void(* plugin_added) (AnjutaProfile *self,
- AnjutaPluginDescription *plugin);
+ AnjutaPluginHandle *plugin);
void(* plugin_removed) (AnjutaProfile *self,
- AnjutaPluginDescription *plugin);
- void(* changed) (AnjutaProfile *self, GList *plugins);
+ AnjutaPluginHandle *plugin);
+ void(* changed) (AnjutaProfile *self);
+ void(* descoped) (AnjutaProfile *self);
+ void(* scoped) (AnjutaProfile *self);
};
/**
@@ -92,21 +103,24 @@
AnjutaPluginManager *plugin_manager);
const gchar *anjuta_profile_get_name (AnjutaProfile *profile);
void anjuta_profile_add_plugin (AnjutaProfile *profile,
- AnjutaPluginDescription *plugin);
+ AnjutaPluginHandle *plugin);
void anjuta_profile_remove_plugin (AnjutaProfile *profile,
- AnjutaPluginDescription *plugin);
+ AnjutaPluginHandle *plugin);
gboolean anjuta_profile_add_plugins_from_xml (AnjutaProfile *profile,
GFile* profile_xml_file,
gboolean exclude_from_sync,
GError **error);
gboolean anjuta_profile_has_plugin (AnjutaProfile *profile,
- AnjutaPluginDescription *plugin);
+ AnjutaPluginHandle *plugin);
GList* anjuta_profile_get_plugins (AnjutaProfile *profile);
void anjuta_profile_set_sync_file (AnjutaProfile *profile,
GFile *sync_file);
gboolean anjuta_profile_sync (AnjutaProfile *profile, GError **error);
+gboolean anjuta_profile_load (AnjutaProfile *profile, GError **error);
+gboolean anjuta_profile_unload (AnjutaProfile *profile, GError **error);
+
G_END_DECLS
#endif /* _ANJUTA_PROFILE_H_ */
diff -Nru anjuta-3.8.4/libanjuta/anjuta-session.c anjuta-3.10.2/libanjuta/anjuta-session.c
--- anjuta-3.8.4/libanjuta/anjuta-session.c 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-session.c 2013-11-11 17:19:39.000000000 +0000
@@ -468,7 +468,7 @@
* It is useful to keep only relative file paths in a session file to be able
* to copy the whole project without breaking references.
*
- * Returns: A string that has to be freed with g_free().
+ * Returns: (transfer full): A string that has to be freed with g_free().
*/
gchar *
anjuta_session_get_relative_uri_from_file (AnjutaSession *session,
@@ -535,7 +535,7 @@
* anjuta_session_get_file_from_relative_uri:
* @session: an #AnjutaSession object
* @uri: a relative URI from a key
- * @fragment: fragment part of the URI if existing, cal be NULL
+ * @fragment: (allow-none): fragment part of the URI if existing, can be %NULL
*
* Return a GFile corresponding to the URI and and optional fragment,
* normally read from a session key.
@@ -545,7 +545,7 @@
* It is useful to keep only relative file paths in a session file to be able
* to copy the whole project without breaking references.
*
- * Returns: A new GFile that has to be freed with g_object_unref().
+ * Returns: (transfer full): A new GFile that has to be freed with g_object_unref().
*/
GFile*
anjuta_session_get_file_from_relative_uri (AnjutaSession *session,
diff -Nru anjuta-3.8.4/libanjuta/anjuta-shell.c anjuta-3.10.2/libanjuta/anjuta-shell.c
--- anjuta-3.8.4/libanjuta/anjuta-shell.c 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-shell.c 2013-07-08 21:06:37.000000000 +0000
@@ -592,11 +592,11 @@
* @shell: A #AnjutaShell interface
* @first_name: First value name
* @first_type: First value type
- * @...: First value, Second value name, Second value type .... NULL
+ * @...: First value, Second value name, Second value type .... %NULL
*
- * Adds a list of values in the shell. The list should be NULL terminated
+ * Adds a list of values in the shell. The list should be %NULL terminated
* and should be in the order - name1, type1, value1, name2, type2, value2,
- * ..., NULL. "value_added" signal will be emitted for each of the value.
+ * ..., %NULL. "value_added" signal will be emitted for each of the value.
*/
void
anjuta_shell_add (AnjutaShell *shell,
@@ -702,11 +702,11 @@
* @shell: A #AnjutaShell interface
* @first_name: First value name
* @first_type: First value type
- * @...: First value holder, Second value name, Second value type .... NULL
+ * @...: First value holder, Second value name, Second value type .... %NULL
*
- * Gets a list of values in the shell. The list should be NULL terminated
+ * Gets a list of values in the shell. The list should be %NULL terminated
* and should be in the order - name1, type1, value1, name2, type2, value2,
- * ..., NULL.
+ * ..., %NULL.
*/
void
anjuta_shell_get (AnjutaShell *shell,
@@ -770,7 +770,8 @@
* Notice that this function takes the interface name string as string, unlike
* anjuta_plugins_get_interface() which takes the type directly.
*
- * Return value: (transfer none): A plugin object implementing the primary interface or NULL.
+ * Return value: (transfer none): A plugin object implementing the primary
+ * interface or %NULL.
*/
GObject*
anjuta_shell_get_object (AnjutaShell *shell, const gchar *iface_name,
@@ -790,7 +791,7 @@
*
* Retrieves the #AnjutaStatus object associated with the shell.
*
- * Return value: The #AnjutaStatus object.
+ * Return value: (transfer none): The #AnjutaStatus object.
*/
AnjutaStatus*
anjuta_shell_get_status (AnjutaShell *shell, GError **error)
@@ -808,7 +809,7 @@
*
* Retrieves the #AnjutaUI object associated with the shell.
*
- * Return value: The #AnjutaUI object.
+ * Return value: (transfer none): The #AnjutaUI object.
*/
AnjutaUI*
anjuta_shell_get_ui (AnjutaShell *shell, GError **error)
@@ -826,7 +827,7 @@
*
* Retrieves the #AnjutaPreferences object associated with the shell.
*
- * Return value: The #AnjutaPreferences object.
+ * Return value: (transfer none): The #AnjutaPreferences object.
*/
AnjutaPreferences*
anjuta_shell_get_preferences (AnjutaShell *shell, GError **error)
@@ -844,7 +845,7 @@
*
* Retrieves the #AnjutaPluginManager object associated with the shell.
*
- * Return value: The #AnjutaPluginManager object.
+ * Return value: (transfer none): The #AnjutaPluginManager object.
*/
AnjutaPluginManager*
anjuta_shell_get_plugin_manager (AnjutaShell *shell, GError **error)
@@ -862,7 +863,7 @@
*
* Retrieves the #AnjutaProfileManager object associated with the shell.
*
- * Return value: The #AnjutaProfileManager object.
+ * Return value: (transfer none): The #AnjutaProfileManager object.
*/
AnjutaProfileManager*
anjuta_shell_get_profile_manager (AnjutaShell *shell, GError **error)
@@ -888,7 +889,7 @@
}
/**
- * anjuta_shell_saving_push:
+ * anjuta_shell_saving_pop:
* @shell: A #AnjutaShell interface
*
* Decrease the count of files that need to be saved
diff -Nru anjuta-3.8.4/libanjuta/anjuta-shell.h anjuta-3.10.2/libanjuta/anjuta-shell.h
--- anjuta-3.8.4/libanjuta/anjuta-shell.h 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-shell.h 2013-07-08 21:06:37.000000000 +0000
@@ -45,7 +45,7 @@
typedef struct _AnjutaShellIface AnjutaShellIface;
/**
- * AnjutaShellError_
+ * AnjutaShellError:
* @ANJUTA_SHELL_ERROR_DOESNT_EXIST:
*/
typedef enum
@@ -77,13 +77,13 @@
void (*save_prompt) (AnjutaShell *shell, AnjutaSavePrompt *save_prompt);
/* Virtual Table */
- AnjutaStatus* (*get_status) (AnjutaShell *shell, GError **err);
- AnjutaUI* (*get_ui) (AnjutaShell *shell, GError **err);
- AnjutaPreferences* (*get_preferences) (AnjutaShell *shell, GError **err);
+ AnjutaStatus* (*get_status) (AnjutaShell *shell, GError **error);
+ AnjutaUI* (*get_ui) (AnjutaShell *shell, GError **error);
+ AnjutaPreferences* (*get_preferences) (AnjutaShell *shell, GError **error);
AnjutaPluginManager* (*get_plugin_manager) (AnjutaShell *shell,
- GError **err);
+ GError **error);
AnjutaProfileManager* (*get_profile_manager) (AnjutaShell *shell,
- GError **err);
+ GError **error);
void (*add_widget_full) (AnjutaShell *shell,
GtkWidget *widget,
diff -Nru anjuta-3.8.4/libanjuta/anjuta-status.c anjuta-3.10.2/libanjuta/anjuta-status.c
--- anjuta-3.8.4/libanjuta/anjuta-status.c 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-status.c 2013-07-08 21:06:37.000000000 +0000
@@ -660,5 +660,5 @@
}
}
-ANJUTA_TYPE_BEGIN(AnjutaStatus, anjuta_status, GTK_TYPE_HBOX);
+ANJUTA_TYPE_BEGIN(AnjutaStatus, anjuta_status, GTK_TYPE_BOX);
ANJUTA_TYPE_END;
diff -Nru anjuta-3.8.4/libanjuta/anjuta-tabber.c anjuta-3.10.2/libanjuta/anjuta-tabber.c
--- anjuta-3.8.4/libanjuta/anjuta-tabber.c 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-tabber.c 2013-07-08 21:06:37.000000000 +0000
@@ -19,16 +19,21 @@
#include "anjuta-tabber.h"
+/**
+ * SECTION:anjuta-tabber
+ * @title: AnjutaTabber
+ * @short_description: Tab widget
+ * @see_also:
+ * @stability: Unstable
+ * @include: libanjuta/anjuta-tabber.h
+ */
+
struct _AnjutaTabberPriv
{
GtkNotebook* notebook;
GList* children;
gint active_page;
- /* Style information (taken from GtkNotebook) */
- gint tab_hborder;
- gint tab_vborder;
-
GdkWindow* event_window;
};
@@ -50,16 +55,19 @@
AnjutaTabber* tabber = ANJUTA_TABBER (object);
AnjutaTabberPriv* priv;
+ GtkStyleContext* context;
+
tabber->priv = ANJUTA_TABBER_GET_PRIVATE (tabber);
priv = tabber->priv;
priv->children = NULL;
priv->active_page = 0;
- priv->tab_hborder = 2;
- priv->tab_vborder = 2;
-
gtk_widget_set_has_window (GTK_WIDGET(tabber), FALSE);
+
+ context = gtk_widget_get_style_context (GTK_WIDGET (tabber));
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_NOTEBOOK);
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_TOP);
}
/**
@@ -158,6 +166,62 @@
}
}
+static GtkRegionFlags
+anjuta_tabber_get_region_flags (AnjutaTabber* tabber, gint page_num)
+{
+ GtkRegionFlags flags = 0;
+
+ if ((page_num + 1) % 2 == 0)
+ flags |= GTK_REGION_EVEN;
+ else
+ flags |= GTK_REGION_ODD;
+
+ if (page_num == 1)
+ flags |= GTK_REGION_FIRST;
+
+ if (page_num == (g_list_length (tabber->priv->children) - 1))
+ flags |= GTK_REGION_LAST;
+
+ return flags;
+}
+
+static void
+anjuta_tabber_setup_style_context (AnjutaTabber* tabber, GtkStyleContext* context,
+ GList* child, GtkStateFlags* state_flags,
+ GtkRegionFlags* region_flags)
+{
+ gint page_num;
+ gboolean current;
+ GtkRegionFlags region;
+ GtkStateFlags state;
+
+ page_num = g_list_position (tabber->priv->children, child);
+ current = page_num == tabber->priv->active_page;
+
+ region = anjuta_tabber_get_region_flags (tabber, page_num);
+
+ gtk_style_context_add_region (context, GTK_STYLE_REGION_TAB, region);
+
+ if (gtk_widget_get_direction (GTK_WIDGET (tabber)) == GTK_TEXT_DIR_LTR)
+ gtk_style_context_set_junction_sides (context,
+ GTK_JUNCTION_CORNER_TOPLEFT);
+ else
+ gtk_style_context_set_junction_sides (context,
+ GTK_JUNCTION_CORNER_TOPRIGHT);
+
+ state = gtk_style_context_get_state (context);
+ if (current)
+ state |= GTK_STATE_FLAG_ACTIVE;
+ else
+ state &= ~GTK_STATE_FLAG_ACTIVE;
+ gtk_style_context_set_state (context, state);
+
+ if (state_flags)
+ *state_flags = state;
+ if (region_flags)
+ *region_flags = region;
+}
+
static void
anjuta_tabber_get_preferred_width (GtkWidget* widget,
gint* minimum,
@@ -166,47 +230,55 @@
g_return_if_fail (ANJUTA_IS_TABBER (widget));
AnjutaTabber* tabber = ANJUTA_TABBER (widget);
+ GtkStyleContext* context;
GList* child;
- gint xthickness;
gint focus_width;
+ gint focus_pad;
gint tab_curvature;
gint tab_overlap;
- gint padding;
-
- GtkStyle* style = gtk_widget_get_style (widget);
-
- xthickness = style->xthickness;
*minimum = 0;
*preferred = 0;
gtk_widget_style_get (GTK_WIDGET (tabber->priv->notebook),
"focus-line-width", &focus_width,
+ "focus-padding", &focus_pad,
"tab-curvature", &tab_curvature,
"tab-overlap", &tab_overlap,
NULL);
- padding = xthickness + focus_width + tabber->priv->tab_hborder;
-
+ context = gtk_widget_get_style_context (widget);
+
for (child = tabber->priv->children; child != NULL; child = g_list_next (child))
{
+ GtkStateFlags state;
+ GtkBorder tab_padding;
+ gint xpadding;
gint child_min;
gint child_preferred;
gint extra_space = 2 * (tab_curvature - tab_overlap);
+
+ /* Get the padding of the tab */
+ gtk_style_context_save (context);
+ anjuta_tabber_setup_style_context (tabber, context, child, &state, NULL);
+ gtk_style_context_get_padding (context, state, &tab_padding);
+ gtk_style_context_restore (context);
+
+ xpadding = 2 * (focus_width + focus_pad) + tab_padding.left + tab_padding.right;
- if (child == g_list_first (tabber->priv->children))
+ if (child->prev == NULL)
extra_space += tab_overlap;
- if (child == g_list_last (tabber->priv->children))
+ if (child->next == NULL)
extra_space += tab_overlap;
gtk_widget_get_preferred_width (GTK_WIDGET (child->data), &child_min, &child_preferred);
if (minimum)
{
- *minimum += child_min + 2 * padding + extra_space;
+ *minimum += child_min + xpadding + extra_space;
}
if (preferred)
{
- *preferred += child_preferred + 2 * padding + extra_space;
+ *preferred += child_preferred + xpadding + extra_space;
}
}
}
@@ -219,29 +291,42 @@
g_return_if_fail (ANJUTA_IS_TABBER (widget));
AnjutaTabber* tabber = ANJUTA_TABBER (widget);
+ GtkStyleContext* context;
GList* child;
gint focus_width;
+ gint focus_pad;
gtk_widget_style_get (GTK_WIDGET (tabber),
"focus-line-width", &focus_width,
+ "focus-padding", &focus_pad,
NULL);
-
+ context = gtk_widget_get_style_context (widget);
+
for (child = tabber->priv->children; child != NULL; child = g_list_next (child))
{
+ GtkStateFlags state;
+ GtkBorder tab_padding;
+ gint ypadding;
gint child_min;
- gint child_preferred;
+ gint child_preferred;
+
+ /* Get the padding of the tab */
+ gtk_style_context_save (context);
+ anjuta_tabber_setup_style_context (tabber, context, child, &state, NULL);
+ gtk_style_context_get_padding (context, state, &tab_padding);
+ gtk_style_context_restore (context);
+
+ ypadding = 2 * (focus_width + focus_pad) + tab_padding.top + tab_padding.bottom;
gtk_widget_get_preferred_height (GTK_WIDGET (child->data), &child_min, &child_preferred);
if (minimum)
{
- *minimum = MAX(*minimum, child_min +
- 2 * (focus_width + tabber->priv->tab_vborder));
+ *minimum = MAX(*minimum, child_min + ypadding);
}
if (preferred)
{
- *preferred = MAX(*preferred, child_preferred +
- 2 * (focus_width + tabber->priv->tab_vborder));
+ *preferred = MAX(*preferred, child_preferred + ypadding);
}
}
}
@@ -253,22 +338,27 @@
g_return_if_fail (ANJUTA_IS_TABBER (widget));
AnjutaTabber* tabber = ANJUTA_TABBER (widget);
+ GtkStyleContext* context;
GList* child;
gint focus_width;
+ gint focus_pad;
gint tab_curvature;
gint tab_overlap;
gint n_children = g_list_length (tabber->priv->children);
gint x;
- gint padding;
+ gint focus_space;
gint tab_space;
-
+
+ context = gtk_widget_get_style_context (widget);
+
gtk_widget_style_get (GTK_WIDGET (tabber),
"focus-line-width", &focus_width,
+ "focus-padding", &focus_pad,
"tab-curvature", &tab_curvature,
"tab-overlap", &tab_overlap,
NULL);
- padding = focus_width + tabber->priv->tab_hborder;
+ focus_space = focus_width + focus_pad;
tab_space = tab_curvature - tab_overlap;
gtk_widget_set_allocation (widget, allocation);
@@ -294,46 +384,79 @@
if (n_children > 0)
{
- gint total_width = 2 * tab_overlap;
+ gint total_space;
+ gint total_width;
gboolean use_natural = FALSE;
gint child_equal;
gint extra_space = 0;
gint real_width = allocation->width;
+ /* Calculate the total space that is used for padding/overlap */
+ total_space = 2 * tab_curvature
+ + 2 * tab_space * (n_children - 1)
+ + 2 * focus_space * n_children;
+
+ for (child = tabber->priv->children; child != NULL; child = g_list_next (child))
+ {
+ GtkStateFlags state;
+ GtkBorder tab_padding;
+
+ /* Get the padding of the tab */
+ gtk_style_context_save (context);
+ anjuta_tabber_setup_style_context (tabber, context, child, &state, NULL);
+ gtk_style_context_get_padding (context, state, &tab_padding);
+ gtk_style_context_restore (context);
+
+ total_space += tab_padding.left + tab_padding.right;
+ }
+
/* Check if we have enough space for all widgets natural size */
- child_equal = real_width / n_children -
- n_children * 2 * (padding + tab_space) - 2 * tab_overlap;
+ child_equal = (real_width - total_space) / n_children;
if (child_equal < 0)
return;
-
+
+ /* Calculate the total width of the tabs */
+ total_width = total_space;
for (child = tabber->priv->children; child != NULL; child = g_list_next (child))
{
GtkWidget* child_widget = GTK_WIDGET (child->data);
gint natural;
+
gtk_widget_get_preferred_width (child_widget, NULL,
&natural);
- total_width += natural + 2 * (padding + tab_space);
+ total_width += natural;
+
if (natural < child_equal)
extra_space += child_equal - natural;
}
+
use_natural = (total_width <= real_width);
child_equal += extra_space / n_children;
for (child = tabber->priv->children; child != NULL; child = g_list_next (child))
{
GtkWidget* child_widget = GTK_WIDGET (child->data);
+ GtkStateFlags state;
+ GtkBorder tab_padding, active_padding;
GtkAllocation child_alloc;
gint natural;
gint minimal;
gint begin_tab = tab_space;
gint end_tab = tab_space;
- if (child == g_list_first (tabber->priv->children))
- begin_tab += tab_overlap;
- if (child == g_list_last (tabber->priv->children))
- end_tab += tab_overlap;
+ /* Get the padding of the tab */
+ gtk_style_context_save (context);
+ anjuta_tabber_setup_style_context (tabber, context, child, &state, NULL);
+ gtk_style_context_get_padding (context, state, &tab_padding);
+ gtk_style_context_get_padding (context, state | GTK_STATE_ACTIVE, &active_padding);
+ gtk_style_context_restore (context);
+
+ if (child->prev == NULL)
+ begin_tab = tab_curvature;
+ if (child->next == NULL)
+ end_tab = tab_curvature;
gtk_widget_get_preferred_width (child_widget, &minimal,
&natural);
@@ -342,86 +465,82 @@
{
child_alloc.width = natural;
}
- else
+ else
{
if (natural < child_equal)
child_alloc.width = natural;
else
child_alloc.width = child_equal;
}
- child_alloc.height = allocation->height
- - 2 * (focus_width + tabber->priv->tab_vborder);
+ /* The active pad is by definition at least the same height
+ * as the inactive one. Therefore we always use the padding of the
+ * active tab to calculate the height and y position of the child.
+ */
+ child_alloc.height = allocation->height - 2 * focus_space
+ - active_padding.top - active_padding.bottom;
+ child_alloc.y = allocation->y + focus_space + active_padding.top;
+
switch (gtk_widget_get_direction (widget))
{
case GTK_TEXT_DIR_RTL:
- child_alloc.x = x - padding - begin_tab - child_alloc.width;
- x = child_alloc.x - padding - end_tab;
+ child_alloc.x = x - focus_space - tab_padding.right
+ - begin_tab - child_alloc.width;
+ x = child_alloc.x - focus_space - tab_padding.left - end_tab;
break;
case GTK_TEXT_DIR_LTR:
default:
- child_alloc.x = x + padding + begin_tab;
- x = child_alloc.x + child_alloc.width + padding + end_tab;
+ child_alloc.x = x + focus_space + tab_padding.left + begin_tab;
+ x = child_alloc.x + child_alloc.width + focus_space
+ + tab_padding.right + end_tab;
}
- child_alloc.y = allocation->y +
- tabber->priv->tab_vborder + focus_width;
- gtk_widget_size_allocate (GTK_WIDGET (child->data), &child_alloc);
+ gtk_widget_size_allocate (child_widget, &child_alloc);
}
}
}
static void
-anjuta_tabber_render_tab (GtkWidget* widget,
- GtkWidget* tab,
- cairo_t* cr,
- gboolean current,
- GtkRegionFlags region_flags)
+anjuta_tabber_draw_tab (AnjutaTabber* tabber, cairo_t* cr, GList* child)
{
- AnjutaTabber* tabber = ANJUTA_TABBER (widget);
- GtkAllocation alloc;
- GtkAllocation widget_alloc;
+ GtkWidget* widget = GTK_WIDGET (tabber);
+ GtkWidget* tab = GTK_WIDGET (child->data);
+ gboolean current;
gint focus_width;
+ gint focus_pad;
gint tab_curvature;
gint tab_overlap;
+ gint focus_space;
gint tab_begin;
gint tab_end;
- gint xpadding;
- gint ypadding;
+ GtkStateFlags state;
+ GtkRegionFlags region_flags;
+ GtkBorder tab_padding;
+ GtkAllocation alloc;
+ GtkAllocation widget_alloc;
+
GtkStyleContext* context = gtk_widget_get_style_context (widget);
- if (current)
- gtk_widget_set_state_flags (tab, GTK_STATE_FLAG_ACTIVE, TRUE);
- else
- gtk_widget_unset_state_flags (tab, GTK_STATE_FLAG_ACTIVE);
-
+ current = g_list_position (tabber->priv->children, child) == tabber->priv->active_page;
+
gtk_widget_style_get (widget,
"focus-line-width", &focus_width,
+ "focus-padding", &focus_pad,
"tab-curvature", &tab_curvature,
"tab-overlap", &tab_overlap,
NULL);
- /* Get border/padding for tab */
+ focus_space = focus_pad + focus_width;
+
+ /* Get border/padding for tab */
gtk_style_context_save (context);
- gtk_style_context_add_class (context, GTK_STYLE_CLASS_NOTEBOOK);
- gtk_style_context_add_region (context, GTK_STYLE_REGION_TAB,
- region_flags);
- if (current)
- gtk_style_context_set_state (context, GTK_STATE_FLAG_ACTIVE);
- if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
- gtk_style_context_set_junction_sides (context,
- GTK_JUNCTION_CORNER_TOPLEFT);
- else
- gtk_style_context_set_junction_sides (context,
- GTK_JUNCTION_CORNER_TOPRIGHT);
-
+ anjuta_tabber_setup_style_context (tabber, context, child, &state, ®ion_flags);
+ gtk_style_context_get_padding (context, state, &tab_padding);
+
gtk_widget_get_allocation (widget, &widget_alloc);
gtk_widget_get_allocation (tab, &alloc);
- xpadding = focus_width + tabber->priv->tab_hborder;
- ypadding = focus_width + tabber->priv->tab_vborder;
-
tab_begin = tab_curvature - tab_overlap;
tab_end = tab_curvature - tab_overlap;
@@ -432,11 +551,12 @@
alloc.x -= widget_alloc.x;
alloc.x -= tab_begin;
- alloc.x -= xpadding;
+ alloc.x -= focus_space + tab_padding.left;
alloc.y -= widget_alloc.y;
- alloc.y -= ypadding;
- alloc.width += 2 * (xpadding) + tab_begin + tab_end;
- alloc.height += 2 * ypadding;
+ alloc.y -= focus_space + tab_padding.top;
+ alloc.width += 2 * focus_space + tab_padding.left + tab_padding.right
+ + tab_begin + tab_end;
+ alloc.height += 2 * focus_space + tab_padding.top + tab_padding.bottom;
gtk_render_extension (context,
cr,
@@ -454,47 +574,15 @@
gtk_widget_get_allocation (tab, &allocation);
gtk_render_focus (context, cr,
- allocation.x - focus_width,
- allocation.y - focus_width,
- allocation.width + 2 * focus_width,
- allocation.height + 2 * focus_width);
+ allocation.x - focus_space,
+ allocation.y - focus_space,
+ allocation.width + 2 * focus_space,
+ allocation.height + 2 * focus_space);
}
gtk_style_context_restore (context);
}
-static GtkRegionFlags
-anjuta_tabber_get_region_flags (gint page_num, gboolean is_last)
-{
- GtkRegionFlags flags = 0;
- if ((page_num) % 2 == 0)
- flags |= GTK_REGION_EVEN;
- else
- flags |= GTK_REGION_ODD;
-
- if (page_num == 0)
- flags |= GTK_REGION_FIRST;
-
- if (is_last)
- flags |= GTK_REGION_LAST;
-
- return flags;
-}
-
-static void
-anjuta_tabber_draw_tab (AnjutaTabber* tabber,
- cairo_t* cr,
- GList* child,
- gboolean current)
-{
- GtkWidget* tab = GTK_WIDGET (child->data);
- gint nth = g_list_index (tabber->priv->children,
- child->data) + 1;
- gboolean last = (child->next == NULL);
- anjuta_tabber_render_tab (GTK_WIDGET (tabber), tab, cr, current,
- anjuta_tabber_get_region_flags (nth, last));
-}
-
static gboolean
anjuta_tabber_draw (GtkWidget* widget, cairo_t* cr)
{
@@ -510,27 +598,29 @@
return TRUE;
current_tab = g_list_nth (tabber->priv->children, tabber->priv->active_page);
-
+
+ /* Draw the current tab last since it overlaps the others */
for (child = tabber->priv->children; child != current_tab; child = g_list_next (child))
{
- anjuta_tabber_draw_tab (tabber, cr, child, FALSE);
+ anjuta_tabber_draw_tab (tabber, cr, child);
}
for (child = g_list_last (tabber->priv->children); child != current_tab; child = g_list_previous (child))
{
- anjuta_tabber_draw_tab (tabber, cr, child, FALSE);
- }
- anjuta_tabber_draw_tab (tabber, cr, current_tab, TRUE);
+ anjuta_tabber_draw_tab (tabber, cr, child);
+ }
+ anjuta_tabber_draw_tab (tabber, cr, current_tab);
+
return GTK_WIDGET_CLASS (anjuta_tabber_parent_class)->draw (widget, cr);
}
/**
- * anjuta_tabber_get_widget_coordintes
+ * anjuta_tabber_get_widget_coordinates:
* @widget: widget for the coordinates
* @event: event to get coordinates from
* @x: return location for x coordinate
* @y: return location for y coordinate
*
- * Returns: TRUE if coordinates were set, FALSE otherwise
+ * Returns: %TRUE if coordinates were set, %FALSE otherwise
*/
static gboolean
anjuta_tabber_get_widget_coordinates (GtkWidget *widget,
@@ -624,8 +714,6 @@
tabber->priv->event_window = gdk_window_new (gtk_widget_get_parent_window (widget),
&attributes, GDK_WA_X | GDK_WA_Y);
gdk_window_set_user_data (tabber->priv->event_window, tabber);
-
- gtk_widget_style_attach (widget);
}
static void
@@ -714,6 +802,28 @@
}
}
+static GtkWidgetPath*
+anjuta_tabber_get_path_for_child (GtkContainer* container,
+ GtkWidget* widget)
+{
+ AnjutaTabber* tabber = ANJUTA_TABBER (container);
+
+ GtkWidgetPath* path;
+ gint page_num;;
+ gint tabber_pos;
+
+ path = GTK_CONTAINER_CLASS (anjuta_tabber_parent_class)->get_path_for_child (container, widget);
+
+ page_num = g_list_index (tabber->priv->children, widget);
+ if (page_num == -1)
+ return path;
+
+ tabber_pos = gtk_widget_path_length (path) - 2;
+ gtk_widget_path_iter_add_region (path, tabber_pos, GTK_STYLE_REGION_TAB,
+ anjuta_tabber_get_region_flags (tabber, page_num));
+ return path;
+}
+
static void
anjuta_tabber_class_init (AnjutaTabberClass *klass)
{
@@ -739,6 +849,7 @@
container_class->add = anjuta_tabber_add;
container_class->remove = anjuta_tabber_remove;
container_class->forall = anjuta_tabber_forall;
+ container_class->get_path_for_child = anjuta_tabber_get_path_for_child;
g_object_class_install_property (object_class,
PROP_NOTEBOOK,
diff -Nru anjuta-3.8.4/libanjuta/anjuta-token-file.c anjuta-3.10.2/libanjuta/anjuta-token-file.c
--- anjuta-3.8.4/libanjuta/anjuta-token-file.c 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-token-file.c 2013-07-08 21:06:37.000000000 +0000
@@ -251,7 +251,7 @@
* Update the file with all changed token starting from @token. The function can
* return an error if the token is not in the file.
*
- * Return value: TRUE is the update is done without error.
+ * Return value: %TRUE is the update is done without error.
*/
gboolean
anjuta_token_file_update (AnjutaTokenFile *file, AnjutaToken *token)
diff -Nru anjuta-3.8.4/libanjuta/anjuta-token-list.c anjuta-3.10.2/libanjuta/anjuta-token-list.c
--- anjuta-3.8.4/libanjuta/anjuta-token-list.c 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-token-list.c 2013-07-08 21:06:37.000000000 +0000
@@ -331,7 +331,7 @@
* Get the first word of the list. A word is an item in the list which is not
* a space or a separator.
*
- * Return value: A #AnjutaToken representing the first word or NULL.
+ * Return value: A #AnjutaToken representing the first word or %NULL.
*/
AnjutaToken *
anjuta_token_first_word (AnjutaToken *list)
diff -Nru anjuta-3.8.4/libanjuta/anjuta-token-stream.c anjuta-3.10.2/libanjuta/anjuta-token-stream.c
--- anjuta-3.8.4/libanjuta/anjuta-token-stream.c 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-token-stream.c 2013-07-08 21:06:37.000000000 +0000
@@ -259,7 +259,7 @@
*
* Return the root token for the output stream.
*
- * Return value: The output root token.
+ * Return value: (transfer none): The output root token.
*/
AnjutaToken*
anjuta_token_stream_get_root (AnjutaTokenStream *stream)
@@ -275,7 +275,7 @@
*
* Return the current directory.
*
- * Return value: The current directory.
+ * Return value: (transfer none): The current directory.
*/
GFile*
anjuta_token_stream_get_current_directory (AnjutaTokenStream *stream)
@@ -292,7 +292,7 @@
*
* Return the current file.
*
- * Return value: The current file.
+ * Return value: (transfer none): The current file.
*/
GFile*
anjuta_token_stream_get_current_file (AnjutaTokenStream *stream)
@@ -307,9 +307,10 @@
/**
* anjuta_token_stream_push:
- * @parent: a parent #AnjutaTokenStream object or NULL.
- * @root: a token or NULL
+ * @parent: (allow-none): a parent #AnjutaTokenStream object or %NULL.
+ * @root: (allow-none): a token or %NULL
* @content: a token list.
+ * @file: (allow-none): a #GFile of the file.
*
* Create a new stream from a list of tokens. If a parent stream is passed,
* the new stream keep a link on it, so we can return it when the new stream
@@ -361,7 +362,7 @@
*
* Destroy the stream object and return the parent stream if it exists.
*
- * Return value: The parent stream or NULL if there is no parent.
+ * Return value: (transfer none) (allow-none): The parent stream or %NULL if there is no parent.
*/
AnjutaTokenStream *
anjuta_token_stream_pop (AnjutaTokenStream *stream)
@@ -384,7 +385,8 @@
*
* Return the parent stream
*
- * Return value: The parent stream or NULL if there is no parent.
+ * Return value: (transfer none) (allow-none): The parent stream or %NULL if
+ * there is no parent.
*/
AnjutaTokenStream *
anjuta_token_stream_get_parent (AnjutaTokenStream *stream)
diff -Nru anjuta-3.8.4/libanjuta/anjuta-token-stream.h anjuta-3.10.2/libanjuta/anjuta-token-stream.h
--- anjuta-3.8.4/libanjuta/anjuta-token-stream.h 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-token-stream.h 2013-07-08 21:06:37.000000000 +0000
@@ -28,7 +28,7 @@
typedef struct _AnjutaTokenStream AnjutaTokenStream;
-AnjutaTokenStream *anjuta_token_stream_push (AnjutaTokenStream *stream, AnjutaToken *root, AnjutaToken *content, GFile *filename);
+AnjutaTokenStream *anjuta_token_stream_push (AnjutaTokenStream *parent, AnjutaToken *root, AnjutaToken *content, GFile *file);
AnjutaTokenStream *anjuta_token_stream_pop (AnjutaTokenStream *stream);
AnjutaTokenStream *anjuta_token_stream_get_parent (AnjutaTokenStream *stream);
diff -Nru anjuta-3.8.4/libanjuta/anjuta-tree-combo.c anjuta-3.10.2/libanjuta/anjuta-tree-combo.c
--- anjuta-3.8.4/libanjuta/anjuta-tree-combo.c 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-tree-combo.c 2013-07-08 21:06:37.000000000 +0000
@@ -1061,8 +1061,6 @@
priv->valid_func = NULL;
priv->valid_destroy = NULL;
- gtk_widget_push_composite_child ();
-
gtk_widget_set_halign (GTK_WIDGET (combo), GTK_ALIGN_FILL);
gtk_widget_show (GTK_WIDGET (combo));
@@ -1110,8 +1108,6 @@
gtk_box_pack_start (GTK_BOX (box), arrow, FALSE, FALSE, 0);
gtk_widget_show (arrow);
- gtk_widget_pop_composite_child ();
-
gtk_widget_show_all (GTK_WIDGET (combo));
anjuta_tree_combo_box_popup_setup (combo);
diff -Nru anjuta-3.8.4/libanjuta/anjuta-ui.c anjuta-3.10.2/libanjuta/anjuta-ui.c
--- anjuta-3.8.4/libanjuta/anjuta-ui.c 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-ui.c 2013-07-08 21:06:37.000000000 +0000
@@ -470,8 +470,7 @@
{
GtkWidget *dummy = gtk_label_new ("Dummy");
g_object_ref_sink(G_OBJECT(dummy));
- pixbuf = gtk_widget_render_icon (dummy, icon,
- GTK_ICON_SIZE_MENU, NULL);
+ pixbuf = gtk_widget_render_icon_pixbuf (dummy, icon, GTK_ICON_SIZE_MENU);
}
gtk_tree_store_set (GTK_TREE_STORE (model), iter,
COLUMN_PIXBUF, pixbuf,
@@ -1009,7 +1008,7 @@
* @ui: A #AnjutaUI object.
* @action_group_name: Untranslated name of the action group.
* @action_group_label: Translated label of the action group.
- * @entries: An array of action entries.
+ * @entries: (array length=num_entries): An array of action entries.
* @num_entries: Number of elements in the action entries array.
* @can_customize: If true the actions are customizable by user.
* @translation_domain: The translation domain used to translated the entries.
@@ -1028,7 +1027,8 @@
* @action_group_label is used as the display name for the action group in
* UI manager dialog where action shortcuts are configured.
*
- * Return value: A #GtkActionGroup object holding all the action objects.
+ * Return value: (transfer none): A #GtkActionGroup object holding all the
+ * action objects.
*/
GtkActionGroup*
anjuta_ui_add_action_group_entries (AnjutaUI *ui,
@@ -1062,7 +1062,7 @@
* @ui: A #AnjutaUI object.
* @action_group_name: Untranslated name of the action group.
* @action_group_label: Translated label of the action group.
- * @entries: An array of action entries.
+ * @entries: (array length=num_entries): An array of action entries.
* @num_entries: Number of elements in the action entries array.
* @translation_domain: The translation domain used to translated the entries.
* It is usually the GETTEXT_PACKAGE macro in a project.
@@ -1072,7 +1072,8 @@
* This is similar to anjuta_ui_add_action_group_entries(), except that
* it adds #GtkToggleAction objects after creating them from the @entries.
*
- * Return value: A #GtkActionGroup object holding all the action objects.
+ * Return value: (transfer none): A #GtkActionGroup object holding all the
+ * action objects.
*/
GtkActionGroup*
anjuta_ui_add_toggle_action_group_entries (AnjutaUI *ui,
@@ -1105,7 +1106,7 @@
* @ui: A #AnjutaUI object.
* @action_group_name: Untranslated name of the action group.
* @action_group_label: Translated label of the action group.
- * @action_group: #GtkActionGroup object to add.
+ * @action_group: (transfer full): #GtkActionGroup object to add.
*
* This is similar to anjuta_ui_add_action_group_entries(), except that
* it adds #GtkActionGroup object @action_group directly. All actions in this
@@ -1212,7 +1213,7 @@
* Note that it will be only sucessully returned if the group has been added
* using methods in #AnjutaUI.
*
- * Returns: A #GtkAction object
+ * Returns: (transfer none): A #GtkAction object
*/
GtkAction*
anjuta_ui_get_action (AnjutaUI *ui, const gchar *action_group_name,
@@ -1355,7 +1356,7 @@
*
* Returns the #GtkAccelGroup object associated with this UI manager.
*
- * Returns: A #GtkAccelGroup object.
+ * Returns: (transfer none): A #GtkAccelGroup object.
*/
GtkAccelGroup*
anjuta_ui_get_accel_group (AnjutaUI *ui)
@@ -1371,7 +1372,7 @@
* Creates an accel editor widget and returns it. It should be added to
* container and displayed to users.
*
- * Returns: a #GtkWidget containing the editor.
+ * Returns: (transfer none): a #GtkWidget containing the editor.
*/
GtkWidget *
anjuta_ui_get_accel_editor (AnjutaUI *ui)
@@ -1471,7 +1472,7 @@
* this icon factory. Read the documentation for #GtkIconFactory on how to
* use it.
*
- * Return value: The #GtkIconFactory object used by it
+ * Return value: (transfer none): The #GtkIconFactory object used by it
*/
GtkIconFactory*
anjuta_ui_get_icon_factory (AnjutaUI *ui)
diff -Nru anjuta-3.8.4/libanjuta/anjuta-utils.c anjuta-3.10.2/libanjuta/anjuta-utils.c
--- anjuta-3.8.4/libanjuta/anjuta-utils.c 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-utils.c 2013-07-08 21:06:37.000000000 +0000
@@ -40,14 +40,10 @@
#include
#include
#include
-#include
#include
#include
#include
#include
-#ifndef G_OS_WIN32
-#include
-#endif
#include
#include
@@ -55,12 +51,21 @@
#include
#include
+#ifndef G_OS_WIN32
+#include
+#else
+#define WIN32_MEAN_AND_LEAN
+#include
+#endif
+
#include
#include
#include
#define FILE_BUFFER_SIZE 1024
+static gchar *anjuta_prefix = "anjuta";
+
static void
anjuta_util_from_file_to_file (GInputStream *istream,
GOutputStream *ostream)
@@ -108,11 +113,11 @@
* anjuta_util_copy_file:
* @src: the file where copy
* @dest: the path to copy the @src
- * @show_error: TRUE to show a dialog error
+ * @show_error: %TRUE to show a dialog error
*
* Copies @src to @dest and shows a dialog error in case is needed.
*
- * Returns: TRUE if there was an error copying the file.
+ * Returns: %TRUE if there was an error copying the file.
*/
gboolean
anjuta_util_copy_file (const gchar * src, const gchar * dest, gboolean show_error)
@@ -582,7 +587,7 @@
}
- if (WIFEXITED (exit_status) && WEXITSTATUS (exit_status) == 0)
+ if (g_spawn_check_exit_status (exit_status, NULL))
return TRUE;
if (show)
@@ -761,7 +766,8 @@
if (path != NULL)
{
gchar *result;
-#ifdef PATH_MAX
+#ifndef G_OS_WIN32
+# ifdef PATH_MAX
gchar buf[PATH_MAX+1];
result = realpath (path, buf);
@@ -770,7 +776,7 @@
*(buf + PATH_MAX) = '\0'; /* ensure a terminator */
return g_strdup (buf);
}
-#else
+# else
char *buf;
/* the string returned by realpath should be cleaned with
free(), not g_free() */
@@ -781,6 +787,32 @@
free (buf);
return result;
}
+# endif
+#else
+ char dummy;
+ int rc, len;
+
+ /* Get length of path */
+ rc = GetFullPathName (path, 1, &dummy, NULL);
+ if (rc == 0)
+ {
+ /* Weird failure */
+ return g_strdup (path);
+ }
+
+ len = rc + 1;
+ result = g_malloc (len);
+
+ /* Get the real path */
+ rc = GetFullPathName (path, len, result, NULL);
+ if (rc == 0 || rc > len)
+ {
+ /* Another weird failure */
+ g_free (result);
+ return g_strdup (path);
+ }
+
+ return result;
#endif
}
return NULL;
@@ -838,13 +870,12 @@
/**
* anjuta_util_file_new_for_commandline_arg:
- *
* @arg: URI or relative or absolute file path
*
* Create a new file corresponding to arg, unlike g_file_new_for_commandline_arg,
* keeps symbolic links in path name.
*
- * Returns: A new GFile object
+ * Returns: (transfer full): A new GFile object
*/
GFile *
anjuta_util_file_new_for_commandline_arg (const gchar *arg)
@@ -1124,17 +1155,14 @@
*
* Retrieves the user's preferred terminal.
*
- * Returns: A newly allocated strings list. The first argument is the terminal
- * program name. The following are the arguments needed to execute
- * a command. The list has to be freed with g_strfreev
+ * Returns: (transfer full): A newly allocated strings list. The first argument
+ * is the terminal program name. The following are the arguments needed to
+ * execute a command. The list has to be freed with g_strfreev
*/
/* copied from deprecated gnome_execute_terminal in libgnome */
gchar **
anjuta_util_user_terminal (void)
{
-/* FIXME: GSettings */
-#if 0
- GConfClient *client;
gchar *terminal = NULL;
gchar **argv = NULL;
static const gchar *terms[] = {
@@ -1148,22 +1176,22 @@
NULL
};
const gchar **term;
+ GSettingsSchema *schema;
- client = gconf_client_get_default ();
- terminal = gconf_client_get_string (client, "/desktop/gnome/applications/terminal/exec", NULL);
- g_object_unref (client);
+ schema = g_settings_schema_source_lookup (g_settings_schema_source_get_default (),
+ "org.gnome.desktop.default-applications.terminal",
+ TRUE);
- if (terminal)
+ if (schema)
{
- gchar *command_line;
- gchar *exec_flag;
+ GSettings *settings = g_settings_new ("org.gnome.desktop.default-applications.terminal");
- exec_flag = gconf_client_get_string (client, "/desktop/gnome/applications/terminal/exec_arg", NULL);
- command_line = g_strconcat (terminal, " ", exec_flag, NULL);
+ argv = g_new0 (gchar *, 3);
+ argv[0] = g_settings_get_string (settings, "exec");
+ argv[1] = g_settings_get_string (settings, "exec-arg");
- g_shell_parse_argv (command_line, NULL, &argv, NULL);
- g_free (terminal);
- g_free (exec_flag);
+ g_settings_schema_unref (schema);
+ g_object_unref (settings);
return argv;
}
@@ -1188,68 +1216,102 @@
argv[1] = g_strdup (term == &terms[2] ? "-x" : "-e");
return argv;
-#else
- g_warning ("anjuta_util_user_terminal: Not implemented");
- return NULL;
-#endif
}
-pid_t
+static void
+close_pid (GPid pid,
+ gint status,
+ gpointer user_data)
+{
+ g_spawn_close_pid (pid);
+}
+
+GPid
anjuta_util_execute_shell (const gchar *dir, const gchar *command)
{
- pid_t pid;
- gchar *shell;
+ GPid pid;
+ gchar **argv;
+ GError *error = NULL;
g_return_val_if_fail (command != NULL, -1);
- shell = anjuta_util_user_shell ();
- pid = fork();
- if (pid == 0)
+ argv = g_new0 (gchar *, 4);
+
+ argv[0] = anjuta_util_user_shell ();
+#ifndef G_OS_WIN32
+ argv[1] = g_strdup ("-c");
+#else
+ argv[2] = g_strdup ("/C");
+#endif
+ argv[3] = g_strdup (command);
+
+ if (dir)
+ anjuta_util_create_dir (dir);
+
+ if (!g_spawn_async (dir, argv, NULL,
+ G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
+ NULL, NULL, &pid, &error))
{
- if(dir)
- {
- anjuta_util_create_dir (dir);
- chdir (dir);
- }
- execlp (shell, shell, "-c", command, NULL);
- g_warning (_("Cannot execute command: %s (using shell %s)\n"), command, shell);
- _exit(1);
+ g_warning (_("Cannot execute command: %s (using shell %s): %s\n"),
+ command, argv[0], error->message);
+ pid = 0;
}
- if (pid < 0)
- g_warning (_("Cannot execute command: %s (using shell %s)\n"), command, shell);
- g_free (shell);
+
+ g_child_watch_add (pid, close_pid, NULL);
+
+ g_strfreev (argv);
// Anjuta will take care of child exit automatically.
return pid;
}
-pid_t
+GPid
anjuta_util_execute_terminal_shell (const gchar *dir, const gchar *command)
{
- pid_t pid;
+ GPid pid;
gchar *shell;
gchar **term_argv;
+ gchar **argv;
+ gint i;
+ GError *error = NULL;
g_return_val_if_fail (command != NULL, -1);
shell = anjuta_util_user_shell ();
term_argv = anjuta_util_user_terminal ();
- pid = fork();
- if (pid == 0)
+ argv = g_new0 (gchar *, g_strv_length (term_argv) + 4);
+
+ i = 0;
+ if (term_argv)
{
- if(dir)
- {
- anjuta_util_create_dir (dir);
- chdir (dir);
- }
- execlp (term_argv[0], term_argv[0], term_argv[1], shell, "-c", command, NULL);
- g_warning (_("Cannot execute command: %s (using shell %s)\n"), command, shell);
- _exit(1);
- }
- if (pid < 0)
- g_warning (_("Cannot execute command: %s (using shell %s)\n"), command, shell);
- g_free (shell);
- g_strfreev (term_argv);
+ for (; term_argv [i]; i++)
+ argv[i] = term_argv[i];
+ }
+
+ argv[i++] = shell;
+#ifndef G_OS_WIN32
+ argv[i++] = g_strdup ("-c");
+#else
+ argv[i++] = g_strdup ("/C");
+#endif
+ argv[i++] = g_strdup (command);
+
+ if (dir)
+ anjuta_util_create_dir (dir);
+
+ if (!g_spawn_async (dir, argv, NULL,
+ G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
+ NULL, NULL, &pid, &error))
+ {
+ g_warning (_("Cannot execute command: %s (using shell %s): %s\n"),
+ command, shell, error->message);
+ pid = 0;
+ }
+
+ g_child_watch_add (pid, close_pid, NULL);
+
+ g_strfreev (argv);
+ g_free (term_argv);
// Anjuta will take care of child exit automatically.
return pid;
@@ -1337,6 +1399,15 @@
return FALSE;
}
+/**
+ * anjuta_util_parse_args_from_string:
+ * @string: arguments
+ *
+ * Parse arguments from a string to a GList.
+ *
+ * Returns: (element-type utf8) (transfer full): A newly allocated GList of
+ * strings.
+ */
GList*
anjuta_util_parse_args_from_string (const gchar* string)
{
@@ -1512,12 +1583,12 @@
* anjuta_util_is_project_file:
* @filename: the file name
*
- * Return TRUE if the file is an anjuta project file. It is implemented by
+ * Return %TRUE if the file is an anjuta project file. It is implemented by
* checking only the file extension. So it does not check the existence
* of the file. But it is working on an URI if it does not containt a
* fragment.
*
- * Returns: TRUE if the file is a project file, else FALSE
+ * Returns: %TRUE if the file is a project file, else %FALSE
*/
gboolean
anjuta_util_is_project_file (const gchar *filename)
@@ -1530,12 +1601,12 @@
* anjuta_util_is_template_file:
* @filename: the file name
*
- * Return TRUE if the file is an template project file. It is implemented by
+ * Return %TRUE if the file is an template project file. It is implemented by
* checking only the file extension. So it does not check the existence
* of the file. But it is working on an URI if it does not containt a
* fragment.
*
- * Returns: TRUE if the file is a template file, else FALSE
+ * Returns: %TRUE if the file is a template file, else %FALSE
*/
gboolean
anjuta_util_is_template_file (const gchar *filename)
@@ -1550,8 +1621,8 @@
*
* Return the mime type corresponding to a file infor object.
*
- * Returns: The mime type as a newly allocated string that must be freed with
- * g_free() or %NULL if the mime type cannot be found.
+ * Returns: (transfer full) (allow-none): The mime type as a newly allocated
+ * string that must be freed with g_free() or %NULL if the mime type cannot be found.
*/
gchar *
anjuta_util_get_file_info_mime_type (GFileInfo *info)
@@ -1602,8 +1673,9 @@
*
* Check if a file exists and return its mime type.
*
- * Returns: NULL if the corresponding file doesn't exist or the mime type as a newly
- * allocated string that must be freed with g_free().
+ * Returns: (transfer full) (allow-none): %NULL if the corresponding file doesn't
+ * exist or the mime type as a newly allocated string that must be freed with
+ * g_free().
*/
gchar *
anjuta_util_get_file_mime_type (GFile *file)
@@ -2040,7 +2112,7 @@
*
* Expand environment variables $(var_name) and tilde (~) in the input string.
*
- * Returns: a newly-allocated string that must be freed with g_free().
+ * Returns: (transfer full): a newly-allocated string that must be freed with g_free().
*/
gchar*
anjuta_util_shell_expand (const gchar *string)
@@ -2149,6 +2221,12 @@
*
*/
+void
+anjuta_util_set_anjuta_prefix (const gchar *prefix)
+{
+ anjuta_prefix = g_strdup (prefix);
+}
+
static gchar*
anjuta_util_construct_pathv (const gchar* str, va_list str_list)
{
@@ -2183,7 +2261,6 @@
{
gchar *uri_str, *base_path, *dir;
GFile *uri;
- const gchar anjuta_prefix[] = "anjuta";
base_path = g_build_filename (g_get_user_cache_dir(), anjuta_prefix, path, NULL);
uri_str = anjuta_util_construct_pathv (base_path, list);
@@ -2210,7 +2287,6 @@
{
gchar *uri_str, *base_path, *dir;
GFile *uri;
- const gchar anjuta_prefix[] = "anjuta";
base_path = g_build_filename (g_get_user_config_dir(), anjuta_prefix, path, NULL);
uri_str = anjuta_util_construct_pathv (base_path, list);
@@ -2237,7 +2313,6 @@
{
gchar *uri_str, *base_path, *dir;
GFile *uri;
- const gchar anjuta_prefix[] = "anjuta";
base_path = g_build_filename (g_get_user_data_dir(), anjuta_prefix, path, NULL);
uri_str = anjuta_util_construct_pathv (base_path, list);
@@ -2355,10 +2430,10 @@
/**
* anjuta_util_builder_new:
* @filename: Builder file name to open
- * @error: Optional error object, if NULL display a dialog if the file is missing
+ * @error: Optional error object, if %NULL display a dialog if the file is missing
*
* Create a new GtkBuilder object and load the file in it. Display an error
- * if the file is missing. Use a dialog if error is NULL, just a warning
+ * if the file is missing. Use a dialog if error is %NULL, just a warning
* if the error can be reported.
*
* Returns: The new GtkBuilder object
@@ -2402,13 +2477,13 @@
* @builder: Builder object
* @first_widget: Name of first widget to get
* ...: Address to store the first widget pointer, followed optionally by
- * more name/pointer pairs, followed by NULL
+ * more name/pointer pairs, followed by %NULL
*
* Create a new GtkBuilder object and load the file in it. Display an error
- * if the file is missing. Use a dialog if error is NULL, just a warning
+ * if the file is missing. Use a dialog if error is %NULL, just a warning
* if the error can be reported.
*
- * Returns: TRUE is everything works as expected.
+ * Returns: %TRUE is everything works as expected.
*/
gboolean
anjuta_util_builder_get_objects (GtkBuilder *builder, const gchar *first_widget,...)
@@ -2490,7 +2565,7 @@
*
* Clones the contents of source GPtrArray into a new allocated GPtrArray.
*
- * Return a new allocated GPtrArray with strings g_strdup (), NULL on error.
+ * Return a new allocated GPtrArray with strings g_strdup (), %NULL on error.
* The returned array has set g_free as GDestroyNotity function, so that user
* should only care to g_ptr_array_unref () without freeing the strings.
*/
diff -Nru anjuta-3.8.4/libanjuta/anjuta-utils.h anjuta-3.10.2/libanjuta/anjuta-utils.h
--- anjuta-3.8.4/libanjuta/anjuta-utils.h 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-utils.h 2013-07-08 21:06:37.000000000 +0000
@@ -122,8 +122,8 @@
gboolean anjuta_util_create_dir (const gchar * d);
gchar * anjuta_util_user_shell (void);
gchar ** anjuta_util_user_terminal (void);
-pid_t anjuta_util_execute_shell (const gchar *dir, const gchar *command);
-pid_t anjuta_util_execute_terminal_shell (const gchar *dir, const gchar *command);
+GPid anjuta_util_execute_shell (const gchar *dir, const gchar *command);
+GPid anjuta_util_execute_terminal_shell (const gchar *dir, const gchar *command);
gchar* anjuta_util_escape_quotes (const gchar* str);
@@ -148,6 +148,7 @@
const gchar *item);
/* XDG BaseDir specifcation functions */
+void anjuta_util_set_anjuta_prefix (const gchar* name);
GFile* anjuta_util_get_user_data_file (const gchar* path, ...);
GFile* anjuta_util_get_user_cache_file (const gchar* path, ...);
GFile* anjuta_util_get_user_config_file (const gchar* path, ...);
@@ -218,7 +219,7 @@
&type_info, 0);
/**
- * ANJUTA_TYPE_END
+ * ANJUTA_TYPE_END:
*
* Ends a declaration that began with ANJUTA_TYPE_BEGIN
*/
diff -Nru anjuta-3.8.4/libanjuta/anjuta-version.h anjuta-3.10.2/libanjuta/anjuta-version.h
--- anjuta-3.8.4/libanjuta/anjuta-version.h 2013-06-03 21:24:34.000000000 +0000
+++ anjuta-3.10.2/libanjuta/anjuta-version.h 2013-11-14 21:21:27.000000000 +0000
@@ -40,21 +40,21 @@
*
* Anjuta minor version component (e.g. 2 if %LIBANJUTA_VERSION is 1.2.3)
*/
-#define LIBANJUTA_MINOR_VERSION (8)
+#define LIBANJUTA_MINOR_VERSION (10)
/**
* LIBANJUTA_MICRO_VERSION:
*
* Anjuta micro version component (e.g. 3 if %LIBANJUTA_VERSION is 1.2.3)
*/
-#define LIBANJUTA_MICRO_VERSION (4)
+#define LIBANJUTA_MICRO_VERSION (2)
/**
* LIBANJUTA_VERSION
*
* Anjuta version.
*/
-#define LIBANJUTA_VERSION (3.8.4)
+#define LIBANJUTA_VERSION (3.10.2)
/**
* LIBANJUTA_VERSION_S:
@@ -62,7 +62,7 @@
* Anjuta version, encoded as a string, useful for printing and
* concatenation.
*/
-#define LIBANJUTA_VERSION_S "3.8.4"
+#define LIBANJUTA_VERSION_S "3.10.2"
/**
* LIBANJUTA_VERSION_HEX:
diff -Nru anjuta-3.8.4/libanjuta/interfaces/Makefile.am.gir anjuta-3.10.2/libanjuta/interfaces/Makefile.am.gir
--- anjuta-3.8.4/libanjuta/interfaces/Makefile.am.gir 2012-09-26 20:54:13.000000000 +0000
+++ anjuta-3.10.2/libanjuta/interfaces/Makefile.am.gir 2013-11-14 20:43:39.000000000 +0000
@@ -33,6 +33,7 @@
interfaces/ianjuta-file-loader.c\
interfaces/ianjuta-file-manager.c\
interfaces/ianjuta-file-savable.c\
+ interfaces/ianjuta-glade.c\
interfaces/ianjuta-help.c\
interfaces/ianjuta-indenter.c\
interfaces/ianjuta-indicable.c\
@@ -99,6 +100,7 @@
interfaces/ianjuta-file-loader.h\
interfaces/ianjuta-file-manager.h\
interfaces/ianjuta-file-savable.h\
+ interfaces/ianjuta-glade.h\
interfaces/ianjuta-help.h\
interfaces/ianjuta-indenter.h\
interfaces/ianjuta-indicable.h\
diff -Nru anjuta-3.8.4/libanjuta/interfaces/Makefile.am.iface anjuta-3.10.2/libanjuta/interfaces/Makefile.am.iface
--- anjuta-3.8.4/libanjuta/interfaces/Makefile.am.iface 2012-09-26 20:54:13.000000000 +0000
+++ anjuta-3.10.2/libanjuta/interfaces/Makefile.am.iface 2013-11-14 20:43:39.000000000 +0000
@@ -33,6 +33,7 @@
ianjuta-file-loader.c\
ianjuta-file-manager.c\
ianjuta-file-savable.c\
+ ianjuta-glade.c\
ianjuta-help.c\
ianjuta-indenter.c\
ianjuta-indicable.c\
@@ -99,6 +100,7 @@
ianjuta-file-loader.h\
ianjuta-file-manager.h\
ianjuta-file-savable.h\
+ ianjuta-glade.h\
ianjuta-help.h\
ianjuta-indenter.h\
ianjuta-indicable.h\
diff -Nru anjuta-3.8.4/libanjuta/interfaces/Makefile.in anjuta-3.10.2/libanjuta/interfaces/Makefile.in
--- anjuta-3.8.4/libanjuta/interfaces/Makefile.in 2013-06-03 21:24:28.000000000 +0000
+++ anjuta-3.10.2/libanjuta/interfaces/Makefile.in 2013-11-14 21:21:10.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -17,23 +16,51 @@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
esac; \
- test $$am__dry = yes; \
- }
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -52,9 +79,9 @@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-DIST_COMMON = $(idl_HEADERS) $(libanjuta_interfaces_include_HEADERS) \
- $(srcdir)/Makefile.am $(srcdir)/Makefile.am.iface \
- $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.am.iface $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am $(top_srcdir)/depcomp $(idl_HEADERS) \
+ $(libanjuta_interfaces_include_HEADERS)
subdir = libanjuta/interfaces
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
@@ -94,25 +121,39 @@
ianjuta-editor-view.lo ianjuta-editor-zoom.lo \
ianjuta-environment.lo ianjuta-file.lo ianjuta-file-loader.lo \
ianjuta-file-manager.lo ianjuta-file-savable.lo \
- ianjuta-help.lo ianjuta-indenter.lo ianjuta-indicable.lo \
- ianjuta-iterable.lo ianjuta-iterable-tree.lo \
- ianjuta-language.lo ianjuta-language-provider.lo \
- ianjuta-loader.lo ianjuta-markable.lo \
- ianjuta-message-manager.lo ianjuta-message-view.lo \
- ianjuta-plugin-factory.lo ianjuta-preferences.lo \
- ianjuta-print.lo ianjuta-project.lo ianjuta-project-backend.lo \
- ianjuta-project-chooser.lo ianjuta-project-manager.lo \
- ianjuta-provider.lo ianjuta-snippets-manager.lo \
- ianjuta-stream.lo ianjuta-stream-loader.lo \
- ianjuta-stream-savable.lo ianjuta-symbol.lo \
- ianjuta-symbol-manager.lo ianjuta-symbol-query.lo \
- ianjuta-terminal.lo ianjuta-todo.lo ianjuta-vcs.lo \
- ianjuta-wizard.lo libanjuta-iface-marshallers.lo
+ ianjuta-glade.lo ianjuta-help.lo ianjuta-indenter.lo \
+ ianjuta-indicable.lo ianjuta-iterable.lo \
+ ianjuta-iterable-tree.lo ianjuta-language.lo \
+ ianjuta-language-provider.lo ianjuta-loader.lo \
+ ianjuta-markable.lo ianjuta-message-manager.lo \
+ ianjuta-message-view.lo ianjuta-plugin-factory.lo \
+ ianjuta-preferences.lo ianjuta-print.lo ianjuta-project.lo \
+ ianjuta-project-backend.lo ianjuta-project-chooser.lo \
+ ianjuta-project-manager.lo ianjuta-provider.lo \
+ ianjuta-snippets-manager.lo ianjuta-stream.lo \
+ ianjuta-stream-loader.lo ianjuta-stream-savable.lo \
+ ianjuta-symbol.lo ianjuta-symbol-manager.lo \
+ ianjuta-symbol-query.lo ianjuta-terminal.lo ianjuta-todo.lo \
+ ianjuta-vcs.lo ianjuta-wizard.lo \
+ libanjuta-iface-marshallers.lo
libanjuta_interfaces_la_OBJECTS = \
$(am_libanjuta_interfaces_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
+am__v_lt_1 =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -125,20 +166,16 @@
$(AM_CFLAGS) $(CFLAGS)
AM_V_CC = $(am__v_CC_@AM_V@)
am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo " CC " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 =
CCLD = $(CC)
LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo " CCLD " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 =
SOURCES = $(libanjuta_interfaces_la_SOURCES)
DIST_SOURCES = $(libanjuta_interfaces_la_SOURCES)
am__can_run_installinfo = \
@@ -176,6 +213,23 @@
am__installdirs = "$(DESTDIR)$(idldir)" \
"$(DESTDIR)$(libanjuta_interfaces_includedir)"
HEADERS = $(idl_HEADERS) $(libanjuta_interfaces_include_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -326,6 +380,8 @@
PLUGIN_DEVHELP_LIBS = @PLUGIN_DEVHELP_LIBS@
PLUGIN_GLADE_CFLAGS = @PLUGIN_GLADE_CFLAGS@
PLUGIN_GLADE_LIBS = @PLUGIN_GLADE_LIBS@
+PLUGIN_TERMINAL_CFLAGS = @PLUGIN_TERMINAL_CFLAGS@
+PLUGIN_TERMINAL_LIBS = @PLUGIN_TERMINAL_LIBS@
POSUB = @POSUB@
PREF_SUFFIX = @PREF_SUFFIX@
PYTHON = @PYTHON@
@@ -340,8 +396,11 @@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+SHM_LIBS = @SHM_LIBS@
SOURCEVIEW_CFLAGS = @SOURCEVIEW_CFLAGS@
SOURCEVIEW_LIBS = @SOURCEVIEW_LIBS@
+SQLITE_CFLAGS = @SQLITE_CFLAGS@
+SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
SVNCONFIG = @SVNCONFIG@
SVN_CFLAGS = @SVN_CFLAGS@
@@ -353,8 +412,6 @@
VALA_CFLAGS = @VALA_CFLAGS@
VALA_LIBS = @VALA_LIBS@
VERSION = @VERSION@
-VTE_CFLAGS = @VTE_CFLAGS@
-VTE_LIBS = @VTE_LIBS@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
@@ -465,6 +522,7 @@
ianjuta-file-loader.c\
ianjuta-file-manager.c\
ianjuta-file-savable.c\
+ ianjuta-glade.c\
ianjuta-help.c\
ianjuta-indenter.c\
ianjuta-indicable.c\
@@ -532,6 +590,7 @@
ianjuta-file-loader.h\
ianjuta-file-manager.h\
ianjuta-file-savable.h\
+ ianjuta-glade.h\
ianjuta-help.h\
ianjuta-indenter.h\
ianjuta-indicable.h\
@@ -637,12 +696,15 @@
clean-noinstLTLIBRARIES:
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
- @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(noinst_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
libanjuta-interfaces.la: $(libanjuta_interfaces_la_OBJECTS) $(libanjuta_interfaces_la_DEPENDENCIES) $(EXTRA_libanjuta_interfaces_la_DEPENDENCIES)
$(AM_V_CCLD)$(LINK) $(libanjuta_interfaces_la_OBJECTS) $(libanjuta_interfaces_la_LIBADD) $(LIBS)
@@ -686,6 +748,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ianjuta-file-manager.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ianjuta-file-savable.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ianjuta-file.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ianjuta-glade.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ianjuta-help.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ianjuta-indenter.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ianjuta-indicable.Plo@am__quote@
@@ -787,26 +850,15 @@
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(libanjuta_interfaces_includedir)'; $(am__uninstall_files_from_dir)
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@ -818,15 +870,11 @@
$$unique; \
fi; \
fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@ -835,6 +883,21 @@
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -985,20 +1048,21 @@
.MAKE: all check install install-am install-strip
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-noinstLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-idlHEADERS install-info \
- install-info-am install-libanjuta_interfaces_includeHEADERS \
- install-man install-pdf install-pdf-am install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
- uninstall-am uninstall-idlHEADERS \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am \
+ install-idlHEADERS install-info install-info-am \
+ install-libanjuta_interfaces_includeHEADERS install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-idlHEADERS \
uninstall-libanjuta_interfaces_includeHEADERS
diff -Nru anjuta-3.8.4/libanjuta/interfaces/ianjuta-builder.h anjuta-3.10.2/libanjuta/interfaces/ianjuta-builder.h
--- anjuta-3.8.4/libanjuta/interfaces/ianjuta-builder.h 2013-06-03 21:24:37.000000000 +0000
+++ anjuta-3.10.2/libanjuta/interfaces/ianjuta-builder.h 2013-11-14 20:43:39.000000000 +0000
@@ -34,7 +34,7 @@
#define IANJUTA_BUILDER_ERROR ianjuta_builder_error_quark()
/**
-* IANJUTA_BUILDER_ROOT_URI
+* IANJUTA_BUILDER_ROOT_URI:
*
* Build directory uri. It is the same than the project_root_uri for
* in source build.
@@ -42,21 +42,21 @@
#define IANJUTA_BUILDER_ROOT_URI "build_root_uri"
/**
-* IANJUTA_BUILDER_CONFIGURATION_DEBUG
+* IANJUTA_BUILDER_CONFIGURATION_DEBUG:
*
* Name of debugging configutation.
*/
#define IANJUTA_BUILDER_CONFIGURATION_DEBUG "Debug"
/**
-* IANJUTA_BUILDER_CONFIGURATION_OPTIMIZED
+* IANJUTA_BUILDER_CONFIGURATION_OPTIMIZED:
*
* Name of optimized configutation.
*/
#define IANJUTA_BUILDER_CONFIGURATION_OPTIMIZED "Optimized"
/**
-* IANJUTA_BUILDER_CONFIGURATION_PROFILING
+* IANJUTA_BUILDER_CONFIGURATION_PROFILING:
*
* Name of profiling configutation.
*/
diff -Nru anjuta-3.8.4/libanjuta/interfaces/ianjuta-debugger-breakpoint.h anjuta-3.10.2/libanjuta/interfaces/ianjuta-debugger-breakpoint.h
--- anjuta-3.8.4/libanjuta/interfaces/ianjuta-debugger-breakpoint.h 2013-06-03 21:24:37.000000000 +0000
+++ anjuta-3.10.2/libanjuta/interfaces/ianjuta-debugger-breakpoint.h 2013-11-14 20:43:39.000000000 +0000
@@ -128,7 +128,7 @@
* IAnjutaDebuggerBreakpointCallback:
* @data: a #IAnjutaBreakpointItem object
* @user_data: user data passed to the function
- * @error: error
+ * @err: error
*
* This callback function is used to return a #IAnjutaBreakpointItem.
*/
diff -Nru anjuta-3.8.4/libanjuta/interfaces/ianjuta-debugger-instruction.h anjuta-3.10.2/libanjuta/interfaces/ianjuta-debugger-instruction.h
--- anjuta-3.8.4/libanjuta/interfaces/ianjuta-debugger-instruction.h 2013-06-03 21:24:37.000000000 +0000
+++ anjuta-3.10.2/libanjuta/interfaces/ianjuta-debugger-instruction.h 2013-11-14 20:43:39.000000000 +0000
@@ -67,7 +67,7 @@
* IAnjutaDebuggerInstructionCallback:
* @data: a #IAnjutaDebuggerInstructionDisassembly object
* @user_data: user data passed to the function
- * @error: error
+ * @err: error
*
* This callback function is used to return a #IAnjutaDebuggerInstructionDisassembly.
*/
diff -Nru anjuta-3.8.4/libanjuta/interfaces/ianjuta-debugger-memory.h anjuta-3.10.2/libanjuta/interfaces/ianjuta-debugger-memory.h
--- anjuta-3.8.4/libanjuta/interfaces/ianjuta-debugger-memory.h 2013-06-03 21:24:37.000000000 +0000
+++ anjuta-3.10.2/libanjuta/interfaces/ianjuta-debugger-memory.h 2013-11-14 20:43:39.000000000 +0000
@@ -54,7 +54,7 @@
* IAnjutaDebuggerMemoryCallback:
* @data: a #IAnjutaDebuggerMemoryBlock object
* @user_data: user data passed to the function
- * @error: error
+ * @err: error
*
* This callback function is used to return a #IAnjutaDebuggerMemoryBlock.
*/
diff -Nru anjuta-3.8.4/libanjuta/interfaces/ianjuta-debugger-variable.h anjuta-3.10.2/libanjuta/interfaces/ianjuta-debugger-variable.h
--- anjuta-3.8.4/libanjuta/interfaces/ianjuta-debugger-variable.h 2013-06-03 21:24:37.000000000 +0000
+++ anjuta-3.10.2/libanjuta/interfaces/ianjuta-debugger-variable.h 2013-11-14 20:43:39.000000000 +0000
@@ -66,7 +66,7 @@
* IAnjutaDebuggerVariableCallback:
* @data: a #IAnjutaDebuggerVariableObject object
* @user_data: user data passed to the function
- * @error: error
+ * @err: error
*
* This callback function is used to return a #IAnjutaDebuggerVariableObject.
*/
diff -Nru anjuta-3.8.4/libanjuta/interfaces/ianjuta-debugger.c anjuta-3.10.2/libanjuta/interfaces/ianjuta-debugger.c
--- anjuta-3.8.4/libanjuta/interfaces/ianjuta-debugger.c 2013-06-03 21:24:37.000000000 +0000
+++ anjuta-3.10.2/libanjuta/interfaces/ianjuta-debugger.c 2013-11-14 20:43:39.000000000 +0000
@@ -777,16 +777,16 @@
* Returns: TRUE if sucessful, otherwise FALSE.
*/
gboolean
-ianjuta_debugger_print (IAnjutaDebugger *obj, const gchar *variable, IAnjutaDebuggerGCharCallback callback, gpointer user_data, GError **err)
+ianjuta_debugger_print (IAnjutaDebugger *obj, const gchar *name, IAnjutaDebuggerGCharCallback callback, gpointer user_data, GError **err)
{
g_return_val_if_fail (IANJUTA_IS_DEBUGGER(obj), FALSE);
g_return_val_if_fail (user_data != NULL, FALSE);
- return IANJUTA_DEBUGGER_GET_IFACE (obj)->print (obj, variable, callback, user_data, err);
+ return IANJUTA_DEBUGGER_GET_IFACE (obj)->print (obj, name, callback, user_data, err);
}
/* Default implementation */
static gboolean
-ianjuta_debugger_print_default (IAnjutaDebugger *obj, const gchar *variable, IAnjutaDebuggerGCharCallback callback, gpointer user_data, GError **err)
+ianjuta_debugger_print_default (IAnjutaDebugger *obj, const gchar *name, IAnjutaDebuggerGCharCallback callback, gpointer user_data, GError **err)
{
g_return_val_if_reached (FALSE);
}
diff -Nru anjuta-3.8.4/libanjuta/interfaces/ianjuta-debugger.h anjuta-3.10.2/libanjuta/interfaces/ianjuta-debugger.h
--- anjuta-3.8.4/libanjuta/interfaces/ianjuta-debugger.h 2013-06-03 21:24:37.000000000 +0000
+++ anjuta-3.10.2/libanjuta/interfaces/ianjuta-debugger.h 2013-11-14 20:43:39.000000000 +0000
@@ -158,7 +158,7 @@
* IAnjutaDebuggerCallback:
* @data: data
* @user_data: user data passed to the function
- * @error: error
+ * @err: error
*
* This callback function is used only by #ianjuta_debugger_callback with a
* NULL data.
@@ -169,7 +169,7 @@
* IAnjutaDebuggerGListCallback:
* @list: (element-type any): list of data
* @user_data: user data passed to the function
- * @error: error
+ * @err: error
*
* This callback function is used by several debugger functions. Depending on
* the function, the kind of elements in the list is different. It is a string
@@ -180,9 +180,9 @@
/**
* IAnjutaDebuggerGCharCallback:
- * @data: string
+ * @value: string
* @user_data: user data
- * @error: error
+ * @err: error
*
* This callback function is used by several debugger functions. The data is
* a string
@@ -191,9 +191,9 @@
/**
* IAnjutaDebuggerOutputCallback:
- * @data: Self
+ * @type: kind of output
+ * @output: string
* @user_data: user data
- * @error: error
*
* This callback function is used only by #ianjuta_debugger_callback with a
* NULL data.
@@ -255,7 +255,7 @@
gboolean (*list_local) (IAnjutaDebugger *obj, IAnjutaDebuggerGListCallback callback, gpointer user_data, GError **err);
gboolean (*list_thread) (IAnjutaDebugger *obj, IAnjutaDebuggerGListCallback callback, gpointer user_data, GError **err);
gboolean (*load) (IAnjutaDebugger *obj, const gchar *file, const gchar *mime_type, const GList* source_search_directories, GError **err);
- gboolean (*print) (IAnjutaDebugger *obj, const gchar *variable, IAnjutaDebuggerGCharCallback callback, gpointer user_data, GError **err);
+ gboolean (*print) (IAnjutaDebugger *obj, const gchar *name, IAnjutaDebuggerGCharCallback callback, gpointer user_data, GError **err);
gboolean (*quit) (IAnjutaDebugger *obj, GError **err);
gboolean (*run) (IAnjutaDebugger *obj, GError **err);
gboolean (*run_from) (IAnjutaDebugger *obj, const gchar *file, gint line, GError **err);
@@ -334,7 +334,7 @@
gboolean ianjuta_debugger_load (IAnjutaDebugger *obj, const gchar *file, const gchar *mime_type, const GList* source_search_directories, GError **err);
-gboolean ianjuta_debugger_print (IAnjutaDebugger *obj, const gchar *variable, IAnjutaDebuggerGCharCallback callback, gpointer user_data, GError **err);
+gboolean ianjuta_debugger_print (IAnjutaDebugger *obj, const gchar *name, IAnjutaDebuggerGCharCallback callback, gpointer user_data, GError **err);
gboolean ianjuta_debugger_quit (IAnjutaDebugger *obj, GError **err);
diff -Nru anjuta-3.8.4/libanjuta/interfaces/ianjuta-document-manager.h anjuta-3.10.2/libanjuta/interfaces/ianjuta-document-manager.h
--- anjuta-3.8.4/libanjuta/interfaces/ianjuta-document-manager.h 2013-06-03 21:24:37.000000000 +0000
+++ anjuta-3.10.2/libanjuta/interfaces/ianjuta-document-manager.h 2013-11-14 20:43:39.000000000 +0000
@@ -37,7 +37,7 @@
#define IANJUTA_DOCUMENT_MANAGER_ERROR ianjuta_document_manager_error_quark()
/**
-* IANJUTA_DOCUMENT_MANAGER_CURRENT_DOCUMENT
+* IANJUTA_DOCUMENT_MANAGER_CURRENT_DOCUMENT:
*
* Anjuta shell value set by document manager to the current document
*/
diff -Nru anjuta-3.8.4/libanjuta/interfaces/ianjuta-editor-assist.c anjuta-3.10.2/libanjuta/interfaces/ianjuta-editor-assist.c
--- anjuta-3.8.4/libanjuta/interfaces/ianjuta-editor-assist.c 2013-06-03 21:24:37.000000000 +0000
+++ anjuta-3.10.2/libanjuta/interfaces/ianjuta-editor-assist.c 2013-11-14 20:43:39.000000000 +0000
@@ -43,7 +43,7 @@
}
/*
- * ianjuta_editor_assist_add
+ * ianjuta_editor_assist_add:
* @obj: self
* @provider: a IAnjutaProvider
* @err: Error handling
@@ -66,7 +66,7 @@
}
/*
- * ianjuta_editor_assist_invoke
+ * ianjuta_editor_assist_invoke:
* @obj: self
* @provider: a IAnjutaProvider (can be NULL to use all providers)
* @err: Error handling
@@ -121,7 +121,7 @@
}
/*
- * ianjuta_editor_assist_remove
+ * ianjuta_editor_assist_remove:
* @obj: self
* @provider: a IAnjutaProvider
* @err: Error handling
@@ -156,7 +156,7 @@
if (!initialized) {
/**
- * IAnjutaEditorAssist::cancelled
+ * IAnjutaEditorAssist::cancelled:
* @obj: Self
*
* This signal is emitted when the autocompletion is cancelled due to various
diff -Nru anjuta-3.8.4/libanjuta/interfaces/ianjuta-editor-glade-signal.c anjuta-3.10.2/libanjuta/interfaces/ianjuta-editor-glade-signal.c
--- anjuta-3.8.4/libanjuta/interfaces/ianjuta-editor-glade-signal.c 2013-06-03 21:24:37.000000000 +0000
+++ anjuta-3.10.2/libanjuta/interfaces/ianjuta-editor-glade-signal.c 2013-11-14 20:43:39.000000000 +0000
@@ -50,7 +50,8 @@
if (!initialized) {
- /* IAnjutaEditorGladeSignal::drop
+ /**
+ * IAnjutaEditorGladeSignal::drop:
* @obj: self
* @iter: a IAnjutaIterable of the position where drop happens
* @signal_data: Signal data in form "widget:signal:handler", e.g.
@@ -71,7 +72,8 @@
G_TYPE_STRING);
- /* IAnjutaEditorGladeSignal::drop-possible
+ /**
+ * IAnjutaEditorGladeSignal::drop-possible:
* @obj: self
* @iter: a IAnjutaIterable of the position where drop would happen
*
diff -Nru anjuta-3.8.4/libanjuta/interfaces/ianjuta-editor-hover.c anjuta-3.10.2/libanjuta/interfaces/ianjuta-editor-hover.c
--- anjuta-3.8.4/libanjuta/interfaces/ianjuta-editor-hover.c 2013-06-03 21:24:37.000000000 +0000
+++ anjuta-3.10.2/libanjuta/interfaces/ianjuta-editor-hover.c 2013-11-14 20:43:39.000000000 +0000
@@ -75,7 +75,8 @@
if (!initialized) {
- /* IAnjutaEditorHover::hover-leave
+ /**
+ * IAnjutaEditorHover::hover-leave:
* @obj: self
* @position: IAnjutaEditorCell specifying the position the mouse was over
*
@@ -93,7 +94,8 @@
IANJUTA_TYPE_ITERABLE);
- /* IAnjutaEditorHover::hover-over:
+ /**
+ * IAnjutaEditorHover::hover-over:
* @obj: self
* @position: IAnjutaEditorCell specifying the position the mouse is over
*
diff -Nru anjuta-3.8.4/libanjuta/interfaces/ianjuta-editor-language.c anjuta-3.10.2/libanjuta/interfaces/ianjuta-editor-language.c
--- anjuta-3.8.4/libanjuta/interfaces/ianjuta-editor-language.c 2013-06-03 21:24:37.000000000 +0000
+++ anjuta-3.10.2/libanjuta/interfaces/ianjuta-editor-language.c 2013-11-14 20:43:39.000000000 +0000
@@ -145,7 +145,8 @@
if (!initialized) {
- /* IAnjutaEditorLanguage::language-changed:
+ /**
+ * IAnjutaEditorLanguage::language-changed:
* @obj: self
* @language: new language
*
diff -Nru anjuta-3.8.4/libanjuta/interfaces/ianjuta-editor-tip.c anjuta-3.10.2/libanjuta/interfaces/ianjuta-editor-tip.c
--- anjuta-3.8.4/libanjuta/interfaces/ianjuta-editor-tip.c 2013-06-03 21:24:37.000000000 +0000
+++ anjuta-3.10.2/libanjuta/interfaces/ianjuta-editor-tip.c 2013-11-14 20:43:39.000000000 +0000
@@ -43,7 +43,7 @@
}
/**
- * ianjuta_editor_tip_cancel
+ * ianjuta_editor_tip_cancel:
* @obj: Self
* @err: Error propagation and reporting
*
diff -Nru anjuta-3.8.4/libanjuta/interfaces/ianjuta-editor.c anjuta-3.10.2/libanjuta/interfaces/ianjuta-editor.c
--- anjuta-3.8.4/libanjuta/interfaces/ianjuta-editor.c 2013-06-03 21:24:37.000000000 +0000
+++ anjuta-3.10.2/libanjuta/interfaces/ianjuta-editor.c 2013-11-14 20:43:39.000000000 +0000
@@ -710,7 +710,7 @@
/**
* ianjuta_editor_set_indentsize:
* @obj: Self
- * @tabsize: Indentation size in spaces
+ * @indentsize: Indentation size in spaces
* @err: Error propagation and reporting
*
* Sets the indentation size of the editor.
@@ -905,18 +905,18 @@
/**
- * IAnjutaEditor::code-added:
- * @position: The iter position where @ch is added.
- * @code: The code that has been added.
+ * IAnjutaEditor::code-changed:
+ * @position: The iter position where code has been changed or NULL.
+ * @code: The code that has been added or NULL.
* @obj: Self
*
- * This signal is emitted when code is added inside the editor.
- * The newly added code is @code which has been inserted at @position.
+ * This signal is emitted when code is changed inside the editor.
+ * When such information is availabe, @position stores the position where @code was added.
*/
- g_signal_new ("code-added",
+ g_signal_new ("code-changed",
IANJUTA_TYPE_EDITOR,
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (IAnjutaEditorIface, code_added),
+ G_STRUCT_OFFSET (IAnjutaEditorIface, code_changed),
NULL, NULL,
libanjuta_iface_cclosure_marshal_VOID__OBJECT_STRING,
G_TYPE_NONE,
@@ -943,7 +943,7 @@
/**
- * IAnjutaEditor::glade-member-add:
+ * IAnjutaEditor::glade-callback-add:
* @widget_typename: Name of the type of the widget.
* @signal_name: Name of the signal.
* @handler_name: Name of the signal handler.
diff -Nru anjuta-3.8.4/libanjuta/interfaces/ianjuta-editor.h anjuta-3.10.2/libanjuta/interfaces/ianjuta-editor.h
--- anjuta-3.8.4/libanjuta/interfaces/ianjuta-editor.h 2013-06-03 21:24:37.000000000 +0000
+++ anjuta-3.10.2/libanjuta/interfaces/ianjuta-editor.h 2013-11-14 20:43:39.000000000 +0000
@@ -37,28 +37,28 @@
#define IANJUTA_EDITOR_ERROR ianjuta_editor_error_quark()
/**
-* IANJUTA_EDITOR_PREF_SCHEMA
+* IANJUTA_EDITOR_PREF_SCHEMA:
*
* Schema id used to store common editor settings.
*/
#define IANJUTA_EDITOR_PREF_SCHEMA "editor"
/**
-* IANJUTA_EDITOR_USE_TABS_KEY
+* IANJUTA_EDITOR_USE_TABS_KEY:
*
* Boolean key, true is tabs has to be used for indenting.
*/
#define IANJUTA_EDITOR_USE_TABS_KEY "use-tabs"
/**
-* IANJUTA_EDITOR_TAB_WIDTH_KEY
+* IANJUTA_EDITOR_TAB_WIDTH_KEY:
*
* Integer key, defines the size of a tabulation in spaces.
*/
#define IANJUTA_EDITOR_TAB_WIDTH_KEY "tab-width"
/**
-* IANJUTA_EDITOR_INDENT_WIDTH_KEY
+* IANJUTA_EDITOR_INDENT_WIDTH_KEY:
*
* Integer key, defines the number a space for one indentation step.
*/
@@ -100,7 +100,7 @@
/* Signal */
void (*char_added) (IAnjutaEditor *obj, IAnjutaIterable *position, gchar ch);
/* Signal */
- void (*code_added) (IAnjutaEditor *obj, IAnjutaIterable *position, gchar *code);
+ void (*code_changed) (IAnjutaEditor *obj, IAnjutaIterable *position, gchar *code);
/* Signal */
void (*cursor_moved) (IAnjutaEditor *obj);
/* Signal */
diff -Nru anjuta-3.8.4/libanjuta/interfaces/ianjuta-file-manager.h anjuta-3.10.2/libanjuta/interfaces/ianjuta-file-manager.h
--- anjuta-3.8.4/libanjuta/interfaces/ianjuta-file-manager.h 2013-06-03 21:24:37.000000000 +0000
+++ anjuta-3.10.2/libanjuta/interfaces/ianjuta-file-manager.h 2013-11-14 20:43:39.000000000 +0000
@@ -33,7 +33,7 @@
#define IANJUTA_FILE_MANAGER_ERROR ianjuta_file_manager_error_quark()
/**
-* IANJUTA_FILE_MANAGER_SELECTED_FILE
+* IANJUTA_FILE_MANAGER_SELECTED_FILE:
*
* Anjuta shell value set by file manager to the selected file.
*/
diff -Nru anjuta-3.8.4/libanjuta/interfaces/ianjuta-glade.c anjuta-3.10.2/libanjuta/interfaces/ianjuta-glade.c
--- anjuta-3.8.4/libanjuta/interfaces/ianjuta-glade.c 1970-01-01 00:00:00.000000000 +0000
+++ anjuta-3.10.2/libanjuta/interfaces/ianjuta-glade.c 2013-11-14 20:43:39.000000000 +0000
@@ -0,0 +1,93 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * ianjuta-glade.c -- Autogenerated from libanjuta.idl
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+
+#include "ianjuta-glade.h"
+#include "libanjuta-iface-marshallers.h"
+
+GQuark
+ianjuta_glade_error_quark (void)
+{
+ static GQuark quark = 0;
+
+ if (quark == 0) {
+ quark = g_quark_from_static_string ("ianjuta-glade-quark");
+ }
+
+ return quark;
+}
+
+/**
+ * ianjuta_add_association:
+ * @obj: Self
+ * @master: ui file name.
+ * @slave: source code file name.
+ * @err: Error propagation and reporting.
+ *
+ * Adds an association of master ui file and slave source code file
+ *
+ */
+void
+ianjuta_glade_add_association (IAnjutaGlade *obj, gchar *master, gchar *slave, GError **err)
+{
+ g_return_if_fail (IANJUTA_IS_GLADE(obj));
+ IANJUTA_GLADE_GET_IFACE (obj)->add_association (obj, master, slave, err);
+}
+
+/* Default implementation */
+static void
+ianjuta_glade_add_association_default (IAnjutaGlade *obj, gchar *master, gchar *slave, GError **err)
+{
+ g_return_if_reached ();
+}
+
+static void
+ianjuta_glade_base_init (IAnjutaGladeIface* klass)
+{
+ static gboolean initialized = FALSE;
+
+ klass->add_association = ianjuta_glade_add_association_default;
+
+ if (!initialized) {
+
+ initialized = TRUE;
+ }
+}
+
+GType
+ianjuta_glade_get_type (void)
+{
+ static GType type = 0;
+ if (!type) {
+ static const GTypeInfo info = {
+ sizeof (IAnjutaGladeIface),
+ (GBaseInitFunc) ianjuta_glade_base_init,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ 0,
+ 0,
+ NULL
+ };
+ type = g_type_register_static (G_TYPE_INTERFACE, "IAnjutaGlade", &info, 0);
+ g_type_interface_add_prerequisite (type, G_TYPE_OBJECT);
+ }
+ return type;
+}
diff -Nru anjuta-3.8.4/libanjuta/interfaces/ianjuta-glade.h anjuta-3.10.2/libanjuta/interfaces/ianjuta-glade.h
--- anjuta-3.8.4/libanjuta/interfaces/ianjuta-glade.h 1970-01-01 00:00:00.000000000 +0000
+++ anjuta-3.10.2/libanjuta/interfaces/ianjuta-glade.h 2013-11-14 20:43:39.000000000 +0000
@@ -0,0 +1,55 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * ianjuta-glade.h -- Autogenerated from libanjuta.idl
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef _IANJUTA_GLADE_H_
+#define _IANJUTA_GLADE_H_
+
+#include
+
+G_BEGIN_DECLS
+
+#define IANJUTA_TYPE_GLADE (ianjuta_glade_get_type ())
+#define IANJUTA_GLADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), IANJUTA_TYPE_GLADE, IAnjutaGlade))
+#define IANJUTA_IS_GLADE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), IANJUTA_TYPE_GLADE))
+#define IANJUTA_GLADE_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), IANJUTA_TYPE_GLADE, IAnjutaGladeIface))
+
+#define IANJUTA_GLADE_ERROR ianjuta_glade_error_quark()
+
+typedef struct _IAnjutaGlade IAnjutaGlade;
+typedef struct _IAnjutaGladeIface IAnjutaGladeIface;
+
+
+struct _IAnjutaGladeIface {
+ GTypeInterface g_iface;
+
+
+ void (*add_association) (IAnjutaGlade *obj, gchar *master, gchar *slave, GError **err);
+
+};
+
+
+GQuark ianjuta_glade_error_quark (void);
+GType ianjuta_glade_get_type (void);
+
+void ianjuta_glade_add_association (IAnjutaGlade *obj, gchar *master, gchar *slave, GError **err);
+
+
+G_END_DECLS
+
+#endif
diff -Nru anjuta-3.8.4/libanjuta/interfaces/ianjuta-indenter.c anjuta-3.10.2/libanjuta/interfaces/ianjuta-indenter.c
--- anjuta-3.8.4/libanjuta/interfaces/ianjuta-indenter.c 2013-06-03 21:24:37.000000000 +0000
+++ anjuta-3.10.2/libanjuta/interfaces/ianjuta-indenter.c 2013-11-14 20:43:39.000000000 +0000
@@ -43,11 +43,11 @@
}
/**
- * ianjuta_indenter_indent
+ * ianjuta_indenter_indent:
* @obj: Self
* @start: Start of the area to indent
* @end: End of the area to indent
- * @error: Error propagation
+ * @err: Error propagation
*
* Indent the area between @start and @end according to the indentation rules
* of the programming language. Usually implemented by language support plugins.
diff -Nru anjuta-3.8.4/libanjuta/interfaces/ianjuta-language-provider.h anjuta-3.10.2/libanjuta/interfaces/ianjuta-language-provider.h
--- anjuta-3.8.4/libanjuta/interfaces/ianjuta-language-provider.h 2013-06-03 21:24:37.000000000 +0000
+++ anjuta-3.10.2/libanjuta/interfaces/ianjuta-language-provider.h 2013-11-14 20:43:39.000000000 +0000
@@ -36,35 +36,35 @@
#define IANJUTA_LANGUAGE_PROVIDER_ERROR ianjuta_language_provider_error_quark()
/**
- * IANJUTA_LANGUAGE_PROVIDER_PREF_CALLTIP_ENABLE
+ * IANJUTA_LANGUAGE_PROVIDER_PREF_CALLTIP_ENABLE:
*
* Boolean key, true is calltips has to be shown.
*/
#define IANJUTA_LANGUAGE_PROVIDER_PREF_CALLTIP_ENABLE "calltip-enable"
/**
- * IANJUTA_LANGUAGE_PROVIDER_PREF_AUTOCOMPLETE_ENABLE
+ * IANJUTA_LANGUAGE_PROVIDER_PREF_AUTOCOMPLETE_ENABLE:
*
* Boolean key, true is code completion is enable.
*/
#define IANJUTA_LANGUAGE_PROVIDER_PREF_AUTOCOMPLETE_ENABLE "completion-enable"
/**
- * IANJUTA_LANGUAGE_PROVIDER_PREF_AUTOCOMPLETE_SPACE_AFTER_FUNC
+ * IANJUTA_LANGUAGE_PROVIDER_PREF_AUTOCOMPLETE_SPACE_AFTER_FUNC:
*
* Boolean key, true is adding a space after function call autocompletion
*/
#define IANJUTA_LANGUAGE_PROVIDER_PREF_AUTOCOMPLETE_SPACE_AFTER_FUNC "completion-space-after-func"
/**
- * IANJUTA_LANGUAGE_PROVIDER_PREF_AUTOCOMPLETE_BRACE_AFTER_FUNC
+ * IANJUTA_LANGUAGE_PROVIDER_PREF_AUTOCOMPLETE_BRACE_AFTER_FUNC:
*
* Boolean key, true is adding '(' after function call autocompletion
*/
#define IANJUTA_LANGUAGE_PROVIDER_PREF_AUTOCOMPLETE_BRACE_AFTER_FUNC "completion-brace-after-func"
/**
- * IANJUTA_LANGUAGE_PROVIDER_PREF_AUTOCOMPLETE_CLOSEBRACE_AFTER_FUNC
+ * IANJUTA_LANGUAGE_PROVIDER_PREF_AUTOCOMPLETE_CLOSEBRACE_AFTER_FUNC:
*
* Boolean key, true is adding ')' after function call autocompletion
*/
diff -Nru anjuta-3.8.4/libanjuta/interfaces/ianjuta-print.c anjuta-3.10.2/libanjuta/interfaces/ianjuta-print.c
--- anjuta-3.8.4/libanjuta/interfaces/ianjuta-print.c 2013-06-03 21:24:37.000000000 +0000
+++ anjuta-3.10.2/libanjuta/interfaces/ianjuta-print.c 2013-11-14 20:43:39.000000000 +0000
@@ -65,7 +65,7 @@
}
/**
-* ianjuta_print_print:
+* ianjuta_print_print_preview:
* @obj: Self
* @err: Error propagation and reporting.
*
diff -Nru anjuta-3.8.4/libanjuta/interfaces/ianjuta-project-backend.c anjuta-3.10.2/libanjuta/interfaces/ianjuta-project-backend.c
--- anjuta-3.8.4/libanjuta/interfaces/ianjuta-project-backend.c 2013-06-03 21:24:37.000000000 +0000
+++ anjuta-3.10.2/libanjuta/interfaces/ianjuta-project-backend.c 2013-11-14 20:43:39.000000000 +0000
@@ -70,7 +70,7 @@
/**
* ianjuta_project_backend_probe:
* @obj: Self
- * @file: (transfer none): Project file or directory
+ * @directory: (transfer none): Project file or directory
* @err: Error propagation and reporting
*
* Check if the directory contains a project supported by this
diff -Nru anjuta-3.8.4/libanjuta/interfaces/ianjuta-project-manager.c anjuta-3.10.2/libanjuta/interfaces/ianjuta-project-manager.c
--- anjuta-3.8.4/libanjuta/interfaces/ianjuta-project-manager.c 2012-09-26 20:54:13.000000000 +0000
+++ anjuta-3.10.2/libanjuta/interfaces/ianjuta-project-manager.c 2013-11-14 20:43:39.000000000 +0000
@@ -443,6 +443,32 @@
g_return_val_if_reached (FALSE);
}
+/**
+ * ianjuta_project_manager_remove_file:
+ * @obj: Self.
+ * @file: A #GFile that will be removed from the project
+ * @err: Error propagation and reporting.
+ *
+ * Remove a source file from the project. If the file is used in several
+ * targets, it is removed from all targets. The file could be removed from
+ * the disk.
+ *
+ * Returns: %TRUE if the file has been removed from the project else %FALSE
+ */
+gboolean
+ianjuta_project_manager_remove_file (IAnjutaProjectManager *obj, GFile *file, GError **err)
+{
+ g_return_val_if_fail (IANJUTA_IS_PROJECT_MANAGER(obj), FALSE);
+ return IANJUTA_PROJECT_MANAGER_GET_IFACE (obj)->remove_file (obj, file, err);
+}
+
+/* Default implementation */
+static gboolean
+ianjuta_project_manager_remove_file_default (IAnjutaProjectManager *obj, GFile *file, GError **err)
+{
+ g_return_val_if_reached (FALSE);
+}
+
static void
ianjuta_project_manager_base_init (IAnjutaProjectManagerIface* klass)
{
@@ -463,6 +489,7 @@
klass->get_target_type = ianjuta_project_manager_get_target_type_default;
klass->get_targets = ianjuta_project_manager_get_targets_default;
klass->is_open = ianjuta_project_manager_is_open_default;
+ klass->remove_file = ianjuta_project_manager_remove_file_default;
if (!initialized) {
diff -Nru anjuta-3.8.4/libanjuta/interfaces/ianjuta-project-manager.h anjuta-3.10.2/libanjuta/interfaces/ianjuta-project-manager.h
--- anjuta-3.8.4/libanjuta/interfaces/ianjuta-project-manager.h 2013-06-03 21:24:37.000000000 +0000
+++ anjuta-3.10.2/libanjuta/interfaces/ianjuta-project-manager.h 2013-11-14 20:43:39.000000000 +0000
@@ -34,14 +34,14 @@
#define IANJUTA_PROJECT_MANAGER_ERROR ianjuta_project_manager_error_quark()
/**
-* IANJUTA_PROJECT_MANAGER_PROJECT_ROOT_URI
+* IANJUTA_PROJECT_MANAGER_PROJECT_ROOT_URI:
*
* Anjuta shell value set by project manager to the project root uri.
*/
#define IANJUTA_PROJECT_MANAGER_PROJECT_ROOT_URI "project_root_uri"
/**
-* IANJUTA_PROJECT_MANAGER_CURRENT_PROJECT
+* IANJUTA_PROJECT_MANAGER_CURRENT_PROJECT:
*
* Anjuta shell value set by project manager to the current project object
* which implement #IAnjutaProject interface.
@@ -49,7 +49,7 @@
#define IANJUTA_PROJECT_MANAGER_CURRENT_PROJECT "project_manager_current_project"
/**
-* IANJUTA_PROJECT_MANAGER_CURRENT_URI
+* IANJUTA_PROJECT_MANAGER_CURRENT_URI:
*
* Anjuta shell value set by project manager to the current uri.
*/
@@ -87,6 +87,7 @@
AnjutaProjectNodeType (*get_target_type) (IAnjutaProjectManager *obj, GFile *target, GError **err);
GList* (*get_targets) (IAnjutaProjectManager *obj, AnjutaProjectNodeType target_type, GError **err);
gboolean (*is_open) (IAnjutaProjectManager *obj, GError **err);
+ gboolean (*remove_file) (IAnjutaProjectManager *obj, GFile *file, GError **err);
};
@@ -124,6 +125,8 @@
gboolean ianjuta_project_manager_is_open (IAnjutaProjectManager *obj, GError **err);
+gboolean ianjuta_project_manager_remove_file (IAnjutaProjectManager *obj, GFile *file, GError **err);
+
G_END_DECLS
diff -Nru anjuta-3.8.4/libanjuta/interfaces/ianjuta-project.c anjuta-3.10.2/libanjuta/interfaces/ianjuta-project.c
--- anjuta-3.8.4/libanjuta/interfaces/ianjuta-project.c 2013-06-03 21:24:37.000000000 +0000
+++ anjuta-3.10.2/libanjuta/interfaces/ianjuta-project.c 2013-11-14 20:43:39.000000000 +0000
@@ -289,16 +289,16 @@
* Return value: (allow-none) (transfer none): The new property of NULL if the property cannot be set
*/
AnjutaProjectProperty *
-ianjuta_project_set_property (IAnjutaProject *obj, AnjutaProjectNode *parent, const gchar *id, const gchar *name, const gchar *value, GError **err)
+ianjuta_project_set_property (IAnjutaProject *obj, AnjutaProjectNode *node, const gchar *id, const gchar *name, const gchar *value, GError **err)
{
g_return_val_if_fail (IANJUTA_IS_PROJECT(obj), NULL);
- g_return_val_if_fail ((parent == NULL) ||ANJUTA_IS_PROJECT_NODE(parent), NULL);
- return IANJUTA_PROJECT_GET_IFACE (obj)->set_property (obj, parent, id, name, value, err);
+ g_return_val_if_fail ((node == NULL) ||ANJUTA_IS_PROJECT_NODE(node), NULL);
+ return IANJUTA_PROJECT_GET_IFACE (obj)->set_property (obj, node, id, name, value, err);
}
/* Default implementation */
static AnjutaProjectProperty *
-ianjuta_project_set_property_default (IAnjutaProject *obj, AnjutaProjectNode *parent, const gchar *id, const gchar *name, const gchar *value, GError **err)
+ianjuta_project_set_property_default (IAnjutaProject *obj, AnjutaProjectNode *node, const gchar *id, const gchar *name, const gchar *value, GError **err)
{
g_return_val_if_reached (NULL);
}
diff -Nru anjuta-3.8.4/libanjuta/interfaces/ianjuta-project.h anjuta-3.10.2/libanjuta/interfaces/ianjuta-project.h
--- anjuta-3.8.4/libanjuta/interfaces/ianjuta-project.h 2013-06-03 21:24:37.000000000 +0000
+++ anjuta-3.10.2/libanjuta/interfaces/ianjuta-project.h 2013-11-14 20:43:39.000000000 +0000
@@ -79,7 +79,7 @@
gboolean (*remove_node) (IAnjutaProject *obj, AnjutaProjectNode *node, GError **err);
gboolean (*remove_property) (IAnjutaProject *obj, AnjutaProjectNode *node, const gchar *id, const gchar *name, GError **err);
gboolean (*save_node) (IAnjutaProject *obj, AnjutaProjectNode *node, GError **err);
- AnjutaProjectProperty * (*set_property) (IAnjutaProject *obj, AnjutaProjectNode *parent, const gchar *id, const gchar *name, const gchar *value, GError **err);
+ AnjutaProjectProperty * (*set_property) (IAnjutaProject *obj, AnjutaProjectNode *node, const gchar *id, const gchar *name, const gchar *value, GError **err);
};
@@ -107,7 +107,7 @@
gboolean ianjuta_project_save_node (IAnjutaProject *obj, AnjutaProjectNode *node, GError **err);
-AnjutaProjectProperty * ianjuta_project_set_property (IAnjutaProject *obj, AnjutaProjectNode *parent, const gchar *id, const gchar *name, const gchar *value, GError **err);
+AnjutaProjectProperty * ianjuta_project_set_property (IAnjutaProject *obj, AnjutaProjectNode *node, const gchar *id, const gchar *name, const gchar *value, GError **err);
G_END_DECLS
diff -Nru anjuta-3.8.4/libanjuta/interfaces/ianjuta-symbol-manager.h anjuta-3.10.2/libanjuta/interfaces/ianjuta-symbol-manager.h
--- anjuta-3.8.4/libanjuta/interfaces/ianjuta-symbol-manager.h 2012-09-26 20:54:13.000000000 +0000
+++ anjuta-3.10.2/libanjuta/interfaces/ianjuta-symbol-manager.h 2013-11-14 20:43:39.000000000 +0000
@@ -25,6 +25,7 @@
#include
#include
#include
+#include
G_BEGIN_DECLS
diff -Nru anjuta-3.8.4/libanjuta/interfaces/ianjuta-symbol-query.c anjuta-3.10.2/libanjuta/interfaces/ianjuta-symbol-query.c
--- anjuta-3.8.4/libanjuta/interfaces/ianjuta-symbol-query.c 2013-06-03 21:24:37.000000000 +0000
+++ anjuta-3.10.2/libanjuta/interfaces/ianjuta-symbol-query.c 2013-11-14 20:43:39.000000000 +0000
@@ -204,15 +204,15 @@
* Executes #IANJUTA_SYMBOL_QUERY_SEARCH_ID query.
*/
IAnjutaIterable*
-ianjuta_symbol_query_search_id (IAnjutaSymbolQuery *obj, gint symbol_id, GError **err)
+ianjuta_symbol_query_search_id (IAnjutaSymbolQuery *obj, gint symbol, GError **err)
{
g_return_val_if_fail (IANJUTA_IS_SYMBOL_QUERY(obj), NULL);
- return IANJUTA_SYMBOL_QUERY_GET_IFACE (obj)->search_id (obj, symbol_id, err);
+ return IANJUTA_SYMBOL_QUERY_GET_IFACE (obj)->search_id (obj, symbol, err);
}
/* Default implementation */
static IAnjutaIterable*
-ianjuta_symbol_query_search_id_default (IAnjutaSymbolQuery *obj, gint symbol_id, GError **err)
+ianjuta_symbol_query_search_id_default (IAnjutaSymbolQuery *obj, gint symbol, GError **err)
{
g_return_val_if_reached (NULL);
}
@@ -392,15 +392,15 @@
* they are excluded.
*/
void
-ianjuta_symbol_query_set_filters (IAnjutaSymbolQuery *obj, IAnjutaSymbolType filters, gboolean includes_types, GError **err)
+ianjuta_symbol_query_set_filters (IAnjutaSymbolQuery *obj, IAnjutaSymbolType filters, gboolean include_types, GError **err)
{
g_return_if_fail (IANJUTA_IS_SYMBOL_QUERY(obj));
- IANJUTA_SYMBOL_QUERY_GET_IFACE (obj)->set_filters (obj, filters, includes_types, err);
+ IANJUTA_SYMBOL_QUERY_GET_IFACE (obj)->set_filters (obj, filters, include_types, err);
}
/* Default implementation */
static void
-ianjuta_symbol_query_set_filters_default (IAnjutaSymbolQuery *obj, IAnjutaSymbolType filters, gboolean includes_types, GError **err)
+ianjuta_symbol_query_set_filters_default (IAnjutaSymbolQuery *obj, IAnjutaSymbolType filters, gboolean include_types, GError **err)
{
g_return_if_reached ();
}
diff -Nru anjuta-3.8.4/libanjuta/interfaces/ianjuta-symbol-query.h anjuta-3.10.2/libanjuta/interfaces/ianjuta-symbol-query.h
--- anjuta-3.8.4/libanjuta/interfaces/ianjuta-symbol-query.h 2013-06-03 21:24:37.000000000 +0000
+++ anjuta-3.10.2/libanjuta/interfaces/ianjuta-symbol-query.h 2013-11-14 20:43:39.000000000 +0000
@@ -131,7 +131,7 @@
IAnjutaIterable* (*search_all) (IAnjutaSymbolQuery *obj, GError **err);
IAnjutaIterable* (*search_class_parents) (IAnjutaSymbolQuery *obj, IAnjutaSymbol *symbol, GError **err);
IAnjutaIterable* (*search_file) (IAnjutaSymbolQuery *obj, const gchar *pattern, const GFile *file, GError **err);
- IAnjutaIterable* (*search_id) (IAnjutaSymbolQuery *obj, gint symbol_id, GError **err);
+ IAnjutaIterable* (*search_id) (IAnjutaSymbolQuery *obj, gint symbol, GError **err);
IAnjutaIterable* (*search_in_scope) (IAnjutaSymbolQuery *obj, const gchar *pattern, IAnjutaSymbol *scope, GError **err);
IAnjutaIterable* (*search_members) (IAnjutaSymbolQuery *obj, IAnjutaSymbol *symbol, GError **err);
IAnjutaIterable* (*search_parent_scope) (IAnjutaSymbolQuery *obj, IAnjutaSymbol *symbol, GError **err);
@@ -139,7 +139,7 @@
IAnjutaIterable* (*search_scope) (IAnjutaSymbolQuery *obj, const gchar *file_path, gint line, GError **err);
void (*set_fields) (IAnjutaSymbolQuery *obj, gint n_fields, IAnjutaSymbolField *fields, GError **err);
void (*set_file_scope) (IAnjutaSymbolQuery *obj, IAnjutaSymbolQueryFileScope filescope_search, GError **err);
- void (*set_filters) (IAnjutaSymbolQuery *obj, IAnjutaSymbolType filters, gboolean includes_types, GError **err);
+ void (*set_filters) (IAnjutaSymbolQuery *obj, IAnjutaSymbolType filters, gboolean include_types, GError **err);
void (*set_group_by) (IAnjutaSymbolQuery *obj, IAnjutaSymbolField field, GError **err);
void (*set_limit) (IAnjutaSymbolQuery *obj, gint limit, GError **err);
void (*set_mode) (IAnjutaSymbolQuery *obj, IAnjutaSymbolQueryMode mode, GError **err);
@@ -166,7 +166,7 @@
IAnjutaIterable* ianjuta_symbol_query_search_file (IAnjutaSymbolQuery *obj, const gchar *pattern, const GFile *file, GError **err);
-IAnjutaIterable* ianjuta_symbol_query_search_id (IAnjutaSymbolQuery *obj, gint symbol_id, GError **err);
+IAnjutaIterable* ianjuta_symbol_query_search_id (IAnjutaSymbolQuery *obj, gint symbol, GError **err);
IAnjutaIterable* ianjuta_symbol_query_search_in_scope (IAnjutaSymbolQuery *obj, const gchar *pattern, IAnjutaSymbol *scope, GError **err);
@@ -182,7 +182,7 @@
void ianjuta_symbol_query_set_file_scope (IAnjutaSymbolQuery *obj, IAnjutaSymbolQueryFileScope filescope_search, GError **err);
-void ianjuta_symbol_query_set_filters (IAnjutaSymbolQuery *obj, IAnjutaSymbolType filters, gboolean includes_types, GError **err);
+void ianjuta_symbol_query_set_filters (IAnjutaSymbolQuery *obj, IAnjutaSymbolType filters, gboolean include_types, GError **err);
void ianjuta_symbol_query_set_group_by (IAnjutaSymbolQuery *obj, IAnjutaSymbolField field, GError **err);
diff -Nru anjuta-3.8.4/libanjuta/interfaces/ianjuta-terminal.c anjuta-3.10.2/libanjuta/interfaces/ianjuta-terminal.c
--- anjuta-3.8.4/libanjuta/interfaces/ianjuta-terminal.c 2013-06-03 21:24:37.000000000 +0000
+++ anjuta-3.10.2/libanjuta/interfaces/ianjuta-terminal.c 2013-11-14 20:43:39.000000000 +0000
@@ -47,7 +47,7 @@
* @obj: Self
* @directory: Working directory
* @command: Command executed followed by arguments
-* @environment: List of additional environment variables
+* @environment: (array zero-terminated=1): List of additional environment variables
* @err: Error propagation and reporting.
*
* Run the command in a terminal, setting the working directory
diff -Nru anjuta-3.8.4/libanjuta/interfaces/ianjuta-vcs.c anjuta-3.10.2/libanjuta/interfaces/ianjuta-vcs.c
--- anjuta-3.8.4/libanjuta/interfaces/ianjuta-vcs.c 2013-06-03 21:24:37.000000000 +0000
+++ anjuta-3.10.2/libanjuta/interfaces/ianjuta-vcs.c 2013-11-14 20:43:39.000000000 +0000
@@ -186,7 +186,7 @@
if (!initialized) {
/**
- * IAnjutaVcsStatus
+ * IAnjutaVcsStatus:
* @obj: Self
*
* This signal is emited when the git pull command is finished, and refreshes the tree of files with the new pulled files without the need to
diff -Nru anjuta-3.8.4/libanjuta/interfaces/libanjuta-interfaces.h anjuta-3.10.2/libanjuta/interfaces/libanjuta-interfaces.h
--- anjuta-3.8.4/libanjuta/interfaces/libanjuta-interfaces.h 2013-06-03 21:24:37.000000000 +0000
+++ anjuta-3.10.2/libanjuta/interfaces/libanjuta-interfaces.h 2013-11-14 20:43:39.000000000 +0000
@@ -35,6 +35,7 @@
#include "ianjuta-file-loader.h"
#include "ianjuta-file-manager.h"
#include "ianjuta-file-savable.h"
+#include "ianjuta-glade.h"
#include "ianjuta-help.h"
#include "ianjuta-indenter.h"
#include "ianjuta-indicable.h"
diff -Nru anjuta-3.8.4/libanjuta/interfaces/libanjuta.idl anjuta-3.10.2/libanjuta/interfaces/libanjuta.idl
--- anjuta-3.8.4/libanjuta/interfaces/libanjuta.idl 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/interfaces/libanjuta.idl 2013-07-08 21:06:37.000000000 +0000
@@ -674,7 +674,7 @@
typedef void (*Callback) (GObject *sender, IAnjutaBuilderHandle command, GError* err, gpointer user_data);
/**
- * IANJUTA_BUILDER_ROOT_URI
+ * IANJUTA_BUILDER_ROOT_URI:
*
* Build directory uri. It is the same than the project_root_uri for
* in source build.
@@ -682,21 +682,21 @@
#define ROOT_URI "build_root_uri"
/**
- * IANJUTA_BUILDER_CONFIGURATION_DEBUG
+ * IANJUTA_BUILDER_CONFIGURATION_DEBUG:
*
* Name of debugging configutation.
*/
#define CONFIGURATION_DEBUG "Debug"
/**
- * IANJUTA_BUILDER_CONFIGURATION_OPTIMIZED
+ * IANJUTA_BUILDER_CONFIGURATION_OPTIMIZED:
*
* Name of optimized configutation.
*/
#define CONFIGURATION_OPTIMIZED "Optimized"
/**
- * IANJUTA_BUILDER_CONFIGURATION_PROFILING
+ * IANJUTA_BUILDER_CONFIGURATION_PROFILING:
*
* Name of profiling configutation.
*/
@@ -1249,6 +1249,22 @@
void clear ();
}
+
+interface IAnjutaGlade
+{
+ /**
+ * ianjuta_add_association:
+ * @obj: Self
+ * @master: ui file name.
+ * @slave: source code file name.
+ * @err: Error propagation and reporting.
+ *
+ * Adds an association of master ui file and slave source code file
+ *
+ */
+ void add_association (gchar *master, gchar *slave);
+}
+
/**
* SECTION:ianjuta-editor
* @title: IAnjutaEditor
@@ -1264,28 +1280,28 @@
#include
/**
- * IANJUTA_EDITOR_PREF_SCHEMA
+ * IANJUTA_EDITOR_PREF_SCHEMA:
*
* Schema id used to store common editor settings.
*/
#define PREF_SCHEMA "editor"
/**
- * IANJUTA_EDITOR_USE_TABS_KEY
+ * IANJUTA_EDITOR_USE_TABS_KEY:
*
* Boolean key, true is tabs has to be used for indenting.
*/
#define USE_TABS_KEY "use-tabs"
/**
- * IANJUTA_EDITOR_TAB_WIDTH_KEY
+ * IANJUTA_EDITOR_TAB_WIDTH_KEY:
*
* Integer key, defines the size of a tabulation in spaces.
*/
#define TAB_WIDTH_KEY "tab-width"
/**
- * IANJUTA_EDITOR_INDENT_WIDTH_KEY
+ * IANJUTA_EDITOR_INDENT_WIDTH_KEY:
*
* Integer key, defines the number a space for one indentation step.
*/
@@ -1326,7 +1342,7 @@
void ::glade_member_add (gchar *widget_typename, gchar *widget_name, gchar *filename);
/**
- * IAnjutaEditor::glade-member-add:
+ * IAnjutaEditor::glade-callback-add:
* @widget_typename: Name of the type of the widget.
* @signal_name: Name of the signal.
* @handler_name: Name of the signal handler.
@@ -1341,15 +1357,15 @@
void ::glade_callback_add (gchar *widget_typename, gchar *signal_name, gchar *handler_name, gchar *object, gboolean swap, gboolean after, gchar *filename);
/**
- * IAnjutaEditor::code-added:
- * @position: The iter position where @ch is added.
- * @code: The code that has been added.
+ * IAnjutaEditor::code-changed:
+ * @position: The iter position where code has been changed or NULL.
+ * @code: The code that has been added or NULL.
* @obj: Self
*
- * This signal is emitted when code is added inside the editor.
- * The newly added code is @code which has been inserted at @position.
+ * This signal is emitted when code is changed inside the editor.
+ * When such information is availabe, @position stores the position where @code was added.
*/
- void ::code_added (IAnjutaIterable *position, gchar *code);
+ void ::code_changed (IAnjutaIterable *position, gchar *code);
/**
* IAnjutaEditor::char-added:
@@ -1472,7 +1488,7 @@
/**
* ianjuta_editor_set_indentsize:
* @obj: Self
- * @tabsize: Indentation size in spaces
+ * @indentsize: Indentation size in spaces
* @err: Error propagation and reporting
*
* Sets the indentation size of the editor.
@@ -1946,7 +1962,6 @@
gboolean backward (const gchar* search, gboolean case_sensitive, IAnjutaEditorCell* start, IAnjutaEditorCell* end, IAnjutaEditorCell** result_start, IAnjutaEditorCell** result_end);
}
-
/**
* SECTION:ianjuta-editor-convert
* @title: IAnjutaEditorConvert
@@ -2083,7 +2098,7 @@
void show (List tips, IAnjutaIterable *position);
/**
- * ianjuta_editor_tip_cancel
+ * ianjuta_editor_tip_cancel:
* @obj: Self
* @err: Error propagation and reporting
*
@@ -2125,7 +2140,7 @@
}
/**
- * IAnjutaEditorAssist::cancelled
+ * IAnjutaEditorAssist::cancelled:
* @obj: Self
*
* This signal is emitted when the autocompletion is cancelled due to various
@@ -2135,7 +2150,7 @@
void ::cancelled ();
/*
- * ianjuta_editor_assist_add
+ * ianjuta_editor_assist_add:
* @obj: self
* @provider: a IAnjutaProvider
* @err: Error handling
@@ -2145,7 +2160,7 @@
void add(IAnjutaProvider* provider);
/*
- * ianjuta_editor_assist_remove
+ * ianjuta_editor_assist_remove:
* @obj: self
* @provider: a IAnjutaProvider
* @err: Error handling
@@ -2155,7 +2170,7 @@
void remove(IAnjutaProvider* provider);
/*
- * ianjuta_editor_assist_invoke
+ * ianjuta_editor_assist_invoke:
* @obj: self
* @provider: a IAnjutaProvider (can be NULL to use all providers)
* @err: Error handling
@@ -2197,7 +2212,8 @@
{
#include
- /* IAnjutaEditorHover::hover-over:
+ /**
+ * IAnjutaEditorHover::hover-over:
* @obj: self
* @position: IAnjutaEditorCell specifying the position the mouse is over
*
@@ -2206,7 +2222,8 @@
*/
void ::hover_over (IAnjutaIterable* position);
- /* IAnjutaEditorHover::hover-leave
+ /**
+ * IAnjutaEditorHover::hover-leave:
* @obj: self
* @position: IAnjutaEditorCell specifying the position the mouse was over
*
@@ -2238,7 +2255,8 @@
*/
interface IAnjutaEditorLanguage
{
- /* IAnjutaEditorLanguage::language-changed:
+ /**
+ * IAnjutaEditorLanguage::language-changed:
* @obj: self
* @language: new language
*
@@ -2503,7 +2521,8 @@
*/
interface IAnjutaEditorGladeSignal
{
- /* IAnjutaEditorGladeSignal::drop-possible
+ /**
+ * IAnjutaEditorGladeSignal::drop-possible:
* @obj: self
* @iter: a IAnjutaIterable of the position where drop would happen
*
@@ -2513,7 +2532,8 @@
*/
gboolean ::drop_possible (IAnjutaIterable* iterator);
- /* IAnjutaEditorGladeSignal::drop
+ /**
+ * IAnjutaEditorGladeSignal::drop:
* @obj: self
* @iter: a IAnjutaIterable of the position where drop happens
* @signal_data: Signal data in form "widget:signal:handler", e.g.
@@ -2707,35 +2727,35 @@
#include "ianjuta-symbol.h"
/**
- * IANJUTA_LANGUAGE_PROVIDER_PREF_CALLTIP_ENABLE
+ * IANJUTA_LANGUAGE_PROVIDER_PREF_CALLTIP_ENABLE:
*
* Boolean key, true is calltips has to be shown.
*/
#define PREF_CALLTIP_ENABLE "calltip-enable"
/**
- * IANJUTA_LANGUAGE_PROVIDER_PREF_AUTOCOMPLETE_ENABLE
+ * IANJUTA_LANGUAGE_PROVIDER_PREF_AUTOCOMPLETE_ENABLE:
*
* Boolean key, true is code completion is enable.
*/
#define PREF_AUTOCOMPLETE_ENABLE "completion-enable"
/**
- * IANJUTA_LANGUAGE_PROVIDER_PREF_AUTOCOMPLETE_SPACE_AFTER_FUNC
+ * IANJUTA_LANGUAGE_PROVIDER_PREF_AUTOCOMPLETE_SPACE_AFTER_FUNC:
*
* Boolean key, true is adding a space after function call autocompletion
*/
#define PREF_AUTOCOMPLETE_SPACE_AFTER_FUNC "completion-space-after-func"
/**
- * IANJUTA_LANGUAGE_PROVIDER_PREF_AUTOCOMPLETE_BRACE_AFTER_FUNC
+ * IANJUTA_LANGUAGE_PROVIDER_PREF_AUTOCOMPLETE_BRACE_AFTER_FUNC:
*
* Boolean key, true is adding '(' after function call autocompletion
*/
#define PREF_AUTOCOMPLETE_BRACE_AFTER_FUNC "completion-brace-after-func"
/**
- * IANJUTA_LANGUAGE_PROVIDER_PREF_AUTOCOMPLETE_CLOSEBRACE_AFTER_FUNC
+ * IANJUTA_LANGUAGE_PROVIDER_PREF_AUTOCOMPLETE_CLOSEBRACE_AFTER_FUNC:
*
* Boolean key, true is adding ')' after function call autocompletion
*/
@@ -2812,7 +2832,7 @@
#include
/**
- * IANJUTA_DOCUMENT_MANAGER_CURRENT_DOCUMENT
+ * IANJUTA_DOCUMENT_MANAGER_CURRENT_DOCUMENT:
*
* Anjuta shell value set by document manager to the current document
*/
@@ -3246,7 +3266,7 @@
#include
/**
- * IANJUTA_FILE_MANAGER_SELECTED_FILE
+ * IANJUTA_FILE_MANAGER_SELECTED_FILE:
*
* Anjuta shell value set by file manager to the selected file.
*/
@@ -3320,7 +3340,7 @@
* @obj: Self
* @directory: Working directory
* @command: Command executed followed by arguments
- * @environment: List of additional environment variables
+ * @environment: (array zero-terminated=1): List of additional environment variables
* @err: Error propagation and reporting.
*
* Run the command in a terminal, setting the working directory
@@ -3493,7 +3513,7 @@
*
* Return value: (allow-none) (transfer none): The new property of NULL if the property cannot be set
*/
- AnjutaProjectProperty *set_property (AnjutaProjectNode *parent, const gchar *id, const gchar *name, const gchar *value);
+ AnjutaProjectProperty *set_property (AnjutaProjectNode *node, const gchar *id, const gchar *name, const gchar *value);
/**
* ianjuta_project_remove_property:
@@ -3574,7 +3594,7 @@
/**
* ianjuta_project_backend_probe:
* @obj: Self
- * @file: (transfer none): Project file or directory
+ * @directory: (transfer none): Project file or directory
* @err: Error propagation and reporting
*
* Check if the directory contains a project supported by this
@@ -3602,14 +3622,14 @@
#include
/**
- * IANJUTA_PROJECT_MANAGER_PROJECT_ROOT_URI
+ * IANJUTA_PROJECT_MANAGER_PROJECT_ROOT_URI:
*
* Anjuta shell value set by project manager to the project root uri.
*/
#define PROJECT_ROOT_URI "project_root_uri"
/**
- * IANJUTA_PROJECT_MANAGER_CURRENT_PROJECT
+ * IANJUTA_PROJECT_MANAGER_CURRENT_PROJECT:
*
* Anjuta shell value set by project manager to the current project object
* which implement #IAnjutaProject interface.
@@ -3617,7 +3637,7 @@
#define CURRENT_PROJECT "project_manager_current_project"
/**
- * IANJUTA_PROJECT_MANAGER_CURRENT_URI
+ * IANJUTA_PROJECT_MANAGER_CURRENT_URI:
*
* Anjuta shell value set by project manager to the current uri.
*/
@@ -3863,6 +3883,20 @@
GFile* add_group (const gchar *name, GFile *default_group);
/**
+ * ianjuta_project_manager_remove_file:
+ * @obj: Self.
+ * @file: A #GFile that will be removed from the project
+ * @err: Error propagation and reporting.
+ *
+ * Remove a source file from the project. If the file is used in several
+ * targets, it is removed from all targets. The file could be removed from
+ * the disk.
+ *
+ * Returns: %TRUE if the file has been removed from the project else %FALSE
+ */
+ gboolean remove_file (GFile *file);
+
+ /**
* ianjuta_project_manager_is_open:
* @obj: Self
* @err: Error propagation and reporting.
@@ -4162,7 +4196,7 @@
* IAnjutaDebuggerCallback:
* @data: data
* @user_data: user data passed to the function
- * @error: error
+ * @err: error
*
* This callback function is used only by #ianjuta_debugger_callback with a
* NULL data.
@@ -4173,7 +4207,7 @@
* IAnjutaDebuggerGListCallback:
* @list: (element-type any): list of data
* @user_data: user data passed to the function
- * @error: error
+ * @err: error
*
* This callback function is used by several debugger functions. Depending on
* the function, the kind of elements in the list is different. It is a string
@@ -4184,9 +4218,9 @@
/**
* IAnjutaDebuggerGCharCallback:
- * @data: string
+ * @value: string
* @user_data: user data
- * @error: error
+ * @err: error
*
* This callback function is used by several debugger functions. The data is
* a string
@@ -4195,9 +4229,9 @@
/**
* IAnjutaDebuggerOutputCallback:
- * @data: Self
+ * @type: kind of output
+ * @output: string
* @user_data: user data
- * @error: error
*
* This callback function is used only by #ianjuta_debugger_callback with a
* NULL data.
@@ -4579,7 +4613,7 @@
*
* Returns: TRUE if sucessful, otherwise FALSE.
*/
- gboolean print (const gchar *variable, GCharCallback callback, gpointer user_data);
+ gboolean print (const gchar *name, GCharCallback callback, gpointer user_data);
/**
* ianjuta_debugger_list_local:
@@ -4972,7 +5006,7 @@
* IAnjutaDebuggerBreakpointCallback:
* @data: a #IAnjutaBreakpointItem object
* @user_data: user data passed to the function
- * @error: error
+ * @err: error
*
* This callback function is used to return a #IAnjutaBreakpointItem.
*/
@@ -5169,7 +5203,7 @@
* IAnjutaDebuggerVariableCallback:
* @data: a #IAnjutaDebuggerVariableObject object
* @user_data: user data passed to the function
- * @error: error
+ * @err: error
*
* This callback function is used to return a #IAnjutaDebuggerVariableObject.
*/
@@ -5374,7 +5408,7 @@
* IAnjutaDebuggerMemoryCallback:
* @data: a #IAnjutaDebuggerMemoryBlock object
* @user_data: user data passed to the function
- * @error: error
+ * @err: error
*
* This callback function is used to return a #IAnjutaDebuggerMemoryBlock.
*/
@@ -5442,7 +5476,7 @@
* IAnjutaDebuggerInstructionCallback:
* @data: a #IAnjutaDebuggerInstructionDisassembly object
* @user_data: user data passed to the function
- * @error: error
+ * @err: error
*
* This callback function is used to return a #IAnjutaDebuggerInstructionDisassembly.
*/
@@ -5750,7 +5784,7 @@
}
/**
- * IAnjutaVcsStatus
+ * IAnjutaVcsStatus:
* @obj: Self
*
* This signal is emited when the git pull command is finished, and refreshes the tree of files with the new pulled files without the need to
@@ -6260,7 +6294,7 @@
* symbols satisfying the given symbol types are selected, otherwise
* they are excluded.
*/
- void set_filters (IAnjutaSymbolType filters, gboolean includes_types);
+ void set_filters (IAnjutaSymbolType filters, gboolean include_types);
/**
* ianjuta_symbol_query_set_file_scope:
@@ -6395,7 +6429,7 @@
*
* Executes #IANJUTA_SYMBOL_QUERY_SEARCH_ID query.
*/
- IAnjutaIterable* search_id (gint symbol_id);
+ IAnjutaIterable* search_id (gint symbol);
/**
* ianjuta_symbol_query_search_scope:
@@ -6445,6 +6479,7 @@
#include "ianjuta-iterable.h"
#include "ianjuta-symbol.h"
#include "ianjuta-symbol-query.h"
+ #include
/**
* IAnjutaSymbolManager::prj_scan_end:
@@ -6555,7 +6590,7 @@
void print();
/**
- * ianjuta_print_print:
+ * ianjuta_print_print_preview:
* @obj: Self
* @err: Error propagation and reporting.
*
@@ -6790,11 +6825,11 @@
#include
/**
- * ianjuta_indenter_indent
+ * ianjuta_indenter_indent:
* @obj: Self
* @start: Start of the area to indent
* @end: End of the area to indent
- * @error: Error propagation
+ * @err: Error propagation
*
* Indent the area between @start and @end according to the indentation rules
* of the programming language. Usually implemented by language support plugins.
diff -Nru anjuta-3.8.4/libanjuta/libanjuta.h anjuta-3.10.2/libanjuta/libanjuta.h
--- anjuta-3.8.4/libanjuta/libanjuta.h 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/libanjuta.h 2013-07-08 21:06:37.000000000 +0000
@@ -55,5 +55,26 @@
#include
#include
#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
#endif
diff -Nru anjuta-3.8.4/libanjuta/resources.c anjuta-3.10.2/libanjuta/resources.c
--- anjuta-3.8.4/libanjuta/resources.c 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/libanjuta/resources.c 2013-07-08 21:06:37.000000000 +0000
@@ -258,25 +258,27 @@
void
anjuta_res_help_search (const gchar * word)
{
+ GError *error = NULL;
+ gchar **argv = g_new0 (gchar *, 4);
+
+ argv[0] = g_strdup ("devhelp");
+
if(word)
{
+ argv[1] = g_strdup ("-s");
+ argv[2] = g_strdup (word);
+
fprintf(stderr, "Word is %s\n", word);
- if(fork()==0)
- {
- execlp("devhelp", "devhelp", "-s", word, NULL);
- g_warning (_("Cannot execute command: \"%s\""), "devhelp");
- _exit(1);
- }
}
- else
+
+ if (g_spawn_async (NULL, argv, NULL, G_SPAWN_SEARCH_PATH,
+ NULL, NULL, NULL, &error))
{
- if(fork()==0)
- {
- execlp("devhelp", "devhelp", NULL);
- g_warning (_("Cannot execute command: \"%s\""), "devhelp");
- _exit(1);
- }
+ g_warning (_("Cannot execute command \"%s\": %s"), "devhelp", error->message);
+ g_error_free (error);
}
+
+ g_strfreev (argv);
}
void
diff -Nru anjuta-3.8.4/libanjuta/tests/Makefile.am anjuta-3.10.2/libanjuta/tests/Makefile.am
--- anjuta-3.8.4/libanjuta/tests/Makefile.am 2013-02-19 00:02:14.000000000 +0000
+++ anjuta-3.10.2/libanjuta/tests/Makefile.am 2013-11-03 18:57:08.000000000 +0000
@@ -1,7 +1,8 @@
noinst_PROGRAMS = \
anjuta-completion-test \
anjuta-tabber-test \
- anjuta-token-test
+ anjuta-token-test \
+ anjuta-diff-renderer-test
# Include paths
AM_CPPFLAGS = \
@@ -26,6 +27,10 @@
anjuta_token_test_SOURCES = anjuta-token-test.c \
../anjuta-token.c
+anjuta_diff_renderer_test_CFLAGS = $(LIBANJUTA_CFLAGS)
+anjuta_diff_renderer_test_LDADD = $(LIBANJUTA_LIBS) $(ANJUTA_LIBS)
+anjuta_diff_renderer_test_SOURCES = anjuta-diff-renderer-test.c
+
CLEANFILES = anjuta_token_test-anjuta-token.gcno \
anjuta_token_test-anjuta-token-test.gcno \
anjuta_token_test-anjuta-debug.gcno
diff -Nru anjuta-3.8.4/libanjuta/tests/Makefile.in anjuta-3.10.2/libanjuta/tests/Makefile.in
--- anjuta-3.8.4/libanjuta/tests/Makefile.in 2013-06-03 21:24:28.000000000 +0000
+++ anjuta-3.10.2/libanjuta/tests/Makefile.in 2013-11-14 21:21:10.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
@SET_MAKE@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
esac; \
- test $$am__dry = yes; \
- }
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -52,9 +79,11 @@
build_triplet = @build@
host_triplet = @host@
noinst_PROGRAMS = anjuta-completion-test$(EXEEXT) \
- anjuta-tabber-test$(EXEEXT) anjuta-token-test$(EXEEXT)
+ anjuta-tabber-test$(EXEEXT) anjuta-token-test$(EXEEXT) \
+ anjuta-diff-renderer-test$(EXEEXT)
subdir = libanjuta/tests
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
@@ -82,10 +111,21 @@
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
+am__v_lt_1 =
anjuta_completion_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(anjuta_completion_test_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
+am_anjuta_diff_renderer_test_OBJECTS = \
+ anjuta_diff_renderer_test-anjuta-diff-renderer-test.$(OBJEXT)
+anjuta_diff_renderer_test_OBJECTS = \
+ $(am_anjuta_diff_renderer_test_OBJECTS)
+anjuta_diff_renderer_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
+anjuta_diff_renderer_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(anjuta_diff_renderer_test_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
am_anjuta_tabber_test_OBJECTS = \
anjuta_tabber_test-anjuta-tabber-test.$(OBJEXT)
anjuta_tabber_test_OBJECTS = $(am_anjuta_tabber_test_OBJECTS)
@@ -104,6 +144,18 @@
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(anjuta_token_test_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -116,29 +168,44 @@
$(AM_CFLAGS) $(CFLAGS)
AM_V_CC = $(am__v_CC_@AM_V@)
am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo " CC " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 =
CCLD = $(CC)
LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo " CCLD " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 =
SOURCES = $(anjuta_completion_test_SOURCES) \
+ $(anjuta_diff_renderer_test_SOURCES) \
$(anjuta_tabber_test_SOURCES) $(anjuta_token_test_SOURCES)
DIST_SOURCES = $(anjuta_completion_test_SOURCES) \
+ $(anjuta_diff_renderer_test_SOURCES) \
$(anjuta_tabber_test_SOURCES) $(anjuta_token_test_SOURCES)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -289,6 +356,8 @@
PLUGIN_DEVHELP_LIBS = @PLUGIN_DEVHELP_LIBS@
PLUGIN_GLADE_CFLAGS = @PLUGIN_GLADE_CFLAGS@
PLUGIN_GLADE_LIBS = @PLUGIN_GLADE_LIBS@
+PLUGIN_TERMINAL_CFLAGS = @PLUGIN_TERMINAL_CFLAGS@
+PLUGIN_TERMINAL_LIBS = @PLUGIN_TERMINAL_LIBS@
POSUB = @POSUB@
PREF_SUFFIX = @PREF_SUFFIX@
PYTHON = @PYTHON@
@@ -303,8 +372,11 @@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+SHM_LIBS = @SHM_LIBS@
SOURCEVIEW_CFLAGS = @SOURCEVIEW_CFLAGS@
SOURCEVIEW_LIBS = @SOURCEVIEW_LIBS@
+SQLITE_CFLAGS = @SQLITE_CFLAGS@
+SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
SVNCONFIG = @SVNCONFIG@
SVN_CFLAGS = @SVN_CFLAGS@
@@ -316,8 +388,6 @@
VALA_CFLAGS = @VALA_CFLAGS@
VALA_LIBS = @VALA_LIBS@
VERSION = @VERSION@
-VTE_CFLAGS = @VTE_CFLAGS@
-VTE_LIBS = @VTE_LIBS@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
@@ -412,6 +482,9 @@
anjuta_token_test_SOURCES = anjuta-token-test.c \
../anjuta-token.c
+anjuta_diff_renderer_test_CFLAGS = $(LIBANJUTA_CFLAGS)
+anjuta_diff_renderer_test_LDADD = $(LIBANJUTA_LIBS) $(ANJUTA_LIBS)
+anjuta_diff_renderer_test_SOURCES = anjuta-diff-renderer-test.c
CLEANFILES = anjuta_token_test-anjuta-token.gcno \
anjuta_token_test-anjuta-token-test.gcno \
anjuta_token_test-anjuta-debug.gcno
@@ -459,12 +532,19 @@
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
+
anjuta-completion-test$(EXEEXT): $(anjuta_completion_test_OBJECTS) $(anjuta_completion_test_DEPENDENCIES) $(EXTRA_anjuta_completion_test_DEPENDENCIES)
@rm -f anjuta-completion-test$(EXEEXT)
$(AM_V_CCLD)$(anjuta_completion_test_LINK) $(anjuta_completion_test_OBJECTS) $(anjuta_completion_test_LDADD) $(LIBS)
+
+anjuta-diff-renderer-test$(EXEEXT): $(anjuta_diff_renderer_test_OBJECTS) $(anjuta_diff_renderer_test_DEPENDENCIES) $(EXTRA_anjuta_diff_renderer_test_DEPENDENCIES)
+ @rm -f anjuta-diff-renderer-test$(EXEEXT)
+ $(AM_V_CCLD)$(anjuta_diff_renderer_test_LINK) $(anjuta_diff_renderer_test_OBJECTS) $(anjuta_diff_renderer_test_LDADD) $(LIBS)
+
anjuta-tabber-test$(EXEEXT): $(anjuta_tabber_test_OBJECTS) $(anjuta_tabber_test_DEPENDENCIES) $(EXTRA_anjuta_tabber_test_DEPENDENCIES)
@rm -f anjuta-tabber-test$(EXEEXT)
$(AM_V_CCLD)$(anjuta_tabber_test_LINK) $(anjuta_tabber_test_OBJECTS) $(anjuta_tabber_test_LDADD) $(LIBS)
+
anjuta-token-test$(EXEEXT): $(anjuta_token_test_OBJECTS) $(anjuta_token_test_DEPENDENCIES) $(EXTRA_anjuta_token_test_DEPENDENCIES)
@rm -f anjuta-token-test$(EXEEXT)
$(AM_V_CCLD)$(anjuta_token_test_LINK) $(anjuta_token_test_OBJECTS) $(anjuta_token_test_LDADD) $(LIBS)
@@ -476,6 +556,7 @@
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/anjuta_completion_test-anjuta-completion-test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/anjuta_diff_renderer_test-anjuta-diff-renderer-test.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/anjuta_tabber_test-anjuta-tabber-test.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/anjuta_token_test-anjuta-token-test.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/anjuta_token_test-anjuta-token.Po@am__quote@
@@ -515,6 +596,20 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(anjuta_completion_test_CFLAGS) $(CFLAGS) -c -o anjuta_completion_test-anjuta-completion-test.obj `if test -f 'anjuta-completion-test.c'; then $(CYGPATH_W) 'anjuta-completion-test.c'; else $(CYGPATH_W) '$(srcdir)/anjuta-completion-test.c'; fi`
+anjuta_diff_renderer_test-anjuta-diff-renderer-test.o: anjuta-diff-renderer-test.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(anjuta_diff_renderer_test_CFLAGS) $(CFLAGS) -MT anjuta_diff_renderer_test-anjuta-diff-renderer-test.o -MD -MP -MF $(DEPDIR)/anjuta_diff_renderer_test-anjuta-diff-renderer-test.Tpo -c -o anjuta_diff_renderer_test-anjuta-diff-renderer-test.o `test -f 'anjuta-diff-renderer-test.c' || echo '$(srcdir)/'`anjuta-diff-renderer-test.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/anjuta_diff_renderer_test-anjuta-diff-renderer-test.Tpo $(DEPDIR)/anjuta_diff_renderer_test-anjuta-diff-renderer-test.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='anjuta-diff-renderer-test.c' object='anjuta_diff_renderer_test-anjuta-diff-renderer-test.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(anjuta_diff_renderer_test_CFLAGS) $(CFLAGS) -c -o anjuta_diff_renderer_test-anjuta-diff-renderer-test.o `test -f 'anjuta-diff-renderer-test.c' || echo '$(srcdir)/'`anjuta-diff-renderer-test.c
+
+anjuta_diff_renderer_test-anjuta-diff-renderer-test.obj: anjuta-diff-renderer-test.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(anjuta_diff_renderer_test_CFLAGS) $(CFLAGS) -MT anjuta_diff_renderer_test-anjuta-diff-renderer-test.obj -MD -MP -MF $(DEPDIR)/anjuta_diff_renderer_test-anjuta-diff-renderer-test.Tpo -c -o anjuta_diff_renderer_test-anjuta-diff-renderer-test.obj `if test -f 'anjuta-diff-renderer-test.c'; then $(CYGPATH_W) 'anjuta-diff-renderer-test.c'; else $(CYGPATH_W) '$(srcdir)/anjuta-diff-renderer-test.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/anjuta_diff_renderer_test-anjuta-diff-renderer-test.Tpo $(DEPDIR)/anjuta_diff_renderer_test-anjuta-diff-renderer-test.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='anjuta-diff-renderer-test.c' object='anjuta_diff_renderer_test-anjuta-diff-renderer-test.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(anjuta_diff_renderer_test_CFLAGS) $(CFLAGS) -c -o anjuta_diff_renderer_test-anjuta-diff-renderer-test.obj `if test -f 'anjuta-diff-renderer-test.c'; then $(CYGPATH_W) 'anjuta-diff-renderer-test.c'; else $(CYGPATH_W) '$(srcdir)/anjuta-diff-renderer-test.c'; fi`
+
anjuta_tabber_test-anjuta-tabber-test.o: anjuta-tabber-test.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(anjuta_tabber_test_CFLAGS) $(CFLAGS) -MT anjuta_tabber_test-anjuta-tabber-test.o -MD -MP -MF $(DEPDIR)/anjuta_tabber_test-anjuta-tabber-test.Tpo -c -o anjuta_tabber_test-anjuta-tabber-test.o `test -f 'anjuta-tabber-test.c' || echo '$(srcdir)/'`anjuta-tabber-test.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/anjuta_tabber_test-anjuta-tabber-test.Tpo $(DEPDIR)/anjuta_tabber_test-anjuta-tabber-test.Po
@@ -563,26 +658,15 @@
clean-libtool:
-rm -rf .libs _libs
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@ -594,15 +678,11 @@
$$unique; \
fi; \
fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@ -611,6 +691,21 @@
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -753,18 +848,19 @@
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-noinstPROGRAMS ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-am
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-am uninstall uninstall-am
-include $(top_srcdir)/git.mk
diff -Nru anjuta-3.8.4/libanjuta/tests/anjuta-diff-renderer-test.c anjuta-3.10.2/libanjuta/tests/anjuta-diff-renderer-test.c
--- anjuta-3.8.4/libanjuta/tests/anjuta-diff-renderer-test.c 1970-01-01 00:00:00.000000000 +0000
+++ anjuta-3.10.2/libanjuta/tests/anjuta-diff-renderer-test.c 2013-11-03 18:57:08.000000000 +0000
@@ -0,0 +1,152 @@
+/*
+ * anjuta-diff-renderer-test.c
+ *
+ * Copyright (C) 2013 - James Liggett
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#include
+
+enum
+{
+ COL_DIFF,
+
+ NUM_COLS
+};
+
+static void
+on_window_destroy (GtkWidget *window, gpointer user_data)
+{
+ gtk_main_quit ();
+}
+
+int
+main (int argc, char **argv)
+{
+ GtkWidget *window;
+ GtkWidget *scrolled_window;
+ GtkWidget *tree_view;
+ GtkTreeViewColumn *column;
+ GtkCellRenderer *renderer;
+ GtkListStore *list_store;
+ GtkTreeIter iter;
+ const gchar header1[] =
+ "diff --git a/libanjuta/Makefile.am b/libanjuta/Makefile.am\n";
+
+ const gchar header2[] =
+ "index 4ac227e..d47c978 100644\n";
+
+ const gchar header3[] =
+ "--- a/libanjuta/Makefile.am\n";
+
+ const gchar header4[] =
+ "+++ b/libanjuta/Makefile.am\n";
+
+ const gchar hunk_header[] =
+ "@@ -138,7 +138,9 @@ libanjuta_3_la_SOURCES= \\\n";
+
+ const gchar context[] =
+ " anjuta-close-button.c \\\n";
+
+ const gchar add[] =
+ "+ anjuta-modeline.h \\\n";
+
+ const gchar delete[] =
+ "- anjuta-modeline.h\n";
+
+ const gchar non_diff[] = "non-diff text";
+ const gchar broken_hunk[] = "@";
+
+ gtk_init (&argc, &argv);
+
+
+ window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_title (GTK_WINDOW (window), "Diff renderer test");
+
+ scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+ tree_view = gtk_tree_view_new ();
+
+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (tree_view), FALSE);
+
+ renderer = anjuta_cell_renderer_diff_new ();
+ column = gtk_tree_view_column_new ();
+
+ gtk_tree_view_column_pack_start (column, renderer, TRUE);
+ gtk_tree_view_column_add_attribute (column, renderer, "diff", COL_DIFF);
+ gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);
+
+ gtk_container_add (GTK_CONTAINER (scrolled_window), tree_view);
+ gtk_container_add (GTK_CONTAINER (window), scrolled_window);
+
+ list_store = gtk_list_store_new (NUM_COLS, G_TYPE_STRING);
+
+ /* Test headers*/
+ gtk_list_store_append (list_store, &iter);
+ gtk_list_store_set (list_store, &iter, COL_DIFF, header1, -1);
+
+ gtk_list_store_append (list_store, &iter);
+ gtk_list_store_set (list_store, &iter, COL_DIFF, header2, -1);
+
+ gtk_list_store_append (list_store, &iter);
+ gtk_list_store_set (list_store, &iter, COL_DIFF, header3, -1);
+
+ gtk_list_store_append (list_store, &iter);
+ gtk_list_store_set (list_store, &iter, COL_DIFF, header4, -1);
+
+ /* Test hunk headers */
+ gtk_list_store_append (list_store, &iter);
+ gtk_list_store_set (list_store, &iter, COL_DIFF, hunk_header, -1);
+
+ /* Context lines */
+ gtk_list_store_append (list_store, &iter);
+ gtk_list_store_set (list_store, &iter, COL_DIFF, context, -1);
+
+ /* Add */
+ gtk_list_store_append (list_store, &iter);
+ gtk_list_store_set (list_store, &iter, COL_DIFF, add, -1);
+
+ /* Delete */
+ gtk_list_store_append (list_store, &iter);
+ gtk_list_store_set (list_store, &iter, COL_DIFF, delete, -1);
+
+ /* Test non-diff text */
+ gtk_list_store_append (list_store, &iter);
+ gtk_list_store_set (list_store, &iter, COL_DIFF, non_diff, -1);
+
+ /* Test broken hunks */
+ gtk_list_store_append (list_store, &iter);
+ gtk_list_store_set (list_store, &iter, COL_DIFF, broken_hunk, -1);
+
+ /* Test empty and NULL strings */
+ gtk_list_store_append (list_store, &iter);
+ gtk_list_store_set (list_store, &iter, COL_DIFF, "", -1);
+
+ gtk_list_store_append (list_store, &iter);
+ gtk_list_store_set (list_store, &iter, COL_DIFF, NULL, -1);
+
+ gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view),
+ GTK_TREE_MODEL (list_store));
+
+ g_signal_connect (G_OBJECT (window), "destroy",
+ G_CALLBACK (on_window_destroy),
+ NULL);
+
+ gtk_widget_set_size_request (window, 650, 400);
+
+ gtk_widget_show_all (window);
+ gtk_main();
+
+ return 0;
+}
\ No newline at end of file
diff -Nru anjuta-3.8.4/ltmain.sh anjuta-3.10.2/ltmain.sh
--- anjuta-3.8.4/ltmain.sh 2013-04-30 21:53:31.000000000 +0000
+++ anjuta-3.10.2/ltmain.sh 2013-11-14 21:21:01.000000000 +0000
@@ -70,7 +70,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.2ubuntu1
+# $progname: (GNU libtool) 2.4.2
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -80,7 +80,7 @@
PROGRAM=libtool
PACKAGE=libtool
-VERSION="2.4.2 Debian-2.4.2-1.2ubuntu1"
+VERSION=2.4.2
TIMESTAMP=""
package_revision=1.3337
@@ -6124,10 +6124,7 @@
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
- link)
- libs="$deplibs %DEPLIBS%"
- test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
- ;;
+ link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
esac
fi
if test "$linkmode,$pass" = "lib,dlpreopen"; then
@@ -6447,19 +6444,19 @@
# It is a libtool convenience library, so add in its objects.
func_append convenience " $ladir/$objdir/$old_library"
func_append old_convenience " $ladir/$objdir/$old_library"
- tmp_libs=
- for deplib in $dependency_libs; do
- deplibs="$deplib $deplibs"
- if $opt_preserve_dup_deps ; then
- case "$tmp_libs " in
- *" $deplib "*) func_append specialdeplibs " $deplib" ;;
- esac
- fi
- func_append tmp_libs " $deplib"
- done
elif test "$linkmode" != prog && test "$linkmode" != lib; then
func_fatal_error "\`$lib' is not a convenience library"
fi
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ deplibs="$deplib $deplibs"
+ if $opt_preserve_dup_deps ; then
+ case "$tmp_libs " in
+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+ esac
+ fi
+ func_append tmp_libs " $deplib"
+ done
continue
fi # $pass = conv
@@ -7352,9 +7349,6 @@
revision="$number_minor"
lt_irix_increment=no
;;
- *)
- func_fatal_configuration "$modename: unknown library version type \`$version_type'"
- ;;
esac
;;
no)
diff -Nru anjuta-3.8.4/m4/gtk-doc.m4 anjuta-3.10.2/m4/gtk-doc.m4
--- anjuta-3.8.4/m4/gtk-doc.m4 2013-01-28 07:13:59.000000000 +0000
+++ anjuta-3.10.2/m4/gtk-doc.m4 2012-12-14 16:23:01.000000000 +0000
@@ -37,7 +37,7 @@
dnl don't check for glib if we build glib
if test "x$PACKAGE_NAME" != "xglib"; then
dnl don't fail if someone does not have glib
- PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,)
+ PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:])
fi
fi
@@ -58,6 +58,10 @@
enable_gtk_doc_pdf=no
fi
+ if test -z "$AM_DEFAULT_VERBOSITY"; then
+ AM_DEFAULT_VERBOSITY=1
+ fi
+ AC_SUBST([AM_DEFAULT_VERBOSITY])
AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
diff -Nru anjuta-3.8.4/m4/libtool.m4 anjuta-3.10.2/m4/libtool.m4
--- anjuta-3.8.4/m4/libtool.m4 2013-04-30 21:53:32.000000000 +0000
+++ anjuta-3.10.2/m4/libtool.m4 2013-11-14 21:21:01.000000000 +0000
@@ -1324,14 +1324,7 @@
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
- case `/usr/bin/file conftest.o` in
- *x86-64*)
- LD="${LD-ld} -m elf32_x86_64"
- ;;
- *)
- LD="${LD-ld} -m elf_i386"
- ;;
- esac
+ LD="${LD-ld} -m elf_i386"
;;
ppc64-*linux*|powerpc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
@@ -1695,8 +1688,7 @@
;;
*)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len" && \
- test undefined != "$lt_cv_sys_max_cmd_len"; then
+ if test -n "$lt_cv_sys_max_cmd_len"; then
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
else
@@ -2520,6 +2512,17 @@
esac
;;
+gnu*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+
haiku*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
@@ -2636,7 +2639,7 @@
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
@@ -2666,10 +2669,14 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # Add ABI-specific directories to the system library path.
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -2681,18 +2688,6 @@
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -3252,6 +3247,10 @@
fi
;;
+gnu*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
haiku*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -3290,11 +3289,11 @@
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd* | netbsdelf*-gnu)
+netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
@@ -4042,7 +4041,7 @@
;;
esac
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -4106,7 +4105,7 @@
;;
esac
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4341,7 +4340,7 @@
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
@@ -4583,9 +4582,6 @@
;;
esac
;;
- linux* | k*bsd*-gnu | gnu*)
- _LT_TAGVAR(link_all_deplibs, $1)=no
- ;;
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -4648,9 +4644,6 @@
openbsd*)
with_gnu_ld=no
;;
- linux* | k*bsd*-gnu | gnu*)
- _LT_TAGVAR(link_all_deplibs, $1)=no
- ;;
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
@@ -4872,7 +4865,7 @@
fi
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -5049,7 +5042,6 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
- _LT_TAGVAR(link_all_deplibs, $1)=no
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -5354,7 +5346,7 @@
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -6234,6 +6226,9 @@
_LT_TAGVAR(ld_shlibs, $1)=yes
;;
+ gnu*)
+ ;;
+
haiku*)
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
_LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -6395,7 +6390,7 @@
_LT_TAGVAR(inherit_rpath, $1)=yes
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
diff -Nru anjuta-3.8.4/manuals/Makefile.in anjuta-3.10.2/manuals/Makefile.in
--- anjuta-3.8.4/manuals/Makefile.in 2013-06-03 21:24:28.000000000 +0000
+++ anjuta-3.10.2/manuals/Makefile.in 2013-11-14 21:21:10.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -19,23 +18,51 @@
# Add a document module as a subdir here #
##########################################
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
esac; \
- test $$am__dry = yes; \
- }
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -55,7 +82,7 @@
build_triplet = @build@
host_triplet = @host@
subdir = manuals
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
@@ -73,21 +100,28 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
AM_V_GEN = $(am__v_GEN_@AM_V@)
am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
AM_V_at = $(am__v_at_@AM_V@)
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- install-dvi-recursive install-exec-recursive \
- install-html-recursive install-info-recursive \
- install-pdf-recursive install-ps-recursive install-recursive \
- installcheck-recursive installdirs-recursive pdf-recursive \
- ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+ ctags-recursive dvi-recursive html-recursive info-recursive \
+ install-data-recursive install-dvi-recursive \
+ install-exec-recursive install-html-recursive \
+ install-info-recursive install-pdf-recursive \
+ install-ps-recursive install-recursive installcheck-recursive \
+ installdirs-recursive pdf-recursive ps-recursive \
+ tags-recursive uninstall-recursive
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -95,9 +129,29 @@
esac
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+ $(RECURSIVE_TARGETS) \
+ $(RECURSIVE_CLEAN_TARGETS) \
+ $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@@ -274,6 +328,8 @@
PLUGIN_DEVHELP_LIBS = @PLUGIN_DEVHELP_LIBS@
PLUGIN_GLADE_CFLAGS = @PLUGIN_GLADE_CFLAGS@
PLUGIN_GLADE_LIBS = @PLUGIN_GLADE_LIBS@
+PLUGIN_TERMINAL_CFLAGS = @PLUGIN_TERMINAL_CFLAGS@
+PLUGIN_TERMINAL_LIBS = @PLUGIN_TERMINAL_LIBS@
POSUB = @POSUB@
PREF_SUFFIX = @PREF_SUFFIX@
PYTHON = @PYTHON@
@@ -288,8 +344,11 @@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+SHM_LIBS = @SHM_LIBS@
SOURCEVIEW_CFLAGS = @SOURCEVIEW_CFLAGS@
SOURCEVIEW_LIBS = @SOURCEVIEW_LIBS@
+SQLITE_CFLAGS = @SQLITE_CFLAGS@
+SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
SVNCONFIG = @SVNCONFIG@
SVN_CFLAGS = @SVN_CFLAGS@
@@ -301,8 +360,6 @@
VALA_CFLAGS = @VALA_CFLAGS@
VALA_LIBS = @VALA_LIBS@
VERSION = @VERSION@
-VTE_CFLAGS = @VTE_CFLAGS@
-VTE_LIBS = @VTE_LIBS@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
@@ -420,22 +477,25 @@
-rm -rf .libs _libs
# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-# (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+# (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+ @fail=; \
+ if $(am__make_keepgoing); then \
+ failcom='fail=yes'; \
+ else \
+ failcom='exit 1'; \
+ fi; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ for subdir in $$list; do \
echo "Making $$target in $$subdir"; \
if test "$$subdir" = "."; then \
dot_seen=yes; \
@@ -450,57 +510,12 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -516,12 +531,7 @@
set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@ -533,15 +543,11 @@
$$unique; \
fi; \
fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@ -550,6 +556,21 @@
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -710,22 +731,20 @@
uninstall-am:
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
- install-am install-strip tags-recursive
+.MAKE: $(am__recursive_targets) install-am install-strip
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am check check-am clean clean-generic clean-libtool \
- ctags ctags-recursive distclean distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-pdf install-pdf-am \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+ check-am clean clean-generic clean-libtool cscopelist-am ctags \
+ ctags-am distclean distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+ ps ps-am tags tags-am uninstall uninstall-am
-include $(top_srcdir)/git.mk
Binary files /tmp/O0GFMnvACC/anjuta-3.8.4/manuals/anjuta-build-tutorial/C/figures/autotools-process.png and /tmp/ExqgyWdI97/anjuta-3.10.2/manuals/anjuta-build-tutorial/C/figures/autotools-process.png differ
Binary files /tmp/O0GFMnvACC/anjuta-3.8.4/manuals/anjuta-build-tutorial/C/figures/build_preferences.png and /tmp/ExqgyWdI97/anjuta-3.10.2/manuals/anjuta-build-tutorial/C/figures/build_preferences.png differ
Binary files /tmp/O0GFMnvACC/anjuta-3.8.4/manuals/anjuta-build-tutorial/C/figures/compilation-stages.png and /tmp/ExqgyWdI97/anjuta-3.10.2/manuals/anjuta-build-tutorial/C/figures/compilation-stages.png differ
Binary files /tmp/O0GFMnvACC/anjuta-3.8.4/manuals/anjuta-build-tutorial/C/figures/configure-dialog.png and /tmp/ExqgyWdI97/anjuta-3.10.2/manuals/anjuta-build-tutorial/C/figures/configure-dialog.png differ
Binary files /tmp/O0GFMnvACC/anjuta-3.8.4/manuals/anjuta-build-tutorial/C/figures/configure-process.png and /tmp/ExqgyWdI97/anjuta-3.10.2/manuals/anjuta-build-tutorial/C/figures/configure-process.png differ
Binary files /tmp/O0GFMnvACC/anjuta-3.8.4/manuals/anjuta-build-tutorial/C/figures/library-add-pkgconfig.png and /tmp/ExqgyWdI97/anjuta-3.10.2/manuals/anjuta-build-tutorial/C/figures/library-add-pkgconfig.png differ
Binary files /tmp/O0GFMnvACC/anjuta-3.8.4/manuals/anjuta-build-tutorial/C/figures/library-add-properties.png and /tmp/ExqgyWdI97/anjuta-3.10.2/manuals/anjuta-build-tutorial/C/figures/library-add-properties.png differ
Binary files /tmp/O0GFMnvACC/anjuta-3.8.4/manuals/anjuta-build-tutorial/C/figures/new-project-basic.png and /tmp/ExqgyWdI97/anjuta-3.10.2/manuals/anjuta-build-tutorial/C/figures/new-project-basic.png differ
Binary files /tmp/O0GFMnvACC/anjuta-3.8.4/manuals/anjuta-build-tutorial/C/figures/new-project-message.png and /tmp/ExqgyWdI97/anjuta-3.10.2/manuals/anjuta-build-tutorial/C/figures/new-project-message.png differ
Binary files /tmp/O0GFMnvACC/anjuta-3.8.4/manuals/anjuta-build-tutorial/C/figures/new-project-options.png and /tmp/ExqgyWdI97/anjuta-3.10.2/manuals/anjuta-build-tutorial/C/figures/new-project-options.png differ
Binary files /tmp/O0GFMnvACC/anjuta-3.8.4/manuals/anjuta-build-tutorial/C/figures/new-project-select.png and /tmp/ExqgyWdI97/anjuta-3.10.2/manuals/anjuta-build-tutorial/C/figures/new-project-select.png differ
Binary files /tmp/O0GFMnvACC/anjuta-3.8.4/manuals/anjuta-build-tutorial/C/figures/new-project-summary.png and /tmp/ExqgyWdI97/anjuta-3.10.2/manuals/anjuta-build-tutorial/C/figures/new-project-summary.png differ
diff -Nru anjuta-3.8.4/manuals/anjuta-build-tutorial/Makefile.am anjuta-3.10.2/manuals/anjuta-build-tutorial/Makefile.am
--- anjuta-3.8.4/manuals/anjuta-build-tutorial/Makefile.am 2012-09-26 20:53:46.000000000 +0000
+++ anjuta-3.10.2/manuals/anjuta-build-tutorial/Makefile.am 2013-11-03 18:57:08.000000000 +0000
@@ -5,17 +5,17 @@
HELP_FILES = \
index.docbook
-HELP_FIGURES = figures/autotools-process.png \
- figures/configure-process.png \
- figures/new-project-message.png \
- figures/build_preferences.png \
- figures/library-add-pkgconfig.png \
- figures/new-project-options.png \
- figures/compilation-stages.png \
- figures/library-add-properties.png \
- figures/new-project-select.png \
- figures/configure-dialog.png \
- figures/new-project-basic.png \
- figures/new-project-summary.png
+HELP_MEDIA = figures/autotools-process.png \
+ figures/configure-process.png \
+ figures/new-project-message.png \
+ figures/build_preferences.png \
+ figures/library-add-pkgconfig.png \
+ figures/new-project-options.png \
+ figures/compilation-stages.png \
+ figures/library-add-properties.png \
+ figures/new-project-select.png \
+ figures/configure-dialog.png \
+ figures/new-project-basic.png \
+ figures/new-project-summary.png
-include $(top_srcdir)/git.mk
diff -Nru anjuta-3.8.4/manuals/anjuta-build-tutorial/Makefile.in anjuta-3.10.2/manuals/anjuta-build-tutorial/Makefile.in
--- anjuta-3.8.4/manuals/anjuta-build-tutorial/Makefile.in 2013-06-03 21:24:28.000000000 +0000
+++ anjuta-3.10.2/manuals/anjuta-build-tutorial/Makefile.in 2013-11-14 21:21:10.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -15,23 +14,51 @@
@SET_MAKE@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
esac; \
- test $$am__dry = yes; \
- }
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -51,7 +78,7 @@
build_triplet = @build@
host_triplet = @host@
subdir = manuals/anjuta-build-tutorial
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
@@ -69,12 +96,18 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
AM_V_GEN = $(am__v_GEN_@AM_V@)
am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
AM_V_at = $(am__v_at_@AM_V@)
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
am__can_run_installinfo = \
@@ -82,6 +115,7 @@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -230,6 +264,8 @@
PLUGIN_DEVHELP_LIBS = @PLUGIN_DEVHELP_LIBS@
PLUGIN_GLADE_CFLAGS = @PLUGIN_GLADE_CFLAGS@
PLUGIN_GLADE_LIBS = @PLUGIN_GLADE_LIBS@
+PLUGIN_TERMINAL_CFLAGS = @PLUGIN_TERMINAL_CFLAGS@
+PLUGIN_TERMINAL_LIBS = @PLUGIN_TERMINAL_LIBS@
POSUB = @POSUB@
PREF_SUFFIX = @PREF_SUFFIX@
PYTHON = @PYTHON@
@@ -244,8 +280,11 @@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+SHM_LIBS = @SHM_LIBS@
SOURCEVIEW_CFLAGS = @SOURCEVIEW_CFLAGS@
SOURCEVIEW_LIBS = @SOURCEVIEW_LIBS@
+SQLITE_CFLAGS = @SQLITE_CFLAGS@
+SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
SVNCONFIG = @SVNCONFIG@
SVN_CFLAGS = @SVN_CFLAGS@
@@ -257,8 +296,6 @@
VALA_CFLAGS = @VALA_CFLAGS@
VALA_LIBS = @VALA_LIBS@
VERSION = @VERSION@
-VTE_CFLAGS = @VTE_CFLAGS@
-VTE_LIBS = @VTE_LIBS@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
@@ -338,18 +375,18 @@
HELP_FILES = \
index.docbook
-HELP_FIGURES = figures/autotools-process.png \
- figures/configure-process.png \
- figures/new-project-message.png \
- figures/build_preferences.png \
- figures/library-add-pkgconfig.png \
- figures/new-project-options.png \
- figures/compilation-stages.png \
- figures/library-add-properties.png \
- figures/new-project-select.png \
- figures/configure-dialog.png \
- figures/new-project-basic.png \
- figures/new-project-summary.png
+HELP_MEDIA = figures/autotools-process.png \
+ figures/configure-process.png \
+ figures/new-project-message.png \
+ figures/build_preferences.png \
+ figures/library-add-pkgconfig.png \
+ figures/new-project-options.png \
+ figures/compilation-stages.png \
+ figures/library-add-properties.png \
+ figures/new-project-select.png \
+ figures/configure-dialog.png \
+ figures/new-project-basic.png \
+ figures/new-project-summary.png
all: all-am
@@ -390,11 +427,11 @@
clean-libtool:
-rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -530,15 +567,16 @@
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+ cscopelist-am ctags-am distclean distclean-generic \
+ distclean-libtool distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags-am uninstall uninstall-am
@YELP_HELP_RULES@
diff -Nru anjuta-3.8.4/manuals/anjuta-faqs/Makefile.in anjuta-3.10.2/manuals/anjuta-faqs/Makefile.in
--- anjuta-3.8.4/manuals/anjuta-faqs/Makefile.in 2013-06-03 21:24:28.000000000 +0000
+++ anjuta-3.10.2/manuals/anjuta-faqs/Makefile.in 2013-11-14 21:21:10.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -15,23 +14,51 @@
@SET_MAKE@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
esac; \
- test $$am__dry = yes; \
- }
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -51,7 +78,7 @@
build_triplet = @build@
host_triplet = @host@
subdir = manuals/anjuta-faqs
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
@@ -69,12 +96,18 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
AM_V_GEN = $(am__v_GEN_@AM_V@)
am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
AM_V_at = $(am__v_at_@AM_V@)
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
am__can_run_installinfo = \
@@ -82,6 +115,7 @@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -230,6 +264,8 @@
PLUGIN_DEVHELP_LIBS = @PLUGIN_DEVHELP_LIBS@
PLUGIN_GLADE_CFLAGS = @PLUGIN_GLADE_CFLAGS@
PLUGIN_GLADE_LIBS = @PLUGIN_GLADE_LIBS@
+PLUGIN_TERMINAL_CFLAGS = @PLUGIN_TERMINAL_CFLAGS@
+PLUGIN_TERMINAL_LIBS = @PLUGIN_TERMINAL_LIBS@
POSUB = @POSUB@
PREF_SUFFIX = @PREF_SUFFIX@
PYTHON = @PYTHON@
@@ -244,8 +280,11 @@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+SHM_LIBS = @SHM_LIBS@
SOURCEVIEW_CFLAGS = @SOURCEVIEW_CFLAGS@
SOURCEVIEW_LIBS = @SOURCEVIEW_LIBS@
+SQLITE_CFLAGS = @SQLITE_CFLAGS@
+SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
SVNCONFIG = @SVNCONFIG@
SVN_CFLAGS = @SVN_CFLAGS@
@@ -257,8 +296,6 @@
VALA_CFLAGS = @VALA_CFLAGS@
VALA_LIBS = @VALA_LIBS@
VERSION = @VERSION@
-VTE_CFLAGS = @VTE_CFLAGS@
-VTE_LIBS = @VTE_LIBS@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
@@ -387,11 +424,11 @@
clean-libtool:
-rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -527,15 +564,16 @@
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+ cscopelist-am ctags-am distclean distclean-generic \
+ distclean-libtool distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags-am uninstall uninstall-am
@YELP_HELP_RULES@
diff -Nru anjuta-3.8.4/manuals/anjuta-faqs/de/editor-goto-error.page anjuta-3.10.2/manuals/anjuta-faqs/de/editor-goto-error.page
--- anjuta-3.8.4/manuals/anjuta-faqs/de/editor-goto-error.page 2013-06-03 21:26:00.000000000 +0000
+++ anjuta-3.10.2/manuals/anjuta-faqs/de/editor-goto-error.page 2013-11-14 21:02:19.000000000 +0000
@@ -1,5 +1,5 @@
-
+
@@ -11,12 +11,6 @@
Sébastien Granjouxseb.sfo@free.fr
-
-
- Mario Blättermann
- mario.blaettermann@gmail.com
- 2012
- How to jump to the line causing a build error or warning?
diff -Nru anjuta-3.8.4/manuals/anjuta-faqs/de/editor-maximize.page anjuta-3.10.2/manuals/anjuta-faqs/de/editor-maximize.page
--- anjuta-3.8.4/manuals/anjuta-faqs/de/editor-maximize.page 2013-06-03 21:26:00.000000000 +0000
+++ anjuta-3.10.2/manuals/anjuta-faqs/de/editor-maximize.page 2013-11-14 21:02:19.000000000 +0000
@@ -1,5 +1,5 @@
-
+
@@ -21,12 +21,6 @@
Biswapesh Chattopadhyayr
-
-
- Mario Blättermann
- mario.blaettermann@gmail.com
- 2012
- Das Editorfenster maximieren
diff -Nru anjuta-3.8.4/manuals/anjuta-faqs/de/editor-scintilla.page anjuta-3.10.2/manuals/anjuta-faqs/de/editor-scintilla.page
--- anjuta-3.8.4/manuals/anjuta-faqs/de/editor-scintilla.page 2013-06-03 21:26:00.000000000 +0000
+++ anjuta-3.10.2/manuals/anjuta-faqs/de/editor-scintilla.page 2013-11-14 21:02:19.000000000 +0000
@@ -1,5 +1,5 @@
-
+
@@ -9,12 +9,6 @@
Sébastien Granjouxseb.sfo@free.fr
-
-
- Mario Blättermann
- mario.blaettermann@gmail.com
- 2012
- How to use Scintilla editor
diff -Nru anjuta-3.8.4/manuals/anjuta-faqs/de/general-bugs.page anjuta-3.10.2/manuals/anjuta-faqs/de/general-bugs.page
--- anjuta-3.8.4/manuals/anjuta-faqs/de/general-bugs.page 2013-06-03 21:26:00.000000000 +0000
+++ anjuta-3.10.2/manuals/anjuta-faqs/de/general-bugs.page 2013-11-14 21:02:19.000000000 +0000
@@ -1,5 +1,5 @@
-
+
@@ -20,12 +20,6 @@
Biswapesh Chattopadhyayr
-
-
- Mario Blättermann
- mario.blaettermann@gmail.com
- 2012
- Where to report bugs and enhancement requests
diff -Nru anjuta-3.8.4/manuals/anjuta-faqs/de/general-feature.page anjuta-3.10.2/manuals/anjuta-faqs/de/general-feature.page
--- anjuta-3.8.4/manuals/anjuta-faqs/de/general-feature.page 2013-06-03 21:26:00.000000000 +0000
+++ anjuta-3.10.2/manuals/anjuta-faqs/de/general-feature.page 2013-11-14 21:02:19.000000000 +0000
@@ -1,5 +1,5 @@
-
+
@@ -20,12 +20,6 @@
Biswapesh Chattopadhyayr
-
-
- Mario Blättermann
- mario.blaettermann@gmail.com
- 2012
- Why does Anjuta not have my favourite feature?
diff -Nru anjuta-3.8.4/manuals/anjuta-faqs/de/general-name.page anjuta-3.10.2/manuals/anjuta-faqs/de/general-name.page
--- anjuta-3.8.4/manuals/anjuta-faqs/de/general-name.page 2013-06-03 21:26:00.000000000 +0000
+++ anjuta-3.10.2/manuals/anjuta-faqs/de/general-name.page 2013-11-14 21:02:19.000000000 +0000
@@ -1,5 +1,5 @@
-
+
@@ -19,16 +19,10 @@
Biswapesh Chattopadhyayr
-
-
- Mario Blättermann
- mario.blaettermann@gmail.com
- 2012
-
- Wofür steht der Name Anjuta?
+ What does the name Anjuta stand for?
It is not one of those recursive names.
Anjuta is the name of the girlfriend of the founder of this application, Naba Kumar.
diff -Nru anjuta-3.8.4/manuals/anjuta-faqs/de/general-windows.page anjuta-3.10.2/manuals/anjuta-faqs/de/general-windows.page
--- anjuta-3.8.4/manuals/anjuta-faqs/de/general-windows.page 2013-06-03 21:26:00.000000000 +0000
+++ anjuta-3.10.2/manuals/anjuta-faqs/de/general-windows.page 2013-11-14 21:02:19.000000000 +0000
@@ -1,5 +1,5 @@
-
+
@@ -20,12 +20,6 @@
Biswapesh Chattopadhyayr
-
-
- Mario Blättermann
- mario.blaettermann@gmail.com
- 2012
- Is/will there be Anjuta for Microsoft Windows?
diff -Nru anjuta-3.8.4/manuals/anjuta-faqs/de/index.page anjuta-3.10.2/manuals/anjuta-faqs/de/index.page
--- anjuta-3.8.4/manuals/anjuta-faqs/de/index.page 2013-06-03 21:26:00.000000000 +0000
+++ anjuta-3.10.2/manuals/anjuta-faqs/de/index.page 2013-11-14 21:02:19.000000000 +0000
@@ -1,5 +1,5 @@
-
+Häufig gestellte Fragen
@@ -18,12 +18,6 @@
Biswapesh Chattopadhyayr
-
-
- Mario Blättermann
- mario.blaettermann@gmail.com
- 2012
- Anjuta FAQ
diff -Nru anjuta-3.8.4/manuals/anjuta-faqs/de/project-existing.page anjuta-3.10.2/manuals/anjuta-faqs/de/project-existing.page
--- anjuta-3.8.4/manuals/anjuta-faqs/de/project-existing.page 2013-06-03 21:26:00.000000000 +0000
+++ anjuta-3.10.2/manuals/anjuta-faqs/de/project-existing.page 2013-11-14 21:02:19.000000000 +0000
@@ -1,5 +1,5 @@
-
+
@@ -10,12 +10,6 @@
Sébastien Granjouxseb.sfo@free.fr
-
-
- Mario Blättermann
- mario.blaettermann@gmail.com
- 2012
- How can I use Anjuta with an existing project?
diff -Nru anjuta-3.8.4/manuals/anjuta-faqs/de/project-resource.page anjuta-3.10.2/manuals/anjuta-faqs/de/project-resource.page
--- anjuta-3.8.4/manuals/anjuta-faqs/de/project-resource.page 2013-06-03 21:26:00.000000000 +0000
+++ anjuta-3.10.2/manuals/anjuta-faqs/de/project-resource.page 2013-11-14 21:02:19.000000000 +0000
@@ -1,5 +1,5 @@
-
+
@@ -10,16 +10,15 @@
Sébastien Granjouxseb.sfo@free.fr
-
-
- Mario Blättermann
- mario.blaettermann@gmail.com
- 2012
- Einen Ordner zu einem Projekt hinzufügen, welcher Symbole enthält
-
Fügen Sie in einem Autotools-Projekt einen neuen Ordner hinzu: ProjektNeuer Ordner …. Dann erstellen Sie innerhalb dieses Ordners ein neues Datenziel (ProjektNeues Ziel …) und fügen die Dateien entsprechend den Symbolen zu diesem Ziel hinzu (ProjektNeue Quelle …).
+
In an autotools project, you can add a new directory by creating a
+ folder (ProjectNew Folder...).
+ Then inside this folder create a new data target
+ (ProjectNew Target...) and
+ add the files corresponding to the icons to this target
+ (ProjectNew Source...).
Once the glade plug-in is running and the file that will hold the code
- is being viewed, simply double click a widget in the glade inspector.
- The file being viewed will then be scanned for some marker comments
+ is open, simply double click a widget in the glade inspector.
+ The associated file will then be scanned for some marker comments
(/* ANJUTA: Widgets declaration for application.ui - DO NOT REMOVE */ and
/* ANJUTA: Widgets initialization for application.ui - DO NOT REMOVE */) and, if
found, code will be added right after such comments. So, for this feature to work
Binary files /tmp/O0GFMnvACC/anjuta-3.8.4/manuals/anjuta-manual/C/figures/anjuta-in-action.png and /tmp/ExqgyWdI97/anjuta-3.10.2/manuals/anjuta-manual/C/figures/anjuta-in-action.png differ
Binary files /tmp/O0GFMnvACC/anjuta-3.8.4/manuals/anjuta-manual/C/figures/anjuta_logo.png and /tmp/ExqgyWdI97/anjuta-3.10.2/manuals/anjuta-manual/C/figures/anjuta_logo.png differ
diff -Nru anjuta-3.8.4/manuals/anjuta-manual/C/language-support-cpp-modelines-emacs.page anjuta-3.10.2/manuals/anjuta-manual/C/language-support-cpp-modelines-emacs.page
--- anjuta-3.8.4/manuals/anjuta-manual/C/language-support-cpp-modelines-emacs.page 2013-06-03 20:57:12.000000000 +0000
+++ anjuta-3.10.2/manuals/anjuta-manual/C/language-support-cpp-modelines-emacs.page 2013-07-08 21:06:37.000000000 +0000
@@ -17,7 +17,8 @@
Emacs modelines
-
Such modeline is a comment in the first line of the file, composed by
+
Such modeline is a comment in the first line of the file or the second
+ one if the first contains a shebang (#!). It is composed by
a list of variable names followed by : and a value,
separated by ; and surrounded by -*-.
This modeline is a comment in the first line of the file which
- has to start with vim: followed by at least one space and
+
This modeline is a line in the 5 first of the 5 last of the
+ file containing vim: followed by at least one space and
a list of variable names with an optional value after =
separated by space or :.
Once the glade plug-in is running and the file that will hold the code
- is being viewed, simply double click a widget in the glade inspector.
- The file being viewed will then be scanned for some marker comments
+ is open, simply double click a widget in the glade inspector.
+ The associated file will then be scanned for some marker comments
(/* ANJUTA: Widgets declaration for application.ui - DO NOT REMOVE */ and
/* ANJUTA: Widgets initialization for application.ui - DO NOT REMOVE */) and, if
found, code will be added right after such comments. So, for this feature to work
diff -Nru anjuta-3.8.4/manuals/anjuta-manual/ca/autotools-build-build.page anjuta-3.10.2/manuals/anjuta-manual/ca/autotools-build-build.page
--- anjuta-3.8.4/manuals/anjuta-manual/ca/autotools-build-build.page 2013-06-03 21:25:57.000000000 +0000
+++ anjuta-3.10.2/manuals/anjuta-manual/ca/autotools-build-build.page 2013-11-14 21:02:12.000000000 +0000
@@ -1,5 +1,5 @@
-
+
@@ -18,18 +18,6 @@
Philip Chimentophilip.chimento@gmail.com
-
-
- Jaume Planas
- jplanas@itberga.com
- 2011
-
-
-
- Gil Forcada
- gilforcada@guifi.net
- 2013
- Build targets
diff -Nru anjuta-3.8.4/manuals/anjuta-manual/ca/autotools-build-clean.page anjuta-3.10.2/manuals/anjuta-manual/ca/autotools-build-clean.page
--- anjuta-3.8.4/manuals/anjuta-manual/ca/autotools-build-clean.page 2013-06-03 21:25:57.000000000 +0000
+++ anjuta-3.10.2/manuals/anjuta-manual/ca/autotools-build-clean.page 2013-11-14 21:02:12.000000000 +0000
@@ -1,5 +1,5 @@
-
+
@@ -14,18 +14,6 @@
Sébastien Granjouxseb.sfo@free.fr
-
-
- Jaume Planas
- jplanas@itberga.com
- 2011
-
-
-
- Gil Forcada
- gilforcada@guifi.net
- 2013
- Clean targets
@@ -36,12 +24,19 @@
all files will fix this. There are several ways to do this
-
Per suprimir tots els fitxers construïts en el mateix directori del fitxer actual, trieu MuntaNeteja en el menú principal.
+
+ From the main menu, select Build
+ Clean to delete all files built in the
+ same directory as the current edited file.
+
-
Per suprimir tots els fitxers construïts del projecte, trieu MuntaNeteja el projecte en el menú principal.
+
+ From the main menu, select Build
+ Clean Project to delete all project built files,
+
Per obrir la finestra de Punts de ruptura, trieu VisualitzaPunts de ruptura en el menú principal.
+
From the main menu, select View
+ Breakpoints to open the Breakpoint
+ window.
@@ -100,7 +90,10 @@
-
Trieu DepuraAfegeix un punt de ruptura... en el menú principal o feu clic amb el botó secundari a la finestra Punts de ruptura i trieu Afegeix un punt de ruptura....
+
From the main menu, select Debug
+ Add Breakpoint... or right click in the
+ Breakpoint window and select Add Breakpoint....
+
Fill in the Location, which is the position of the
@@ -117,7 +110,10 @@
-
Trieu DepuraCommuta el punt de ruptura en el menú principal o feu clic amb el botó secundari a la finestra de l'Editor i trieu Commuta el punt de ruptura.
+
From the main menu, select Debug
+ Toggle Breakpoint or right click in the
+ Editor window and select Toggle Breakpoint.
+
@@ -173,7 +169,10 @@
-
Trieu DepuraSuprimeix tots els punts de ruptura en el menú principal o feu clic amb el botó secundari a la finestra Punts de ruptura i trieu Suprimeix tots els punts de ruptura.
+
From the main menu, select Debug
+ Remove All Breakpoints or right-click in
+ the Breakpoint window and select
+ Remove All Breakpoints.
Such modeline is a comment in the first line of the file, composed by
+
Such modeline is a comment in the first line of the file or the second
+ one if the first contains a shebang (#!). It is composed by
a list of variable names followed by : and a value,
separated by ; and surrounded by -*-.
This modeline is a comment in the first line of the file which
- has to start with vim: followed by at least one space and
+
This modeline is a line in the 5 first of the 5 last of the
+ file containing vim: followed by at least one space and
a list of variable names with an optional value after =
separated by space or :.
Trieu el grup o el projecte on voleu afegir-hi el grup nou a la vista de projecte, feu clic amb el botó secundari perquè es mostri el menú contextual del projecte i trieu Afegeix un grup.
-
O trieu ProjecteAfegeix un grup en el menú principal.
+
Select the group or the project where you want to add the new group
+ in the project view, click on the right mouse button to
+ make the project context menu appear and select
+ Add Group.
+
Or from the main menu, select Project
+ Add Group.
Enter a new group name.
@@ -42,10 +34,11 @@
-
Podeu triar un altre grup al final de la vista d'arbre de grups.
+
You can select another group in the bottom group tree view.
-
Per afegir el grup al projecte feu clic al botó Afegeix, després de seleccionar el pare i introduir-ne el nom.
+
When you have chosen the parent and enter the name, click on the Add
+ button to add the group to your project.
Trieu la carpeta que voleu suprimir a la vista de projecte, feu-hi clic amb el botó secundari perquè es mostri el menú contextual del projecte i trieu Suprimeix.
+
Select the folder you want to remove in the
+ project view, click on the right mouse button to
+ make the project context menu appear and select
+ Remove.
Confirmeu la supressió. Només s'esborrarà la carpeta dels fitxers del projecte sense suprimir cap fitxer o directori del disc.
A la vista de projecte, trieu el directori (que conté el programa) on voleu afegir la biblioteca, feu clic al botó secundari perquè es mostri el menú contextual del projecte i trieu Propietats.
-
-
O trieu ProjectePropietats en el menú principal. Per defecte s'editen les propietats de l'element seleccionat actualment a la vista de projecte. Podeu seleccionar un altre element al botó de llista desplegable.
+
Select the directory containing the program where you want to
+ add the library in the project view, click on the
+ right mouse button to make the project context menu
+ appear and select Properties.
+
+
Or from the main menu, select Project
+ Properties. By default, it edits the
+ properties of the currently selected item in the project view.
+ You can select a different item in the drop-down list button.
-
Si els fitxers de capçalera són instal·lats a una ubicació estàndard (/usr/include) no cal que ho definiu. En cas contrari i si utilitzeu el gcc com a compilador, heu d'afegir -Icamí_inclusió a la propietat Indicadors del preprocessador de C. Podeu afegir diversos camins separats per espais. S'utilitzaran aquestes opcions en tots els objectius dins d'aquest directori.
+
If the header files are installed in a standard location
+ (/usr/include) you don't have to set this. If not,
+ you need to add -Iinclude_path in
+ the C preprocessor flags property if you are using
+ gcc as your compiler. You can add several paths separated with
+ spaces. These options will be used for all targets inside this
+ directory.
-
Potser haureu de desplegar el botó Més opcions per veure-ho. Feu clic al botó Aplica quan acabeu.
+
You might have to expand the More options button to see this.
+ Click on the Apply button when you are done.
-
Tot seguit, heu d'afegir la biblioteca a un objectiu. A la vista de projecte, trieu l'objectiu on voleu afegir la biblioteca, feu clic al botó secundari del ratolí perquè es mostri el menú contextual del projecte i trieu Propietats.
-
-
O trieu ProjectePropietats en el menú principal. Per defecte s'editen les propietats de l'element seleccionat actualment a la vista de projecte. Podeu seleccionar un altre element al botó de llista desplegable.
+
Next, you need to add the library to a target.
+ Select the target where you want to
+ add the library in the project view, click on the
+ right mouse button to make the project context menu
+ appear and select Properties.
+
+
Or from the main menu, select Project
+ Properties. By default, it edits the
+ properties of the currently selected item in the project view.
+ You can select a different item in the drop-down list button.
-
Heu de definir la propietat Indicadors de l'enllaçador; si el compilador és el gcc, afegiu -lnom_biblioteca. nom_biblioteca és el nom del fitxer de biblioteca sense el prefix lib i sense l'extensió .a o .so.
-
-
Si la biblioteca no és a un directori estàndard, el gcc pot cercar a més directoris si especifiqueu l'opció -Lcamí_biblioteca.
+
You need to set the Linker flags property, adding
+ -llibrary_name if your compiler is gcc.
+ library_name is the name of the library file without the
+ lib prefix and without the .a or
+ .so extension.
+
+
If the library is in not in a standard directory, gcc
+ can look in additional directories with the option
+ -Llibrary_path.
A la vista de projecte, trieu l'objectiu que té la biblioteca que voleu suprimir, feu clic amb el botó secundari del ratolí perquè es mostri el menú contextual del projecte i trieu Propietats.
+
Select the target that has the library you want to remove in the
+ project view, click on the right mouse button to
+ make the project context menu appear and select
+ Properties.
-
Suprimiu la biblioteca de les propietats Indicadors del preprocessador de C i Indicadors de l'enllaçador. Feu clic al botó Aplica per escriure els canvis als fitxers del projecte.
+
Remove the library from the
+ C preprocessor flags and Linker flags
+ properties. Click on the Apply button to write the
+ changes to the project files.
Trieu el programa on voleu afegir-hi la biblioteca nova a la vista de projecte, feu clic al botó secundari del ratolí perquè es mostri el menú contextual del projecte i trieu Afegeix una biblioteca.
-
O en el menú principal, trieu ProjecteBiblioteca nova....
+
Select the program where you want to add the new library in
+ the project view, click on the right mouse button to
+ make the project context menu appear and select
+ Add Library.
+
Or from the main menu, select Project
+ Add Library....
You need to select the target where you want to add the library
diff -Nru anjuta-3.8.4/manuals/anjuta-manual/ca/project-manager-module-new.page anjuta-3.10.2/manuals/anjuta-manual/ca/project-manager-module-new.page
--- anjuta-3.8.4/manuals/anjuta-manual/ca/project-manager-module-new.page 2013-06-03 21:25:58.000000000 +0000
+++ anjuta-3.10.2/manuals/anjuta-manual/ca/project-manager-module-new.page 2013-11-14 21:02:13.000000000 +0000
@@ -1,5 +1,5 @@
-
+
@@ -19,18 +19,6 @@
Philip Chimentophilip.chimento@gmail.com
-
-
- Jaume Planas
- jplanas@itberga.com
- 2011
-
-
-
- Gil Forcada
- gilforcada@guifi.net
- 2013
- Add a Module
@@ -43,7 +31,8 @@
Select a program in the project view, click on the right
mouse button to make the project context menu appear, and
select Add Library.
-
O en el menú principal, trieu ProjecteBiblioteca nova....
+
Or from the main menu, select Project
+ Add Library....
On the Add Library dialog, click on the
diff -Nru anjuta-3.8.4/manuals/anjuta-manual/ca/project-manager-module-remove.page anjuta-3.10.2/manuals/anjuta-manual/ca/project-manager-module-remove.page
--- anjuta-3.8.4/manuals/anjuta-manual/ca/project-manager-module-remove.page 2013-06-03 21:25:58.000000000 +0000
+++ anjuta-3.10.2/manuals/anjuta-manual/ca/project-manager-module-remove.page 2013-11-14 21:02:13.000000000 +0000
@@ -1,5 +1,5 @@
-
+
@@ -15,25 +15,16 @@
Philip Chimentophilip.chimento@gmail.com
-
-
- Jaume Planas
- jplanas@itberga.com
- 2011
-
-
-
- Gil Forcada
- gilforcada@guifi.net
- 2013
- Suprimir un mòdul
-
A la vista de projecte, trieu la biblioteca que voleu suprimir, feu clic amb el botó secundari del ratolí perquè es mostri el menú contextual del projecte i trieu Suprimeix.
+
Select the library you want to remove in the
+ project view, click on the right mouse button to
+ make the project context menu appear, and select
+ Remove.
Confirmeu la supressió. És suprimirà la biblioteca de l'objectiu.
A la vista de projecte, trieu el paquet que voleu suprimir, feu clic amb el botó secundari del ratolí perquè es mostri el menú contextual del projecte i trieu Suprimeix.
+
Select the package you want to remove in the
+ project view , click on the right mouse button to
+ make the project context menu appear and select
+ Remove.
Confirmeu la supressió. Es suprimirà el paquet del fitxer de projecte.
A la vista de projecte, trieu l'objectiu on voleu afegir un fitxer de codi nou, feu clic amb el botó secundari del ratolí perquè es mostri el menú contextual del projecte i trieu Afegeix un fitxer de codi.
+
Select the target where you want to add the new source files in
+ the project view, click on the right mouse button to
+ make the project context menu appear and select
+ Add Source File.
-
O trieu ProjecteAfegeix un fitxer de codi... en el menú principal
+
Or from the main menu, select Project
+ Add Source File...
-
Al botó de selecció d'objectius podeu seleccionar un altre objectiu.
+
You can select another target in the top target chooser button.
+
In the file chooser below, select the files you want to add.
diff -Nru anjuta-3.8.4/manuals/anjuta-manual/ca/project-manager-source-remove.page anjuta-3.10.2/manuals/anjuta-manual/ca/project-manager-source-remove.page
--- anjuta-3.8.4/manuals/anjuta-manual/ca/project-manager-source-remove.page 2013-06-03 21:25:58.000000000 +0000
+++ anjuta-3.10.2/manuals/anjuta-manual/ca/project-manager-source-remove.page 2013-11-14 21:02:13.000000000 +0000
@@ -1,5 +1,5 @@
-
+
@@ -14,25 +14,16 @@
Philip Chimentophilip.chimento@gmail.com
-
-
- Jaume Planas
- jplanas@itberga.com
- 2011
-
-
-
- Gil Forcada
- gilforcada@guifi.net
- 2013
- Suprimiu fitxers
-
A la vista de projecte, trieu el fitxer que voleu suprimir, feu clic amb el botó secundari del ratolí perquè es mostri el menú contextual del projecte i trieu Suprimeix.
+
Select the file you want to remove in the
+ project view, click on the right mouse button to
+ make the project context menu appear and select
+ Remove.
Confirmeu la supressió. Només es suprimirà el fitxer en el projecte, continuarà estant al disc dur.
A la vista de projecte, trieu el directori on voleu afegir-hi l'objectiu nou, feu clic amb el botó secundari del ratolí perquè es mostri el menú contextual del projecte i trieu Objectiu nou.
-
O trieu ProjecteObjectiu nou... en el menú principal.
+
Select the directory where you want to add the new target in
+ the project view, click on the right mouse button to
+ make the project context menu appear and select
+ New Target.
+
Or from the main menu, select Project
+ New Target....
-
A la vista d'arbre de directoris podeu triar-ne un altre.
+
You can select another directory in the bottom directory tree view.
+
Enter a target name and select the type of the target in the
drop-down list below.
Depending on your project backend, various types of target are possible,
@@ -51,7 +44,8 @@
-
Quan hàgiu triat el nom, el tipus i el pare de l'objectiu, feu clic al botó Afegeix per afegir-lo.
+
When you have chosen the target name, type and parent, click on the
+ Add button to create this new target.
A la vista de projecte, trieu l'objectiu que voleu suprimir, feu clic amb el botó secundari del ratolí perquè es mostri el menú contextual del projecte i trieu Suprimeix.
+
Select the target you want to remove in the
+ project view, click on the right mouse button to
+ make the project context menu appear and select
+ Remove.
Confirmeu la supressió. Es suprimirà l'objectiu i totes les seves propietats del fitxer de projecte. Els fitxers del disc dur no canviaran.
L'Anjuta permet diversos formats de projecte ja existents mitjançant els rerefons de connectors. El principal és el format autotools que s'utilitza habitualment a Linux.
+
+ Anjuta supports several already existing project formats
+ through plugin backends. The main one is the autotools format commonly
+ used on Linux.
+
The project backend to use is choosen when creating or importing a new
diff -Nru anjuta-3.8.4/manuals/anjuta-manual/ca/project-wizard-create.page anjuta-3.10.2/manuals/anjuta-manual/ca/project-wizard-create.page
--- anjuta-3.8.4/manuals/anjuta-manual/ca/project-wizard-create.page 2013-06-03 21:25:58.000000000 +0000
+++ anjuta-3.10.2/manuals/anjuta-manual/ca/project-wizard-create.page 2013-11-14 21:02:13.000000000 +0000
@@ -1,5 +1,5 @@
-
+
@@ -15,49 +15,67 @@
Philip Chimentophilip.chimento@gmail.com
-
-
- Jaume Planas
- jplanas@itberga.com
- 2011
-
-
-
- Gil Forcada
- gilforcada@guifi.net
- 2013
- Creació d'un projecte
-
Els projectes nous es creen a partir de plantilles. L'Anjuta us demanarà alguna informació, com el tipus de projecte, el seu nom, etc.
+
+ New projects are created from templates. Anjuta will ask you
+ for various information, like the type of the project, its name and more.
+
-
Trieu FitxerNouProjecte en el menú principal.
-
O a la llista desplegable del botó Nou de la barra d'eines superior, trieu Projecte per iniciar l'auxiliar de projectes.
+
+ From the main menu, select File
+ NewProject.
+
+
+ Or from the drop-down list of the
+ New button in the top tool bar, select
+ Project
+ to start the project wizard.
+
-
Trieu la icona que representa el tipus de projecte que voleu crear i feu clic a Continua.
+
+ Select the icon representing the type of the project you want to
+ create and click on Forward.
+
Deixeu el ratolí sobre d'una icona de projecte un moment perquè aparegui un missatge emergent que mostrarà més informació sobre el tipus de projecte.
-
Segons el tipus de projecte triat, haureu d'introduir un tipus d'informació o una altra. Quan hàgiu acabat, feu clic a Continua.
-
Totes les dades s'agrupen en pàgines, normalment haureu d'emplenar dues o tres pàgines. Podeu tornar enrere en qualsevol moment utilitzant el botó Vés enrere.
+
+ Depending on the selected project type, you will have to enter
+ different information. When you are done, click on Forward.
+
+
+ All informations are grouped in pages, typically you will have
+ to fill two or three pages. You can go back at any time using
+ the button Back.
+
Mantingueu el ratolí sobre del botó o de l'àrea d'escriptura un moment perquè es mostri un petit missatge emergent amb més informació sobre el paràmetre corresponent.
-
Després d'emplenar totes les pàgines de dades, obtindreu una pàgina de resum on es mostra la informació principal sobre el projecte. Encara no s'ha escrit res al disc. Feu clic a Aplica per desar el projecte i obrir-lo a l'Anjuta.
+
+ After filling out all the information pages, you will get a summary page listing
+ the main information about your project. Nothing has been written to your disk
+ yet at this point. Click on Apply to save the project and open
+ it in Anjuta.
+
-
Cada tipus de project correspon a una plantilla. L'Anjuta ja inclou diverses plantilles, però podeu afegir-ne de personalitzades o escriure les vostres.
+
+ Each project type corresponds to a template. Anjuta already
+ includes several templates but you can add custom ones and even write
+ your own.
+
Una plantilla de projecte està formada per tota una sèrie de fitxers que es poden processar mitjançant un motor potent de processament de plantilles anomenat autogen. Els fitxers de plantilla de projecte tenen l'extensió .wiz i descriuen totes les propietats i els fitxers necessaris del projecte.
-
-
Els fitxers .wiz són en un format XML que està documentat aquí.
+
+ A project template is composed of a bunch of files which can be processed
+ by a powerful template processing engine called autogen. A project
+ template file has a .wiz extension, and describes all the project
+ properties and files needed.
+
+
+
+ This .wiz file looks like a XML file and is documented
+ here.
+
Such modeline is a comment in the first line of the file, composed by
+
Such modeline is a comment in the first line of the file or the second
+ one if the first contains a shebang (#!). It is composed by
a list of variable names followed by