Branch: refs/heads/master
Author: Nick Treleaven <nick.treleaven(a)btinternet.com>
Committer: Nick Treleaven <nick.treleaven(a)btinternet.com>
Date: Tue, 24 Apr 2012 15:41:18
Commit: 003185f897069ab44277dce8ecfa91f790785bd9
https://github.com/geany/geany/commit/003185f897069ab44277dce8ecfa91f790785…
Log Message:
-----------
Grep isn't required for tag file generation; remove replacing c99.tags
This removes 'Replacing the default C/C++ tags file' - we should
not encourage users to do this as it's unnecessary and error-prone
when updating Geany.
Modified Paths:
--------------
doc/geany.html
doc/geany.txt
Modified: doc/geany.html
688 files changed, 346 insertions(+), 342 deletions(-)
===================================================================
No diff available, check online
Modified: doc/geany.txt
34 files changed, 12 insertions(+), 22 deletions(-)
===================================================================
@@ -1593,6 +1593,8 @@ Different tag attributes like the return value or the argument list
are separated with different characters indicating the type of the
following argument.
+Pipe-separated format
+*********************
The Pipe-separated format is easier to read and write.
There is one tag per line and different tag attributes are separated
by the pipe character (``|``). A line looks like::
@@ -1637,12 +1639,15 @@ Example for the wxD library for the D programming language::
geany -g wxd.d.tags /home/username/wxd/wx/*.d
-*Generating C/C++ tag files:*
+Generating C/C++ tag files
+**************************
+You may need to first setup the `C ignore.tags`_ file.
-For C/C++ tag files, gcc and grep are required, so that header files
-can be preprocessed to include any other headers they depend upon.
+For C/C++ tag files gcc is required by default, so that header files
+can be preprocessed to include any other headers they depend upon. If
+you do not want this, use the ``-P`` option described above.
-For C/C++ files, the environment variable CFLAGS should be set with
+For preprocessing, the environment variable CFLAGS should be set with
appropriate ``-I/path`` include paths. The following example works with
the bash shell, generating tags for the GnomeUI library::
@@ -1653,28 +1658,13 @@ You can adapt this command to use CFLAGS and header files appropriate
for whichever libraries you want.
-*Replacing the default C/C++ tags file:*
-
-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 c99.tags. You should keep a
-copy of the generated tags file because it will get overwritten when
-upgrading Geany.
-
-*Generating tag files on Windows:*
-
-This works basically the same as on other platforms but you need to make
-sure you have grep installed and Geany can find it, i.e. it must be
-in the PATH environment variable. To test this, open a console window
-and type ``grep`` and see whether it is executed.
-If it is, then you can create a tags file like the following::
+Generating tag files on Windows
+*******************************
+This works basically the same as on other platforms::
"c:\program files\geany\bin\geany" -g c:\mytags.php.tags c:\code\somefile.php
-
C ignore.tags
^^^^^^^^^^^^^
@@ Diff output truncated at 100000 characters. @@
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).
Branch: refs/heads/master
Author: Nick Treleaven <nick.treleaven(a)btinternet.com>
Committer: Nick Treleaven <nick.treleaven(a)btinternet.com>
Date: Mon, 23 Apr 2012 15:17:40
Commit: 1a9451bfc4915ada3ab2d0743293532f574cad00
https://github.com/geany/geany/commit/1a9451bfc4915ada3ab2d0743293532f574ca…
Log Message:
-----------
Fix NULL tags array warning in document_highlight_tags
Modified Paths:
--------------
src/document.c
Modified: src/document.c
4 files changed, 3 insertions(+), 1 deletions(-)
===================================================================
@@ -2312,6 +2312,8 @@ void document_highlight_tags(GeanyDocument *doc)
default:
return; /* early out if type keywords are not supported */
}
+ if (!app->tm_workspace->work_object.tags_array)
+ return;
/* get any type keywords and tell scintilla about them
* this will cause the type keywords to be colourized in scintilla */
@@ -2895,7 +2897,7 @@ gboolean document_check_disk_status(GeanyDocument *doc, gboolean force)
g_return_val_if_fail(doc != NULL, FALSE);
/* ignore remote files and documents that have never been saved to disk */
- if (notebook_switch_in_progress() || file_prefs.disk_check_timeout == 0
+ if (notebook_switch_in_progress() || file_prefs.disk_check_timeout == 0
|| doc->real_path == NULL || doc->priv->is_remote)
return FALSE;
@@ Diff output truncated at 100000 characters. @@
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).
Branch: refs/heads/master
Author: Lex Trotman <elextr(a)gmail.com>
Committer: Lex Trotman <elextr(a)gmail.com>
Date: Sun, 22 Apr 2012 00:54:41
Commit: 4bd962ee8dde25b4ce5605ce7b4bf43d79d066f6
https://github.com/geany/geany/commit/4bd962ee8dde25b4ce5605ce7b4bf43d79d06…
Log Message:
-----------
Remove hard coded option that prevents 64 bit tag generation.
On GNU X86-64 systems the predefined macros are required
to choose the correct headers, so tag definition fails with
-undef. Removed it from hardcoded, systems that need it can
add it to CFLAGS.
Modified Paths:
--------------
src/symbols.c
Modified: src/symbols.c
7 files changed, 3 insertions(+), 4 deletions(-)
===================================================================
@@ -1296,7 +1296,7 @@ static void free_iter_slice_list(gpointer data)
/* inserts a @data in @table on key @tag.
* previous data is not overwritten if the key is duplicated, but rather the
* two values are kept in a list
- *
+ *
* table is: GHashTable<TMTag, GList<GList<TMTag>>> */
static void tags_table_insert(GHashTable *table, TMTag *tag, GList *data)
{
@@ -1702,9 +1702,8 @@ gboolean symbols_recreate_tag_list(GeanyDocument *doc, gint sort_mode)
* CFLAGS=-I/home/user/libname-1.x geany -g libname.d.tags libname.h */
int symbols_generate_global_tags(int argc, char **argv, gboolean want_preprocess)
{
- /* -E pre-process, -dD output user macros, -p prof info (?),
- * -undef remove builtin macros (seems to be needed with FC5 gcc 4.1.1) */
- const char pre_process[] = "gcc -E -dD -p -undef";
+ /* -E pre-process, -dD output user macros, -p prof info (?) */
+ const char pre_process[] = "gcc -E -dD -p";
if (argc > 2)
{
@@ Diff output truncated at 100000 characters. @@
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).