Branch: refs/heads/master
Author: Wayne Nilsen <waynenilsen(a)gmail.com>
Committer: Matthew Brush <matt(a)geany.org>
Date: Fri, 31 Jul 2015 05:40:53 UTC
Commit: 1b5ec633e3a0f15f17ed29b9947cb346a6ee669b
https://github.com/geany/geany/commit/1b5ec633e3a0f15f17ed29b9947cb346a6ee6…
Log Message:
-----------
Use Cargo tool for Rust build commands
Closes PR #557
Modified Paths:
--------------
data/filetypes.rust
Modified: data/filetypes.rust
27 lines changed, 19 insertions(+), 8 deletions(-)
===================================================================
@@ -62,11 +62,22 @@ context_action_cmd=
# 0 is spaces, 1 is tabs, 2 is tab & spaces
#type=1
-[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=rustc "%f"
-linker=rustc -o "%e" "%f"
-run_cmd="./%e"
-
+[build-menu]
+FT_00_LB=Compile
+FT_00_CM=rustc "%f"
+FT_00_WD=
+NF_00_LB=Cargo Build
+NF_00_CM=cargo build
+NF_00_WD=
+NF_01_LB=Cargo Test
+NF_01_CM=cargo test
+NF_01_WD=
+NF_02_LB=Cargo Bench
+NF_02_CM=cargo bench
+NF_02_WD=
+EX_00_LB=Run
+EX_00_CM="./%e"
+EX_00_WD=
+EX_01_LB=Cargo Run
+EX_01_CM=cargo run
+EX_01_WD=
--------------
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: Wed, 22 Jul 2015 19:52:10 UTC
Commit: c0898618f9a162913dfdddc74e2526019dcfb9ea
https://github.com/geany/geany/commit/c0898618f9a162913dfdddc74e2526019dcfb…
Log Message:
-----------
Merge pull request #574 from eht16/doxygen_fixes
Fix Doxygen warnings
Modified Paths:
--------------
doc/plugins.dox
src/spawn.c
Modified: doc/plugins.dox
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -69,7 +69,7 @@ other useful notes.
@page guidelines Plugin Writing Guidelines
-@section intro Introduction
+@section intro_guidelines Introduction
The following hints and guidelines are only recommendations. Nobody is forced to follow
them at all.
@@ -140,7 +140,7 @@ geany-devel at uvena.de or the plugin author directly.
@page howto Plugin HowTo
-@section intro Introduction
+@section intro_howto Introduction
Since Geany 0.12 there is a plugin interface to extend Geany's functionality and
add new features. This document gives a brief overview about how to add new
Modified: src/spawn.c
14 lines changed, 10 insertions(+), 4 deletions(-)
===================================================================
@@ -196,15 +196,17 @@ static gchar *spawn_get_program_name(const gchar *command_line, GError **error)
* All OS:
* - any leading spaces, tabs and new lines are skipped
* - an empty command is invalid
+ *
* Unix:
* - the standard shell quoting and escaping rules are used, see @c g_shell_parse_argv()
* - as a consequence, an unqouted # at the start of an argument comments to the end of line
+ *
* Windows:
* - leading carriage returns are skipped too
* - a quoted program name must be entirely inside the quotes. No "C:\Foo\Bar".pdf or
- * "C:\Foo\Bar".bat, which would be executed by Windows as C:\Foo\Bar.exe
- * - an unquoted program name may not contain spaces. Foo Bar Qux will not be considered
- * "Foo Bar.exe" Qux or "Foo Bar Qux.exe", depending on what executables exist, as
+ * "C:\Foo\Bar".bat, which would be executed by Windows as `C:\Foo\Bar.exe`
+ * - an unquoted program name may not contain spaces. `Foo Bar Qux` will not be considered
+ * `"Foo Bar.exe" Qux` or `"Foo Bar Qux.exe"`, depending on what executables exist, as
* Windows normally does.
* - the program name must be separated from the arguments by at least one space or tab
* - the standard Windows quoting and escaping rules are used: double quote is escaped with
@@ -849,7 +851,7 @@ static void spawn_watch_cb(GPid pid, gint status, gpointer data)
*
* The synchronous execution may not be combined with recursive callbacks.
*
- * In line buffered mode, the child input is broken on '\n', "\r\n", '\r', '\0' and max length.
+ * In line buffered mode, the child input is broken on `\n`, `\r\n`, `\r`, `\0` and max length.
*
* All I/O callbacks are guaranteed to be invoked at least once with @c G_IO_ERR, @c G_IO_HUP
* or @c G_IO_NVAL set (except for a @a stdin_cb which returns @c FALSE before that). For the
@@ -1019,6 +1021,10 @@ gboolean spawn_with_callbacks(const gchar *working_directory, const gchar *comma
* (For example, on asynchronous execution, you can allocate the data in the heap, and free
* it in your @c spawn_with_callbacks() @c exit_cb callback.)
*
+ * @param channel the channel to write data to.
+ * @param condition condition to check for @c G_IO_OUT.
+ * @param data @c SpawnWriteData to write to @a channel.
+ *
* @return @c TRUE if the remaining size is > 0 and @a condition does not indicate any error,
* @c FALSE otherwise.
*
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Enrico Tröger <enrico.troeger(a)uvena.de>
Committer: Enrico Tröger <enrico.troeger(a)uvena.de>
Date: Wed, 22 Jul 2015 18:00:34 UTC
Commit: 2ae6c7fd0fcc84cc73fa7506e874ab8a813dba36
https://github.com/geany/geany/commit/2ae6c7fd0fcc84cc73fa7506e874ab8a813db…
Log Message:
-----------
Fix Doxygen warnings
This resolves warnings from Doxygen about non-existing commands
caused by unescaped backslashes as well as multiply
defined section names.
Modified Paths:
--------------
doc/plugins.dox
src/spawn.c
Modified: doc/plugins.dox
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -69,7 +69,7 @@ other useful notes.
@page guidelines Plugin Writing Guidelines
-@section intro Introduction
+@section intro_guidelines Introduction
The following hints and guidelines are only recommendations. Nobody is forced to follow
them at all.
@@ -140,7 +140,7 @@ geany-devel at uvena.de or the plugin author directly.
@page howto Plugin HowTo
-@section intro Introduction
+@section intro_howto Introduction
Since Geany 0.12 there is a plugin interface to extend Geany's functionality and
add new features. This document gives a brief overview about how to add new
Modified: src/spawn.c
14 lines changed, 10 insertions(+), 4 deletions(-)
===================================================================
@@ -198,15 +198,17 @@ static gchar *spawn_get_program_name(const gchar *command_line, GError **error)
* All OS:
* - any leading spaces, tabs and new lines are skipped
* - an empty command is invalid
+ *
* Unix:
* - the standard shell quoting and escaping rules are used, see @c g_shell_parse_argv()
* - as a consequence, an unqouted # at the start of an argument comments to the end of line
+ *
* Windows:
* - leading carriage returns are skipped too
* - a quoted program name must be entirely inside the quotes. No "C:\Foo\Bar".pdf or
- * "C:\Foo\Bar".bat, which would be executed by Windows as C:\Foo\Bar.exe
- * - an unquoted program name may not contain spaces. Foo Bar Qux will not be considered
- * "Foo Bar.exe" Qux or "Foo Bar Qux.exe", depending on what executables exist, as
+ * "C:\Foo\Bar".bat, which would be executed by Windows as `C:\Foo\Bar.exe`
+ * - an unquoted program name may not contain spaces. `Foo Bar Qux` will not be considered
+ * `"Foo Bar.exe" Qux` or `"Foo Bar Qux.exe"`, depending on what executables exist, as
* Windows normally does.
* - the program name must be separated from the arguments by at least one space or tab
* - the standard Windows quoting and escaping rules are used: double quote is escaped with
@@ -851,7 +853,7 @@ static void spawn_watch_cb(GPid pid, gint status, gpointer data)
*
* The synchronous execution may not be combined with recursive callbacks.
*
- * In line buffered mode, the child input is broken on '\n', "\r\n", '\r', '\0' and max length.
+ * In line buffered mode, the child input is broken on `\n`, `\r\n`, `\r`, `\0` and max length.
*
* All I/O callbacks are guaranteed to be invoked at least once with @c G_IO_ERR, @c G_IO_HUP
* or @c G_IO_NVAL set (except for a @a stdin_cb which returns @c FALSE before that). For the
@@ -1021,6 +1023,10 @@ gboolean spawn_with_callbacks(const gchar *working_directory, const gchar *comma
* (For example, on asynchronous execution, you can allocate the data in the heap, and free
* it in your @c spawn_with_callbacks() @c exit_cb callback.)
*
+ * @param channel the channel to write data to.
+ * @param condition condition to check for @c G_IO_OUT.
+ * @param data @c SpawnWriteData to write to @a channel.
+ *
* @return @c TRUE if the remaining size is > 0 and @a condition does not indicate any error,
* @c FALSE otherwise.
*
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Enrico Tröger <enrico.troeger(a)uvena.de>
Committer: Enrico Tröger <enrico.troeger(a)uvena.de>
Date: Wed, 22 Jul 2015 17:59:38 UTC
Commit: c5b0fc459a1251c824a44edb5dfab4a8feb0bd00
https://github.com/geany/geany/commit/c5b0fc459a1251c824a44edb5dfab4a8feb0b…
Log Message:
-----------
Merge pull request #573 from zhekov/cleanup-win32defines
Cleanup win32defines
Modified Paths:
--------------
src/Makefile.am
src/socket.c
src/spawn.c
src/win32.c
src/win32defines.h
Modified: src/Makefile.am
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -149,7 +149,7 @@ WINDRES = $(host_alias)-windres
geany_private.res: $(top_srcdir)/geany_private.rc
$(WINDRES) -i $(top_srcdir)/geany_private.rc --input-format=rc -o $@ -O coff
-libgeany_la_SOURCES += win32.c win32.h win32defines.h
+libgeany_la_SOURCES += win32.c win32.h
libgeany_la_LIBADD += -lole32 -lwsock32 -lcomdlg32
libgeany_la_LDFLAGS += -Wl,-luuid -mwindows -mms-bitfields -no-undefined
geany_LDFLAGS += -mwindows -mms-bitfields
Modified: src/socket.c
2 lines changed, 0 insertions(+), 2 deletions(-)
===================================================================
@@ -57,8 +57,6 @@
#ifdef HAVE_SOCKET
-#include "win32defines.h" /* should always come before any system headers */
-
#include "socket.h"
#include "app.h"
Modified: src/spawn.c
2 lines changed, 0 insertions(+), 2 deletions(-)
===================================================================
@@ -47,8 +47,6 @@
# include "config.h"
#endif
-#include "win32defines.h" /* should always come before any system headers */
-
#include <errno.h>
#include <string.h>
Modified: src/win32.c
5 lines changed, 4 insertions(+), 1 deletions(-)
===================================================================
@@ -27,7 +27,10 @@
# include "config.h"
#endif
-#include "win32defines.h" /* should always come before any system headers */
+/* Need Windows XP for SHGetFolderPathAndSubDirW */
+#define _WIN32_WINNT 0x0501
+/* Needed for SHGFP_TYPE */
+#define _WIN32_IE 0x0500
#include "win32.h"
Modified: src/win32defines.h
32 lines changed, 0 insertions(+), 32 deletions(-)
===================================================================
@@ -1,32 +0,0 @@
-/*
- * win32defines.h - this file is part of Geany, a fast and lightweight IDE
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef WIN32DEFINES_H
-#define WIN32DEFINES_H 1
-
-/* These defines are necessary defines *before* windows.h is included */
-
-#define VC_EXTRALEAN
-#define WIN32_LEAN_AND_MEAN
-/* Need Windows XP for SHGetFolderPathAndSubDirW */
-#define WINVER 0x0501
-#define _WIN32_WINNT 0x0501
-/* Needed for SHGFP_TYPE */
-#define _WIN32_IE 0x0500
-
-#endif /* WIN32DEFINES_H */
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Jiří Techet <techet(a)gmail.com>
Committer: Jiří Techet <techet(a)gmail.com>
Date: Sat, 18 Jul 2015 19:28:40 UTC
Commit: fb63f9e43a9d81425d14754d6cf02ddfc564201d
https://github.com/geany/geany/commit/fb63f9e43a9d81425d14754d6cf02ddfc5642…
Log Message:
-----------
Use monospace font for the message window by default
Since both gcc and llvm use ^ to mark the position of the error now,
monospace font seems to be a better default font for the message window
to avoid the ^ character misalignment.
Fixes #435.
Modified Paths:
--------------
src/keyfile.c
Modified: src/keyfile.c
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -82,12 +82,12 @@
#ifdef __APPLE__
#define GEANY_DEFAULT_TOOLS_BROWSER "open -a safari"
#define GEANY_DEFAULT_FONT_SYMBOL_LIST "Helvetica Medium 12"
-#define GEANY_DEFAULT_FONT_MSG_WINDOW "Helvetica Medium 12"
+#define GEANY_DEFAULT_FONT_MSG_WINDOW "Menlo Medium 12"
#define GEANY_DEFAULT_FONT_EDITOR "Menlo Medium 12"
#else
#define GEANY_DEFAULT_TOOLS_BROWSER "firefox"
#define GEANY_DEFAULT_FONT_SYMBOL_LIST "Sans 9"
-#define GEANY_DEFAULT_FONT_MSG_WINDOW "Sans 9"
+#define GEANY_DEFAULT_FONT_MSG_WINDOW "Monospace 9"
#define GEANY_DEFAULT_FONT_EDITOR "Monospace 10"
#endif
#define GEANY_DEFAULT_TOOLS_PRINTCMD "lpr"
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).