Plugins-Commits October 2013

plugins-commits@lists.geany.org

1 participants
51 discussions

[geany/geany-plugins] d8d8f7: Set PYEXT lib settings in case they were not set automatically
by Enrico Tröger 13 Oct '13

13 Oct '13

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 13 Oct 2013 15:07:30 UTC Commit: d8d8f768d7b698693d232a8223bd122c4605d227 https://github.com/geany/geany-plugins/commit/d8d8f768d7b698693d232a8223bd1… Log Message: ----------- Set PYEXT lib settings in case they were not set automatically Waf determines whether to set those by evaluating get_config_var("Py_ENABLE_SHARED") == 1. But for some reasons, on Debian systems (Debian Stable and before), this returns 0 while it should return 1. Hence the manual defintion, hoping it won't break more than it fixes. Modified Paths: -------------- geanypy/wscript_configure Modified: geanypy/wscript_configure 5 files changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -61,6 +61,11 @@ else: add_to_env_and_define(conf, 'GEANYPY_PYTHON_LIBRARY', dso_path, quote=True) conf.end_msg(dso_path) +# work around for Debian Python bug (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=695979) +if not 'LIB_PYEXT' in conf.env: + conf.env['LIBPATH_PYEXT'] = conf.env['LIBPATH_PYEMBED'] + conf.env['LIB_PYEXT'] = conf.env['LIB_PYEMBED'] + # dirs is_win32 = target_is_win32(conf) if is_win32: -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 7cf927: Update string/comment style types to check for newly added filetypes in Geany
by Enrico Tröger 13 Oct '13

13 Oct '13

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 13 Oct 2013 11:32:08 UTC Commit: 7cf927cae49326af56dbeee5cdee922c83a7a29a https://github.com/geany/geany-plugins/commit/7cf927cae49326af56dbeee5cdee9… Log Message: ----------- Update string/comment style types to check for newly added filetypes in Geany Modified Paths: -------------- spellcheck/src/speller.c Modified: spellcheck/src/speller.c 44 files changed, 42 insertions(+), 2 deletions(-) =================================================================== @@ -558,6 +558,20 @@ gboolean sc_speller_is_text(GeanyDocument *doc, gint pos) lexer = scintilla_send_message(doc->editor->sci, SCI_GETLEXER, 0, 0); switch (lexer) { + case SCLEX_ABAQUS: + { + switch (style) + { + case SCE_ABAQUS_DEFAULT: + case SCE_ABAQUS_COMMENT: + case SCE_ABAQUS_COMMENTBLOCK: + case SCE_ABAQUS_STRING: + return TRUE; + default: + return FALSE; + } + break; + } case SCLEX_ADA: { switch (style) @@ -604,6 +618,18 @@ gboolean sc_speller_is_text(GeanyDocument *doc, gint pos) } break; } + case SCLEX_BATCH: + { + switch (style) + { + case SCE_BAT_DEFAULT: + case SCE_BAT_COMMENT: + return TRUE; + default: + return FALSE; + } + break; + } case SCLEX_CAML: { switch (style) @@ -927,6 +953,7 @@ gboolean sc_speller_is_text(GeanyDocument *doc, gint pos) break; } case SCLEX_MATLAB: + case SCLEX_OCTAVE: { switch (style) { @@ -990,6 +1017,21 @@ gboolean sc_speller_is_text(GeanyDocument *doc, gint pos) } break; } + case SCLEX_POWERSHELL: + { + switch (style) + { + case SCE_POWERSHELL_DEFAULT: + case SCE_POWERSHELL_COMMENT: + case SCE_POWERSHELL_STRING: + case SCE_POWERSHELL_COMMENTSTREAM: + case SCE_POWERSHELL_COMMENTDOCKEYWORD: + return TRUE; + default: + return FALSE; + } + break; + } case SCLEX_PROPERTIES: { switch (style) @@ -1134,5 +1176,3 @@ gboolean sc_speller_is_text(GeanyDocument *doc, gint pos) * valid text to not ignore more than we want */ return TRUE; } - - -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 4a0ce3: Improve stripping of whitespace and punctuation characters (fixes #98)
by Enrico Tröger 13 Oct '13

13 Oct '13

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 13 Oct 2013 11:16:41 UTC Commit: 4a0ce3edc3effcd8e050484c464201ac9d0027e8 https://github.com/geany/geany-plugins/commit/4a0ce3edc3effcd8e050484c46420… Log Message: ----------- Improve stripping of whitespace and punctuation characters (fixes #98) More expensive stripping of whitespace and punctuation characters, including Unicode characters before checking a word. However, this is rather a workaround than a solution. The proper way would be to read words using Scintilla but split a line into words manually with correct handling of Unicode characters. Modified Paths: -------------- spellcheck/src/speller.c Modified: spellcheck/src/speller.c 101 files changed, 90 insertions(+), 11 deletions(-) =================================================================== @@ -52,10 +52,81 @@ static void dict_describe(const gchar* const lang, const gchar* const name, } +static gboolean is_word_sep(gunichar c) +{ + return (g_unichar_isspace(c) || g_unichar_ispunct(c)) && c != (gunichar)'\''; +} + + +/* Strip punctuation and white space, more or less Unicode-safe. + * The offset of the start of the word is stored in offset if non-NULL. */ +static gchar *strip_word(const gchar *word_to_check, gint *result_offset) +{ + gunichar c; + gchar *word = g_strdup(word_to_check); + gchar *word_start = word; + gchar *word_end; + gint offset = 0; + gint word_len; + gint new_word_len; + + /* strip from the left */ + do + { + c = g_utf8_get_char_validated(word, -1); + if (is_word_sep(c)) + { /* skip this character */ + word = g_utf8_next_char(word); + } + else + break; + } while (c != (gunichar) -1 && c != 0 && *word != '\0'); + word_len = strlen(word_to_check); + offset = word - word_start; + new_word_len = word_len - offset; + + if (new_word_len <= 0) + { /* empty or only punctuation in input string */ + *result_offset = 0; + g_free(word_start); + return NULL; + } + /* move the string in-place and truncate it */ + g_memmove(word_start, word, new_word_len); + word = word_start; + word[new_word_len] = '\0'; + if (! NZV(word)) + { + g_free(word); + return NULL; + } + /* strip from the right */ + word_end = word + strlen(word); + do + { + word_end = g_utf8_prev_char(word_end); + c = g_utf8_get_char_validated(word_end, -1); + if (is_word_sep(c)) + { /* skip this character */ + *word_end = '\0'; + } + else + break; + } while (c != (gunichar) -1 && word_end >= word); + + if (result_offset != NULL) + *result_offset = offset; + + return word; +} + + static gint sc_speller_check_word(GeanyDocument *doc, gint line_number, const gchar *word, gint start_pos, gint end_pos) { gsize n_suggs = 0; + gchar *word_to_check; + gint offset; g_return_val_if_fail(sc_speller_dict != NULL, 0); g_return_val_if_fail(doc != NULL, 0); @@ -73,9 +144,24 @@ static gint sc_speller_check_word(GeanyDocument *doc, gint line_number, const gc if (! sc_speller_is_text(doc, start_pos)) return 0; + /* strip punctuation and white space */ + word_to_check = strip_word(word, &offset); + if (! NZV(word_to_check)) + { + g_free(word_to_check); + return 0; + } + + /* recalculate start_pos and end_pos */ + start_pos += offset; + end_pos = start_pos + strlen(word_to_check); + /* early out if the word is spelled correctly */ - if (enchant_dict_check(sc_speller_dict, word, -1) == 0) + if (enchant_dict_check(sc_speller_dict, word_to_check, -1) == 0) + { + g_free(word_to_check); return 0; + } editor_indicator_set_on_range(doc->editor, GEANY_INDICATOR_ERROR, start_pos, end_pos); @@ -86,10 +172,10 @@ static gint sc_speller_check_word(GeanyDocument *doc, gint line_number, const gc GString *str; str = g_string_sized_new(256); - suggs = enchant_dict_suggest(sc_speller_dict, word, -1, &n_suggs); + suggs = enchant_dict_suggest(sc_speller_dict, word_to_check, -1, &n_suggs); if (suggs != NULL) { - g_string_append_printf(str, "line %d: %s | ", line_number + 1, word); + g_string_append_printf(str, "line %d: %s | ", line_number + 1, word_to_check); g_string_append(str, _("Try: ")); @@ -108,6 +194,7 @@ static gint sc_speller_check_word(GeanyDocument *doc, gint line_number, const gc g_string_free(str, TRUE); } + g_free(word_to_check); return n_suggs; } @@ -118,7 +205,6 @@ gint sc_speller_process_line(GeanyDocument *doc, gint line_number, const gchar * gint wstart, wend; GString *str; gint suggestions_found = 0; - gchar c; g_return_val_if_fail(sc_speller_dict != NULL, 0); g_return_val_if_fail(doc != NULL, 0); @@ -135,13 +221,6 @@ gint sc_speller_process_line(GeanyDocument *doc, gint line_number, const gchar * wend = scintilla_send_message(doc->editor->sci, SCI_WORDENDPOSITION, wstart, FALSE); if (wstart == wend) break; - c = sci_get_char_at(doc->editor->sci, wstart); - /* hopefully it's enough to check for these both */ - if (ispunct(c) || isspace(c)) - { - pos_start++; - continue; - } /* ensure the string has enough allocated memory */ if (str->len < (guint)(wend - wstart)) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/plugins.geany.org] 7123bb: link to third-party plugin GeanyEasyUnicodeInput
by Dominic Hopf 12 Oct '13

12 Oct '13

Branch: refs/heads/master Author: Dominic Hopf <dmaphy(a)googlemail.com> Committer: Dominic Hopf <dmaphy(a)googlemail.com> Date: Sat, 12 Oct 2013 19:59:07 UTC Commit: 7123bb54131d4d5ca70acf239da8dfe5378b44b8 https://github.com/geany/plugins.geany.org/commit/7123bb54131d4d5ca70acf239… Log Message: ----------- link to third-party plugin GeanyEasyUnicodeInput Modified Paths: -------------- index.php Modified: index.php 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -66,6 +66,7 @@ <h1>Third-Party plugins</h1> <ul> <li><a href="djynn.html">Djynn</a></li> + <li><a href="http://sourceforge.net/projects/geanyeasyunicodeinput/">GeanyEasyUnicodeInput</a></li> </ul> <hr /> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/plugins.geany.org] 1ee85c: fix the list tags for third-party plugins
by Dominic Hopf 12 Oct '13

12 Oct '13

Branch: refs/heads/master Author: Dominic Hopf <dmaphy(a)googlemail.com> Committer: Dominic Hopf <dmaphy(a)googlemail.com> Date: Sat, 12 Oct 2013 19:55:32 UTC Commit: 1ee85c8f32a7671eef37b47e03771f690e9c89e3 https://github.com/geany/plugins.geany.org/commit/1ee85c8f32a7671eef37b47e0… Log Message: ----------- fix the list tags for third-party plugins Modified Paths: -------------- index.php Modified: index.php 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -65,7 +65,7 @@ <h1>Third-Party plugins</h1> <ul> - <li><li><a href="djynn.html">Djynn</a></li></li> + <li><a href="djynn.html">Djynn</a></li> </ul> <hr /> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] b1aed2: Merge branch 'master' of github.com:geany/geany-plugins
by Dimitar Zhekov 12 Oct '13

12 Oct '13

Branch: refs/heads/master Author: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Committer: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Date: Sat, 12 Oct 2013 15:36:46 UTC Commit: b1aed2c04f87b8c319b92bc965ab342f6477011c https://github.com/geany/geany-plugins/commit/b1aed2c04f87b8c319b92bc965ab3… Log Message: ----------- Merge branch 'master' of github.com:geany/geany-plugins Modified Paths: -------------- geanypy/wscript_build geanypy/wscript_configure geanypy/wscript_options waf wscript Modified: geanypy/wscript_build 47 files changed, 47 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,47 @@ +# -*- coding: utf-8 -*- +# +# WAF build script for geany-plugins - GeanyPy +# +# Copyright 2013 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> +# +# 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. + +from build.wafutils import build_plugin, target_is_win32 + + +# plugin config +name = 'GeanyPy' +includes = ['geanypy/src'] +libraries = ['PYGTK', 'PYEXT'] + +build_plugin(bld, name, includes=includes, libraries=libraries) + + +# install Python modules (they will be byte-compiled on install) +py_sources = ['geany/__init__.py', + 'geany/console.py', + 'geany/manager.py', + 'geany/loader.py', + 'geany/plugin.py', + 'geany/signalmanager.py'] +bld.new_task_gen( + features = 'py', + source = py_sources, + install_path = '%s/geany' % bld.env['GEANYPY_PYTHON_DIR']) + + +# install plugins +start_dir = bld.path.find_dir('plugins') +bld.install_files(bld.env['GEANYPY_PLUGIN_DIR'], start_dir.ant_glob('*.py'), cwd=start_dir) Modified: geanypy/wscript_configure 75 files changed, 75 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,75 @@ +# -*- coding: utf-8 -*- +# +# WAF build script for geany-plugins - GeanyPy +# +# Copyright 2013 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> +# +# 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. + +from build.wafutils import add_to_env_and_define, check_cfg_cached, target_is_win32 +from waflib.Errors import ConfigurationError + +PYTHON_DETECT_DSO_CODE = """ +from distutils.sysconfig import get_config_vars +from os.path import join as path_join + +cvars = get_config_vars() +# support multiarch-enabled distributions like Ubuntu +if not 'MULTIARCH' in cvars.keys(): + cvars['MULTIARCH'] = '' +print(path_join(cvars['LIBDIR'], cvars['MULTIARCH'], cvars['LDLIBRARY'])) +""" + +# Python +conf.load('python') +conf.check_python_version((2, 6)) +conf.check_python_headers() + +if conf.env['PYTHON_VERSION'][0] == '3': + raise ConfigurationError('Python3 is not supported') + +# PyGTK +check_cfg_cached(conf, + package='pygtk-2.0', + uselib_store="PYGTK", + mandatory=True, + args='--cflags --libs') + +# try to find the Python DSO path, for details see geanypy/m4/ax_python_library.m4 +conf.start_msg('Checking for python DSO path') +try: + dso_path = conf.cmd_and_log(conf.env['PYTHON'] + ['-c', PYTHON_DETECT_DSO_CODE]) + if not dso_path: + conf.fatal('not found') +except: + conf.end_msg(False) + conf.fatal('Could not find the python DSO path') +else: + dso_path = dso_path.strip() + add_to_env_and_define(conf, 'GEANYPY_PYTHON_LIBRARY', dso_path, quote=True) + conf.end_msg(dso_path) + +# dirs +is_win32 = target_is_win32(conf) +if is_win32: + geanypy_lib_path = '%s/lib/geany-plugins/geanypy' % conf.env['G_PREFIX'] + geanypy_data_path = '%s/%s/geany-plugins/geanypy' % ( + conf.env['G_PREFIX'], conf.env['GEANYPLUGINS_DATADIR']) +else: + geanypy_lib_path = '%s/geany-plugins/geanypy' % conf.env['LIBDIR'] + geanypy_data_path = '%s/geany-plugins/geanypy' % conf.env['GEANYPLUGINS_DATADIR'] + +add_to_env_and_define(conf, 'GEANYPY_PYTHON_DIR', geanypy_lib_path, quote=True) +add_to_env_and_define(conf, 'GEANYPY_PLUGIN_DIR', '%s/plugins' % geanypy_data_path, quote=True) Modified: geanypy/wscript_options 22 files changed, 22 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# +# WAF build script for geany-plugins - GeanyPy +# +# Copyright 2013 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> +# +# 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. + +# enable Python specific options +opt.tool_options('python') Modified: waf 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: wscript 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -102,16 +102,16 @@ def configure(conf): gtk_version = conf.check_cfg(modversion='gtk+-2.0') or 'Unknown' load_intltool_if_available(conf) + setup_configuration_env(conf) # build plugin list enabled_plugins = get_enabled_plugins(conf) - # execute plugin specific coniguration code + # execute plugin specific configuration code configure_plugins(conf, enabled_plugins) # now add the enabled_plugins to the env to remember them conf.env.append_value('enabled_plugins', enabled_plugins) - setup_configuration_env(conf) setup_makefile(conf) conf.write_config_header('config.h') -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] a48d7c: scope - small fixes and improvements
by Dimitar Zhekov 12 Oct '13

12 Oct '13

Branch: refs/heads/master Author: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Committer: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Date: Sat, 12 Oct 2013 15:31:07 UTC Commit: a48d7c2816cbd4417ac25fb43c578de97032b9e7 https://github.com/geany/geany-plugins/commit/a48d7c2816cbd4417ac25fb43c578… Log Message: ----------- scope - small fixes and improvements Modified Paths: -------------- scope/ChangeLog scope/src/debug.c scope/src/memory.c scope/src/prefs.c Modified: scope/ChangeLog 13 files changed, 12 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,15 @@ -2013-07-25 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> +2013-10-12 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> + + * src/debug.c: + Fixed a lapsus which prevented gdb stdout resync on overflow. + * src/memory.c: + Improved re-selection of the current line. + * src/memory.c, src/pref.c: + Decreased the maximum memory block size to 15.5K and increased + the default gdb stdout buffer size to 32K to match each other. + + +2013-09-25 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> * src/scope.c: Register ScpTreeStore dynamically, making Scope unloadable again. Modified: scope/src/debug.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -307,7 +307,7 @@ static gboolean source_dispatch(G_GNUC_UNUSED GSource *source, else { reading_pos++; - leading_receive = FALSE; + leading_receive = TRUE; } } Modified: scope/src/memory.c 31 files changed, 12 insertions(+), 19 deletions(-) =================================================================== @@ -134,9 +134,9 @@ static void memory_configure(void) static guint64 memory_start; static guint memory_count = 0; -#define MAX_BYTES (128 * MAX_BYTES_PER_LINE) +#define MAX_BYTES (124 * MAX_BYTES_PER_LINE) -static void write_block(guint64 start, const char *contents, guint count) +static void write_block(guint64 start, const char *contents, guint count, const char *maddr) { if (!memory_count) memory_start = start; @@ -149,8 +149,6 @@ static void write_block(guint64 start, const char *contents, guint count) GString *ascii = g_string_new(" "); gint n = 0; - scp_tree_store_append(store, &iter, NULL); - while (n < bytes_per_line) { char locale; @@ -185,8 +183,10 @@ static void write_block(guint64 start, const char *contents, guint count) g_string_append_c(bytes, ' '); } - scp_tree_store_set(store, &iter, MEMORY_ADDR, addr, MEMORY_BYTES, bytes->str, - MEMORY_ASCII, ascii->str, -1); + scp_tree_store_append_with_values(store, &iter, NULL, MEMORY_ADDR, addr, + MEMORY_BYTES, bytes->str, MEMORY_ASCII, ascii->str, -1); + if (!g_strcmp0(addr, maddr)) + gtk_tree_selection_select_iter(selection, &iter); g_free(addr); g_string_free(bytes, TRUE); @@ -202,7 +202,7 @@ static void write_block(guint64 start, const char *contents, guint count) dc_error("memory: too much data"); } -static void memory_node_read(const ParseNode *node, G_GNUC_UNUSED gpointer gdata) +static void memory_node_read(const ParseNode *node, const char *maddr) { iff (node->type == PT_ARRAY, "memory: contains value") { @@ -218,7 +218,7 @@ static void memory_node_read(const ParseNode *node, G_GNUC_UNUSED gpointer gdata sscanf(begin, "%" G_GINT64_MODIFIER "i", &start); iff (count, "memory: contents too short") - write_block(start, contents, count); + write_block(start, contents, count, maddr); } } } @@ -228,10 +228,10 @@ void on_memory_read_bytes(GArray *nodes) if (pointer_size <= MAX_POINTER_SIZE) { GtkTreeIter iter; - char *addr = NULL; + char *maddr = NULL; if (gtk_tree_selection_get_selected(selection, NULL, &iter)) - gtk_tree_model_get((GtkTreeModel *) store, &iter, MEMORY_ADDR, &addr, -1); + gtk_tree_model_get((GtkTreeModel *) store, &iter, MEMORY_ADDR, &maddr, -1); store_clear(store); memory_count = 0; @@ -243,15 +243,8 @@ void on_memory_read_bytes(GArray *nodes) gtk_tree_view_column_queue_resize(get_column("memory_ascii_column")); } - parse_foreach(parse_lead_array(nodes), (GFunc) memory_node_read, - GINT_TO_POINTER(TRUE)); - - if (addr) - { - if (store_find(store, &iter, MEMORY_ADDR, addr)) - utils_tree_set_cursor(selection, &iter, -1); - g_free(addr); - } + parse_foreach(parse_lead_array(nodes), (GFunc) memory_node_read, maddr); + g_free(maddr); } } Modified: scope/src/prefs.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -233,7 +233,7 @@ void prefs_init(void) group = stash_group_new("scope"); stash_group_add_string(group, &pref_gdb_executable, "gdb_executable", "gdb"); stash_group_add_boolean(group, &pref_gdb_async_mode, "gdb_async_mode", FALSE); - stash_group_add_integer(group, &pref_gdb_buffer_length, "gdb_buffer_length", 16383); + stash_group_add_integer(group, &pref_gdb_buffer_length, "gdb_buffer_length", 32767); stash_group_add_integer(group, &pref_gdb_wait_death, "gdb_wait_death", 20); #ifndef G_OS_UNIX stash_group_add_integer(group, &pref_gdb_send_interval, "gdb_send_interval", 5); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] b41274: Update Waf to version 1.6.11
by Enrico Tröger 07 Oct '13

07 Oct '13

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Mon, 07 Oct 2013 21:02:12 UTC Commit: b41274e7d3ec0a49b42455f35848afe2f12242d4 https://github.com/geany/geany-plugins/commit/b41274e7d3ec0a49b42455f35848a… Log Message: ----------- Update Waf to version 1.6.11 The version 1.6.5 we used before has a bug that expects 'python-config' to be a Python script which is not always true. 1.6.11 has a fix for this bug and many more. Modified Paths: -------------- waf Modified: waf 0 files changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] a73d22: Add build support for GeanyPy using the Waf build system
by Enrico Tröger 06 Oct '13

06 Oct '13

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 06 Oct 2013 12:25:06 UTC Commit: a73d22a04d009e360ab5650f91291b7b632415d9 https://github.com/geany/geany-plugins/commit/a73d22a04d009e360ab5650f91291… Log Message: ----------- Add build support for GeanyPy using the Waf build system Modified Paths: -------------- geanypy/wscript_build geanypy/wscript_configure geanypy/wscript_options Modified: geanypy/wscript_build 47 files changed, 47 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,47 @@ +# -*- coding: utf-8 -*- +# +# WAF build script for geany-plugins - GeanyPy +# +# Copyright 2013 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> +# +# 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. + +from build.wafutils import build_plugin, target_is_win32 + + +# plugin config +name = 'GeanyPy' +includes = ['geanypy/src'] +libraries = ['PYGTK', 'PYEXT'] + +build_plugin(bld, name, includes=includes, libraries=libraries) + + +# install Python modules (they will be byte-compiled on install) +py_sources = ['geany/__init__.py', + 'geany/console.py', + 'geany/manager.py', + 'geany/loader.py', + 'geany/plugin.py', + 'geany/signalmanager.py'] +bld.new_task_gen( + features = 'py', + source = py_sources, + install_path = '%s/geany' % bld.env['GEANYPY_PYTHON_DIR']) + + +# install plugins +start_dir = bld.path.find_dir('plugins') +bld.install_files(bld.env['GEANYPY_PLUGIN_DIR'], start_dir.ant_glob('*.py'), cwd=start_dir) Modified: geanypy/wscript_configure 75 files changed, 75 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,75 @@ +# -*- coding: utf-8 -*- +# +# WAF build script for geany-plugins - GeanyPy +# +# Copyright 2013 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> +# +# 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. + +from build.wafutils import add_to_env_and_define, check_cfg_cached, target_is_win32 +from waflib.Errors import ConfigurationError + +PYTHON_DETECT_DSO_CODE = """ +from distutils.sysconfig import get_config_vars +from os.path import join as path_join + +cvars = get_config_vars() +# support multiarch-enabled distributions like Ubuntu +if not 'MULTIARCH' in cvars.keys(): + cvars['MULTIARCH'] = '' +print(path_join(cvars['LIBDIR'], cvars['MULTIARCH'], cvars['LDLIBRARY'])) +""" + +# Python +conf.load('python') +conf.check_python_version((2, 6)) +conf.check_python_headers() + +if conf.env['PYTHON_VERSION'][0] == '3': + raise ConfigurationError('Python3 is not supported') + +# PyGTK +check_cfg_cached(conf, + package='pygtk-2.0', + uselib_store="PYGTK", + mandatory=True, + args='--cflags --libs') + +# try to find the Python DSO path, for details see geanypy/m4/ax_python_library.m4 +conf.start_msg('Checking for python DSO path') +try: + dso_path = conf.cmd_and_log(conf.env['PYTHON'] + ['-c', PYTHON_DETECT_DSO_CODE]) + if not dso_path: + conf.fatal('not found') +except: + conf.end_msg(False) + conf.fatal('Could not find the python DSO path') +else: + dso_path = dso_path.strip() + add_to_env_and_define(conf, 'GEANYPY_PYTHON_LIBRARY', dso_path, quote=True) + conf.end_msg(dso_path) + +# dirs +is_win32 = target_is_win32(conf) +if is_win32: + geanypy_lib_path = '%s/lib/geany-plugins/geanypy' % conf.env['G_PREFIX'] + geanypy_data_path = '%s/%s/geany-plugins/geanypy' % ( + conf.env['G_PREFIX'], conf.env['GEANYPLUGINS_DATADIR']) +else: + geanypy_lib_path = '%s/geany-plugins/geanypy' % conf.env['LIBDIR'] + geanypy_data_path = '%s/geany-plugins/geanypy' % conf.env['GEANYPLUGINS_DATADIR'] + +add_to_env_and_define(conf, 'GEANYPY_PYTHON_DIR', geanypy_lib_path, quote=True) +add_to_env_and_define(conf, 'GEANYPY_PLUGIN_DIR', '%s/plugins' % geanypy_data_path, quote=True) Modified: geanypy/wscript_options 22 files changed, 22 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# +# WAF build script for geany-plugins - GeanyPy +# +# Copyright 2013 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> +# +# 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. + +# enable Python specific options +opt.tool_options('python') -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] ae17f4: Fix typo
by Enrico Tröger 06 Oct '13

06 Oct '13

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 06 Oct 2013 12:15:35 UTC Commit: ae17f4b445b6c548d13384747d15c896507001af https://github.com/geany/geany-plugins/commit/ae17f4b445b6c548d13384747d15c… Log Message: ----------- Fix typo Modified Paths: -------------- wscript Modified: wscript 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -107,7 +107,7 @@ def configure(conf): # build plugin list enabled_plugins = get_enabled_plugins(conf) - # execute plugin specific coniguration code + # execute plugin specific configuration code configure_plugins(conf, enabled_plugins) # now add the enabled_plugins to the env to remember them conf.env.append_value('enabled_plugins', enabled_plugins) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits October 2013