Branch: refs/heads/document-messages Author: Nick Treleaven nick.treleaven@btinternet.com Committer: Nick Treleaven nick.treleaven@btinternet.com Date: Mon, 23 Apr 2012 15:58:55 Commit: 3275d510d8a64ce0d1be91aa8b11b3e845ff02fd https://github.com/geany/geany/commit/3275d510d8a64ce0d1be91aa8b11b3e845ff02...
Log Message: ----------- Remove unportable pipe-to-grep tag generation hack
Instead always ignore G_BEGIN_DECLS and G_END_DECLS tags.
Modified Paths: -------------- src/symbols.c tagmanager/tm_workspace.c
Modified: src/symbols.c 3 files changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -117,6 +117,9 @@ static void load_c_ignore_tags(void)
if (g_file_get_contents(path, &content, NULL, NULL)) { + /* historically we ignore the glib _DECLS for tag generation */ + SETPTR(content, g_strconcat("G_BEGIN_DECLS G_END_DECLS\n", content, NULL)); + g_strfreev(c_tags_ignore); c_tags_ignore = g_strsplit_set(content, " \n\r", -1); g_free(content);
Modified: tagmanager/tm_workspace.c 8 files changed, 1 insertions(+), 7 deletions(-) =================================================================== @@ -376,16 +376,10 @@ gboolean tm_workspace_create_global_tags(const char *pre_process, const char **i includes_files = NULL; fclose(fp);
- /* FIXME: The following grep command removes the lines - * G_BEGIN_DECLS and G_END_DECLS from the header files. The reason is - * that in tagmanager, the files are not correctly parsed and the typedefs - * following these lines are incorrectly parsed. The real fix should, - * of course be in tagmanager (c) parser. This is just a temporary fix. - */ if (pre_process != NULL) { gint ret; - command = g_strdup_printf("%s %s | grep -v -E '^\s*(G_BEGIN_DECLS|G_END_DECLS)\s*$' > %s", + command = g_strdup_printf("%s %s > %s", pre_process, temp_file, temp_file2); #ifdef TM_DEBUG g_message("Executing: %s", command);
@@ Diff output truncated at 100000 characters. @@
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).