Branch: refs/heads/master
Author: Jiří Techet <techet(a)gmail.com>
Committer: Jiří Techet <techet(a)gmail.com>
Date: Fri, 09 Jan 2015 00:35:43 UTC
Commit: df03bcace008b8dcc77f595d2441790e77f4e707
https://github.com/geany/geany/commit/df03bcace008b8dcc77f595d2441790e77f4e…
Log Message:
-----------
waf: Don't relink scintilla and geany on every build
The ant_glob() function doesn't return a list of strings but rather
a list of waflib.Node.Nod3 objects. These print as paths so build
works but apparently confuse waf which thinks the files have
changed every time the waf command is performed.
Relinking scintilla and geany on every waf invocation is especially
problemmatic during "sudo waf install" where scintilla and geany
binaries get owned by the root user. This isn't a big problem on Linux
but on OS X this prevents subsequent waf calls to update the
binaries and the build fails.
To fix the issue, just convert the waflib.Node.Nod3 objects
to relative (string) paths.
Modified Paths:
--------------
wscript
Modified: wscript
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -416,7 +416,7 @@ def build(bld):
# Scintilla
files = bld.srcnode.ant_glob('scintilla/**/*.cxx', src=True, dir=False)
- scintilla_sources.update(files)
+ scintilla_sources.update([file.path_from(bld.srcnode) for file in files])
bld(
features = ['c', 'cxx', 'cxxstlib'],
name = 'scintilla',
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Martin Spacek <git(a)mspacek.mm.st>
Committer: Martin Spacek <git(a)mspacek.mm.st>
Date: Wed, 02 Jul 2014 22:07:21 UTC
Commit: fd5ac727cbb687cc66c2de596f1dde8d957af051
https://github.com/geany/geany/commit/fd5ac727cbb687cc66c2de596f1dde8d957af…
Log Message:
-----------
Add %l current line number substitution to build commands
Modified Paths:
--------------
doc/geany.txt
src/build.c
Modified: doc/geany.txt
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -3127,6 +3127,7 @@ before the command is run.
* %e - substituted by the name of the current file without the extension or path.
* %f - substituted by the name of the current file without the path.
* %p - if a project is open, substituted by the base path from the project.
+* %l - substituted by the line number at the current cursor position.
.. note::
If the basepath set in the project preferences is not an absolute path , then it is
Modified: src/build.c
14 lines changed, 11 insertions(+), 3 deletions(-)
===================================================================
@@ -43,6 +43,7 @@
#include "msgwindow.h"
#include "prefs.h"
#include "projectprivate.h"
+#include "sciwrappers.h"
#include "support.h"
#include "toolbar.h"
#include "ui_utils.h"
@@ -712,8 +713,8 @@ static void parse_build_output(const gchar **output, gint status)
#endif
-/* Replaces occurences of %e and %p with the appropriate filenames,
- * %d and %p replacements should be in UTF8 */
+/* Replaces occurences of %e and %p with the appropriate filenames and
+ * %l with current line number. %d and %p replacements should be in UTF8 */
static gchar *build_replace_placeholder(const GeanyDocument *doc, const gchar *src)
{
GString *stack;
@@ -721,6 +722,7 @@ static gchar *build_replace_placeholder(const GeanyDocument *doc, const gchar *s
gchar *replacement;
gchar *executable = NULL;
gchar *ret_str; /* to be freed when not in use anymore */
+ gint line_num;
g_return_val_if_fail(doc == NULL || doc->is_valid, NULL);
@@ -744,6 +746,12 @@ static gchar *build_replace_placeholder(const GeanyDocument *doc, const gchar *s
replacement = g_path_get_basename(executable);
utils_string_replace_all(stack, "%e", replacement);
g_free(replacement);
+
+ /* replace %l with the current 1-based line number */
+ line_num = sci_get_current_line(doc->editor->sci) + 1;
+ replacement = g_strdup_printf("%i", line_num);
+ utils_string_replace_all(stack, "%l", replacement);
+ g_free(replacement);
}
/* replace %p with the current project's (absolute) base directory */
@@ -2187,7 +2195,7 @@ GtkWidget *build_commands_table(GeanyDocument *doc, GeanyBuildSource dst, BuildT
++row;
label = gtk_label_new(NULL);
ui_label_set_markup(GTK_LABEL(label), "<i>%s</i>",
- _("%d, %e, %f, %p are substituted in command and directory fields, see manual for details."));
+ _("%d, %e, %f, %p, %l are substituted in command and directory fields, see manual for details."));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
gtk_table_attach(table, label, 0, DC_N_COL, row, row + 1, GTK_FILL, GTK_FILL | GTK_EXPAND,
entry_x_padding, entry_y_padding);
--------------
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: Mon, 05 Jan 2015 15:26:03 UTC
Commit: e06f47d774bd296ed406378c6748ff12d3bd0fb6
https://github.com/geany/geany/commit/e06f47d774bd296ed406378c6748ff12d3bd0…
Log Message:
-----------
Merge pull request #289 from mspacek/build_line_num
Add %l current line number substitution to build commands
Modified Paths:
--------------
doc/geany.txt
src/build.c
Modified: doc/geany.txt
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -3183,6 +3183,7 @@ before the command is run.
* %e - substituted by the name of the current file without the extension or path.
* %f - substituted by the name of the current file without the path.
* %p - if a project is open, substituted by the base path from the project.
+* %l - substituted by the line number at the current cursor position.
.. note::
If the basepath set in the project preferences is not an absolute path , then it is
Modified: src/build.c
14 lines changed, 11 insertions(+), 3 deletions(-)
===================================================================
@@ -43,6 +43,7 @@
#include "msgwindow.h"
#include "prefs.h"
#include "projectprivate.h"
+#include "sciwrappers.h"
#include "support.h"
#include "toolbar.h"
#include "ui_utils.h"
@@ -713,8 +714,8 @@ static void parse_build_output(const gchar **output, gint status)
#endif
-/* Replaces occurences of %e and %p with the appropriate filenames,
- * %d and %p replacements should be in UTF8 */
+/* Replaces occurences of %e and %p with the appropriate filenames and
+ * %l with current line number. %d and %p replacements should be in UTF8 */
static gchar *build_replace_placeholder(const GeanyDocument *doc, const gchar *src)
{
GString *stack;
@@ -722,6 +723,7 @@ static gchar *build_replace_placeholder(const GeanyDocument *doc, const gchar *s
gchar *replacement;
gchar *executable = NULL;
gchar *ret_str; /* to be freed when not in use anymore */
+ gint line_num;
g_return_val_if_fail(doc == NULL || doc->is_valid, NULL);
@@ -745,6 +747,12 @@ static gchar *build_replace_placeholder(const GeanyDocument *doc, const gchar *s
replacement = g_path_get_basename(executable);
utils_string_replace_all(stack, "%e", replacement);
g_free(replacement);
+
+ /* replace %l with the current 1-based line number */
+ line_num = sci_get_current_line(doc->editor->sci) + 1;
+ replacement = g_strdup_printf("%i", line_num);
+ utils_string_replace_all(stack, "%l", replacement);
+ g_free(replacement);
}
/* replace %p with the current project's (absolute) base directory */
@@ -2188,7 +2196,7 @@ GtkWidget *build_commands_table(GeanyDocument *doc, GeanyBuildSource dst, BuildT
++row;
label = gtk_label_new(NULL);
ui_label_set_markup(GTK_LABEL(label), "<i>%s</i>",
- _("%d, %e, %f, %p are substituted in command and directory fields, see manual for details."));
+ _("%d, %e, %f, %p, %l are substituted in command and directory fields, see manual for details."));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
gtk_table_attach(table, label, 0, DC_N_COL, row, row + 1, GTK_FILL, GTK_FILL | GTK_EXPAND,
entry_x_padding, entry_y_padding);
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Frank Lanitz <frank(a)frank.uvena.de>
Committer: Frank Lanitz <frank(a)frank.uvena.de>
Date: Fri, 02 Jan 2015 18:34:24 UTC
Commit: fb7d9fa25f361b823f289cbb2c83201496c711b9
https://github.com/geany/geany/commit/fb7d9fa25f361b823f289cbb2c83201496c71…
Log Message:
-----------
Merge pull request #388 from peter-scholtens/master
Update of dutch translation for geany
Modified Paths:
--------------
po/nl.po
Modified: po/nl.po
3053 lines changed, 1550 insertions(+), 1503 deletions(-)
===================================================================
No diff available, check online
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Peter C. S. Scholtens <peter.scholtens(a)xs4all.nl>
Committer: Peter C. S. Scholtens <peter.scholtens(a)xs4all.nl>
Date: Fri, 02 Jan 2015 16:28:09 UTC
Commit: b7338da5e688c3ca2d3ceb318723cf5b99e678b1
https://github.com/geany/geany/commit/b7338da5e688c3ca2d3ceb318723cf5b99e67…
Log Message:
-----------
Updated Dutch translations.
Modified Paths:
--------------
po/nl.po
Modified: po/nl.po
3053 lines changed, 1550 insertions(+), 1503 deletions(-)
===================================================================
No diff available, check online
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).