[anjuta/newproject: 83/83] Merge branch 'master' into newproject
- From: Sebastien Granjoux <sgranjoux src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [anjuta/newproject: 83/83] Merge branch 'master' into newproject
- Date: Mon, 25 Jan 2010 20:14:08 +0000 (UTC)
commit 4f4daa33b719f22f6bfb4df7254ccd8babc00e07
Merge: bdf09fc 53ca6b8
Author: Sébastien Granjoux <seb sfo free fr>
Date: Mon Jan 25 19:47:41 2010 +0100
Merge branch 'master' into newproject
NEWS | 41 +
configure.in | 43 +-
libanjuta/Makefile.am | 18 +-
libanjuta/anjuta-project.c | 183 +-
libanjuta/anjuta-project.h | 25 +-
libanjuta/anjuta-session.c | 11 +-
libanjuta/anjuta-utils.c | 98 +
libanjuta/anjuta-utils.h | 2 +
libanjuta/interfaces/Makefile.am.iface | 8 +-
libanjuta/interfaces/libanjuta.idl | 203 +-
plugins/Makefile.am | 4 +-
plugins/build-basic-autotools/executer.c | 17 +-
plugins/class-gen/anjuta-class-gen-plugin.ui | 6 +-
plugins/class-gen/plugin.c | 46 +-
plugins/debug-manager/Makefile.am | 4 +-
plugins/debug-manager/plugin.c | 2 +-
plugins/debug-manager/start.c | 14 +-
plugins/dir-project/dir-project.plugin.in | 2 +-
plugins/file-loader/plugin.c | 2 +-
plugins/file-manager/Makefile.am | 4 +-
plugins/file-manager/file-view.c | 30 +-
plugins/file-wizard/file.c | 39 +-
plugins/gdb/anjuta-gdb.plugin.in | 2 +-
plugins/gdb/debugger.c | 13 +-
plugins/glade/plugin.c | 63 +-
plugins/js-debugger/Makefile.am | 48 +
plugins/js-debugger/debugger-js.c | 818 ++++
plugins/js-debugger/debugger-js.h | 73 +
plugins/js-debugger/debugger-server.c | 304 ++
plugins/js-debugger/debugger-server.h | 60 +
plugins/js-debugger/js_debugger.plugin.in | 10 +
plugins/js-debugger/js_debugger.png | Bin 0 -> 3011 bytes
plugins/js-debugger/plugin.c | 693 +++
plugins/js-debugger/plugin.h | 40 +
plugins/language-manager/languages.xml | 1 +
.../language-support-cpp-java/cpp-java-assist.c | 182 +-
.../cxxparser/Makefile.am | 3 +-
.../cxxparser/engine-parser.cpp | 119 +-
.../cxxparser/engine-parser.h | 3 +-
.../cxxparser/function-parser.cpp | 2 +-
.../cxxparser/function-parser.h | 36 +
.../cxxparser/function-result.cpp | 10 +-
.../cxxparser/function-result.h | 8 +-
plugins/language-support-cpp-java/plugin.c | 2 +-
plugins/language-support-js/Makefile.am | 67 +
.../anjuta-language-javascript.ui | 242 +
.../anjuta-language-javascript.xml | 10 +
plugins/language-support-js/code-completion.c | 241 +
plugins/language-support-js/code-completion.h | 32 +
plugins/language-support-js/database-symbol.c | 294 ++
plugins/language-support-js/database-symbol.h | 57 +
plugins/language-support-js/db-anjuta-symbol.c | 237 +
plugins/language-support-js/db-anjuta-symbol.h | 54 +
plugins/language-support-js/dir-symbol.c | 294 ++
plugins/language-support-js/dir-symbol.h | 55 +
plugins/language-support-js/gi-symbol.c | 222 +
plugins/language-support-js/gi-symbol.h | 53 +
plugins/language-support-js/gir-symbol.c | 368 ++
plugins/language-support-js/gir-symbol.h | 53 +
plugins/language-support-js/ijs-symbol.c | 206 +
plugins/language-support-js/ijs-symbol.h | 70 +
plugins/language-support-js/import-symbol.c | 226 +
plugins/language-support-js/import-symbol.h | 54 +
plugins/language-support-js/js-context.c | 1 +
plugins/language-support-js/js-context.h | 1 +
plugins/language-support-js/js-node.c | 1 +
plugins/language-support-js/js-node.h | 1 +
.../js_support_plugin.plugin.in | 7 +
plugins/language-support-js/js_support_plugin.png | Bin 0 -> 4218 bytes
plugins/language-support-js/jsparse.c | 1 +
plugins/language-support-js/jsparse.h | 1 +
plugins/language-support-js/jstypes.h | 1 +
plugins/language-support-js/lex.l | 1 +
plugins/language-support-js/lex.yy.c | 1 +
plugins/language-support-js/lex.yy.h | 1 +
plugins/language-support-js/local-symbol.c | 227 +
plugins/language-support-js/local-symbol.h | 54 +
plugins/language-support-js/node-symbol.c | 240 +
plugins/language-support-js/node-symbol.h | 54 +
plugins/language-support-js/plugin.c | 507 +++
plugins/language-support-js/plugin.h | 49 +
plugins/language-support-js/simple-symbol.c | 157 +
plugins/language-support-js/simple-symbol.h | 60 +
plugins/language-support-js/std-symbol.c | 243 +
plugins/language-support-js/std-symbol.h | 54 +
plugins/language-support-js/unit_test/Makefile.am | 15 +
.../language-support-js/unit_test/Makefile.decl | 61 +
plugins/language-support-js/unit_test/test.c | 179 +
plugins/language-support-js/unit_test/u1.js | 31 +
plugins/language-support-js/unit_test/u2.js | 13 +
plugins/language-support-js/unit_test/u3.js | 14 +
plugins/language-support-js/unit_test/u4.js | 8 +
plugins/language-support-js/unit_test/u5.js | 5 +
plugins/language-support-js/unit_test/u6.js | 8 +
plugins/language-support-js/util.c | 257 ++
plugins/language-support-js/util.h | 52 +
plugins/language-support-js/y.tab.c | 1 +
plugins/language-support-js/y.tab.h | 1 +
plugins/message-view/plugin.c | 4 +-
plugins/mk-project/plugin.c | 2 -
plugins/project-import/plugin.c | 3 +-
plugins/project-manager/gbf-project-model.c | 715 ++--
plugins/project-manager/gbf-project-model.h | 14 +-
plugins/project-manager/gbf-project-util.c | 139 +-
plugins/project-manager/gbf-project-util.h | 12 +-
plugins/project-manager/gbf-project-view.c | 279 +-
plugins/project-manager/gbf-project-view.h | 15 +-
plugins/project-manager/gbf-tree-data.c | 460 ++-
plugins/project-manager/gbf-tree-data.h | 53 +-
plugins/project-manager/plugin.c | 1128 +++---
plugins/project-manager/plugin.h | 4 +-
plugins/project-wizard/Makefile.am | 2 +
plugins/project-wizard/anjuta-project-wizard.ui | 2 +-
plugins/project-wizard/druid.c | 98 +-
plugins/project-wizard/header.c | 25 +-
plugins/project-wizard/templates/Makefile.am | 3 +-
.../project-wizard/templates/cpp/configure.ac.tpl | 1 +
.../project-wizard/templates/gcj/configure.ac.tpl | 1 +
.../templates/gnome-applet/configure.ac.tpl | 1 +
.../project-wizard/templates/java/configure.ac.tpl | 1 +
plugins/project-wizard/templates/js.wiz | 56 +
.../templates/js_minimal/Makefile.am | 10 +
.../templates/js_minimal/Makefile.am.tpl | 9 +
.../project-wizard/templates/js_minimal/autogen.sh | 160 +
.../templates/js_minimal/configure.ac.tpl | 63 +
.../templates/js_minimal/project.anjuta | 37 +
.../templates/js_minimal/src/Makefile.am | 3 +
.../templates/js_minimal/src/Makefile.am.tpl | 38 +
.../templates/js_minimal/src/debug.c | 527 +++
.../templates/js_minimal/src/debug.h | 22 +
.../project-wizard/templates/js_minimal/src/main.c | 46 +
.../templates/js_minimal/src/main.js | 5 +
.../templates/library/configure.ac.tpl | 1 +
.../templates/minimal/configure.ac.tpl | 1 +
.../templates/python/configure.ac.tpl | 1 +
.../project-wizard/templates/sdl/configure.ac.tpl | 1 +
.../templates/terminal/configure.ac.tpl | 1 +
.../templates/translatable-strings.h | 8 +
.../templates/wxwin/configure.ac.tpl | 1 +
.../project-wizard/templates/xlib/configure.ac.tpl | 1 +
plugins/run-program/parameters.c | 8 +-
plugins/search/search-replace_backend.c | 7 +-
plugins/sourceview/Makefile.am | 4 +-
plugins/sourceview/sourceview-cell.c | 12 +
plugins/sourceview/sourceview.c | 2 +-
plugins/starter/Makefile.am | 6 +-
plugins/symbol-db/Makefile.am | 3 +-
plugins/symbol-db/anjuta-tags/Makefile.am | 43 +-
plugins/symbol-db/anjuta-tags/ant.c | 4 +-
plugins/symbol-db/anjuta-tags/eiffel.c | 20 +-
plugins/symbol-db/anjuta-tags/gir.c | 229 +
plugins/symbol-db/anjuta-tags/js_parser/Grammar.y | 1193 +++++
.../symbol-db/anjuta-tags/js_parser/js-context.c | 630 +++
.../symbol-db/anjuta-tags/js_parser/js-context.h | 92 +
plugins/symbol-db/anjuta-tags/js_parser/js-node.c | 203 +
plugins/symbol-db/anjuta-tags/js_parser/js-node.h | 90 +
plugins/symbol-db/anjuta-tags/js_parser/jsparse.c | 147 +
plugins/symbol-db/anjuta-tags/js_parser/jsparse.h | 13 +
plugins/symbol-db/anjuta-tags/js_parser/jstypes.h | 114 +
plugins/symbol-db/anjuta-tags/js_parser/lex.l | 126 +
plugins/symbol-db/anjuta-tags/js_parser/lex.yy.c | 3698 ++++++++++++++++
plugins/symbol-db/anjuta-tags/js_parser/lex.yy.h | 339 ++
plugins/symbol-db/anjuta-tags/js_parser/y.tab.c | 4643 ++++++++++++++++++++
plugins/symbol-db/anjuta-tags/js_parser/y.tab.h | 168 +
plugins/symbol-db/anjuta-tags/jscript.c | 1736 ++-------
plugins/symbol-db/anjuta-tags/lregex.c | 4 +-
plugins/symbol-db/anjuta-tags/parsers.h | 1 +
plugins/symbol-db/anjuta-tags/php.c | 6 +-
plugins/symbol-db/anjuta-tags/python.c | 4 +-
plugins/symbol-db/anjuta-tags/sort.c | 4 +-
plugins/symbol-db/anjuta-tags/sql.c | 274 +-
plugins/symbol-db/anjuta-tags/tex.c | 35 +-
plugins/symbol-db/benchmark/Makefile.am | 29 +-
plugins/symbol-db/plugin.c | 143 +-
plugins/symbol-db/symbol-db-engine-priv.h | 2 +-
plugins/symbol-db/symbol-db-engine-queries.c | 14 +-
plugins/symbol-db/symbol-db-engine-queries.h | 5 +-
plugins/symbol-db/symbol-db-view-locals.c | 2 +-
plugins/symbol-db/symbol-db-view-locals.h | 2 +-
plugins/symbol-db/test-queries/Makefile.am | 29 +-
plugins/tools/plugin.c | 6 +
plugins/tools/plugin.h | 1 +
plugins/tools/scripts/Makefile.am | 10 +-
plugins/tools/tool.c | 13 +-
plugins/tools/tool.h | 2 +-
plugins/tools/variable.c | 10 +-
po/POTFILES.in | 8 +
po/POTFILES.skip | 2 +
po/es.po | 1677 ++++----
po/sl.po | 1031 +++---
po/sv.po | 3900 +++++++++--------
po/th.po | 4153 ++++++++++--------
scripts/build-schemas.mk | 2 +-
193 files changed, 29271 insertions(+), 8015 deletions(-)
---
diff --cc libanjuta/Makefile.am
index 43d1801,15994d5..62c2a92
--- a/libanjuta/Makefile.am
+++ b/libanjuta/Makefile.am
@@@ -80,17 -82,10 +82,17 @@@ 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-project.c \
- anjuta-project.h \
+ anjuta-token-stream.c \
- anjuta-token-stream.h
++ anjuta-token-stream.h \
+ anjuta-project.c \
+ anjuta-project.h
-
if HAVE_PLUGIN_GLADE
# For now install in our own prefix
@@@ -147,9 -142,8 +149,9 @@@ libanjuta_include =
anjuta-sync-command.h \
anjuta-version.h \
gbf-project.h \
- anjuta-command-queue.h \
anjuta-project.h \
- anjuta-command-queue.h
++ anjuta-command-queue.h \
+ anjuta-token.h
libanjutainclude_HEADERS = \
$(libanjuta_include) \
diff --cc plugins/Makefile.am
index 29ea2af,329fd2b..68aa072
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@@ -29,9 -29,11 +29,11 @@@ SUBDIRS = .
git \
sourceview \
run-program \
- gbf-am \
- gbf-mkfile \
- dir-project \
starter \
+ am-project \
+ mk-project \
- dir-project
++ dir-project \
+ js-debugger \
+ language-support-js
-include $(top_srcdir)/git.mk
diff --cc plugins/mk-project/plugin.c
index 3591173,0656bbe..99dd108
--- a/plugins/mk-project/plugin.c
+++ b/plugins/mk-project/plugin.c
@@@ -64,9 -64,7 +64,7 @@@ iproject_backend_new_project (IAnjutaPr
static gint
iproject_backend_probe (IAnjutaProjectBackend* backend, GFile *directory, GError** err)
{
- DEBUG_PRINT("probe mkp project");
-
- return gbf_am_project_probe (directory, err);
+ return mkp_project_probe (directory, err);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
