[anjuta/newproject: 189/189] Merge branch 'master' into newproject
- From: Sebastien Granjoux <sgranjoux src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [anjuta/newproject: 189/189] Merge branch 'master' into newproject
- Date: Sat, 24 Apr 2010 09:59:39 +0000 (UTC)
commit e2574d18b28b5dfdd19aa582765044ee0cebc186
Merge: 0e8390b 8ee9599
Author: Sébastien Granjoux <seb sfo free fr>
Date: Sat Apr 24 11:54:53 2010 +0200
Merge branch 'master' into newproject
Conflicts:
libanjuta/Makefile.am
libanjuta/anjuta-project.c
libanjuta/anjuta-project.h
manuals/reference/libanjuta/libanjuta-sections.txt
plugins/gbf-am/Makefile.am
plugins/project-manager/gbf-project-util.c
plugins/project-manager/plugin.c
plugins/project-manager/project-model.c
plugins/project-manager/project-view.c
.gitignore | 64 +-
NEWS | 18 +
configure.in | 4 +-
libanjuta/Makefile.am | 5 +-
libanjuta/anjuta-command.c | 5 +-
libanjuta/anjuta-command.h | 4 +-
libanjuta/anjuta-shell.c | 74 +
libanjuta/anjuta-shell.h | 29 +
libanjuta/anjuta-tabber.c | 500 ++
libanjuta/anjuta-tabber.h | 57 +
manuals/anjuta-manual/de/de.po | 999 +++--
manuals/reference/libanjuta/Makefile.am | 6 +-
manuals/reference/libanjuta/libanjuta-sections.txt | 2015 --------
manuals/reference/libanjuta/libanjuta.types | 111 -
plugins/build-basic-autotools/plugin.c | 8 +-
plugins/class-gen/Makefile.am | 4 +-
plugins/class-gen/anjuta-class-gen-plugin-48.png | Bin 0 -> 2017 bytes
plugins/class-gen/anjuta-class-gen-plugin.svg | 836 ++++
plugins/class-gen/anjuta-class-gen.plugin.in | 2 +-
plugins/class-gen/class_logo.xpm | 1004 ----
plugins/class-gen/plugin.c | 2 +-
plugins/devhelp/plugin.c | 85 +-
plugins/devhelp/plugin.h | 3 +-
plugins/dir-project/sources.list | 2 +
plugins/document-manager/Makefile.am | 1 +
plugins/document-manager/action-callbacks.c | 37 +
plugins/document-manager/action-callbacks.h | 1 +
plugins/document-manager/anjuta-docman.c | 61 +-
plugins/document-manager/anjuta-docman.h | 1 +
.../document-manager/anjuta-document-manager.xml | 1 +
plugins/document-manager/plugin.c | 3 +
plugins/file-manager/Makefile.am | 1 +
.../file-manager/anjuta-file-manager-plugin-16.png | Bin 0 -> 617 bytes
plugins/file-wizard/Makefile.am | 3 +-
.../file-wizard/anjuta-file-wizard-plugin-48.png | Bin 0 -> 3604 bytes
plugins/file-wizard/anjuta-file-wizard-plugin.png | Bin 3768 -> 0 bytes
plugins/file-wizard/anjuta-file-wizard-plugin.svg | 774 ++++
plugins/file-wizard/anjuta-file-wizard.plugin.in | 2 +-
plugins/file-wizard/plugin.c | 2 +-
plugins/git/git-merge-dialog.c | 3 +-
plugins/gtodo/Makefile.am | 1 +
plugins/gtodo/anjuta-gtodo-plugin-16.png | Bin 0 -> 787 bytes
plugins/gtodo/preferences.c | 31 +
plugins/js-debugger/Makefile.am | 4 +-
plugins/language-manager/Makefile.am | 3 +-
plugins/language-support-cpp-java/Makefile.am | 6 +-
.../language-support-cpp-java/cpp-java-assist.c | 107 +-
.../language-support-cpp-java/cpp-java-assist.h | 2 -
.../cxxparser/engine-parser.cpp | 2 +-
plugins/language-support-cpp-java/plugin.c | 14 +-
plugins/language-support-js/Makefile.am | 15 +-
plugins/language-support-js/js-context.c | 2 +-
plugins/language-support-js/js-context.h | 2 +-
plugins/language-support-js/js-node.c | 2 +-
plugins/language-support-js/js-node.h | 2 +-
plugins/language-support-js/js-parser-y-tab.c | 1 +
plugins/language-support-js/js-parser-y-tab.h | 1 +
plugins/language-support-js/jsparse.c | 2 +-
plugins/language-support-js/jsparse.h | 2 +-
plugins/language-support-js/jstypes.h | 2 +-
plugins/language-support-js/lex.l | 2 +-
plugins/language-support-js/lex.yy.c | 2 +-
plugins/language-support-js/lex.yy.h | 2 +-
plugins/language-support-js/y.tab.c | 1 -
plugins/language-support-js/y.tab.h | 1 -
plugins/macro/Makefile.am | 1 +
plugins/macro/anjuta-macro.ui | 2 +-
plugins/message-view/anjuta-msgman.c | 119 +-
plugins/message-view/anjuta-msgman.h | 2 +-
plugins/message-view/message-view.c | 180 +-
plugins/message-view/message-view.h | 12 +
plugins/message-view/plugin.c | 137 +-
plugins/message-view/plugin.h | 6 +
plugins/mk-project/Makefile.am | 1 +
plugins/project-manager/Makefile.am | 1 +
.../anjuta-project-manager-plugin-16.png | Bin 0 -> 610 bytes
plugins/project-manager/plugin.c | 1 +
plugins/project-wizard/.cvsignore | 4 -
plugins/project-wizard/templates/.cvsignore | 4 -
.../templates/anjuta-plugin/.cvsignore | 4 -
.../templates/anjuta-plugin/po/.cvsignore | 4 -
.../templates/anjuta-plugin/src/.cvsignore | 4 -
plugins/project-wizard/templates/cpp/.cvsignore | 2 -
plugins/project-wizard/templates/gcj/.cvsignore | 4 -
.../project-wizard/templates/gcj/src/.cvsignore | 4 -
plugins/project-wizard/templates/gtk/.cvsignore | 4 -
plugins/project-wizard/templates/gtk/po/.cvsignore | 4 -
.../project-wizard/templates/gtk/src/.cvsignore | 4 -
plugins/project-wizard/templates/gtkmm/.cvsignore | 4 -
.../project-wizard/templates/gtkmm/po/.cvsignore | 4 -
.../project-wizard/templates/gtkmm/src/.cvsignore | 4 -
plugins/project-wizard/templates/java/.cvsignore | 4 -
.../project-wizard/templates/java/po/.cvsignore | 4 -
.../project-wizard/templates/java/src/.cvsignore | 4 -
.../templates/js_minimal/configure.ac.tpl | 2 +-
.../templates/js_minimal/src/debug.c | 10 +-
.../project-wizard/templates/library/po/.cvsignore | 4 -
.../project-wizard/templates/minimal/.cvsignore | 4 -
plugins/project-wizard/templates/mkfile/.cvsignore | 4 -
.../project-wizard/templates/mkfile/po/.cvsignore | 4 -
.../project-wizard/templates/mkfile/src/.cvsignore | 4 -
plugins/project-wizard/templates/python/.cvsignore | 4 -
.../project-wizard/templates/python/po/.cvsignore | 4 -
.../project-wizard/templates/python/src/.cvsignore | 4 -
plugins/project-wizard/templates/sdl/.cvsignore | 4 -
plugins/project-wizard/templates/sdl/po/.cvsignore | 4 -
.../project-wizard/templates/sdl/src/.cvsignore | 4 -
.../project-wizard/templates/terminal/.cvsignore | 4 -
.../templates/terminal/po/.cvsignore | 4 -
.../templates/terminal/src/.cvsignore | 4 -
plugins/project-wizard/templates/wxwin/.cvsignore | 4 -
.../project-wizard/templates/wxwin/po/.cvsignore | 4 -
.../project-wizard/templates/wxwin/src/.cvsignore | 4 -
.../project-wizard/templates/xlib-dock/.cvsignore | 4 -
.../templates/xlib-dock/po/.cvsignore | 4 -
.../templates/xlib-dock/src/.cvsignore | 4 -
plugins/project-wizard/templates/xlib/.cvsignore | 4 -
.../project-wizard/templates/xlib/po/.cvsignore | 4 -
.../project-wizard/templates/xlib/src/.cvsignore | 4 -
plugins/sourceview/sourceview-cell.c | 132 +-
plugins/sourceview/sourceview-prefs.c | 25 +-
plugins/sourceview/sourceview.c | 14 +-
plugins/starter/starter.c | 13 +
plugins/subversion/svn-command.c | 1 +
plugins/subversion/svn-log-command.c | 4 +
plugins/symbol-db/Makefile.am | 68 +-
plugins/symbol-db/anjuta-symbol-db-plugin-16.png | Bin 0 -> 663 bytes
plugins/symbol-db/anjuta-symbol-db-plugin-48.png | Bin 1475 -> 1495 bytes
plugins/symbol-db/anjuta-symbol-db-plugin.svg | 607 +++
plugins/symbol-db/anjuta-tags/Makefile.am | 37 +-
plugins/symbol-db/anjuta-tags/ctags-visitor.vala | 7 +-
plugins/symbol-db/anjuta-tags/gir.c | 8 +-
.../anjuta-tags/{js_parser => js-parser}/Grammar.y | 0
.../{js_parser => js-parser}/js-context.c | 0
.../{js_parser => js-parser}/js-context.h | 0
.../anjuta-tags/{js_parser => js-parser}/js-node.c | 2 +-
.../anjuta-tags/{js_parser => js-parser}/js-node.h | 2 +
.../y.tab.c => js-parser/js-parser-y-tab.c} | 528 ++--
.../y.tab.h => js-parser/js-parser-y-tab.h} | 4 +-
.../anjuta-tags/{js_parser => js-parser}/jsparse.c | 0
.../anjuta-tags/{js_parser => js-parser}/jsparse.h | 0
.../anjuta-tags/{js_parser => js-parser}/jstypes.h | 0
.../anjuta-tags/{js_parser => js-parser}/lex.l | 2 +-
.../anjuta-tags/{js_parser => js-parser}/lex.yy.c | 212 +-
.../anjuta-tags/{js_parser => js-parser}/lex.yy.h | 0
plugins/symbol-db/anjuta-tags/jscript.c | 6 +-
plugins/symbol-db/anjuta-tags/make.c | 4 +-
plugins/symbol-db/anjuta-tags/python.c | 6 +-
plugins/symbol-db/anjuta-tags/vala.c | 1 +
plugins/symbol-db/anjuta-tags/verilog.c | 3 +-
plugins/symbol-db/images/Makefile.am | 11 +-
.../images/element-interface-private-16.png | Bin 0 -> 791 bytes
.../images/element-interface-protected-16.png | Bin 0 -> 728 bytes
.../images/element-interface-public-16.png | Bin 0 -> 658 bytes
plugins/symbol-db/images/element-method-16.png | Bin 604 -> 650 bytes
.../symbol-db/images/element-method-private-16.png | Bin 0 -> 827 bytes
.../images/element-method-protected-16.png | Bin 0 -> 759 bytes
.../symbol-db/images/element-method-public-16.png | Bin 0 -> 650 bytes
.../images/element-property-private-16.png | Bin 0 -> 778 bytes
.../images/element-property-protected-16.png | Bin 0 -> 754 bytes
.../images/element-property-public-16.png | Bin 0 -> 691 bytes
plugins/symbol-db/images/private.png | Bin 0 -> 417 bytes
plugins/symbol-db/images/protected.png | Bin 0 -> 360 bytes
plugins/symbol-db/plugin.c | 397 +--
plugins/symbol-db/plugin.h | 15 +-
plugins/symbol-db/symbol-db-engine-core.c | 306 ++-
plugins/symbol-db/symbol-db-engine-core.h | 15 +
plugins/symbol-db/symbol-db-engine-iterator-node.c | 1 -
plugins/symbol-db/symbol-db-engine-priv.h | 55 +-
plugins/symbol-db/symbol-db-engine-queries.c | 201 +-
plugins/symbol-db/symbol-db-engine-queries.h | 5 +-
plugins/symbol-db/symbol-db-engine-utils.c | 30 +-
plugins/symbol-db/symbol-db-engine.h | 7 +
plugins/symbol-db/symbol-db-iface.c | 1 +
plugins/symbol-db/symbol-db-marshal.list | 3 +
plugins/symbol-db/symbol-db-model-file.c | 307 ++
plugins/symbol-db/symbol-db-model-file.h | 65 +
plugins/symbol-db/symbol-db-model-project.c | 493 ++
plugins/symbol-db/symbol-db-model-project.h | 68 +
plugins/symbol-db/symbol-db-model.c | 1489 ++++++
plugins/symbol-db/symbol-db-model.h | 96 +
plugins/symbol-db/symbol-db-system.c | 4 +-
plugins/symbol-db/symbol-db-view-locals.c | 1601 -------
plugins/symbol-db/symbol-db-view-locals.h | 99 -
plugins/symbol-db/symbol-db-view-search.c | 1 -
plugins/symbol-db/symbol-db-view.c | 1736 -------
plugins/symbol-db/symbol-db-view.h | 89 -
plugins/symbol-db/symbol-db-views.c | 197 +
plugins/symbol-db/symbol-db-views.h | 38 +
plugins/symbol-db/tables.sql | 63 +-
po/POTFILES.in | 2 -
po/bg.po | 3858 ++++++++--------
po/ca.po | 3063 +++++++------
po/ca valencia po | 4837 ++++++++++----------
po/cs.po | 4487 +++++++------------
po/da.po | 1207 +++---
po/el.po | 3678 ++++-----------
po/en_GB.po | 254 +-
po/es.po | 618 ++--
po/gl.po | 612 ++--
po/hu.po | 3873 +++++++++--------
po/it.po | 4049 +++++++++--------
po/pt.po | 4664 +++++++++++--------
po/pt_BR.po | 4153 ++++++++++--------
po/ru.po | 1465 +------
po/sv.po | 1540 +++----
po/uk.po | 4055 +++++++++--------
po/zh_HK.po | 757 +++-
po/zh_TW.po | 762 +++-
src/anjuta-app.c | 147 +-
src/anjuta-app.h | 1 +
src/shell.c | 49 +
212 files changed, 31432 insertions(+), 33346 deletions(-)
---
diff --cc libanjuta/Makefile.am
index 62c2a92,2a8742d..f1a31a0
--- a/libanjuta/Makefile.am
+++ b/libanjuta/Makefile.am
@@@ -82,17 -82,12 +82,19 @@@ libanjuta_la_SOURCES=
gbf-project.h \
anjuta-command-queue.c \
anjuta-command-queue.h \
+ anjuta-token.c \
+ anjuta-token.h \
+ anjuta-token-list.h \
+ anjuta-token-list.c \
+ anjuta-token-file.h \
+ anjuta-token-file.c \
+ anjuta-token-stream.c \
+ anjuta-token-stream.h \
anjuta-project.c \
- anjuta-project.h
+ anjuta-project.h \
+ anjuta-tabber.c \
+ anjuta-tabber.h
-
if HAVE_PLUGIN_GLADE
# For now install in our own prefix
@@@ -151,7 -146,7 +153,8 @@@ libanjuta_include =
gbf-project.h \
anjuta-project.h \
anjuta-command-queue.h \
- anjuta-tabber.h
++ anjuta-tabber.h \
+ anjuta-token.h
libanjutainclude_HEADERS = \
$(libanjuta_include) \
diff --cc plugins/mk-project/Makefile.am
index bcd751b,b978990..5bb2353
--- a/plugins/mk-project/Makefile.am
+++ b/plugins/mk-project/Makefile.am
@@@ -21,27 -25,26 +21,28 @@@ AM_CPPFLAGS =
$(WARN_CFLAGS) \
$(DEPRECATED_FLAGS) \
$(GIO_CFLAGS) \
+ $(LIBXML_CFLAGS) \
$(LIBANJUTA_CFLAGS) \
- -DSCRIPTS_DIR=\"$(scriptsdir)\"
+ -DG_LOG_DOMAIN=\"mk-project\"
plugin_LTLIBRARIES = \
- libgbf-mkfile.la
+ libmk-project.la
-libgbf_mkfile_la_SOURCES = \
+libmk_project_la_SOURCES = \
plugin.c \
plugin.h \
- gbf-mkfile-project.c \
- gbf-mkfile-project.h \
- gbf-mkfile-config.c \
- gbf-mkfile-config.h \
- gbf-mkfile-properties.c \
- gbf-mkfile-properties.h
+ mk-project.c \
+ mk-project.h \
+ mk-scanner.l \
+ mk-parser.y \
+ mk-scanner.h \
+ mk-rule.c \
+ mk-rule.h \
+ mk-project-private.h
-libgbf_mkfile_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
+libmk_project_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
-libgbf_mkfile_la_LIBADD = \
+libmk_project_la_LIBADD = \
$(GIO_LIBS) \
$(LIBANJUTA_LIBS)
diff --cc plugins/project-manager/plugin.c
index 4fa75da,1f40d07..5fd70b0
--- a/plugins/project-manager/plugin.c
+++ b/plugins/project-manager/plugin.c
@@@ -2333,3 -2499,3 +2333,4 @@@ ANJUTA_PLUGIN_ADD_INTERFACE (ifile, IAN
ANJUTA_PLUGIN_END;
ANJUTA_SIMPLE_PLUGIN (ProjectManagerPlugin, project_manager_plugin);
++
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
