Plugins-Commits September 2009

plugins-commits@lists.geany.org

8 participants
93 discussions

SF.net SVN: geany-plugins:[912] trunk/geany-plugins/geanylua
by ntrel＠users.sourceforge.net 01 Sep '09

01 Sep '09

Revision: 912 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=912&view=rev Author: ntrel Date: 2009-09-01 15:37:53 +0000 (Tue, 01 Sep 2009) Log Message: ----------- Check support library ABI version matches. Modified Paths: -------------- trunk/geany-plugins/geanylua/ChangeLog trunk/geany-plugins/geanylua/geanylua.c trunk/geany-plugins/geanylua/glspi_init.c Modified: trunk/geany-plugins/geanylua/ChangeLog =================================================================== --- trunk/geany-plugins/geanylua/ChangeLog 2009-09-01 15:20:22 UTC (rev 911) +++ trunk/geany-plugins/geanylua/ChangeLog 2009-09-01 15:37:53 UTC (rev 912) @@ -1,5 +1,6 @@ September 1, 2009 (ntrel) Try loading system support library if user library fails. + Check support library ABI version matches. August 31, 2009 (ntrel) Print support library path if Geany is in debug mode. Modified: trunk/geany-plugins/geanylua/geanylua.c =================================================================== --- trunk/geany-plugins/geanylua/geanylua.c 2009-09-01 15:20:22 UTC (rev 911) +++ trunk/geany-plugins/geanylua/geanylua.c 2009-09-01 15:37:53 UTC (rev 912) @@ -69,6 +69,7 @@ static gchar **glspi_version = NULL; +static guint *glspi_abi = NULL; static InitFunc glspi_init = NULL; static ConfigFunc glspi_configure = NULL; static CleanupFunc glspi_cleanup = NULL; @@ -114,6 +115,7 @@ if (libgeanylua) { g_module_close(libgeanylua); } libgeanylua = NULL; glspi_version = NULL; + glspi_abi = NULL; glspi_init = NULL; glspi_configure = NULL; glspi_cleanup = NULL; @@ -159,6 +161,7 @@ } if ( !( GETSYM("glspi_version", glspi_version) && + GETSYM("glspi_abi", glspi_abi) && GETSYM("glspi_init", glspi_init) && GETSYM("glspi_configure", glspi_configure) && GETSYM("glspi_cleanup", glspi_cleanup) && @@ -175,6 +178,12 @@ fail_init(); return FALSE; } + if (*glspi_abi != GEANY_ABI_VERSION) { + g_printerr(_("%s: Support library ABI mismatch: %s for %s (should be %s)!\n"), + PLUGIN_NAME, *glspi_abi, libname, GEANY_ABI_VERSION); + fail_init(); + return FALSE; + } if (geany->app->debug_mode) { g_printerr("%s: Using support library path: %s\n", PLUGIN_NAME, libname); } Modified: trunk/geany-plugins/geanylua/glspi_init.c =================================================================== --- trunk/geany-plugins/geanylua/glspi_init.c 2009-09-01 15:20:22 UTC (rev 911) +++ trunk/geany-plugins/geanylua/glspi_init.c 2009-09-01 15:37:53 UTC (rev 912) @@ -30,6 +30,8 @@ PLUGIN_EXPORT const gchar* glspi_version = VERSION; +PLUGIN_EXPORT +const guint glspi_abi = GEANY_ABI_VERSION; GeanyData *glspi_geany_data=NULL; GeanyFunctions *glspi_geany_functions=NULL; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[911] trunk/geany-plugins/geanylua
by ntrel＠users.sourceforge.net 01 Sep '09

01 Sep '09

Revision: 911 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=911&view=rev Author: ntrel Date: 2009-09-01 15:20:22 +0000 (Tue, 01 Sep 2009) Log Message: ----------- Try loading system support library if user library fails. Modified Paths: -------------- trunk/geany-plugins/geanylua/ChangeLog trunk/geany-plugins/geanylua/geanylua.c Modified: trunk/geany-plugins/geanylua/ChangeLog =================================================================== --- trunk/geany-plugins/geanylua/ChangeLog 2009-08-31 17:04:22 UTC (rev 910) +++ trunk/geany-plugins/geanylua/ChangeLog 2009-09-01 15:20:22 UTC (rev 911) @@ -1,3 +1,6 @@ +September 1, 2009 (ntrel) + Try loading system support library if user library fails. + August 31, 2009 (ntrel) Print support library path if Geany is in debug mode. Modified: trunk/geany-plugins/geanylua/geanylua.c =================================================================== --- trunk/geany-plugins/geanylua/geanylua.c 2009-08-31 17:04:22 UTC (rev 910) +++ trunk/geany-plugins/geanylua/geanylua.c 2009-09-01 15:20:22 UTC (rev 911) @@ -146,36 +146,16 @@ -PLUGIN_EXPORT -void plugin_init(GeanyData *data) +static gboolean load_support_lib(const gchar *libname) { - gchar *libname=NULL; - - main_locale_init(LOCALEDIR, GETTEXT_PACKAGE); - - geany_data=data; - libname=g_build_path(G_DIR_SEPARATOR_S, data->app->configdir, "plugins", "geanylua", SUPPORT_LIB, NULL); if ( !g_file_test(libname,G_FILE_TEST_IS_REGULAR) ) { - gchar *libdir=get_lib_dir(); - g_free(libname); - libname=g_build_path(G_DIR_SEPARATOR_S, libdir, "geany-plugins", "geanylua", SUPPORT_LIB, NULL); - g_free(libdir); + return FALSE; } - if ( !g_file_test(libname,G_FILE_TEST_IS_REGULAR) ) { - g_printerr(_("%s: Can't find support library %s!\n"), PLUGIN_NAME, libname); - g_free(libname); - libname=NULL; - return; - } - if (geany->app->debug_mode) { - g_printerr("%s support library path: %s\n", PLUGIN_NAME, libname); - } libgeanylua=g_module_open(libname,0); - g_free(libname); if (!libgeanylua) { g_printerr("%s\n", g_module_error()); - g_printerr(_("%s: Can't load support library!\n"), PLUGIN_NAME); - return; + g_printerr(_("%s: Can't load support library %s!\n"), PLUGIN_NAME, libname); + return FALSE; } if ( !( GETSYM("glspi_version", glspi_version) && @@ -185,16 +165,46 @@ GETSYM("glspi_geany_callbacks", glspi_geany_callbacks) )) { g_printerr("%s\n", g_module_error()); - g_printerr(_("%s: Failed to initialize support library!\n"), PLUGIN_NAME); + g_printerr(_("%s: Failed to initialize support library %s!\n"), PLUGIN_NAME, libname); fail_init(); - return; + return FALSE; } if (!g_str_equal(*glspi_version, VERSION)) { - g_printerr(_("%s: Support library version mismatch: %s <=> %s\n"), - PLUGIN_NAME, *glspi_version, VERSION); + g_printerr(_("%s: Support library version mismatch: %s for %s (should be %s)!\n"), + PLUGIN_NAME, *glspi_version, libname, VERSION); fail_init(); - return; + return FALSE; } + if (geany->app->debug_mode) { + g_printerr("%s: Using support library path: %s\n", PLUGIN_NAME, libname); + } + return TRUE; +} + + +PLUGIN_EXPORT +void plugin_init(GeanyData *data) +{ + gchar *libname=NULL; + + main_locale_init(LOCALEDIR, GETTEXT_PACKAGE); + + geany_data=data; + /* first try the user config path */ + libname=g_build_path(G_DIR_SEPARATOR_S, data->app->configdir, "plugins", "geanylua", SUPPORT_LIB, NULL); + if (!load_support_lib(libname)) { + /* try the system path */ + gchar *libdir=get_lib_dir(); + g_free(libname); + libname=g_build_path(G_DIR_SEPARATOR_S, libdir, "geany-plugins", "geanylua", SUPPORT_LIB, NULL); + g_free(libdir); + if (!load_support_lib(libname)) { + g_printerr(_("%s: Can't find support library %s!\n"), PLUGIN_NAME, libname); + g_free(libname); + return; + } + } + g_free(libname); copy_callbacks(); glspi_init(data, geany_functions, geany_plugin); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

Nightly build failed: Plugins GTK 2.8 build test
by noreply＠nightly.geany.org 01 Sep '09

01 Sep '09

Plugins GTK 2.8 build test failed at: waf build See http://nightly.geany.org/misc/build_gtk28_plugins_stderr.log for details. Error messages: ../../gtk28_test_plugins/codenav/src/codenavigation.c: In function 'switch_menu_item_activate': ../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: 'g_strcmp0' undeclared (first use in this function) ../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: (Each undeclared identifier is reported only once ../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: for each function it appears in.) ... ../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: for each function it appears in.) ../../gtk28_test_plugins/codenav/src/codenavigation.c:251: warning: comparison between signed and unsigned ../../gtk28_test_plugins/codenav/src/codenavigation.c:260: warning: implicit declaration of function 'g_strcmp0' ../../gtk28_test_plugins/codenav/src/codenavigation.c:311: warning: ISO C90 forbids mixed declarations and code Build failed -> task failed (err #1): {task: cc codenavigation.c -> codenavigation_2.o} http://nightly.geany.org/

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits September 2009