Commits April 2015

commits@lists.geany.org

1 participants
100 discussions

[geany/geany] 3d0bdb: waf: The GEANY_*_SYMBOL flags also need to be defined for C++
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:15:58 UTC Commit: 3d0bdbd6da48ea2000aff937b34baec57f98bb2b https://github.com/geany/geany/commit/3d0bdbd6da48ea2000aff937b34baec57f98b… Log Message: ----------- waf: The GEANY_*_SYMBOL flags also need to be defined for C++ In Waf, we need to add the new flags to CFLAGS *and* CXXFLAGS otherwise the Scintilla build would break. To keep it more reabable, we first populate a temporary list geany_symbol_flags which is then added to CFLAGS and CXXFLAGS. Concerning the quote FIXME: no further qoting is necessary here. Modified Paths: -------------- wscript Modified: wscript 13 lines changed, 7 insertions(+), 6 deletions(-) =================================================================== @@ -308,17 +308,18 @@ but you then may not have a local copy of the HTML manual.''' conf.write_config_header('config.h', remove=False) # GEANY_EXPORT_SYMBOL and GEANY_API_SYMBOL - # FIXME: should I put quoting in the appended values or are they passed as-is? if is_win32: - conf.env.append_value('CFLAGS', ['-DGEANY_EXPORT_SYMBOL=__declspec(dllexport)']) + 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': - conf.env.append_value('CFLAGS', ['-fvisibility=hidden', - '-DGEANY_EXPORT_SYMBOL=__attribute__((visibility("default")))']) + geany_symbol_flags = ['-fvisibility=hidden', + '-DGEANY_EXPORT_SYMBOL=__attribute__((visibility("default")))'] else: # unknown, define to nothing - conf.env.append_value('CFLAGS', ['-DGEANY_EXPORT_SYMBOL=']) - conf.env.append_value('CFLAGS', ['-DGEANY_API_SYMBOL=GEANY_EXPORT_SYMBOL']) + 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) # some more compiler flags conf.env.append_value('CFLAGS', ['-DHAVE_CONFIG_H']) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] abc5f3: waf: Adjust to build and use libgeany
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:15:45 UTC Commit: abc5f3239b45d6a3853276678f72de59ebf67c53 https://github.com/geany/geany/commit/abc5f3239b45d6a3853276678f72de59ebf67… Log Message: ----------- waf: Adjust to build and use libgeany Modified Paths: -------------- wscript Modified: wscript 29 lines changed, 19 insertions(+), 10 deletions(-) =================================================================== @@ -58,6 +58,8 @@ MINIMUM_GTK_VERSION = '2.16.0' MINIMUM_GTK3_VERSION = '3.0.0' MINIMUM_GLIB_VERSION = '2.20.0' +GEANY_LIB_VERSION = '0.0.0' + top = '.' out = '_build_' @@ -131,7 +133,7 @@ geany_sources = set([ 'src/editor.c', 'src/encodings.c', 'src/filetypes.c', 'src/geanyentryaction.c', 'src/geanymenubuttonaction.c', 'src/geanyobject.c', 'src/geanywraplabel.c', 'src/highlighting.c', 'src/keybindings.c', - 'src/keyfile.c', 'src/log.c', 'src/main.c', 'src/msgwindow.c', 'src/navqueue.c', 'src/notebook.c', 'src/osx.c', + 'src/keyfile.c', 'src/log.c', 'src/libmain.c', 'src/msgwindow.c', 'src/navqueue.c', 'src/notebook.c', 'src/osx.c', 'src/plugins.c', 'src/pluginutils.c', 'src/prefix.c', 'src/prefs.c', 'src/printing.c', 'src/project.c', 'src/sciwrappers.c', 'src/search.c', 'src/socket.c', 'src/stash.c', 'src/symbols.c', @@ -400,6 +402,7 @@ def build(bld): defines = 'G_LOG_DOMAIN="%s"' % plugin_name, target = plugin_name, uselib = ['GTK', 'GLIB', 'GMODULE'] + uselib_add, + use = ['geany'], install_path = instpath) # CTags @@ -454,23 +457,29 @@ def build(bld): geany_sources.add('src/win32.c') geany_sources.add('geany_private.rc') + base_uselibs = ['GTK', 'GLIB', 'GMODULE', 'GIO', 'GTHREAD', 'WIN32', 'MAC_INTEGRATION', 'SUNOS_SOCKET', 'M'] + # libgeany bld( - features = ['c', 'cxx', 'cprogram'], + features = ['c', 'cxx', 'cshlib'], name = 'geany', target = 'geany', source = geany_sources, includes = ['.', 'scintilla/include', 'tagmanager/src'], defines = ['G_LOG_DOMAIN="Geany"', 'GEANY_PRIVATE'], - uselib = ['GTK', 'GLIB', 'GMODULE', 'GIO', 'GTHREAD', 'WIN32', 'MAC_INTEGRATION', 'SUNOS_SOCKET', 'M'], - use = ['scintilla', 'ctags', 'tagmanager', 'mio']) + uselib = base_uselibs, + use = ['scintilla', 'ctags', 'tagmanager', 'mio'], + vnum = GEANY_LIB_VERSION) - # geanyfunctions.h + # geany executable bld( - source = ['plugins/genapi.py', 'src/plugins.c'], - name = 'geanyfunctions.h', - before = ['c', 'cxx'], - cwd = '%s/plugins' % bld.path.abspath(), - rule = '%s genapi.py -q' % sys.executable) + features = ['c', 'cxx', 'cprogram'], + name = 'geany_bin', + target = 'geany', + source = ['src/main.c'], + includes = ['.', 'scintilla/include', 'tagmanager/src'], + defines = ['G_LOG_DOMAIN="Geany"', 'GEANY_PRIVATE'], + uselib = base_uselibs, + use = ['geany']) # Plugins if bld.env['HAVE_PLUGINS'] == 1: -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 9644fb: Define GEANY_{EXPORT, API}_SYMBOL from the build system
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:08:08 UTC Commit: 9644fb0ae21601b5acb6a5a5763a1e558a95c315 https://github.com/geany/geany/commit/9644fb0ae21601b5acb6a5a5763a1e558a95c… Log Message: ----------- Define GEANY_{EXPORT,API}_SYMBOL from the build system This makes it easier to define it consistently to what the compiler and platform supports, and avoids having to include a special header everywhere, which is some kind of a problem for separate libraries like TagManager and especially Scintilla. As we only use these macros from the source and not the headers, it is fine for it to be defined to a configure-time check from the build system. Warning: Although Waf and Windows makefiles are updated they are not tested an will probably required tuning. Modified Paths: -------------- m4/geany-lib.m4 scintilla/gtk/makefile.win32 src/Makefile.am src/build.c src/callbacks.c src/dialogs.c src/document.c src/editor.c src/encodings.c src/filetypes.c src/highlighting.c src/keybindings.c src/libmain.c src/makefile.win32 src/msgwindow.c src/navqueue.c src/pluginexport.h src/pluginutils.c src/project.c src/sciwrappers.c src/search.c src/stash.c src/symbols.c src/templates.c src/ui_utils.c src/utils.c tagmanager/src/makefile.win32 tagmanager/src/tm_source_file.c tagmanager/src/tm_workspace.c wscript Modified: m4/geany-lib.m4 55 lines changed, 38 insertions(+), 17 deletions(-) =================================================================== @@ -1,5 +1,42 @@ +dnl checks whether the compiler supports GCC4-style visibility +AC_DEFUN([GCC4_VISIBILITY], +[ + have_gcc4_visibility=no + AC_MSG_CHECKING([whether compiler supports GCC4-style visibility]) + gcc_visibility_backup_cflags=$CFLAGS + CFLAGS=-fvisibility=hidden + AC_LINK_IFELSE([AC_LANG_SOURCE([[__attribute__((visibility("default"))) + int main(int argc, char **argv) { return 0; }]])], + [have_gcc4_visibility=yes]) + AC_MSG_RESULT([$have_gcc4_visibility]) + CFLAGS="${gcc_visibility_backup_cflags}" +]) + +dnl Checks and fills LIBGEANY_EXPORT_CFLAGS +AC_DEFUN([GEANY_EXPORT], +[ + AC_REQUIRE([GEANY_CHECK_MINGW]) + AC_REQUIRE([GCC4_VISIBILITY]) + + dnl FIXME: better way to detect Windows? + AM_COND_IF([MINGW], [win32=yes], [win32=false]) + + export_CFLAGS= + AS_IF([test x$win32 = xyes], + [export_CFLAGS='-DGEANY_EXPORT_SYMBOL="__declspec(dllexport)"'], + [test x$have_gcc4_visibility = xyes], + [export_CFLAGS='-fvisibility=hidden -DGEANY_EXPORT_SYMBOL="__attribute__((visibility(\"default\")))"'], + [dnl GEANY_EXPORT_SYMBOL expands to nothing + export_CFLAGS='-DGEANY_EXPORT_SYMBOL']) + + LIBGEANY_EXPORT_CFLAGS="${export_CFLAGS} -DGEANY_API_SYMBOL=GEANY_EXPORT_SYMBOL" + + AC_SUBST([LIBGEANY_EXPORT_CFLAGS]) +]) + AC_DEFUN([GEANY_LIB_INIT], [ + AC_REQUIRE([GEANY_EXPORT]) dnl In the future, if we want to use libtool/library versioning, we can dnl set these variables accordingly. For now its the same as if not specified (0:0:0) @@ -7,23 +44,7 @@ dnl set these variables accordingly. For now its the same as if not specified (0 libgeany_revision=0 libgeany_age=0 -dnl Try and see if we can use -fvisibility compiler option and GCC`s -dnl `__attribute__((visibility(...)))` extension and use it if so. - AC_MSG_CHECKING([whether compiler supports -fvisibility]) - libgeany_backup_cflags=$CFLAGS - CFLAGS=-fvisibility=hidden - AC_TRY_COMPILE([], [ - __attribute__ ((visibility ("default"))) - int main(int argc, char **argv) { return 0; } - ], [ - LIBGEANY_CFLAGS="${CFLAGS}" - AC_MSG_RESULT([yes]) - ], [ - LIBGEANY_CFLAGS="" - AC_MSG_RESULT([no]) - ]) - CFLAGS="${libgeany_backup_cflags}" - + LIBGEANY_CFLAGS="${LIBGEANY_EXPORT_CFLAGS}" LIBGEANY_LDFLAGS="-version-info ${libgeany_current}:${libgeany_revision}:${libgeany_age}" AC_SUBST([LIBGEANY_CFLAGS]) Modified: scintilla/gtk/makefile.win32 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -32,7 +32,9 @@ vpath %.h ../src ../include ../lexlib vpath %.cxx ../src ../lexlib ../lexers INCLUDEDIRS=-I ../include -I ../src -I ../lexlib -CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -DGTK -DSCI_LEXER $(INCLUDEDIRS) +CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -DGTK -DSCI_LEXER $(INCLUDEDIRS) \ + -DGEANY_EXPORT_SYMBOL="__declspec(dllexport)" \ + -DGEANY_API_SYMBOL=GEANY_EXPORT_SYMBOL ifdef THREADS THREADFLAGS= Modified: src/Makefile.am 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -44,7 +44,6 @@ SRCS = \ navqueue.c navqueue.h \ notebook.c notebook.h \ osx.c osx.h \ - pluginexport.h \ plugins.c plugins.h \ pluginutils.c pluginutils.h \ prefix.c prefix.h \ Modified: src/build.c 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -41,7 +41,6 @@ #include "geanyobject.h" #include "keybindingsprivate.h" #include "msgwindow.h" -#include "pluginexport.h" #include "prefs.h" #include "projectprivate.h" #include "sciwrappers.h" Modified: src/callbacks.c 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -45,7 +45,6 @@ #include "main.h" #include "msgwindow.h" #include "navqueue.h" -#include "pluginexport.h" #include "plugins.h" #include "pluginutils.h" #include "prefs.h" Modified: src/dialogs.c 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -35,7 +35,6 @@ #include "encodings.h" #include "filetypes.h" #include "main.h" -#include "pluginexport.h" #include "support.h" #include "utils.h" #include "ui_utils.h" Modified: src/document.c 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -44,7 +44,6 @@ #include "msgwindow.h" #include "navqueue.h" #include "notebook.h" -#include "pluginexport.h" #include "project.h" #include "sciwrappers.h" #include "sidebar.h" Modified: src/editor.c 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -48,7 +48,6 @@ #include "highlighting.h" #include "keybindings.h" #include "main.h" -#include "pluginexport.h" #include "prefs.h" #include "projectprivate.h" #include "sciwrappers.h" Modified: src/encodings.c 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -39,7 +39,6 @@ #include "app.h" #include "callbacks.h" #include "documentprivate.h" -#include "pluginexport.h" #include "support.h" #include "ui_utils.h" #include "utils.h" Modified: src/filetypes.c 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -40,7 +40,6 @@ #include "geany.h" #include "geanyobject.h" #include "highlighting.h" -#include "pluginexport.h" #include "projectprivate.h" #include "sciwrappers.h" #include "support.h" Modified: src/highlighting.c 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -37,7 +37,6 @@ #include "document.h" #include "editor.h" #include "filetypesprivate.h" -#include "pluginexport.h" #include "sciwrappers.h" #include "support.h" #include "symbols.h" Modified: src/keybindings.c 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -43,7 +43,6 @@ #include "msgwindow.h" #include "navqueue.h" #include "notebook.h" -#include "pluginexport.h" #include "prefs.h" #include "sciwrappers.h" #include "sidebar.h" Modified: src/libmain.c 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -46,7 +46,6 @@ #include "msgwindow.h" #include "navqueue.h" #include "notebook.h" -#include "pluginexport.h" #include "plugins.h" #include "prefs.h" #include "printing.h" Modified: src/makefile.win32 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -6,7 +6,9 @@ DEFINES = -DHAVE_CONFIG_H \ -DGEANY_LOCALEDIR=\"\" \ -DGEANY_LIBDIR=\"\" \ -DGEANY_PREFIX=\"\" \ - -DGTK + -DGTK \ + -DGEANY_EXPORT_SYMBOL="__declspec(dllexport)" \ + -DGEANY_API_SYMBOL=GEANY_EXPORT_SYMBOL .SUFFIXES: .c .o .h .a WINDRES = windres.exe Modified: src/msgwindow.c 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -40,7 +40,6 @@ #include "keybindings.h" #include "main.h" #include "navqueue.h" -#include "pluginexport.h" #include "prefs.h" #include "support.h" #include "ui_utils.h" Modified: src/navqueue.c 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -32,7 +32,6 @@ #include "document.h" #include "geanyobject.h" -#include "pluginexport.h" #include "sciwrappers.h" #include "toolbar.h" #include "utils.h" Modified: src/pluginexport.h 34 lines changed, 0 insertions(+), 34 deletions(-) =================================================================== @@ -1,34 +0,0 @@ -/* - * pluginexport.h - this file is part of Geany, a fast and lightweight IDE - * - * Copyright 2014 Matthew Brush <mbrush(a)codebrainz.ca> - * - * 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 GEANY_PLUGINEXPORT_H -#define GEANY_PLUGINEXPORT_H 1 - -#if defined(_WIN32) || defined(__CYGWIN__) -# define GEANY_EXPORT_SYMBOL __declspec(dllexport) -#elif defined(__GNUC__) && __GNUC__ >= 4 -# define GEANY_EXPORT_SYMBOL __attribute__((visibility ("default"))) -#else -# define GEANY_API_SYMBOL -#endif - -#define GEANY_API_SYMBOL GEANY_EXPORT_SYMBOL - -#endif /* GEANY_PLUGINEXPORT_H */ Modified: src/pluginutils.c 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -34,7 +34,6 @@ #include "app.h" #include "geanyobject.h" #include "plugindata.h" -#include "pluginexport.h" #include "pluginprivate.h" #include "plugins.h" #include "support.h" Modified: src/project.c 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -38,7 +38,6 @@ #include "geanyobject.h" #include "keyfile.h" #include "main.h" -#include "pluginexport.h" #include "projectprivate.h" #include "sidebar.h" #include "stash.h" Modified: src/sciwrappers.c 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -37,7 +37,6 @@ #include "sciwrappers.h" -#include "pluginexport.h" #include "utils.h" #include <string.h> Modified: src/search.c 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -35,7 +35,6 @@ #include "encodings.h" #include "keyfile.h" #include "msgwindow.h" -#include "pluginexport.h" #include "prefs.h" #include "sciwrappers.h" #include "stash.h" Modified: src/stash.c 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -78,7 +78,6 @@ #include "stash.h" -#include "pluginexport.h" /* for GEANY_API_SYMBOL */ #include "support.h" /* only for _("text") */ #include "utils.h" /* only for foreach_*, utils_get_setting_*(). Stash should not depend on Geany. */ Modified: src/symbols.c 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -47,7 +47,6 @@ #include "geanyobject.h" #include "main.h" #include "navqueue.h" -#include "pluginexport.h" #include "sciwrappers.h" #include "sidebar.h" #include "support.h" Modified: src/templates.c 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -37,7 +37,6 @@ #include "geany.h" #include "geanymenubuttonaction.h" #include "geanyobject.h" -#include "pluginexport.h" #include "support.h" #include "toolbar.h" #include "ui_utils.h" Modified: src/ui_utils.c 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -40,7 +40,6 @@ #include "keyfile.h" #include "main.h" #include "msgwindow.h" -#include "pluginexport.h" #include "prefs.h" #include "project.h" #include "sciwrappers.h" Modified: src/utils.c 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -32,7 +32,6 @@ #include "app.h" #include "dialogs.h" #include "document.h" -#include "pluginexport.h" #include "prefs.h" #include "sciwrappers.h" #include "support.h" Modified: tagmanager/src/makefile.win32 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -29,7 +29,9 @@ GTK_INCLUDES= \ INCLUDEDIRS=-I ../ctags -I ../ -I . $(GTK_INCLUDES) -CBASEFLAGS=-Wall -pipe -mms-bitfields -DGEANY_PRIVATE -DPACKAGE=\"geany\" -Wno-missing-braces -Wno-char-subscripts $(INCLUDEDIRS) +CBASEFLAGS=-Wall -pipe -mms-bitfields -DGEANY_PRIVATE -DPACKAGE=\"geany\" -Wno-missing-braces -Wno-char-subscripts $(INCLUDEDIRS) \ + -DGEANY_EXPORT_SYMBOL="__declspec(dllexport)" \ + -DGEANY_API_SYMBOL=GEANY_EXPORT_SYMBOL ifdef DEBUG CFLAGS= -O0 -g $(CBASEFLAGS) else Modified: tagmanager/src/tm_source_file.c 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -34,7 +34,6 @@ #define LIBCTAGS_DEFINED #include "tm_source_file.h" #include "tm_tag.h" -#include "../src/pluginexport.h" /* for GEANY_API_SYMBOL */ static TMSourceFile *current_source_file = NULL; Modified: tagmanager/src/tm_workspace.c 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -32,7 +32,6 @@ #include "tm_workspace.h" #include "tm_tag.h" -#include "../src/pluginexport.h" /* for GEANY_API_SYMBOL */ /* when changing, always keep the three sort criteria below in sync */ Modified: wscript 13 lines changed, 13 insertions(+), 0 deletions(-) =================================================================== @@ -305,6 +305,19 @@ but you then may not have a local copy of the HTML manual.''' conf.write_config_header('config.h', remove=False) + # GEANY_EXPORT_SYMBOL and GEANY_API_SYMBOL + # FIXME: should I put quoting in the appended values or are they passed as-is? + if is_win32: + conf.env.append_value('CFLAGS', ['-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': + conf.env.append_value('CFLAGS', ['-fvisibility=hidden', + '-DGEANY_EXPORT_SYMBOL=__attribute__((visibility("default")))']) + else: # unknown, define to nothing + conf.env.append_value('CFLAGS', ['-DGEANY_EXPORT_SYMBOL=']) + conf.env.append_value('CFLAGS', ['-DGEANY_API_SYMBOL=GEANY_EXPORT_SYMBOL']) + # some more compiler flags conf.env.append_value('CFLAGS', ['-DHAVE_CONFIG_H']) if conf.env['CC_NAME'] == 'gcc' and '-O' not in ''.join(conf.env['CFLAGS']): -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 9eee68: Fix exporting Scintilla symbols
by Colomban Wendling 10 Apr '15

10 Apr '15

1 0

[geany/geany] 616cbe: src: Makefile.am cleanup
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:08:08 UTC Commit: 616cbe3da9cfb69f6e9f265cdfd35715d7ab4e9d https://github.com/geany/geany/commit/616cbe3da9cfb69f6e9f265cdfd35715d7ab4… Log Message: ----------- src: Makefile.am cleanup Modified Paths: -------------- src/Makefile.am Modified: src/Makefile.am 163 lines changed, 76 insertions(+), 87 deletions(-) =================================================================== @@ -13,13 +13,56 @@ EXTRA_DIST = \ makefile.win32 \ $(srcdir)/signalconn.c.in +AM_CPPFLAGS = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/scintilla/include \ + -I$(top_srcdir)/tagmanager/src \ + -DGTK \ + -DGEANY_PRIVATE \ + -DG_LOG_DOMAIN=\""Geany"\" \ + @LIBGEANY_CFLAGS@ \ + @GTK_CFLAGS@ @GTHREAD_CFLAGS@ \ + $(MAC_INTEGRATION_CFLAGS) + bin_PROGRAMS = geany lib_LTLIBRARIES = libgeany.la geany_SOURCES = main.c geany_LDADD = libgeany.la $(GTK_LIBS) $(GTHREAD_LIBS) $(INTLLIBS) -SRCS = \ +geany_includedir = $(includedir)/geany + +# only install headers that define types or macros, not just functions +geany_include_HEADERS = \ + app.h \ + build.h \ + dialogs.h \ + document.h \ + editor.h \ + encodings.h \ + filetypes.h \ + geany.h \ + gtkcompat.h \ + highlighting.h \ + keybindings.h \ + main.h \ + msgwindow.h \ + navqueue.h \ + plugindata.h \ + pluginutils.h \ + prefs.h \ + project.h \ + sciwrappers.h \ + search.h \ + stash.h \ + support.h \ + symbols.h \ + templates.h \ + toolbar.h \ + ui_utils.h \ + utils.h + +libgeany_la_SOURCES = \ about.c about.h \ app.h \ build.c build.h \ @@ -63,54 +106,7 @@ SRCS = \ ui_utils.c ui_utils.h \ utils.c utils.h - -geany_includedir = $(includedir)/geany - -# only install headers that define types or macros, not just functions -geany_include_HEADERS = \ - app.h \ - build.h \ - dialogs.h \ - document.h \ - editor.h \ - encodings.h \ - filetypes.h \ - geany.h \ - gtkcompat.h \ - highlighting.h \ - keybindings.h \ - main.h \ - msgwindow.h \ - navqueue.h \ - plugindata.h \ - pluginutils.h \ - prefs.h \ - project.h \ - sciwrappers.h \ - search.h \ - stash.h \ - support.h \ - symbols.h \ - templates.h \ - toolbar.h \ - ui_utils.h \ - utils.h - - -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/scintilla/include \ - -I$(top_srcdir)/tagmanager/src \ - @GTK_CFLAGS@ @GTHREAD_CFLAGS@ $(MAC_INTEGRATION_CFLAGS) @LIBGEANY_CFLAGS@ - -# tell automake we have a C++ file so it uses the C++ linker we need for Scintilla -nodist_EXTRA_geany_SOURCES = dummy.cxx -nodist_EXTRA_libgeany_la_SOURCES = dummy1.cxx - -if MINGW -# build Geany for Windows on non-Windows systems (cross-compile) - -libgeany_la_SOURCES = $(SRCS) win32.c win32.h +libgeany_la_LDFLAGS = @LIBGEANY_LDFLAGS@ libgeany_la_LIBADD = \ $(top_builddir)/scintilla/libscintilla.la \ @@ -119,58 +115,51 @@ libgeany_la_LIBADD = \ $(top_builddir)/tagmanager/src/libtagmanager.la \ @GTK_LIBS@ \ @GTHREAD_LIBS@ \ - $(INTLLIBS) \ - -lole32 -lwsock32 -lcomdlg32 + $(MAC_INTEGRATION_LIBS) \ + $(INTLLIBS) -libgeany_la_LDFLAGS = -Wl,-luuid $(AM_LDFLAGS) -geany_LDADD += geany_private.res -lcomdlg32 +# tell automake we have a C++ file so it uses the C++ linker we need for Scintilla +nodist_EXTRA_geany_SOURCES = dummy.cxx +nodist_EXTRA_libgeany_la_SOURCES = dummy1.cxx + +CLEANFILES = + +if MINGW -AM_CFLAGS = -DGEANY_DATADIR=\"data\" \ - -DGEANY_DOCDIR=\"\" \ - -DGEANY_LIBDIR=\"\" \ - -DGEANY_LOCALEDIR=\"\" \ - -DGEANY_PREFIX=\"\" \ - -DGEANY_PRIVATE \ - -DGTK \ - -DG_LOG_DOMAIN=\""Geany"\" +AM_CPPFLAGS += \ + -DGEANY_DATADIR=\"data\" \ + -DGEANY_DOCDIR=\"\" \ + -DGEANY_LIBDIR=\"\" \ + -DGEANY_LOCALEDIR=\"\" \ + -DGEANY_PREFIX=\"\" -libgeany_la_LDFLAGS += @LIBGEANY_LDFLAGS@ -mwindows -mms-bitfields -no-undefined +geany_LDADD += geany_private.res 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 -clean-local: - rm -f geany_private.res +# build Geany for Windows on non-Windows systems (cross-compile) +libgeany_la_SOURCES += win32.c win32.h -else -# build Geany for all other platforms +libgeany_la_LIBADD += -lole32 -lwsock32 -lcomdlg32 -libgeany_la_SOURCES = $(SRCS) vte.c vte.h +libgeany_la_LDFLAGS += -Wl,-luuid -mwindows -mms-bitfields -no-undefined -libgeany_la_LIBADD = \ - $(top_builddir)/scintilla/libscintilla.la \ - $(top_builddir)/tagmanager/ctags/libctags.la \ - $(top_builddir)/tagmanager/mio/libmio.la \ - $(top_builddir)/tagmanager/src/libtagmanager.la \ - @GTK_LIBS@ \ - @GTHREAD_LIBS@ \ - $(MAC_INTEGRATION_LIBS) \ - $(INTLLIBS) +CLEANFILES += geany_private.res -AM_CFLAGS = -DGEANY_DATADIR=\""$(datadir)"\" \ - -DGEANY_DOCDIR=\""$(docdir)"\" \ - -DGEANY_LIBDIR=\""$(libdir)"\" \ - -DGEANY_LOCALEDIR=\""$(localedir)"\" \ - -DGEANY_PREFIX=\""$(prefix)"\" \ - -DGEANY_PRIVATE \ - -DGTK \ - -DG_LOG_DOMAIN=\""Geany"\" +else +# build Geany for all other platforms -libgeany_la_LDFLAGS = @LIBGEANY_LDFLAGS@ +AM_CPPFLAGS += \ + -DGEANY_DATADIR=\""$(datadir)"\" \ + -DGEANY_DOCDIR=\""$(docdir)"\" \ + -DGEANY_LIBDIR=\""$(libdir)"\" \ + -DGEANY_LOCALEDIR=\""$(localedir)"\" \ + -DGEANY_PREFIX=\""$(prefix)"\" -clean-local: +libgeany_la_SOURCES += vte.c vte.h endif @@ -188,4 +177,4 @@ signalconn.c: $(glade_file) $(template_file) $(SED) -n '/@callback_map@/{:l;n;p;b l}' "$(template_file)" \ ) > $@ || { $(RM) $@ && exit 1; } -CLEANFILES = signalconn.c +CLEANFILES += signalconn.c -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 4e6da7: PHP: Use the variable style for variable interpolated in strings
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: Thu, 09 Apr 2015 22:24:20 UTC Commit: 4e6da78f54e8734dc84386c2df1610985da91931 https://github.com/geany/geany/commit/4e6da78f54e8734dc84386c2df1610985da91… Log Message: ----------- PHP: Use the variable style for variable interpolated in strings Use the same variable style for simple interpolations ("$foo") than for complex ones ("${foo}") instead of using the string style itself. This gives a visual feedback for simple interpolations. Modified Paths: -------------- data/filetypes.html Modified: data/filetypes.html 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -44,7 +44,7 @@ php_comment=comment php_commentline=comment_line php_operator=operator -php_hstring_variable=string_2 +php_hstring_variable=preprocessor php_complex_variable=preprocessor jscript_start=tag -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 1bed45: Merge pull request #270 from b4n/zephir-filetype
by Colomban Wendling 09 Apr '15

09 Apr '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 08 Apr 2015 23:06:57 UTC Commit: 1bed458ab9e9c9d3d37440a8c7543c27b073e556 https://github.com/geany/geany/commit/1bed458ab9e9c9d3d37440a8c7543c27b073e… Log Message: ----------- Merge pull request #270 from b4n/zephir-filetype Zephir filetype Modified Paths: -------------- data/Makefile.am data/filetype_extensions.conf data/filetypes.zephir scintilla/scintilla_changes.patch scintilla/src/Catalogue.cxx src/editor.c src/filetypes.c src/filetypes.h src/highlighting.c src/highlightingmappings.h src/symbols.c tagmanager/ctags/parsers.h tagmanager/ctags/php.c tagmanager/src/tm_parser.h tests/ctags/Makefile.am tests/ctags/return-hint.zep tests/ctags/return-hint.zep.tags tests/ctags/simple.zep tests/ctags/simple.zep.tags Modified: data/Makefile.am 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -69,7 +69,8 @@ filetypes = \ filetypes.verilog \ filetypes.vhdl \ filetypes.xml \ - filetypes.yaml + filetypes.yaml \ + filetypes.zephir tagfiles = \ c99.tags \ Modified: data/filetype_extensions.conf 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -67,6 +67,7 @@ Verilog=*.v; VHDL=*.vhd;*.vhdl; XML=*.xml;*.sgml;*.xsl;*.xslt;*.xsd;*.xhtml;*.xul;*.dtd;*.xtpl; YAML=*.yaml;*.yml; +Zephir=*.zep; None=*; # Note: restarting is required after editing groups Modified: data/filetypes.zephir 24 lines changed, 24 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,24 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling=HTML] + +[keywords=HTML] +# all items must be in one line +# these are Zephir instructions, overriding PHP list +php=abstract bool break case catch class const continue default empty else false fetch finally fixed float for foreach function if int integer interface isset let long namespace new null private protected public return static string switch this throw true try typeof uint ulong unlikely var void while + +[lexer_properties=PHP] + +[settings=PHP] +# default extension used when saving files +extension=zep + +[indentation] +#width=4 +# 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=zephir build Modified: scintilla/scintilla_changes.patch 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -112,7 +112,7 @@ index 41d5d54..70ce3bc 100644 LINK_LEXER(lmPascal); - LINK_LEXER(lmPB); LINK_LEXER(lmPerl); -- LINK_LEXER(lmPHPSCRIPT); + LINK_LEXER(lmPHPSCRIPT); - LINK_LEXER(lmPLM); LINK_LEXER(lmPO); - LINK_LEXER(lmPOV); Modified: scintilla/src/Catalogue.cxx 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -107,6 +107,7 @@ int Scintilla_LinkLexers() { LINK_LEXER(lmOctave); LINK_LEXER(lmPascal); LINK_LEXER(lmPerl); + LINK_LEXER(lmPHPSCRIPT); LINK_LEXER(lmPO); LINK_LEXER(lmPowerShell); LINK_LEXER(lmProps); Modified: src/editor.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -1261,6 +1261,7 @@ static gboolean lexer_has_braces(ScintillaObject *sci) case SCLEX_CPP: case SCLEX_D: case SCLEX_HTML: /* for PHP & JS */ + case SCLEX_PHPSCRIPT: case SCLEX_PASCAL: /* for multiline comments? */ case SCLEX_BASH: case SCLEX_PERL: @@ -2871,6 +2872,7 @@ static gint get_multiline_comment_style(GeanyEditor *editor, gint line_start) { case SCLEX_XML: case SCLEX_HTML: + case SCLEX_PHPSCRIPT: { if (is_style_php(sci_get_style_at(editor->sci, line_start))) style_comment = SCE_HPHP_COMMENT; @@ -3408,6 +3410,7 @@ static gboolean in_block_comment(gint lexer, gint style) style == SCE_D_COMMENTNESTED); case SCLEX_HTML: + case SCLEX_PHPSCRIPT: return (style == SCE_HPHP_COMMENT); case SCLEX_CSS: @@ -4956,6 +4959,7 @@ void editor_set_indentation_guides(GeanyEditor *editor) /* C-like (structured) languages benefit from the "look both" method */ case SCLEX_CPP: case SCLEX_HTML: + case SCLEX_PHPSCRIPT: case SCLEX_XML: case SCLEX_PERL: case SCLEX_LATEX: Modified: src/filetypes.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -192,6 +192,7 @@ static void init_builtin_filetypes(void) FT_INIT( RUST, RUST, "Rust", NULL, SOURCE_FILE, COMPILED ); FT_INIT( COFFEESCRIPT, NONE, "CoffeeScript", NULL, SOURCE_FILE, SCRIPT ); FT_INIT( GO, GO, "Go", NULL, SOURCE_FILE, COMPILED ); + FT_INIT( ZEPHIR, ZEPHIR, "Zephir", NULL, SOURCE_FILE, COMPILED ); } Modified: src/filetypes.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -102,6 +102,7 @@ typedef enum GEANY_FILETYPES_RUST, GEANY_FILETYPES_COFFEESCRIPT, GEANY_FILETYPES_GO, + GEANY_FILETYPES_ZEPHIR, /* ^ append items here */ GEANY_MAX_BUILT_IN_FILETYPES /* Don't use this, use filetypes_array->len instead */ } Modified: src/highlighting.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -1046,6 +1046,7 @@ void highlighting_init_styles(guint filetype_idx, GKeyFile *config, GKeyFile *co init_styleset_case(VERILOG); init_styleset_case(XML); init_styleset_case(YAML); + init_styleset_case(ZEPHIR); default: if (ft->lexer_filetype) geany_debug("Filetype %s has a recursive lexer_filetype %s set!", @@ -1131,6 +1132,7 @@ void highlighting_set_styles(ScintillaObject *sci, GeanyFiletype *ft) styleset_case(VERILOG); styleset_case(XML); styleset_case(YAML); + styleset_case(ZEPHIR); case GEANY_FILETYPES_NONE: default: styleset_default(sci, ft->id); @@ -1490,6 +1492,7 @@ gboolean highlighting_is_string_style(gint lexer, gint style) case SCLEX_XML: case SCLEX_HTML: + case SCLEX_PHPSCRIPT: return ( style == SCE_HBA_STRING || style == SCE_HBA_STRINGEOL || @@ -1674,6 +1677,7 @@ gboolean highlighting_is_comment_style(gint lexer, gint style) case SCLEX_XML: case SCLEX_HTML: + case SCLEX_PHPSCRIPT: return ( style == SCE_HBA_COMMENTLINE || style == SCE_HB_COMMENTLINE || Modified: src/highlightingmappings.h 7 lines changed, 7 insertions(+), 0 deletions(-) =================================================================== @@ -1611,6 +1611,13 @@ static const HLKeyword highlighting_keywords_YAML[] = }; #define highlighting_properties_YAML EMPTY_PROPERTIES + +/* Zephir */ +#define highlighting_lexer_ZEPHIR SCLEX_PHPSCRIPT +#define highlighting_styles_ZEPHIR highlighting_styles_PHP +#define highlighting_keywords_ZEPHIR highlighting_keywords_PHP +#define highlighting_properties_ZEPHIR highlighting_properties_PHP + G_END_DECLS #endif /* GEANY_HIGHLIGHTING_MAPPINGS_H */ Modified: src/symbols.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -302,6 +302,7 @@ const gchar *symbols_get_context_separator(gint ft_id) /*case GEANY_FILETYPES_RUBY:*/ /* not sure what to use atm*/ case GEANY_FILETYPES_PHP: case GEANY_FILETYPES_RUST: + case GEANY_FILETYPES_ZEPHIR: return "::"; /* avoid confusion with other possible separators in group/section name */ @@ -724,6 +725,7 @@ static void add_top_level_items(GeanyDocument *doc) break; } case GEANY_FILETYPES_PHP: + case GEANY_FILETYPES_ZEPHIR: { tag_list_add_groups(tag_store, &(tv_iters.tag_namespace), _("Namespaces"), "classviewer-namespace", Modified: tagmanager/ctags/parsers.h 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -64,7 +64,8 @@ AbaqusParser, \ RustParser, \ GoParser, \ - JsonParser + JsonParser, \ + ZephirParser #endif /* _PARSERS_H */ Modified: tagmanager/ctags/php.c 57 lines changed, 49 insertions(+), 8 deletions(-) =================================================================== @@ -227,6 +227,7 @@ typedef struct { } tokenInfo; static langType Lang_php; +static langType Lang_zephir; static boolean InPhp = FALSE; /* whether we are between <? ?> */ @@ -240,14 +241,14 @@ static struct { static vString *CurrentNamesapce; -static void buildPhpKeywordHash (void) +static void buildPhpKeywordHash (const langType language) { const size_t count = sizeof (PhpKeywordTable) / sizeof (PhpKeywordTable[0]); size_t i; for (i = 0; i < count ; i++) { const keywordDesc* const p = &PhpKeywordTable[i]; - addKeyword (p->name, Lang_php, (int) p->id); + addKeyword (p->name, language, (int) p->id); } } @@ -974,7 +975,7 @@ static void readToken (tokenInfo *const token) else { parseIdentifier (token->string, c); - token->keyword = analyzeToken (token->string, Lang_php); + token->keyword = analyzeToken (token->string, getSourceLanguage ()); if (token->keyword == KEYWORD_NONE) token->type = TOKEN_IDENTIFIER; else @@ -1180,6 +1181,17 @@ static boolean parseFunction (tokenInfo *const token, const tokenInfo *name) readToken (token); /* normally it's an open brace or "use" keyword */ } + /* if parsing Zephir, skip function return type hint */ + if (getSourceLanguage () == Lang_zephir && token->type == TOKEN_OPERATOR) + { + do + readToken (token); + while (token->type != TOKEN_EOF && + token->type != TOKEN_OPEN_CURLY && + token->type != TOKEN_CLOSE_CURLY && + token->type != TOKEN_SEMICOLON); + } + /* skip use(...) */ if (token->type == TOKEN_KEYWORD && token->keyword == KEYWORD_use) { @@ -1435,11 +1447,10 @@ static void enterScope (tokenInfo *const parentToken, deleteToken (token); } -static void findPhpTags (void) +static void findTags (void) { tokenInfo *const token = newToken (); - InPhp = FALSE; CurrentStatement.access = ACCESS_UNDEFINED; CurrentStatement.impl = IMPL_UNDEFINED; CurrentNamesapce = vStringNew (); @@ -1454,10 +1465,28 @@ static void findPhpTags (void) deleteToken (token); } -static void initialize (const langType language) +static void findPhpTags (void) +{ + InPhp = FALSE; + findTags (); +} + +static void findZephirTags (void) +{ + InPhp = TRUE; + findTags (); +} + +static void initializePhpParser (const langType language) { Lang_php = language; - buildPhpKeywordHash (); + buildPhpKeywordHash (language); +} + +static void initializeZephirParser (const langType language) +{ + Lang_zephir = language; + buildPhpKeywordHash (language); } extern parserDefinition* PhpParser (void) @@ -1468,7 +1497,19 @@ extern parserDefinition* PhpParser (void) def->kindCount = KIND_COUNT (PhpKinds); def->extensions = extensions; def->parser = findPhpTags; - def->initialize = initialize; + def->initialize = initializePhpParser; + return def; +} + +extern parserDefinition* ZephirParser (void) +{ + static const char *const extensions [] = { "zep", NULL }; + parserDefinition* def = parserNew ("Zephir"); + def->kinds = PhpKinds; + def->kindCount = KIND_COUNT (PhpKinds); + def->extensions = extensions; + def->parser = findZephirTags; + def->initialize = initializeZephirParser; return def; } Modified: tagmanager/src/tm_parser.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -71,6 +71,7 @@ typedef enum TM_PARSER_RUST, TM_PARSER_GO, TM_PARSER_JSON, + TM_PARSER_ZEPHIR, TM_PARSER_COUNT } TMParserType; Modified: tests/ctags/Makefile.am 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -237,6 +237,7 @@ test_sources = \ recursive.f95 \ refcurs.sql \ regexp.js \ + return-hint.zep \ rules.t2t \ sample.t2t \ secondary_fcn_name.js \ @@ -258,6 +259,7 @@ test_sources = \ simple.rb \ simple.sh \ simple.tcl \ + simple.zep \ size_t_wchar_t_alias.d \ size_t_wchar_t_typedef.c \ spurious_label_tags.c \ Modified: tests/ctags/return-hint.zep 14 lines changed, 14 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,14 @@ +class Test +{ + public function first(string str) -> string + { + function nested() { + + } + } + + public function second(int i) -> int + { + + } +} Modified: tests/ctags/return-hint.zep.tags 5 lines changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,5 @@ +# format=tagmanager +Test�1�0 +first�16�(string str)�Test�0 +nested�16�()�Test::first�0 +second�16�(int i)�Test�0 Modified: tests/ctags/simple.zep 19 lines changed, 19 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,19 @@ +/* from http://zephir-lang.com/language.html */ +namespace Test; + +class MyClass +{ + + public function someMethod1() + { + int a = 1, b = 2; + return a + b; + } + + public function someMethod2() + { + int a = 3, b = 4; + return a + b; + } + +} Modified: tests/ctags/simple.zep.tags 5 lines changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,5 @@ +# format=tagmanager +MyClass�1�Test�0 +Test�256�0 +someMethod1�16�()�Test::MyClass�0 +someMethod2�16�()�Test::MyClass�0 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 5cf251: icon: Adjust the color of the inside of the bottleneck
by Jiří Techet 06 Apr '15

06 Apr '15

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 06 Apr 2015 18:59:20 UTC Commit: 5cf2511945f9598530401f31b62403a3a40bd8b6 https://github.com/geany/geany/commit/5cf2511945f9598530401f31b62403a3a40bd… Log Message: ----------- icon: Adjust the color of the inside of the bottleneck The (almost) black color of the inside of the bottleneck is a bit too high contrast and doesn't fit the rest of the icon (the only black part of it). Use the "lamp yellow" as the base and lower the L in HSL representation of the color so it just looks as darker lamp material. Modified Paths: -------------- icons/scalable/geany.svg Modified: icons/scalable/geany.svg 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -607,7 +607,7 @@ style="display:inline"> <path sodipodi:type="arc" - style="color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:#c4a000;stroke-width:1.22474468px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + style="color:#000000;fill:#816a24;fill-opacity:1;fill-rule:evenodd;stroke:#c4a000;stroke-width:1.22474467999999992px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="path17203" sodipodi:cx="3" sodipodi:cy="20.5" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] cbd13b: icon: Adjust the left-bottom curve of the bottleneck
by Jiří Techet 06 Apr '15

06 Apr '15

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 06 Apr 2015 18:59:08 UTC Commit: cbd13b8f71bf788273f73e2e109fd3702d0c9be6 https://github.com/geany/geany/commit/cbd13b8f71bf788273f73e2e109fd3702d0c9… Log Message: ----------- icon: Adjust the left-bottom curve of the bottleneck After making the bottleneck wider (by shifting the curve to the left), the curve became flatter which looks strange. Make the curve a bit more round in the middle. Modified Paths: -------------- icons/scalable/geany.svg Modified: icons/scalable/geany.svg 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -543,7 +543,7 @@ style="display:inline"> <path style="color:#000000;fill:url(#linearGradient2846);fill-opacity:1;fill-rule:evenodd;stroke:#c4a000;stroke-width:0.9999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - d="m 22.676304,13.5 c -7.601097,0 -13.7690322,3.129657 -13.7690325,6.993968 0,1.016241 -0.1527472,3.176442 0.1114902,5.708082 C 6.530419,25.243195 6.5331578,23.087734 6.3151258,20.525331 l -3.4122534,0 c 1.0212964,13.220693 10.9191816,18.349382 19.7734316,18.974668 3.800548,0 8.522563,-1.031253 11.455611,-6.053076 2.933052,-5.021821 2.31342,-11.020802 2.313421,-12.952955 0,-3.86431 -6.167938,-6.993968 -13.769032,-6.993968 z" + d="m 22.676304,13.5 c -7.601097,0 -13.7690322,3.129657 -13.7690325,6.993968 0,1.016241 -0.1527472,3.176442 0.1114902,5.708082 C 6.530419,25.243195 6.5331578,23.087734 6.3151258,20.525331 l -3.4122534,0 c 1.0212964,13.220693 10.8298956,18.795811 19.7734316,18.974668 3.800548,0 8.522563,-1.031253 11.455611,-6.053076 2.933052,-5.021821 2.31342,-11.020802 2.313421,-12.952955 0,-3.86431 -6.167938,-6.993968 -13.769032,-6.993968 z" id="path2196" sodipodi:nodetypes="csccccssc" inkscape:connector-curvature="0" /> @@ -595,7 +595,7 @@ style="display:inline"> <path style="color:#000000;fill:none;stroke:url(#radialGradient17706);stroke-width:0.99999988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - d="m 22.725993,14.5 c -7.023753,0 -12.7987342,2.811741 -12.7987342,6.379465 l 0.00151,6.727679 C 7.2436344,26.91518 5.6295693,25.718751 5.4919108,22.25 4.8643187,22.28638 4.5162462,22.093645 4.1428569,22.263394 5.6806192,32.712819 13.865517,37.816728 22.725993,38.500002 c 3.511878,0 7.889437,-0.957354 10.59971,-5.59375 C 36.035972,28.269858 35.445645,22.75261 35.445644,20.968751 35.445644,17.401028 29.749748,14.5 22.725993,14.5 z" + d="m 22.725993,14.5 c -7.023753,0 -12.7987342,2.811741 -12.7987342,6.379465 l 0.00151,6.727679 C 7.2436344,26.91518 5.6295693,25.718751 5.4919108,22.25 4.8643187,22.28638 4.5162462,22.093645 4.1428569,22.263394 5.6806192,32.712819 13.776231,38.263157 22.725993,38.500002 c 3.511878,0 7.889437,-0.957354 10.59971,-5.59375 C 36.035972,28.269858 35.445645,22.75261 35.445644,20.968751 35.445644,17.401028 29.749748,14.5 22.725993,14.5 z" id="path2206" sodipodi:nodetypes="ccccccssc" inkscape:connector-curvature="0" /> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 11e16e: Remove an unused argument
by Colomban Wendling 02 Apr '15

02 Apr '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 02 Apr 2015 17:12:13 UTC Commit: 11e16eed6fdb66e6a4046ea5cf6c718c6ce830cd https://github.com/geany/geany/commit/11e16eed6fdb66e6a4046ea5cf6c718c6ce83… Log Message: ----------- Remove an unused argument Modified Paths: -------------- src/symbols.c Modified: src/symbols.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1079,7 +1079,7 @@ static const gchar *get_parent_name(const TMTag *tag, filetype_id ft_id) } -static GtkTreeIter *get_tag_type_iter(TMTagType tag_type, filetype_id ft_id) +static GtkTreeIter *get_tag_type_iter(TMTagType tag_type) { GtkTreeIter *iter = NULL; @@ -1456,7 +1456,7 @@ static void update_tree_tags(GeanyDocument *doc, GList **tags) TMTag *tag = item->data; GtkTreeIter *parent; - parent = get_tag_type_iter(tag->type, doc->file_type->id); + parent = get_tag_type_iter(tag->type); if (G_UNLIKELY(! parent)) geany_debug("Missing symbol-tree parent iter for type %d!", tag->type); else -------------- 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

2007

2006

Commits April 2015