[anjuta/newproject: 307/307] Merge branch 'master' into newproject
- From: Sebastien Granjoux <sgranjoux src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [anjuta/newproject: 307/307] Merge branch 'master' into newproject
- Date: Tue, 3 Aug 2010 19:12:28 +0000 (UTC)
commit 2cedb9f88123199e25015877eae411cbaf27e963
Merge: e348d92 8f08bd8
Author: Sébastien Granjoux <seb sfo free fr>
Date: Mon Aug 2 22:27:56 2010 +0200
Merge branch 'master' into newproject
Conflicts:
.gitignore
libanjuta/Makefile.am
libanjuta/anjuta-project.h
plugins/gbf-am/gbf-am-dialogs.ui
plugins/gbf-am/gbf-am-project.c
plugins/gbf-am/gbf-am-properties.c
plugins/gbf-mkfile/gbf-mkfile-project.c
plugins/symbol-db/plugin.c
.gitignore | 41 +-
AUTHORS | 1 +
Makefile.am | 2 +-
NEWS | 116 +-
README | 14 +-
TODO.tasks | 22 +-
anjuta.doap | 2 +-
autogen.sh | 2 +-
configure.in | 229 +-
launcher/Makefile.am | 4 +-
libanjuta/Makefile.am | 71 +-
libanjuta/anjuta-async-command.c | 16 +-
libanjuta/anjuta-async-command.h | 6 +-
libanjuta/anjuta-async-notify.c | 14 +-
libanjuta/anjuta-c-module.c | 9 +
libanjuta/anjuta-command-queue.c | 18 +
libanjuta/anjuta-command.c | 4 +-
libanjuta/anjuta-convert.h | 6 +
libanjuta/anjuta-glade-catalog.c | 1 +
libanjuta/anjuta-glade.xml | 4 +
libanjuta/anjuta-launcher.c | 14 +
libanjuta/anjuta-pkg-config-chooser.c | 444 +
libanjuta/anjuta-pkg-config-chooser.h | 67 +
libanjuta/anjuta-plugin-description.h | 8 +
libanjuta/anjuta-plugin-manager.h | 5 +
libanjuta/anjuta-plugin.c | 2 +-
libanjuta/anjuta-preferences-dialog.c | 1 +
libanjuta/anjuta-preferences.c | 2 +-
libanjuta/anjuta-project.h | 4 +-
libanjuta/anjuta-shell.h | 4 +
libanjuta/anjuta-status.c | 2 +-
libanjuta/anjuta-tabber.c | 73 +-
libanjuta/anjuta-ui.c | 907 +-
libanjuta/anjuta-ui.h | 27 +-
libanjuta/anjuta-utils.c | 112 +-
libanjuta/anjuta-utils.h | 34 +
libanjuta/interfaces/Makefile.am.iface | 15 +-
libanjuta/interfaces/anjuta-idl-compiler.pl | 32 +-
libanjuta/interfaces/libanjuta.idl | 1432 +-
libfoocanvas/Makefile.am | 60 +
libfoocanvas/foo-canvas-i18n.h | 68 +
libfoocanvas/foo-canvas-line.c | 1263 ++
libfoocanvas/foo-canvas-line.h | 144 +
libfoocanvas/foo-canvas-marshal.c | 131 +
libfoocanvas/foo-canvas-marshal.h | 28 +
libfoocanvas/foo-canvas-marshal.list | 2 +
libfoocanvas/foo-canvas-pixbuf.c | 825 +
libfoocanvas/foo-canvas-pixbuf.h | 62 +
libfoocanvas/foo-canvas-polygon.c | 774 +
libfoocanvas/foo-canvas-polygon.h | 119 +
libfoocanvas/foo-canvas-rect-ellipse.c | 1294 ++
libfoocanvas/foo-canvas-rect-ellipse.h | 172 +
libfoocanvas/foo-canvas-text.c | 1583 ++
libfoocanvas/foo-canvas-text.h | 168 +
libfoocanvas/foo-canvas-util.c | 399 +
libfoocanvas/foo-canvas-util.h | 105 +
libfoocanvas/foo-canvas-widget.c | 591 +
libfoocanvas/foo-canvas-widget.h | 103 +
libfoocanvas/foo-canvas.c | 3973 ++++
libfoocanvas/foo-canvas.h | 520 +
libfoocanvas/libfoocanvas.h | 45 +
libfoocanvas/libfoocanvastypes.c | 43 +
.../C/anjuta-build-tutorial.xml | 32 -
manuals/anjuta-manual/Makefile.am | 2 +-
.../fr/figures/Capture-Rechercher et remplacer.png | Bin 0 -> 40936 bytes
.../anjuta-manual/fr/figures/add_edit_macro.png | Bin 0 -> 27507 bytes
.../anjuta-manual/fr/figures/anjuta-in-action.png | Bin 0 -> 238789 bytes
manuals/anjuta-manual/fr/figures/attach.png | Bin 0 -> 49484 bytes
manuals/anjuta-manual/fr/figures/brk_add.png | Bin 0 -> 16686 bytes
manuals/anjuta-manual/fr/figures/brk_dlg.png | Bin 0 -> 19938 bytes
manuals/anjuta-manual/fr/figures/display_macro.png | Bin 0 -> 35133 bytes
manuals/anjuta-manual/fr/figures/editor_guides.png | Bin 0 -> 23702 bytes
manuals/anjuta-manual/fr/figures/file_menu.png | Bin 0 -> 21652 bytes
manuals/anjuta-manual/fr/figures/keyword_macro.png | Bin 0 -> 21130 bytes
.../anjuta-manual/fr/figures/local_variables.png | Bin 0 -> 31769 bytes
manuals/anjuta-manual/fr/figures/menubar.png | Bin 0 -> 6162 bytes
.../anjuta-manual/fr/figures/new_file_wizard.png | Bin 0 -> 33319 bytes
manuals/anjuta-manual/fr/figures/open_file.png | Bin 0 -> 108012 bytes
.../fr/figures/open_file_multiple.png | Bin 0 -> 109680 bytes
manuals/anjuta-manual/fr/figures/prefs_print.png | Bin 0 -> 49417 bytes
manuals/anjuta-manual/fr/figures/print_dlg.png | Bin 0 -> 35827 bytes
manuals/anjuta-manual/fr/figures/print_preview.png | Bin 0 -> 129153 bytes
.../anjuta-manual/fr/figures/project-window.png | Bin 0 -> 26812 bytes
manuals/anjuta-manual/fr/figures/project_group.png | Bin 0 -> 37257 bytes
manuals/anjuta-manual/fr/figures/project_info.png | Bin 0 -> 37849 bytes
.../anjuta-manual/fr/figures/project_target.png | Bin 0 -> 27051 bytes
.../fr/figures/project_target_details.png | Bin 0 -> 28648 bytes
manuals/anjuta-manual/fr/figures/save_as_file.png | Bin 0 -> 74958 bytes
manuals/anjuta-manual/fr/figures/search_expr.png | Bin 0 -> 34589 bytes
.../fr/figures/search_file_pattern.png | Bin 0 -> 52446 bytes
.../anjuta-manual/fr/figures/search_replace.png | Bin 0 -> 35154 bytes
.../anjuta-manual/fr/figures/search_setting.png | Bin 0 -> 28089 bytes
manuals/anjuta-manual/fr/figures/search_target.png | Bin 0 -> 34377 bytes
.../fr/figures/search_target_action.png | Bin 0 -> 38117 bytes
.../anjuta-manual/fr/figures/search_target_in.png | Bin 0 -> 37234 bytes
manuals/anjuta-manual/fr/figures/sharedlibs.png | Bin 0 -> 22249 bytes
manuals/anjuta-manual/fr/figures/signals.png | Bin 0 -> 36275 bytes
manuals/anjuta-manual/fr/figures/stack.png | Bin 0 -> 21778 bytes
.../anjuta-manual/fr/figures/symbol_browser.png | Bin 0 -> 24258 bytes
manuals/anjuta-manual/fr/fr.po | 5523 ++++++
manuals/reference/libanjuta/Makefile.am | 2 +-
manuals/reference/libanjuta/libanjuta-docs.sgml | 2 +-
.../reference/libanjuta/project-wizard-format.sgml | 58 +-
mime/Makefile.am | 10 +-
mime/anjuta.xml | 5 +
pixmaps/16x16/Makefile.am | 7 +
pixmaps/16x16/anjuta.png | Bin 0 -> 1006 bytes
pixmaps/16x16/gnome-mime-application-x-anjuta.png | Bin 0 -> 975 bytes
pixmaps/22x22/Makefile.am | 7 +
pixmaps/22x22/anjuta.png | Bin 0 -> 1656 bytes
pixmaps/22x22/gnome-mime-application-x-anjuta.png | Bin 0 -> 1601 bytes
pixmaps/24x24/Makefile.am | 7 +
pixmaps/24x24/anjuta.png | Bin 0 -> 1621 bytes
pixmaps/24x24/gnome-mime-application-x-anjuta.png | Bin 0 -> 1565 bytes
pixmaps/32x32/Makefile.am | 7 +
pixmaps/32x32/anjuta.png | Bin 0 -> 2569 bytes
pixmaps/32x32/gnome-mime-application-x-anjuta.png | Bin 0 -> 2355 bytes
pixmaps/48x48/Makefile.am | 7 +
pixmaps/{ => 48x48}/anjuta.png | Bin 3649 -> 3649 bytes
.../48x48}/gnome-mime-application-x-anjuta.png | Bin 3549 -> 3549 bytes
pixmaps/Makefile.am | 9 +-
pixmaps/scalable/Makefile.am | 8 +
pixmaps/{ => scalable}/anjuta.svg | 0
.../scalable}/gnome-mime-application-x-anjuta.svg | 0
plugins/Makefile.am | 4 +-
plugins/build-basic-autotools/build-options.c | 5 +-
plugins/build-basic-autotools/plugin.c | 16 +-
plugins/class-gen/generator.c | 2 +-
plugins/class-inheritance/Makefile.am | 63 +
.../anjuta-class-inheritance-plugin-48.png | Bin 0 -> 980 bytes
.../anjuta-class-inheritance-plugin.svg | 311 +
.../anjuta-class-inheritance.plugin.in | 5 +
plugins/class-inheritance/class-callbacks.c | 442 +
plugins/class-inheritance/class-callbacks.h | 47 +
plugins/class-inheritance/class-inherit.c | 1275 ++
plugins/class-inheritance/class-inherit.h | 118 +
plugins/class-inheritance/plugin.c | 197 +
plugins/class-inheritance/plugin.h | 94 +
plugins/debug-manager/anjuta-debug-manager.xml | 5 +-
plugins/debug-manager/breakpoints.c | 79 +-
plugins/debug-manager/breakpoints.h | 3 +
plugins/debug-manager/command.c | 137 +-
plugins/debug-manager/command.h | 5 +-
plugins/debug-manager/data_view.c | 8 +-
plugins/debug-manager/debug_tree.c | 671 +-
plugins/debug-manager/debug_tree.h | 5 +-
plugins/debug-manager/locals.c | 48 +-
plugins/debug-manager/plugin.c | 117 +-
plugins/debug-manager/queue.c | 62 +-
plugins/debug-manager/registers.c | 2 +-
plugins/debug-manager/sparse_view.c | 8 +-
plugins/debug-manager/stack_trace.c | 33 +
plugins/debug-manager/start.c | 14 +-
plugins/debug-manager/watch.c | 10 +-
plugins/document-manager/anjuta-bookmarks.c | 38 +-
.../anjuta-document-manager.plugin.in | 2 +-
plugins/document-manager/plugin.c | 15 +-
plugins/document-manager/plugin.h | 2 +-
plugins/file-manager/file-model.c | 2 +-
plugins/file-manager/plugin.c | 30 +-
plugins/file-manager/plugin.h | 3 +-
plugins/file-wizard/file.c | 2 +-
plugins/gdb/Makefile.am | 6 +-
plugins/gdb/anjuta-gdb.plugin.in | 2 +-
plugins/gdb/anjuta-gdb.ui | 124 +
plugins/gdb/debugger.c | 642 +-
plugins/gdb/debugger.h | 93 +-
plugins/gdb/gdb.init | 3 +-
plugins/gdb/parser.c | 495 -
plugins/gdb/parser.h | 38 -
plugins/gdb/plugin.c | 162 +-
plugins/gdb/preferences.c | 469 +
plugins/gdb/preferences.h | 48 +
plugins/glade/Makefile.am | 40 +-
plugins/glade/anjuta-design-document.c | 314 +-
plugins/glade/anjuta-design-document.h | 27 +-
plugins/glade/anjuta-glade.glade | 467 -
plugins/glade/anjuta-glade.plugin.in | 2 +-
.../glade/{anjuta-glade.ui => anjuta-glade.xml} | 0
plugins/glade/designer-associations-item.c | 529 -
plugins/glade/designer-associations-item.h | 159 -
plugins/glade/designer-associations.c | 353 -
plugins/glade/designer-associations.h | 131 -
plugins/glade/plugin.c | 4789 +-----
plugins/glade/plugin.h | 31 +-
plugins/gtodo/mcategory.c | 2 +-
plugins/js-debugger/debugger-js.c | 30 +-
plugins/js-debugger/debugger-js.h | 14 +-
plugins/js-debugger/plugin.c | 68 +-
.../language-support-cpp-java/cpp-java-assist.c | 536 +-
.../cxxparser/engine-parser-priv.h | 16 +-
.../cxxparser/engine-parser.cpp | 227 +-
plugins/language-support-cpp-java/plugin.c | 46 +-
plugins/language-support-js/Makefile.am | 7 +-
plugins/language-support-js/db-anjuta-symbol.c | 51 +-
.../js-support-plugin.plugin.in | 11 +
.../js_support_plugin.plugin.in | 7 -
plugins/language-support-vala/Makefile.am | 56 +
.../language-support-vala/anjuta-vala.plugin.in | 10 +
plugins/language-support-vala/libanjuta-1.0.deps | 9 +
plugins/language-support-vala/libanjuta-1.0.vapi | 1790 ++
plugins/language-support-vala/locator.vala | 105 +
plugins/language-support-vala/plugin.vala | 352 +
plugins/language-support-vala/provider.vala | 145 +
plugins/language-support-vala/report.vala | 92 +
.../message-view/anjuta-message-manager-plugin.ui | 45 +-
plugins/message-view/message-view.c | 4 +-
plugins/message-view/plugin.c | 2 +-
plugins/patch/plugin.c | 14 +-
plugins/patch/plugin.h | 1 +
plugins/project-wizard/Makefile.am | 4 +-
.../project-wizard/anjuta-project-wizard.plugin.in | 5 +-
plugins/project-wizard/druid.c | 102 +-
plugins/project-wizard/druid.h | 2 +-
plugins/project-wizard/header.c | 34 +-
plugins/project-wizard/header.h | 4 +-
plugins/project-wizard/parser.c | 444 +-
plugins/project-wizard/plugin.c | 153 +-
plugins/project-wizard/plugin.h | 2 +
plugins/project-wizard/property.c | 167 +-
plugins/project-wizard/property.h | 8 +-
plugins/project-wizard/tar.c | 231 +
plugins/project-wizard/tar.h | 34 +
plugins/project-wizard/templates/Makefile.am | 48 +-
plugins/project-wizard/templates/anjuta-plugin.wiz | 123 -
.../project-wizard/templates/anjuta-plugin.wiz.in | 121 +
.../templates/anjuta-plugin/configure.ac.tpl | 5 +-
plugins/project-wizard/templates/cpp.wiz | 94 -
plugins/project-wizard/templates/cpp.wiz.in | 92 +
.../project-wizard/templates/cpp/configure.ac.tpl | 5 +-
plugins/project-wizard/templates/django.wiz | 27 -
plugins/project-wizard/templates/django.wiz.in | 29 +
.../templates/extract-translatable-strings.pl | 40 -
plugins/project-wizard/templates/gcj.wiz | 100 -
plugins/project-wizard/templates/gcj.wiz.in | 98 +
.../project-wizard/templates/gcj/configure.ac.tpl | 2 +-
plugins/project-wizard/templates/gnome-applet.wiz | 102 -
.../project-wizard/templates/gnome-applet/HACKING | 33 -
.../templates/gnome-applet/Makefile.am | 13 -
.../templates/gnome-applet/Makefile.am.tpl | 33 -
.../templates/gnome-applet/autogen.sh | 23 -
.../templates/gnome-applet/configure.ac.tpl | 48 -
.../templates/gnome-applet/po/Makefile.am | 5 -
.../templates/gnome-applet/po/POTFILES.in | 5 -
.../gnome-applet/src/GNOME_Applet.server.in.in | 22 -
.../templates/gnome-applet/src/Makefile.am | 9 -
.../templates/gnome-applet/src/Makefile.am.tpl | 54 -
.../templates/gnome-applet/src/main.c | 44 -
plugins/project-wizard/templates/gtk.wiz | 96 -
plugins/project-wizard/templates/gtk.wiz.in | 95 +
plugins/project-wizard/templates/gtkmm.wiz | 95 -
plugins/project-wizard/templates/gtkmm.wiz.in | 98 +
plugins/project-wizard/templates/java.wiz | 89 -
plugins/project-wizard/templates/java.wiz.in | 88 +
.../project-wizard/templates/java/configure.ac.tpl | 2 +-
plugins/project-wizard/templates/js.wiz | 56 -
plugins/project-wizard/templates/js.wiz.in | 58 +
.../templates/js_minimal/configure.ac.tpl | 3 -
plugins/project-wizard/templates/library.wiz | 100 -
plugins/project-wizard/templates/library.wiz.in | 98 +
.../templates/library/configure.ac.tpl | 5 +-
plugins/project-wizard/templates/minimal.wiz | 73 -
plugins/project-wizard/templates/minimal.wiz.in | 72 +
.../templates/minimal/configure.ac.tpl | 5 +-
plugins/project-wizard/templates/mkfile.wiz | 24 -
plugins/project-wizard/templates/mkfile.wiz.in | 26 +
plugins/project-wizard/templates/python.wiz | 89 -
plugins/project-wizard/templates/python.wiz.in | 87 +
.../templates/python/configure.ac.tpl | 2 +-
plugins/project-wizard/templates/sdl.wiz | 85 -
plugins/project-wizard/templates/sdl.wiz.in | 87 +
.../project-wizard/templates/sdl/configure.ac.tpl | 3 -
plugins/project-wizard/templates/terminal.wiz | 85 -
plugins/project-wizard/templates/terminal.wiz.in | 83 +
.../templates/terminal/configure.ac.tpl | 5 +-
.../templates/translatable-strings.h | 115 -
plugins/project-wizard/templates/wxwin.wiz | 88 -
plugins/project-wizard/templates/wxwin.wiz.in | 87 +
.../templates/wxwin/configure.ac.tpl | 5 +-
plugins/project-wizard/templates/xlib-dock.wiz | 96 -
plugins/project-wizard/templates/xlib-dock.wiz.in | 95 +
plugins/project-wizard/templates/xlib.wiz | 91 -
plugins/project-wizard/templates/xlib.wiz.in | 90 +
.../project-wizard/templates/xlib/configure.ac.tpl | 5 +-
plugins/run-program/execute.c | 16 +-
plugins/run-program/parameters.c | 4 +-
plugins/search/search-replace_backend.c | 2 +-
plugins/sourceview/sourceview.c | 32 +-
plugins/symbol-db/Makefile.am | 23 +-
plugins/symbol-db/anjuta-tags/Makefile.am | 13 +-
plugins/symbol-db/anjuta-tags/c.c | 29 +-
plugins/symbol-db/anjuta-tags/ctags-utils.c | 41 +
plugins/symbol-db/anjuta-tags/ctags-utils.h | 38 +
plugins/symbol-db/anjuta-tags/gir.c | 15 +-
plugins/symbol-db/anjuta-tags/jscript.c | 15 +-
plugins/symbol-db/benchmark/Makefile.am | 31 +-
plugins/symbol-db/benchmark/benchmark.c | 86 -
plugins/symbol-db/benchmark/data/hash_values.log |20959 ++++++++++++++++++++
plugins/symbol-db/benchmark/libgda/Makefile.am | 32 +
plugins/symbol-db/benchmark/libgda/libgda.c | 312 +
plugins/symbol-db/benchmark/sqlite/Makefile.am | 30 +
plugins/symbol-db/benchmark/sqlite/sqlite.c | 179 +
plugins/symbol-db/benchmark/symbol-db/Makefile.am | 32 +
plugins/symbol-db/benchmark/symbol-db/README | 14 +
plugins/symbol-db/benchmark/symbol-db/benchmark.c | 144 +
.../benchmark/symbol-db/populate-test-dir.sh | 8 +
.../symbol-db/libgda-extra/gda-data-model-concat.c | 366 -
.../symbol-db/libgda-extra/gda-data-model-concat.h | 62 -
plugins/symbol-db/plugin.c | 336 +-
plugins/symbol-db/plugin.h | 8 +-
plugins/symbol-db/symbol-db-engine-core.c | 3170 +--
plugins/symbol-db/symbol-db-engine-core.h | 36 +-
plugins/symbol-db/symbol-db-engine-iterator-node.c | 502 -
plugins/symbol-db/symbol-db-engine-iterator-node.h | 104 -
plugins/symbol-db/symbol-db-engine-iterator.c | 412 -
plugins/symbol-db/symbol-db-engine-iterator.h | 100 -
plugins/symbol-db/symbol-db-engine-priv.h | 267 +-
plugins/symbol-db/symbol-db-engine-queries.c | 3569 ----
plugins/symbol-db/symbol-db-engine-queries.h | 340 -
plugins/symbol-db/symbol-db-engine-utils.c | 272 +-
plugins/symbol-db/symbol-db-engine-utils.h | 48 +-
plugins/symbol-db/symbol-db-engine.h | 4 -
plugins/symbol-db/symbol-db-iface.c | 737 -
plugins/symbol-db/symbol-db-iface.h | 190 -
plugins/symbol-db/symbol-db-model-file.c | 40 +-
plugins/symbol-db/symbol-db-model-file.h | 9 -
plugins/symbol-db/symbol-db-model-project.c | 56 +-
plugins/symbol-db/symbol-db-model-search.c | 271 +
plugins/symbol-db/symbol-db-model-search.h | 56 +
plugins/symbol-db/symbol-db-model.c | 8 +-
plugins/symbol-db/symbol-db-query-result.c | 533 +
plugins/symbol-db/symbol-db-query-result.h | 68 +
plugins/symbol-db/symbol-db-query.c | 1301 ++
plugins/symbol-db/symbol-db-query.h | 59 +
plugins/symbol-db/symbol-db-search-command.c | 326 -
plugins/symbol-db/symbol-db-search-command.h | 91 -
plugins/symbol-db/symbol-db-view-search.c | 705 -
plugins/symbol-db/symbol-db-view-search.h | 75 -
plugins/symbol-db/symbol-db-views.c | 34 +
plugins/symbol-db/symbol-db-views.h | 5 +-
plugins/symbol-db/tables.sql | 56 +-
plugins/terminal/terminal.c | 74 +-
plugins/tools/execute.c | 2 +-
po/POTFILES.in | 43 +-
po/de.po | 3266 ++--
po/en shaw po | 4384 +++--
po/es.po | 3142 ++--
po/fr.po | 10 +-
po/gl.po | 3109 ++--
po/id.po | 8094 ++++----
po/nb.po | 2759 ++--
po/sl.po | 4245 ++---
po/th.po | 2941 ++--
po/zh_CN.po | 5542 +++---
po/zh_HK.po | 3147 ++--
po/zh_TW.po | 3155 ++--
src/anjuta-app.c | 34 +-
src/anjuta.c | 25 +-
src/main.c | 3 +-
359 files changed, 81420 insertions(+), 41841 deletions(-)
---
diff --cc .gitignore
index 8b4002d,9ecf5ff..64ac0c3
--- a/.gitignore
+++ b/.gitignore
@@@ -24,14 -35,13 +24,34 @@@
/intltool-merge.in
/intltool-update
/intltool-update.in
+/_libs
+/.libs
/libtool
- /*.lo
- /Makefile
- /Makefile.in
- /*.o
- /*.orig
+ /po/*.mo
+ /po/.intltool-merge-cache
++/po/it.gmo
++/po/ja.gmo
++/po/kn.gmo
++/po/ko.gmo
++/po/lt.gmo
++/po/lv.gmo
++/po/mai.gmo
+ /po/Makefile
+ /po/Makefile.in
+ /po/Makefile.in.in
++/po/mk.gmo
++/po/ml.gmo
++/po/*.mo
++/po/mr.gmo
++/po/ms.gmo
++/po/nb.gmo
++/po/ne.gmo
++/po/nl.gmo
++/po/oc.gmo
++/po/or.gmo
++/po/pa.gmo
++/po/pl.gmo
+ /po/POTFILES
/po/ar.gmo
/po/az.gmo
/po/be.gmo
@@@ -104,10 -108,6 +118,9 @@@
/po/zh_CN.gmo
/po/zh_HK.gmo
/po/zh_TW.gmo
- /*.rej
/so_locations
/stamp-h1
+/.*.swp
+/*.tab.c
/tags
+/TAGS
diff --cc configure.in
index a409514,6bf3183..d39bbde
--- a/configure.in
+++ b/configure.in
@@@ -70,17 -67,9 +67,17 @@@ AC_DISABLE_STATI
AM_MAINTAINER_MODE
GNOME_DOC_INIT
- #Check for C Compiler
+ dnl Check for C Compiler
AC_PROG_CC
AC_PROG_CPP
+AC_PROG_LEX
+if [["$LEX" != "flex"]]; then
+ AC_MSG_ERROR(flex is required)
+fi
+AC_PROG_YACC
+if [["$YACC" != "bison"]]; then
+ AC_MSG_ERROR(bison is required)
+fi
AC_LANG_C
AC_PROG_CXX
AM_PROG_CC_C_O
@@@ -737,23 -732,29 +719,34 @@@ f
AC_SUBST(SYMBOL_DB_SHM)
- dnl --------- help outputs -----------
- dnl manuals/C/Makefile
- dnl manuals/C/anjuta-tutorial/Makefile
- dnl manuals/C/anjuta-advanced-tutorial/Makefile
- dnl manuals/C/anjuta-faqs/Makefile
- dnl manuals/C/anjuta-manual/Makefile
- dnl manuals/de/Makefile
- dnl manuals/de/anjuta-tutorial/Makefile
- dnl manuals/ja/Makefile
- dnl manuals/ja/anjuta-faqs/Makefile
- dnl manuals/ja/anjuta-manual/Makefile
+
+ dnl Check for graphviz (class inheritance and profiler plugins)
+ AC_ARG_ENABLE(graphviz,
+ AC_HELP_STRING([--disable-graphviz],[Disable GraphViz support in Anjuta]),
+ [ if test "$enableval" = "no"; then
+ user_disabled_graphviz=1
+ fi ],
+ [ user_disabled_graphviz=0 ])
+
+ AC_MSG_CHECKING(if GraphViz support is disabled)
+ if test "$user_disabled_graphviz" = 1; then
+ AC_MSG_RESULT(yes)
+ libgraphviz_found="no"
+ else
+ AC_MSG_RESULT(no)
+ PKG_CHECK_MODULES(GRAPHVIZ,
+ [libgvc >= $LIBGRAPHVIZ_REQUIRED libgraph >= $LIBGRAPHVIZ_REQUIRED],
+ [libgraphviz_found="yes"],
+ [libgraphviz_found="no"])
+ fi
+
+ AM_CONDITIONAL(HAVE_GRAPHVIZ, [test x$libgraphviz_found = xyes])
+dnl Test using autotest
+dnl -----------------------------
+AC_CONFIG_TESTDIR(plugins/am-project/tests)
+AM_MISSING_PROG([AUTOM4TE], [autom4te])
+
AC_OUTPUT([
Makefile
po/Makefile.in
@@@ -792,7 -801,16 +793,10 @@@ plugins/file-wizard/Makefil
plugins/terminal/Makefile
plugins/build-basic-autotools/Makefile
plugins/project-manager/Makefile
-plugins/gbf-am/Makefile
-plugins/gbf-am/gbf-am-parse
-plugins/gbf-am/GBF/Makefile
-plugins/gbf-mkfile/Makefile
-plugins/gbf-mkfile/gbf-mkfile-parse
-plugins/gbf-mkfile/GBF/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
diff --cc libanjuta/Makefile.am
index f1a31a0,892b453..bf83a81
--- a/libanjuta/Makefile.am
+++ b/libanjuta/Makefile.am
@@@ -93,8 -94,11 +102,10 @@@ libanjuta_la_SOURCES=
anjuta-project.c \
anjuta-project.h \
anjuta-tabber.c \
- anjuta-tabber.h
+ anjuta-tabber.h \
+ anjuta-pkg-config-chooser.h \
+ anjuta-pkg-config-chooser.c
-
if HAVE_PLUGIN_GLADE
# For now install in our own prefix
@@@ -154,7 -158,7 +165,8 @@@ libanjuta_include =
anjuta-project.h \
anjuta-command-queue.h \
anjuta-tabber.h \
- anjuta-token.h
++ anjuta-token.h \
+ anjuta-pkg-config-chooser.h
libanjutainclude_HEADERS = \
$(libanjuta_include) \
diff --cc libanjuta/anjuta-project.h
index 05276bb,632b8ba..799331e
--- a/libanjuta/anjuta-project.h
+++ b/libanjuta/anjuta-project.h
@@@ -32,88 -31,44 +32,90 @@@ G_BEGIN_DECL
typedef enum
{
- ANJUTA_PROJECT_UNKNOWN,
- ANJUTA_PROJECT_GROUP,
- ANJUTA_PROJECT_TARGET,
- ANJUTA_PROJECT_SOURCE,
- ANJUTA_PROJECT_VARIABLE
+ ANJUTA_PROJECT_UNKNOWN = 0,
+ ANJUTA_PROJECT_SHAREDLIB,
+ ANJUTA_PROJECT_STATICLIB,
+ ANJUTA_PROJECT_BINARY,
+ ANJUTA_PROJECT_PYTHON,
+ ANJUTA_PROJECT_JAVA,
+ ANJUTA_PROJECT_LISP,
+ ANJUTA_PROJECT_HEADER,
+ ANJUTA_PROJECT_MAN,
+ ANJUTA_PROJECT_INFO,
+ ANJUTA_PROJECT_GENERIC,
+ ANJUTA_PROJECT_DATA,
+ ANJUTA_PROJECT_EXTRA,
+ ANJUTA_PROJECT_INTLTOOL,
+ ANJUTA_PROJECT_CONFIGURE,
+ ANJUTA_PROJECT_IDL,
+ ANJUTA_PROJECT_MKENUMS,
+ ANJUTA_PROJECT_GENMARSHAL,
+ ANJUTA_PROJECT_SCRIPT,
+ ANJUTA_PROJECT_PROXY = 1 << 12,
+ ANJUTA_PROJECT_PROJECT = 1 << 13,
+ ANJUTA_PROJECT_PRIMARY = 1 << 14,
+ ANJUTA_PROJECT_EXECUTABLE = 1 << 15,
+ ANJUTA_PROJECT_ID_MASK = 0xFFF,
+ ANJUTA_PROJECT_FLAG_MASK = 0x0F << 12,
+ ANJUTA_PROJECT_TYPE_MASK = 0xFFFF << 16,
+ ANJUTA_PROJECT_ROOT = 1 << 16,
+ ANJUTA_PROJECT_GROUP = 2 << 16,
+ ANJUTA_PROJECT_TARGET = 3 << 16,
+ ANJUTA_PROJECT_SOURCE = 4 << 16 ,
+ ANJUTA_PROJECT_MODULE = 5 << 16,
+ ANJUTA_PROJECT_PACKAGE = 6 << 16,
+ ANJUTA_PROJECT_VARIABLE = 7 << 16
} AnjutaProjectNodeType;
-
+
typedef enum
{
- ANJUTA_TARGET_UNKNOWN,
- ANJUTA_TARGET_SHAREDLIB,
- ANJUTA_TARGET_STATICLIB,
- ANJUTA_TARGET_EXECUTABLE,
- ANJUTA_TARGET_PYTHON,
- ANJUTA_TARGET_JAVA,
- ANJUTA_TARGET_LISP,
- ANJUTA_TARGET_HEADER,
- ANJUTA_TARGET_MAN,
- ANJUTA_TARGET_INFO,
- ANJUTA_TARGET_GENERIC,
- ANJUTA_TARGET_DATA,
- ANJUTA_TARGET_EXTRA,
- ANJUTA_TARGET_INTLTOOL,
- ANJUTA_TARGET_CONFIGURE,
- ANJUTA_TARGET_IDL,
- ANJUTA_TARGET_MKENUMS,
- ANJUTA_TARGET_GENMARSHAL
-} AnjutaProjectTargetClass;
+ ANJUTA_PROJECT_OK = 0,
+ ANJUTA_PROJECT_MODIFIED = 1 << 0, /* Node has been modified */
+ ANJUTA_PROJECT_INCOMPLETE = 1 << 1, /* Node is not fully loaded */
+ ANJUTA_PROJECT_LOADING = 1 << 2, /* Node is send to the worker thread */
+ ANJUTA_PROJECT_REMOVED = 1 << 3, /* Node has been removed */
+ ANJUTA_PROJECT_CAN_ADD_GROUP = 1 << 8,
+ ANJUTA_PROJECT_CAN_ADD_TARGET = 1 << 9,
+ ANJUTA_PROJECT_CAN_ADD_SOURCE = 1 << 10,
+ ANJUTA_PROJECT_CAN_ADD_MODULE = 1 << 11,
+ ANJUTA_PROJECT_CAN_ADD_PACKAGE = 1 << 12,
+ ANJUTA_PROJECT_CAN_REMOVE = 1 << 16,
+ ANJUTA_PROJECT_CAN_SAVE = 1 << 17,
+ ANJUTA_PROJECT_REMOVE_FILE = 1 << 18
+} AnjutaProjectNodeState;
- typedef struct
+ typedef struct _AnjutaProjectTargetInformation
{
+ AnjutaProjectNodeType type;
gchar *name;
- AnjutaProjectTargetClass base;
gchar *mime_type;
-} AnjutaProjectTargetInformation;
+} AnjutaProjectNodeInfo;
+
+typedef enum
+{
+ ANJUTA_PROJECT_PROPERTY_STRING = 1,
+ ANJUTA_PROJECT_PROPERTY_BOOLEAN,
+ ANJUTA_PROJECT_PROPERTY_LIST
+} AnjutaProjectValueType;
+
+typedef struct
+{
+ gchar *name;
+ AnjutaProjectValueType type;
+ gchar *value;
+ GList *override;
+} AnjutaProjectPropertyInfo;
+
+typedef GList AnjutaProjectProperty;
+
+typedef struct
+{
+ AnjutaProjectProperty *property;
+ gchar *value;
+} AnjutaProjectPropertyValue;
+ typedef struct _AnjutaProjectTargetInformation* AnjutaProjectTargetType;
+
typedef struct
{
AnjutaProjectNodeType type;
diff --cc plugins/Makefile.am
index 68aa072,ed7161b..8227aa5
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@@ -29,11 -30,12 +30,12 @@@ SUBDIRS = .
git \
sourceview \
run-program \
- gbf-am \
- gbf-mkfile \
- dir-project \
starter \
+ am-project \
+ mk-project \
+ dir-project \
js-debugger \
- language-support-js
+ language-support-js \
+ language-support-vala
-include $(top_srcdir)/git.mk
diff --cc plugins/symbol-db/plugin.c
index 9bf8e1a,0ab5a2c..49dfcf3
--- a/plugins/symbol-db/plugin.c
+++ b/plugins/symbol-db/plugin.c
@@@ -1516,7 -1466,8 +1460,9 @@@ do_check_offline_files_changed (SymbolD
}
}
- if (it != NULL) g_object_unref (it);
++ /*if (it != NULL) g_object_unref (it);*/
+ g_object_unref (it);
+ g_object_unref (model);
g_ptr_array_free (to_add_files, TRUE);
g_hash_table_destroy (prj_elements_hash);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
