Revision: 3469
http://geany.svn.sourceforge.net/geany/?rev=3469&view=rev
Author: eht16
Date: 2009-01-15 18:20:19 +0000 (Thu, 15 Jan 2009)
Log Message:
-----------
Rename command line option --debug to --verbose.
Change short form of --version from -v to -V.
Modified Paths:
--------------
trunk/ChangeLog
trunk/doc/geany.1.in
trunk/doc/geany.html
trunk/doc/geany.txt
trunk/src/main.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-01-14 19:19:08 UTC (rev 3468)
+++ trunk/ChangeLog 2009-01-15 18:20:19 UTC (rev 3469)
@@ -1,3 +1,10 @@
+2009-01-15 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/main.c, doc/geany.txt, doc/geany.html, doc/geany.1.in:
+ Rename command line option --debug to --verbose.
+ Change short form of --version from -v to -V.
+
+
2009-01-14 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* data/global.tags, data/latex.tags, data/pascal.tags, data/php.tags,
Modified: trunk/doc/geany.1.in
===================================================================
--- trunk/doc/geany.1.in 2009-01-14 19:19:08 UTC (rev 3468)
+++ trunk/doc/geany.1.in 2009-01-15 18:20:19 UTC (rev 3469)
@@ -1,4 +1,4 @@
-.TH "GEANY" "1" "October 19, 2008" "geany @VERSION@" ""
+.TH "GEANY" "1" "January 15, 2009" "geany @VERSION@" ""
.SH "NAME"
Geany \(em a small and lightweight IDE
.SH "SYNOPSIS"
@@ -31,9 +31,7 @@
.IP "\fB-c\fP, \fB\-\-config\fP " 10
Use an alternate configuration directory. Default configuration directory is
~/.config/geany/ and there resides geany.conf and some template files.
-.IP "\fB-d\fP, \fB\-\-debug\fP " 10
-Run Geany in debug mode, which means being verbose and printing lots of information.
-.IP "\fB\fP, \fB\-\-ft\-names\fP " 10
+.IP "\fB\fP \fB\-\-ft\-names\fP " 10
Print a list of Geany's internal filetype names (useful snippets configuration).
.IP "\fB-g\fP, \fB\-\-generate\-tags\fP " 10
Generate a global tags file (see documentation).
@@ -52,7 +50,7 @@
For more information please see documentation.
.IP "\fB-p\fP, \fB\-\-no-plugins\fP " 10
Don't load plugin support.
-.IP "\fB\fP \fB\-\-print-prefix\fP " 10
+.IP "\fB\fP \fB\-\-print-prefix\fP " 10
Print installation prefix, the data directory, the lib directory and the locale directory (in
this order) to stdout, each per line. This is mainly intended for plugin authors to detect
installation paths.
@@ -62,11 +60,13 @@
Don't load terminal support. Use this option, if you don't want to load the virtual terminal
emulator widget at startup. If you don't have libvte.so.4 installed, then terminal-support is
automatically disabled. Only available if Geany was compiled with support for VTE.
-.IP "\fB\fP \fB\-\-vte-lib\fP " 10
+.IP "\fB\fP \fB\-\-vte-lib\fP " 10
Specify explicitly the path including filename or only the filename to the VTE library, e.g.
/usr/lib/libvte.so or libvte.so. This option is only needed, when the autodetection doesn't
work. Only available if Geany was compiled with support for VTE.
-.IP "\fB-v\fP, \fB\-\-version\fP " 10
+.IP "\fB-v\fP, \fB\-\-verbose\fP " 10
+Be verbose (print useful status messages).
+.IP "\fB-V\fP, \fB\-\-version\fP " 10
Show version information and exit.
.IP "\fB-?\fP, \fB\-\-help\fP " 10
Show help information and exit.
Modified: trunk/doc/geany.html
===================================================================
--- trunk/doc/geany.html 2009-01-14 19:19:08 UTC (rev 3468)
+++ trunk/doc/geany.html 2009-01-15 18:20:19 UTC (rev 3469)
@@ -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-11" />
+<meta name="date" content="2009-01-14" />
<style type="text/css">
/*
@@ -139,7 +139,7 @@
<br />Nick Treleaven
<br />Frank Lanitz</td></tr>
<tr><th class="docinfo-name">Date:</th>
-<td>2009-01-11</td></tr>
+<td>2009-01-14</td></tr>
<tr><th class="docinfo-name">Version:</th>
<td>0.16</td></tr>
</tbody>
@@ -558,11 +558,6 @@
configuration directory is <tt class="docutils literal"><span class="pre">~/.config/geany/</span></tt> and there
resides <tt class="docutils literal"><span class="pre">geany.conf</span></tt> and other configuration files.</td>
</tr>
-<tr><td>-d</td>
-<td>--debug</td>
-<td>Run Geany in debug mode, which means being verbose
-and printing lots of information.</td>
-</tr>
<tr><td><em>none</em></td>
<td>--ft-names</td>
<td>Print a list of Geany's internal filetype names (useful
@@ -629,6 +624,10 @@
available if Geany was compiled with support for VTE.</td>
</tr>
<tr><td>-v</td>
+<td>--verbose</td>
+<td>Be verbose (print useful status messages).</td>
+</tr>
+<tr><td>-V</td>
<td>--version</td>
<td>Show version information and exit.</td>
</tr>
@@ -4604,7 +4603,7 @@
<div class="footer">
<hr class="footer" />
<a class="reference external" href="geany.txt">View document source</a>.
-Generated on: 2009-01-14 15:59 UTC.
+Generated on: 2009-01-15 17:48 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>
Modified: trunk/doc/geany.txt
===================================================================
--- trunk/doc/geany.txt 2009-01-14 19:19:08 UTC (rev 3468)
+++ trunk/doc/geany.txt 2009-01-15 18:20:19 UTC (rev 3469)
@@ -204,9 +204,6 @@
configuration directory is ``~/.config/geany/`` and there
resides ``geany.conf`` and other configuration files.
--d --debug Run Geany in debug mode, which means being verbose
- and printing lots of information.
-
*none* --ft-names Print a list of Geany's internal filetype names (useful
for snippets configuration).
@@ -248,8 +245,10 @@
only needed when the auto detection does not work. Only
available if Geany was compiled with support for VTE.
--v --version Show version information and exit.
+-v --verbose Be verbose (print useful status messages).
+-V --version Show version information and exit.
+
-? --help Show help information and exit.
*none* [files ...] Open all given files at startup. This option causes
Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c 2009-01-14 19:19:08 UTC (rev 3468)
+++ trunk/src/main.c 2009-01-15 18:20:19 UTC (rev 3469)
@@ -99,6 +99,7 @@
/* command-line options */
static gboolean debug_mode = FALSE;
+static gboolean verbose_mode = FALSE;
static gboolean ignore_global_tags = FALSE;
static gboolean no_msgwin = FALSE;
static gboolean show_version = FALSE;
@@ -122,7 +123,7 @@
{
{ "column", 0, 0, G_OPTION_ARG_INT, &cl_options.goto_column, N_("Set initial column number for the first opened file (useful in conjunction with --line)"), NULL },
{ "config", 'c', 0, G_OPTION_ARG_FILENAME, &alternate_config, N_("Use an alternate configuration directory"), NULL },
- { "debug", 'd', 0, G_OPTION_ARG_NONE, &debug_mode, N_("Runs in debug mode (means being verbose)"), NULL },
+ { "debug", 'd', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &debug_mode, N_("Be verbose"), NULL },
{ "ft-names", 0, 0, G_OPTION_ARG_NONE, &ft_names, N_("Print internal filetype names"), NULL },
{ "generate-tags", 'g', 0, G_OPTION_ARG_NONE, &generate_tags, N_("Generate global tags file (see documentation)"), NULL },
{ "no-preprocessing", 'P', 0, G_OPTION_ARG_NONE, &no_preprocessing, N_("Don't preprocess C/C++ files when generating tags"), NULL },
@@ -142,7 +143,8 @@
{ "no-terminal", 't', 0, G_OPTION_ARG_NONE, &no_vte, N_("Don't load terminal support"), NULL },
{ "vte-lib", 0, 0, G_OPTION_ARG_FILENAME, &lib_vte, N_("Filename of libvte.so"), NULL },
#endif
- { "version", 'v', 0, G_OPTION_ARG_NONE, &show_version, N_("Show version and exit"), NULL },
+ { "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose_mode, N_("Be verbose"), NULL },
+ { "version", 'V', 0, G_OPTION_ARG_NONE, &show_version, N_("Show version and exit"), NULL },
{ "dummy", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &dummy, NULL, NULL }, /* for +NNN line number arguments */
{ NULL, 0, 0, 0, NULL, NULL, NULL }
};
@@ -512,7 +514,13 @@
exit(0);
}
- app->debug_mode = debug_mode;
+ app->debug_mode = verbose_mode;
+ if (debug_mode)
+ {
+ app->debug_mode = TRUE;
+ g_warning(
+ "Command line option --debug is obsolete and will be removed in the next version.");
+ }
#ifdef G_OS_WIN32
win32_init_debug_code();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 3467
http://geany.svn.sourceforge.net/geany/?rev=3467&view=rev
Author: eht16
Date: 2009-01-14 18:38:31 +0000 (Wed, 14 Jan 2009)
Log Message:
-----------
Fix Windows build: don't use GIO. Link against GIO anyways just to be safe with GTK 2.14.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/makefile.win32
trunk/win32-config.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-01-14 16:45:24 UTC (rev 3466)
+++ trunk/ChangeLog 2009-01-14 18:38:31 UTC (rev 3467)
@@ -14,6 +14,9 @@
* src/msgwindow.c:
Strip the compiler error messages to fix possibly broken message
parsing.
+ * win32-config.h, src/makefile.win32:
+ Fix Windows build: don't use GIO.
+ Link against GIO anyways just to be safe with GTK 2.14.
2009-01-12 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/src/makefile.win32
===================================================================
--- trunk/src/makefile.win32 2009-01-14 16:45:24 UTC (rev 3466)
+++ trunk/src/makefile.win32 2009-01-14 18:38:31 UTC (rev 3467)
@@ -46,7 +46,7 @@
ifdef GTK280
ALL_GTK_LIBS +=-liconv
else
-ALL_GTK_LIBS +=-lcairo -lpangocairo-1.0
+ALL_GTK_LIBS +=-lcairo -lpangocairo-1.0 -lgio-2.0
endif
WIN_LIBS=-mwindows -lkernel32 -limm32 -lshfolder -lshell32 \
Modified: trunk/win32-config.h
===================================================================
--- trunk/win32-config.h 2009-01-14 16:45:24 UTC (rev 3466)
+++ trunk/win32-config.h 2009-01-14 18:38:31 UTC (rev 3467)
@@ -321,6 +321,6 @@
/* Define if you want to detect a running instance */
#define HAVE_SOCKET 1
-/* Define if GIO should be used, need GLib 2.16.x or newer */
-#define HAVE_GIO 1
+/* Define if GIO should be used, we don't use GIO on Windows */
+/* #define HAVE_GIO 1 */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 3466
http://geany.svn.sourceforge.net/geany/?rev=3466&view=rev
Author: eht16
Date: 2009-01-14 16:45:24 +0000 (Wed, 14 Jan 2009)
Log Message:
-----------
Strip the compiler error messages to fix possibly broken message parsing.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/msgwindow.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-01-14 16:08:00 UTC (rev 3465)
+++ trunk/ChangeLog 2009-01-14 16:45:24 UTC (rev 3466)
@@ -11,6 +11,9 @@
add the new format specification.
Update global tags files.
Add documentation for the two supported global tags files formats.
+ * src/msgwindow.c:
+ Strip the compiler error messages to fix possibly broken message
+ parsing.
2009-01-12 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/src/msgwindow.c
===================================================================
--- trunk/src/msgwindow.c 2009-01-14 16:08:00 UTC (rev 3465)
+++ trunk/src/msgwindow.c 2009-01-14 16:45:24 UTC (rev 3466)
@@ -576,10 +576,13 @@
gint line;
gchar *filename, *dir;
GtkTreePath *path;
+ /* save the beginning of the string to use when free'ing it after it was stripped */
+ gchar *string_start = string;
path = gtk_tree_model_get_path(model, &iter);
find_prev_build_dir(path, model, &dir);
gtk_tree_path_free(path);
+ g_strchug(string); /* remove possible leading whitespace */
msgwin_parse_compiler_error_line(string, dir, &filename, &line);
if (dir != NULL)
@@ -605,8 +608,8 @@
}
}
g_free(filename);
+ g_free(string_start);
}
- g_free(string);
}
return ret;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 3464
http://geany.svn.sourceforge.net/geany/?rev=3464&view=rev
Author: ntrel
Date: 2009-01-12 17:20:43 +0000 (Mon, 12 Jan 2009)
Log Message:
-----------
Add default build commands (other sections are commented out and
untested).
Modified Paths:
--------------
trunk/ChangeLog
Added Paths:
-----------
trunk/data/filetypes.vala
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-01-12 00:33:29 UTC (rev 3463)
+++ trunk/ChangeLog 2009-01-12 17:20:43 UTC (rev 3464)
@@ -1,3 +1,10 @@
+2009-01-12 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * data/filetypes.vala:
+ Add default build commands (other sections are commented out and
+ untested).
+
+
2009-01-11 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* configure.in, wscript, src/Makefile.am, src/utils.c:
Added: trunk/data/filetypes.vala
===================================================================
--- trunk/data/filetypes.vala (rev 0)
+++ trunk/data/filetypes.vala 2009-01-12 17:20:43 UTC (rev 3464)
@@ -0,0 +1,63 @@
+# For complete documentation of this file, please see Geany's main documentation
+[styling]
+# foreground;background;bold;italic
+#default=0x000000;0xffffff;false;false
+#comment=0xd00000;0xffffff;false;false
+#commentline=0xd00000;0xffffff;false;false
+#commentdoc=0x3f5fbf;0xffffff;false;false
+#number=0x007f00;0xffffff;false;false
+#word=0x00007f;0xffffff;true;false
+#word2=0x991111;0xffffff;true;false
+#string=0xff901e;0xffffff;false;false
+#character=0xff901e;0xffffff;false;false
+#uuid=0x404080;0xffffff;false;false
+#preprocessor=0x007F7F;0xffffff;false;false
+#operator=0x301010;0xffffff;false;false
+#identifier=0x000000;0xffffff;false;false
+#stringeol=0x000000;0xe0c0e0;false;false
+#verbatim=0x101030;0xffffff;false;false
+#regex=0x105090;0xffffff;false;false
+#commentlinedoc=0x3f5fbf;0xffffff;true;false
+#commentdockeyword=0x3f5fbf;0xffffff;true;true
+#commentdockeyworderror=0x3f5fbf;0xffffff;false;false
+#globalclass=0x0000d0;0xffffff;true;false
+
+[keywords]
+# all items must be in one line
+#primary=
+#secondary=
+# these are some doxygen keywords (incomplete)
+#docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo typedef var version warning union
+
+[settings]
+# default extension used when saving files
+#extension=vala
+
+# the following characters are these which a "word" can contains, see documentation
+#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
+
+# if only single comment char is supported like # in this file, leave comment_close blank
+#comment_open=//
+#comment_close=
+# this is an alternative way, so multiline comments are used
+#comment_open=/*
+#comment_close=*/
+
+# set to false if a comment character/string should start at column 0 of a line, true uses any
+# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d
+ #command_example();
+# setting to false would generate this
+# command_example();
+# This setting works only for single line comments
+#comment_use_indent=true
+
+# context action command (please see Geany's main documentation for details)
+#context_action_cmd=
+
+[build_settings]
+# %f will be replaced by the complete filename
+# %e will be replaced by the filename without extension
+# (use only one of it at one time)
+compiler=valac -c "%f"
+linker=valac "%f"
+run_cmd=./"%e"
Property changes on: trunk/data/filetypes.vala
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.