Commits April 2015

commits@lists.geany.org

1 participants
100 discussions

Start a nNew thread

[geany/geany] 5b9bb1: Include geanyplugin.h from geanyfunctions.h for compatibility
by Colomban Wendling 10 Apr '15

10 Apr '15

1 0

[geany/geany] 01db7f: Add signallist.i to gitignore
by Colomban Wendling 10 Apr '15

10 Apr '15

1 0

[geany/geany] 07dacb: waf: Improve passing of export and visibility flags
by Colomban Wendling 10 Apr '15

10 Apr '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 10 Apr 2015 14:16:19 UTC Commit: 07dacb66d23b58b34eee51aac28a8ad2fcf5693c https://github.com/geany/geany/commit/07dacb66d23b58b34eee51aac28a8ad2fcf56… Log Message: ----------- waf: Improve passing of export and visibility flags Modified Paths: -------------- wscript Modified: wscript 31 lines changed, 16 insertions(+), 15 deletions(-) =================================================================== @@ -309,16 +309,18 @@ but you then may not have a local copy of the HTML manual.''' # GEANY_EXPORT_SYMBOL and GEANY_API_SYMBOL if is_win32: - geany_symbol_flags = ['-DGEANY_EXPORT_SYMBOL=__declspec(dllexport)'] + geanyexport_cflags = [] + geanyexport_defines = ['GEANY_EXPORT_SYMBOL=__declspec(dllexport)'] elif visibility_hidden_supported: - geany_symbol_flags = ['-fvisibility=hidden', - '-DGEANY_EXPORT_SYMBOL=__attribute__((visibility("default")))'] - conf.env['CFLAGS_plugin'] = '-fvisibility=default' + geanyexport_cflags = ['-fvisibility=hidden'] + geanyexport_defines = ['GEANY_EXPORT_SYMBOL=__attribute__((visibility("default")))'] else: # unknown, define to nothing - geany_symbol_flags = ['-DGEANY_EXPORT_SYMBOL='] - geany_symbol_flags.append('-DGEANY_API_SYMBOL=GEANY_EXPORT_SYMBOL') - conf.env.append_value('CFLAGS', geany_symbol_flags) - conf.env.append_value('CXXFLAGS', geany_symbol_flags) + geanyexport_cflags = [] + geanyexport_defines = ['GEANY_EXPORT_SYMBOL='] + geanyexport_defines.append('GEANY_API_SYMBOL=GEANY_EXPORT_SYMBOL') + conf.env['DEFINES_geanyexport'] = geanyexport_defines + conf.env['CFLAGS_geanyexport'] = geanyexport_cflags + conf.env['CXXFLAGS_geanyexport'] = geanyexport_cflags # some more compiler flags conf.env.append_value('CFLAGS', ['-DHAVE_CONFIG_H']) @@ -401,7 +403,6 @@ def build(bld): includes = ['.', 'src/', 'scintilla/include', 'tagmanager/src'], defines = 'G_LOG_DOMAIN="%s"' % plugin_name, target = plugin_name, - cflags = bld.env['CFLAGS_plugin'], uselib = ['GTK', 'GLIB', 'GMODULE'] + uselib_add, use = ['geany'], install_path = instpath) @@ -414,7 +415,7 @@ def build(bld): target = 'ctags', includes = ['.', 'tagmanager', 'tagmanager/ctags'], defines = 'G_LOG_DOMAIN="CTags"', - uselib = ['cshlib', 'GLIB']) + uselib = ['cshlib', 'GLIB', 'geanyexport']) # Tagmanager bld.objects( @@ -424,7 +425,7 @@ def build(bld): target = 'tagmanager', includes = ['.', 'tagmanager', 'tagmanager/ctags'], defines = ['GEANY_PRIVATE', 'G_LOG_DOMAIN="Tagmanager"'], - uselib = ['cshlib', 'GTK', 'GLIB']) + uselib = ['cshlib', 'GTK', 'GLIB', 'geanyexport']) # MIO bld.objects( @@ -434,7 +435,7 @@ def build(bld): target = 'mio', includes = ['.', 'tagmanager/mio/'], defines = 'G_LOG_DOMAIN="MIO"', - uselib = ['cshlib', 'GTK', 'GLIB']) + uselib = ['cshlib', 'GTK', 'GLIB', 'geanyexport']) # Scintilla files = bld.srcnode.ant_glob('scintilla/**/*.cxx', src=True, dir=False) @@ -445,7 +446,7 @@ def build(bld): target = 'scintilla', source = scintilla_sources, includes = ['.', 'scintilla/include', 'scintilla/src', 'scintilla/lexlib'], - uselib = ['cshlib', 'cxxshlib', 'GTK', 'GLIB', 'GMODULE', 'M']) + uselib = ['cshlib', 'cxxshlib', 'GTK', 'GLIB', 'GMODULE', 'M', 'geanyexport']) # Geany if bld.env['HAVE_VTE'] == 1: @@ -488,7 +489,7 @@ def build(bld): source = geany_sources, includes = ['.', 'scintilla/include', 'tagmanager/src', 'src'], defines = ['G_LOG_DOMAIN="Geany"', 'GEANY_PRIVATE'], - uselib = base_uselibs, + uselib = base_uselibs + ['geanyexport'], use = ['scintilla', 'ctags', 'tagmanager', 'mio'], linkflags = bld.env['LINKFLAGS_cprogram'], vnum = GEANY_LIB_VERSION, @@ -502,7 +503,7 @@ def build(bld): source = ['src/main.c'], includes = ['.', 'scintilla/include', 'tagmanager/src'], defines = ['G_LOG_DOMAIN="Geany"', 'GEANY_PRIVATE'], - uselib = base_uselibs, + uselib = base_uselibs + ['geanyexport'], use = ['geany']) if not is_win32: # http://www.freehackers.org/~tnagy/testdoc/single.html#common_c -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] b2ba6c: autotools: Cleanup makefile a little
by Colomban Wendling 10 Apr '15

10 Apr '15

1 0

[geany/geany] 7ac4bf: waf: Don't abuse static libraries
by Colomban Wendling 10 Apr '15

10 Apr '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 10 Apr 2015 14:16:19 UTC Commit: 7ac4bf3d24a08533e2557c30624aa961c3547c4e https://github.com/geany/geany/commit/7ac4bf3d24a08533e2557c30624aa961c3547… Log Message: ----------- waf: Don't abuse static libraries Instead of abusing static libraries putting shared objects in them, and manually setting the flags required to build shared objects, use sets of objects and Waf's own cshlib/cxxshlib flags. Also explicitly call the appropriate build context method instead of only listing features in order to make it clear what is built. Some references: * http://docs.waf.googlecode.com/git/book_16/single.html#_predefined_task_gen… * http://docs.waf.googlecode.com/git/book_16/single.html#_local_libraries * https://code.google.com/p/waf/issues/detail?id=1398 Modified Paths: -------------- wscript Modified: wscript 42 lines changed, 16 insertions(+), 26 deletions(-) =================================================================== @@ -284,12 +284,6 @@ but you then may not have a local copy of the HTML manual.''' _define_from_opt(conf, 'DOCDIR', conf.options.docdir, docdir) _define_from_opt(conf, 'LIBDIR', conf.options.libdir, libdir) _define_from_opt(conf, 'MANDIR', conf.options.mandir, mandir) - # The check could be improved, -fPIC iso only really necessary on 64bit linux - # It is needed because waf doesn't realize the static files go into - # a shared library - conf.env.append_value('CFLAGS_cstlib', '-fPIC') - conf.env.append_value('CFLAGS_cxxstlib', '-fPIC') - conf.env.append_value('CXXFLAGS_cxxstlib', '-fPIC') conf.define('ENABLE_NLS', 1) conf.define('GEANY_LOCALEDIR', '' if is_win32 else conf.env['LOCALEDIR'], quote=True) @@ -413,49 +407,45 @@ def build(bld): install_path = instpath) # CTags - bld( - features = ['c', 'cstlib'], + bld.objects( + features = ['c'], source = ctags_sources, name = 'ctags', target = 'ctags', includes = ['.', 'tagmanager', 'tagmanager/ctags'], defines = 'G_LOG_DOMAIN="CTags"', - uselib = ['GLIB'], - install_path = None) # do not install this library + uselib = ['cshlib', 'GLIB']) # Tagmanager - bld( - features = ['c', 'cstlib'], + bld.objects( + features = ['c'], source = tagmanager_sources, name = 'tagmanager', target = 'tagmanager', includes = ['.', 'tagmanager', 'tagmanager/ctags'], defines = ['GEANY_PRIVATE', 'G_LOG_DOMAIN="Tagmanager"'], - uselib = ['GTK', 'GLIB'], - install_path = None) # do not install this library + uselib = ['cshlib', 'GTK', 'GLIB']) # MIO - bld( - features = ['c', 'cstlib'], + bld.objects( + features = ['c'], source = mio_sources, name = 'mio', target = 'mio', includes = ['.', 'tagmanager/mio/'], defines = 'G_LOG_DOMAIN="MIO"', - uselib = ['GTK', 'GLIB'], - install_path = None) # do not install this library + uselib = ['cshlib', 'GTK', 'GLIB']) # Scintilla files = bld.srcnode.ant_glob('scintilla/**/*.cxx', src=True, dir=False) scintilla_sources.update([file.path_from(bld.srcnode) for file in files]) - bld( - features = ['c', 'cxx', 'cxxstlib'], + bld.objects( + features = ['c', 'cxx'], name = 'scintilla', target = 'scintilla', source = scintilla_sources, includes = ['.', 'scintilla/include', 'scintilla/src', 'scintilla/lexlib'], - uselib = ['GTK', 'GLIB', 'GMODULE', 'M'], - install_path = None) # do not install this library + uselib = ['cshlib', 'cxxshlib', 'GTK', 'GLIB', 'GMODULE', 'M']) # Geany if bld.env['HAVE_VTE'] == 1: @@ -491,8 +481,8 @@ def build(bld): base_uselibs = ['GTK', 'GLIB', 'GMODULE', 'GIO', 'GTHREAD', 'WIN32', 'MAC_INTEGRATION', 'SUNOS_SOCKET', 'M'] # libgeany - bld( - features = ['c', 'cxx', 'cshlib'], + bld.shlib( + features = ['c', 'cxx'], name = 'geany', target = 'geany', source = geany_sources, @@ -505,8 +495,8 @@ def build(bld): install_path = '${PREFIX}/bin' if is_win32 else '${LIBDIR}') # geany executable - t = bld( - features = ['c', 'cxx', 'cprogram'], + t = bld.program( + features = ['c', 'cxx'], name = 'geany_bin', target = 'geany', source = ['src/main.c'], -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 11d4bc: Only use LIBGEANY_CFLAGS on libgeany.
by Thomas Martitz 10 Apr '15

10 Apr '15

Branch: refs/heads/master Author: Thomas Martitz <kugel(a)rockbox.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 10 Apr 2015 14:16:18 UTC Commit: 11d4bcf7c29b587b59a0bd1fbec754c7e1439c6f https://github.com/geany/geany/commit/11d4bcf7c29b587b59a0bd1fbec754c7e1439… Log Message: ----------- Only use LIBGEANY_CFLAGS on libgeany. It includes stuff like -fvisibility which isn't appropriate for the main binary. Modified Paths: -------------- src/Makefile.am Modified: src/Makefile.am 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -20,7 +20,6 @@ AM_CPPFLAGS = \ -DGTK \ -DGEANY_PRIVATE \ -DG_LOG_DOMAIN=\""Geany"\" \ - @LIBGEANY_CFLAGS@ \ @GTK_CFLAGS@ @GTHREAD_CFLAGS@ \ $(MAC_INTEGRATION_CFLAGS) @@ -106,6 +105,7 @@ libgeany_la_SOURCES = \ ui_utils.c ui_utils.h \ utils.c utils.h +libgeany_la_CFLAGS = $(AM_CPPFLAGS) @LIBGEANY_CFLAGS@ libgeany_la_LDFLAGS = @LIBGEANY_LDFLAGS@ libgeany_la_LIBADD = \ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] c85b84: Simplify automated signal connection
by Colomban Wendling 10 Apr '15

10 Apr '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 10 Apr 2015 14:16:18 UTC Commit: c85b846eeb08ff9c3260f35a51367736e8b87287 https://github.com/geany/geany/commit/c85b846eeb08ff9c3260f35a51367736e8b87… Log Message: ----------- Simplify automated signal connection Instead of processing a template C source in the build system, generate a list to be included by the preprocessor. This simplifies the build system code as it now only generates the list and doesn't take care of processing the template. It incidentally fixes build on systems with 4.2BSD sed (at least OSX and FreeBSD) as it removes some offending sed code. Modified Paths: -------------- src/Makefile.am src/callbacks.c src/signalconn.c.in Modified: src/Makefile.am 16 lines changed, 6 insertions(+), 10 deletions(-) =================================================================== @@ -10,8 +10,7 @@ EXTRA_DIST = \ keybindingsprivate.h \ pluginprivate.h \ projectprivate.h \ - makefile.win32 \ - $(srcdir)/signalconn.c.in + makefile.win32 AM_CPPFLAGS = \ -I$(top_srcdir) \ @@ -163,18 +162,15 @@ libgeany_la_SOURCES += vte.c vte.h endif -callbacks.c: signalconn.c +callbacks.c: signallist.i glade_file=$(top_srcdir)/data/geany.glade -template_file=$(srcdir)/signalconn.c.in -signalconn.c: $(glade_file) $(template_file) +signallist.i: $(glade_file) Makefile $(AM_V_GEN)( \ echo '/* This file is auto-generated, do not edit. */' && \ - $(SED) -n '/@callback_map@/q;p' "$(template_file)" && \ - $(SED) -n 's/^.*handler="$[^"]\+$".*$$/\tg_hash_table_insert(hash, (gpointer) "\1", G_CALLBACK(\1));/p' "$(glade_file)" \ - | $(SORT) | $(UNIQ) && \ - $(SED) -n '/@callback_map@/{:l;n;p;b l}' "$(template_file)" \ + $(SED) -n 's/^.*handler="$[^"]\+$".*$$/ITEM(\1)/p' "$(glade_file)" \ + | $(SORT) | $(UNIQ) \ ) > $@ || { $(RM) $@ && exit 1; } -CLEANFILES += signalconn.c +CLEANFILES += signallist.i Modified: src/callbacks.c 34 lines changed, 33 insertions(+), 1 deletions(-) =================================================================== @@ -1909,4 +1909,36 @@ static void on_detect_width_from_file_activate(GtkMenuItem *menuitem, gpointer u } } -#include "signalconn.c" + +static void builder_connect_func(GtkBuilder *builder, GObject *object, + const gchar *signal_name, const gchar *handler_name, GObject *connect_obj, + GConnectFlags flags, gpointer user_data) +{ + GHashTable *hash = user_data; + GCallback callback; + + callback = g_hash_table_lookup(hash, handler_name); + g_return_if_fail(callback); + + if (connect_obj == NULL) + g_signal_connect_data(object, signal_name, callback, NULL, NULL, flags); + else + g_signal_connect_object(object, signal_name, callback, connect_obj, flags); +} + + +void callbacks_connect(GtkBuilder *builder) +{ + GHashTable *hash; + + g_return_if_fail(GTK_IS_BUILDER(builder)); + + hash = g_hash_table_new(g_str_hash, g_str_equal); + +#define ITEM(n) g_hash_table_insert(hash, (gpointer) #n, G_CALLBACK(n)); +# include "signallist.i" +#undef ITEM + + gtk_builder_connect_signals_full(builder, builder_connect_func, hash); + g_hash_table_destroy(hash); +} Modified: src/signalconn.c.in 32 lines changed, 0 insertions(+), 32 deletions(-) =================================================================== @@ -1,32 +0,0 @@ - - -static void builder_connect_func(GtkBuilder *builder, GObject *object, - const gchar *signal_name, const gchar *handler_name, GObject *connect_obj, - GConnectFlags flags, gpointer user_data) -{ - GHashTable *hash = user_data; - GCallback callback; - - callback = g_hash_table_lookup(hash, handler_name); - g_return_if_fail(callback); - - if (connect_obj == NULL) - g_signal_connect_data(object, signal_name, callback, NULL, NULL, flags); - else - g_signal_connect_object(object, signal_name, callback, connect_obj, flags); -} - - -void callbacks_connect(GtkBuilder *builder) -{ - GHashTable *hash; - - g_return_if_fail(GTK_IS_BUILDER(builder)); - - hash = g_hash_table_new(g_str_hash, g_str_equal); - -@callback_map@ - - gtk_builder_connect_signals_full(builder, builder_connect_func, hash); - g_hash_table_destroy(hash); -} -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] dbe910: GEANY_API_SYMBOL for project_write_config()
by Thomas Martitz 10 Apr '15

10 Apr '15

Branch: refs/heads/master Author: Thomas Martitz <kugel(a)rockbox.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 10 Apr 2015 14:16:18 UTC Commit: dbe910ca5e059cc67b53b1dac62147e1fcdd7e3c https://github.com/geany/geany/commit/dbe910ca5e059cc67b53b1dac62147e1fcdd7… Log Message: ----------- GEANY_API_SYMBOL for project_write_config() Modified Paths: -------------- src/project.c Modified: src/project.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1153,6 +1153,7 @@ static gboolean write_config(gboolean emit_signal) * * @since 1.25 */ +GEANY_API_SYMBOL void project_write_config(void) { if (!write_config(TRUE)) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 56b918: Fix generation of `signallist.i` with BSD sed
by Colomban Wendling 10 Apr '15

10 Apr '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 10 Apr 2015 14:16:18 UTC Commit: 56b9189a6cf42d877de5cbab64b22e722a0097ab https://github.com/geany/geany/commit/56b9189a6cf42d877de5cbab64b22e722a009… Log Message: ----------- Fix generation of `signallist.i` with BSD sed 4.2BSD sed doesn't understand the `+` quantifier, so use `{1,}`. Modified Paths: -------------- src/Makefile.am Modified: src/Makefile.am 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -169,7 +169,7 @@ glade_file=$(top_srcdir)/data/geany.glade signallist.i: $(glade_file) Makefile $(AM_V_GEN)( \ echo '/* This file is auto-generated, do not edit. */' && \ - $(SED) -n 's/^.*handler="$[^"]\+$".*$$/ITEM(\1)/p' "$(glade_file)" \ + $(SED) -n 's/^.*handler="$[^"]\{1,\}$".*$$/ITEM(\1)/p' "$(glade_file)" \ | $(SORT) | $(UNIQ) \ ) > $@ || { $(RM) $@ && exit 1; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 43037b: waf: Implement check whether compiler supports -fvisibility=hidden
by Enrico Tröger 10 Apr '15

10 Apr '15

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 10 Apr 2015 14:16:05 UTC Commit: 43037b379b10637eca15dc5c2ce4de80abd73f0c https://github.com/geany/geany/commit/43037b379b10637eca15dc5c2ce4de80abd73… Log Message: ----------- waf: Implement check whether compiler supports -fvisibility=hidden This is a bit better than compiler == 'gcc'. Tested with gcc 4.9 (success) and gcc 3.4.5 (not supported). Modified Paths: -------------- wscript Modified: wscript 5 lines changed, 2 insertions(+), 3 deletions(-) =================================================================== @@ -186,6 +186,7 @@ def configure(conf): conf.load('compiler_c') is_win32 = _target_is_win32(conf) + visibility_hidden_supported = conf.check_cc(cflags=['-Werror', '-fvisibility=hidden'], mandatory=False) conf.check_cc(header_name='fcntl.h', mandatory=False) conf.check_cc(header_name='fnmatch.h', mandatory=False) conf.check_cc(header_name='glob.h', mandatory=False) @@ -310,9 +311,7 @@ but you then may not have a local copy of the HTML manual.''' # GEANY_EXPORT_SYMBOL and GEANY_API_SYMBOL if is_win32: geany_symbol_flags = ['-DGEANY_EXPORT_SYMBOL=__declspec(dllexport)'] - # FIXME: check for -fvisibility and the __attribute__((visibility)), or - # at least for GCC >= 4 - elif conf.env['CC_NAME'] == 'gcc': + elif visibility_hidden_supported: geany_symbol_flags = ['-fvisibility=hidden', '-DGEANY_EXPORT_SYMBOL=__attribute__((visibility("default")))'] else: # unknown, define to nothing -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2015