Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Sat, 22 Feb 2014 14:06:39 UTC
Commit: ece919a81a0ff154de708d24326caaefd5c1a57b
https://github.com/geany/geany-plugins/commit/ece919a81a0ff154de708d24326ca…
Log Message:
-----------
Fix installation path during distcheck
When distchecking we need not to install plugins in the real Geany
libdir, both because it's not writable and because it's a bad idea.
So, pass the appropriate configure flag to override automatic detection
during distcheck's configure run.
Modified Paths:
--------------
Makefile.am
Modified: Makefile.am
1 files changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -1,4 +1,5 @@
ACLOCAL_AMFLAGS = -I build/cache -I build -I build/bundled -I geanypy/m4 --install
+AM_DISTCHECK_CONFIGURE_FLAGS = --with-geany-libdir='$${libdir}'
SUBDIRS = po
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Fri, 21 Feb 2014 16:35:51 UTC
Commit: f931e296d4fadf8e8a8456348f7ee9ee3cf48158
https://github.com/geany/geany-plugins/commit/f931e296d4fadf8e8a8456348f7ee…
Log Message:
-----------
spellcheck: fix checking with cppcheck
cppcheck tests all preprocessor conditionals, but when the code tests
whether one is defined or not it tests simply with it defined or not,
but always to an empty value. So, code testing whether a macro is
defined, but then relying on the macro expanding to a non-empty value,
cppcheck might very well detect a syntax error.
So, explicitly tell cppcheck to only test the SCE_PAS_DEFAULT=0 case
so it doesn't incorrectly test the SCE_PAS_DEFAULT= case.
Modified Paths:
--------------
spellcheck/src/Makefile.am
Modified: spellcheck/src/Makefile.am
1 files changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -22,4 +22,5 @@ spellcheck_la_LIBADD = \
$(COMMONLIBS) \
$(ENCHANT_LIBS)
+AM_CPPCHECKFLAGS = -DSCE_PAS_DEFAULT=0
include $(top_srcdir)/build/cppcheck.mk
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Fri, 21 Feb 2014 16:35:43 UTC
Commit: f26710b7e904f713e3fba860c62ebad11a5206ad
https://github.com/geany/geany-plugins/commit/f26710b7e904f713e3fba860c62eb…
Log Message:
-----------
cppcheck: allow for extra user and developer flags
Make cppheck calls use flags variables `$(AM_CPPCHECKFLAGS)` (for
developer flags) and `$(CPPCHECKFLAGS)` (for user flags).
This allows both a developer to add specific flags needed to cppcheck
to behave appropriately for the checked code, as well as the users to
specify flags, like e.g. the number ob concurrent jobs.
Modified Paths:
--------------
build/cppcheck.mk
Modified: build/cppcheck.mk
5 files changed, 4 insertions(+), 1 deletions(-)
===================================================================
@@ -2,7 +2,10 @@
if HAVE_CPPCHECK
check-cppcheck: $(srcdir)
- $(CPPCHECK) -q --template gcc --error-exitcode=2 $^
+ $(CPPCHECK) \
+ -q --template gcc --error-exitcode=2 \
+ $(AM_CPPCHECKFLAGS) $(CPPCHECKFLAGS) \
+ $^
check-local: check-cppcheck
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Thu, 20 Feb 2014 14:56:22 UTC
Commit: 67fbfbfc6ba71c84890cdcf6f969830986ea747e
https://github.com/geany/geany-plugins/commit/67fbfbfc6ba71c84890cdcf6f9698…
Log Message:
-----------
geanygendoc: Hide a harmless GCC warning
GTokenType don't have named constants for every possible character, so
GCC will warn for byte values not explicitly part of that enumeration,
even though it has a gap designed for any byte to be valid.
Modified Paths:
--------------
geanygendoc/src/ggd-file-type-loader.c
Modified: geanygendoc/src/ggd-file-type-loader.c
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -408,7 +408,7 @@
identifier = g_strdup (scanner->value.v_identifier);
/*g_debug ("identifier is %s", identifier);*/
- switch (g_scanner_get_next_token (scanner)) {
+ switch ((guint) g_scanner_get_next_token (scanner)) {
case '.': /* skip it */ break;
case G_TOKEN_EQUAL_SIGN:
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Thu, 20 Feb 2014 14:26:46 UTC
Commit: 19118407ac98893f9c1a123cd6035be0837dd073
https://github.com/geany/geany-plugins/commit/19118407ac98893f9c1a123cd6035…
Log Message:
-----------
geanygendoc: Remove some dead code
Modified Paths:
--------------
geanygendoc/src/ggd-tag-utils.c
geanygendoc/src/ggd-tag-utils.h
geanygendoc/src/ggd.c
Modified: geanygendoc/src/ggd-tag-utils.c
88 files changed, 2 insertions(+), 86 deletions(-)
===================================================================
@@ -424,69 +424,11 @@
return tag;
}
-
-/*
- * scope_child_matches:
- * @a: parent scope
- * @b: child scope
- * @geany_ft: The Geany's file type identifier for which tags were generated
- * @maxdepth: maximum sub-child level that matches, or < 0 for all to match
- *
- * Checks if scope @b is inside scope @a. @maxdepth make possible to only match
- * child scope if it have less than @maxdepth parents before scope @a.
- * E.g., with a maximum depth of 1, only direct children will match.
- *
- * Returns: %TRUE if matches, %FALSE otherwise.
- */
-static gboolean
-scope_child_matches (const gchar *a,
- const gchar *b,
- filetype_id geany_ft,
- gint maxdepth)
-{
- gboolean matches = FALSE;
-
- /*g_debug ("trying to match %s against %s", b, a);*/
- if (a && b) {
- for (; *a && *b && *a == *b; a++, b++);
- if (! *a /* we're at the end of the prefix and it matched */) {
- const gchar *separator;
-
- separator = symbols_get_context_separator (geany_ft);
- if (maxdepth < 0) {
- if (! *b || strncmp (b, separator, strlen (separator)) == 0) {
- matches = TRUE;
- }
- } else {
- while (! matches && maxdepth >= 0) {
- const gchar *tmp;
-
- tmp = strstr (b, separator);
- if (tmp) {
- b = &tmp[2];
- maxdepth --;
- } else {
- if (! *b) {
- matches = TRUE;
- }
- break;
- }
- }
- }
- }
- }
-
- return matches;
-}
-
-
/**
* ggd_tag_find_children:
* @tags: Array of tags that contains @parent
* @parent: Tag for which get children
* @geany_ft: The Geany's file type identifier for which tags were generated
- * @depth: Maximum depth for children to be found (< 0 means infinite)
- * Value != 0 aren't honored for now, see FIXME in function's body.
* @filter: A logical OR of the TMTagType<!-- -->s to match
*
* Finds children tags of a #TMTag that matches @matches.
@@ -499,46 +441,23 @@
ggd_tag_find_children_filtered (const GPtrArray *tags,
const TMTag *parent,
filetype_id geany_ft,
- gint depth,
TMTagType filter)
{
GList *children = NULL;
guint i;
TMTag *el;
- /*gchar *fake_scope;*/
g_return_val_if_fail (tags != NULL, NULL);
g_return_val_if_fail (parent != NULL, NULL);
- /*if (parent->atts.entry.scope) {
- fake_scope = g_strconcat (parent->atts.entry.scope,
- symbols_get_context_separator (geany_ft),
- parent->name, NULL);
- } else {
- fake_scope = g_strdup (parent->name);
- }*/
GGD_PTR_ARRAY_FOR (tags, i, el) {
- /* FIXME: we definitely need a better way to determinate who is child of
- * who and who is parent of who.
- * On this side, it may find as children a tag that isn't the children,
- * and simply getting children that comes after parent isn't a proper fix
- * since the first possible parent will have all children.
- * Crap.
- *
- * Hack by checking if the parent of the element is the same as the parent
- * we search for children. It breaks depth >= 0, but as we don't use it for
- * now it's OK. A little odd but it works. */
if (el->type & filter &&
- /*el->atts.entry.line >= parent->atts.entry.line &&*/
- /*scope_child_matches (fake_scope, el->atts.entry.scope,
- geany_ft, depth) &&*/
ggd_tag_find_parent (tags, geany_ft, el) == parent) {
children = g_list_insert_sorted_with_data (children, el,
tag_cmp_by_line,
GINT_TO_POINTER (GGD_SORT_ASC));
}
}
- /*g_free (fake_scope);*/
return children;
}
@@ -548,7 +467,6 @@
* @tags: Array of tags that contains @parent
* @parent: Tag for which get children
* @geany_ft: The Geany's file type identifier for which tags were generated
- * @depth: Maximum depth for children to be found (< 0 means infinite)
*
* Finds children tags of a #TMTag.
* <note><para>The returned list of children is sorted in the order they appears
@@ -559,9 +477,7 @@
GList *
ggd_tag_find_children (const GPtrArray *tags,
const TMTag *parent,
- filetype_id geany_ft,
- gint depth)
+ filetype_id geany_ft)
{
- return ggd_tag_find_children_filtered (tags, parent, geany_ft,
- depth, tm_tag_max_t);
+ return ggd_tag_find_children_filtered (tags, parent, geany_ft, tm_tag_max_t);
}
Modified: geanygendoc/src/ggd-tag-utils.h
4 files changed, 1 insertions(+), 3 deletions(-)
===================================================================
@@ -56,12 +56,10 @@ TMTag *ggd_tag_find_parent (const GPtrArray *tags,
GList *ggd_tag_find_children_filtered (const GPtrArray *tags,
const TMTag *parent,
filetype_id geany_ft,
- gint depth,
TMTagType filter);
GList *ggd_tag_find_children (const GPtrArray *tags,
const TMTag *parent,
- filetype_id geany_ft,
- gint depth);
+ filetype_id geany_ft);
gchar *ggd_tag_resolve_type_hierarchy (const GPtrArray *tags,
filetype_id geany_ft,
const TMTag *tag);
Modified: geanygendoc/src/ggd.c
4 files changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -179,7 +179,7 @@
ctpl_environ_push_int (env, "returns", returns);
/* get direct children tags */
children = ggd_tag_find_children (tag_array, tag,
- FILETYPE_ID (doc->file_type), 0);
+ FILETYPE_ID (doc->file_type));
if (setting->merge_children) {
CtplValue *v;
@@ -546,7 +546,7 @@
if (setting && setting->autodoc_children) {
tag_list = ggd_tag_find_children_filtered (tag_array, tag,
FILETYPE_ID (doc->file_type),
- 0, setting->matches);
+ setting->matches);
}
/* we assume that a parent always comes before any children, then simply add
* it at the end */
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Dimitar Zhekov <dimitar.zhekov(a)gmail.com>
Committer: Dimitar Zhekov <dimitar.zhekov(a)gmail.com>
Date: Tue, 18 Feb 2014 19:28:26 UTC
Commit: 85a4570c7f23b91eeee40f8182f58edf7a58466b
https://github.com/geany/geany-plugins/commit/85a4570c7f23b91eeee40f8182f58…
Log Message:
-----------
scope - ChangeLog and NEWS fixes
Modified Paths:
--------------
scope/ChangeLog
scope/NEWS
Modified: scope/ChangeLog
9 files changed, 5 insertions(+), 4 deletions(-)
===================================================================
@@ -1,4 +1,4 @@
-2013-02-17 Dimitar Zhekov <dimitar.zhekov(a)gmail.com>
+2014-02-17 Dimitar Zhekov <dimitar.zhekov(a)gmail.com>
* src/store/scptreestore.c:
Fixed warning generated by emitting "rows-reordered" for empty
@@ -7,7 +7,7 @@
Increased version to 0.93.2.
-2013-02-13 Dimitar Zhekov <dimitar.zhekov(a)gmail.com>
+2014-02-13 Dimitar Zhekov <dimitar.zhekov(a)gmail.com>
* data/scope.glade, docs/codes.html, docs/scope.html, src/break.c,
src/views.c, src/views.h:
@@ -17,7 +17,7 @@
Small changes and clarifications.
-2013-01-08 Dimitar Zhekov <dimitar.zhekov(a)gmail.com>
+2014-01-08 Dimitar Zhekov <dimitar.zhekov(a)gmail.com>
* src/utils.c:
Check whether file from a thread/breakpoint/stack location exists
@@ -25,7 +25,7 @@
missing files).
-2013-01-06 Dimitar Zhekov <dimitar.zhekov(a)gmail.com>
+2014-01-06 Dimitar Zhekov <dimitar.zhekov(a)gmail.com>
* data/scope.glade, src/break.c:
Show breakpoint origin in the type column, with tooltip.
@@ -37,6 +37,7 @@
Remove the "Temporary breakpoint on load" only on unload, not on
hit or when resetting the program state.
Show catchpoint condition (depends on the gdb version).
+ Support filenames and watch expressions with spaces.
* src/break.c, src/debug.c, src/inspect.c:
Apply any unapplied breakpoints/inspects marked as "Apply on run"
on each run (only important if "Auto run/exit" is off).
Modified: scope/NEWS
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,4 +1,4 @@
-Scope 0.93.2 (2013-02-13):
+Scope 0.93.2 (2014-02-13):
* Remember the total (initial) breakpoint ignore count and
restore it on each run. Saving the current (remaining) value
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).