Remove GTK tags (data/global.tags).

Add C (C99) tags (data/c99.tags) and a script to generate them).

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3480 ea778897-0a13-0410-b9d1-a72fbfd435f5

ChangeLog

@@ -21,6 +21,11 @@
    Add 'Build' toolbar button with a submenu for Make actions.
    Make use of ui_image_menu_item_new() for some menu items.
    Remove tooltips from menu items.
+ * Makefile.am, geany.nsi, data/c99.tags, data/global.tags,
+   doc/geany.html, doc/geany.txt, scripts/create_c_tags.sh,
+   src/symbols.c, tagmanager/tm_workspace.c:
+   Remove GTK tags (data/global.tags).
+   Add C (C99) tags (data/c99.tags) and a script to generate them).
 
 
 2009-01-16  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Makefile.am

@@ -13,7 +13,7 @@ WIN32_BUILD_FILES = \
     src/makefile.win32
 
 SYS_DATA_FILES = \
-	data/global.tags \
+	data/c99.tags \
 	data/php.tags \
 	data/python.tags \
 	data/latex.tags \
@@ -61,7 +61,7 @@ install-data-local:
 	  $(INSTALL_DATA) $(srcdir)/pixmaps/geany.png $(DESTDIR)$(datadir)/pixmaps; \
 	fi
 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir); \
-	$(INSTALL_DATA) $(srcdir)/data/global.tags $(DESTDIR)$(pkgdatadir); \
+	$(INSTALL_DATA) $(srcdir)/data/c99.tags $(DESTDIR)$(pkgdatadir); \
 	$(INSTALL_DATA) $(srcdir)/data/php.tags $(DESTDIR)$(pkgdatadir); \
 	$(INSTALL_DATA) $(srcdir)/data/python.tags $(DESTDIR)$(pkgdatadir); \
 	$(INSTALL_DATA) $(srcdir)/data/pascal.tags $(DESTDIR)$(pkgdatadir); \

TODO

@@ -35,8 +35,6 @@ Note: features included in brackets have lower priority.
 
 	1.0:
 	o generating tags for latex/pascal/php
-	o include standard library tags only for C global.tags (offer
-	  separate GTK tags file for download)
 	o stable plugin ABI for the 1.0 series? (Split up geany_data, prefs,
 	  GeanyKeyCommand enum into groups)
 	o review documentation

doc/geany.html

@@ -6,7 +6,7 @@
 <meta name="generator" content="Docutils 0.5: http://docutils.sourceforge.net/" />
 <title>Geany</title>
 <meta name="authors" content="Enrico Tröger  Nick Treleaven  Frank Lanitz" />
-<meta name="date" content="2009-01-15" />
+<meta name="date" content="2009-01-17" />
 <style type="text/css">
 
 /*
@@ -139,7 +139,7 @@ Stylesheet for Geany's documentation based on a version of John Gabriele.
 <br />Nick Treleaven
 <br />Frank Lanitz</td></tr>
 <tr><th class="docinfo-name">Date:</th>
-<td>2009-01-15</td></tr>
+<td>2009-01-17</td></tr>
 <tr><th class="docinfo-name">Version:</th>
 <td>0.16</td></tr>
 </tbody>
@@ -1576,11 +1576,11 @@ CFLAGS=`pkg-config --cflags libgnomeui-2.0` geany -g gnomeui.c.tags \
 <p>You can adapt this command to use CFLAGS and header files appropriate
 for whichever libraries you want.</p>
 <p><em>Replacing the default C/C++ tags file:</em></p>
-<p>Geany currently uses a default global tags file global.tags for
+<p>Geany currently uses a default global tags file c99.tags for
 C and C++, commonly installed in /usr/share/geany. This file can
 be replaced with one containing tags parsed from a different set
 of header files. When Geany is next started, your custom tags file
-will be loaded instead of the default global.tags. You should keep a
+will be loaded instead of the default c99.tags. You should keep a
 copy of the generated tags file because it will get overwritten when
 upgrading Geany.</p>
 </div>
@@ -3798,6 +3798,11 @@ for changes to take effect.</li>
 <tr><td>Compile</td>
 <td>Compile the current file</td>
 </tr>
+<tr><td>Build</td>
+<td>Build the current file, includes also a submenu for Make commands. Geany
+remembers the last chosen action from the submenu and uses this as default
+action when the button itself is clicked.</td>
+</tr>
 <tr><td>Run</td>
 <td>Run or view the current file</td>
 </tr>
@@ -4664,7 +4669,7 @@ USE OR PERFORMANCE OF THIS SOFTWARE.</p>
 <div class="footer">
 <hr class="footer" />
 <a class="reference external" href="geany.txt">View document source</a>.
-Generated on: 2009-01-15 19:48 UTC.
+Generated on: 2009-01-17 18:42 UTC.
 Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
 
 </div>

doc/geany.txt

@@ -1288,11 +1288,11 @@ for whichever libraries you want.
 
 *Replacing the default C/C++ tags file:*
 
-Geany currently uses a default global tags file global.tags for
+Geany currently uses a default global tags file c99.tags for
 C and C++, commonly installed in /usr/share/geany. This file can
 be replaced with one containing tags parsed from a different set
 of header files. When Geany is next started, your custom tags file
-will be loaded instead of the default global.tags. You should keep a
+will be loaded instead of the default c99.tags. You should keep a
 copy of the generated tags file because it will get overwritten when
 upgrading Geany.
 

geany.nsi

@@ -191,7 +191,7 @@ Section "Autocompletion Tags" SEC05
 	File "${RESOURCEDIR}\data\latex.tags"
 	File "${RESOURCEDIR}\data\python.tags"
 	File "${RESOURCEDIR}\data\html_entities.tags"
-	File "${RESOURCEDIR}\data\global.tags"
+	File "${RESOURCEDIR}\data\c99.tags"
 SectionEnd
 
 ; Include GTK runtime library but only if desired from command line

scripts/create_c_tags.sh

+#!/bin/sh
+#
+# Author:  Enrico Tröger
+# License: GPL v2 or later
+#
+# Create a C tags file for Geany from C header files
+#
+
+tmpfile="tmp.c.tags"
+tagfile="data/c99.tags"
+
+headers="\
+assert.h \
+complex.h \
+ctype.h \
+errno.h \
+fenv.h \
+float.h \
+inttypes.h \
+iso646.h \
+limits.h \
+locale.h \
+math.h \
+setjmp.h \
+signal.h \
+stdarg.h \
+stdbool.h \
+stddef.h \
+stdint.h \
+stdio.h \
+stdlib.h \
+string.h \
+time.h \
+wchar.h \
+wctype.h"
+
+
+# generate the tags file with Geany
+geany -g "$tmpfile" $headers || exit 1
+
+# remove any tags beginning with an underscrore
+grep -v '^_' "$tmpfile" > "$tagfile"
+
+rm "$tmpfile"

src/symbols.c

@@ -79,7 +79,7 @@ enum	/* Geany tag files */
 
 static TagFileInfo tag_file_info[GTF_MAX] =
 {
-	{FALSE, "global.tags"},
+	{FALSE, "c99.tags"},
 	{FALSE, "pascal.tags"},
 	{FALSE, "php.tags"},
 	{FALSE, "html_entities.tags"},

tagmanager/tm_workspace.c

@@ -180,7 +180,7 @@ gboolean tm_workspace_load_global_tags(const char *tags_file, gint mode)
 	fclose(fp);
 
 	/* resort the whole array, because tm_tags_find expects a sorted array and it is not sorted
-	 * when global.tags, php.tags and latex.tags are loaded at the same time */
+	 * when c99.tags, php.tags and latex.tags are loaded at the same time */
 	tm_tags_sort(theWorkspace->global_tags, global_tags_sort_attrs, TRUE);
 
 	return TRUE;