Plugins-Commits June 2009

plugins-commits@lists.geany.org

6 participants
105 discussions

SF.net SVN: geany-plugins:[778] trunk/geany-plugins/geanylua/examples/info/ Makefile.am
by eht16＠users.sourceforge.net 24 Jun '09

24 Jun '09

Revision: 778 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=778&view=rev Author: eht16 Date: 2009-06-24 17:15:06 +0000 (Wed, 24 Jun 2009) Log Message: ----------- Fix typo Modified Paths: -------------- trunk/geany-plugins/geanylua/examples/info/Makefile.am Modified: trunk/geany-plugins/geanylua/examples/info/Makefile.am =================================================================== --- trunk/geany-plugins/geanylua/examples/info/Makefile.am 2009-06-23 14:46:30 UTC (rev 777) +++ trunk/geany-plugins/geanylua/examples/info/Makefile.am 2009-06-24 17:15:06 UTC (rev 778) @@ -10,7 +10,6 @@ app-information.lua \ file-information.lua \ list-open-files.lua \ - Makefile.am \ show-filename.lua if ENABLE_GEANYLUA 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:[777] trunk/geany-plugins/geanylua
by ntrel＠users.sourceforge.net 23 Jun '09

23 Jun '09

Revision: 777 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=777&view=rev Author: ntrel Date: 2009-06-23 14:46:30 +0000 (Tue, 23 Jun 2009) Log Message: ----------- Make Help script look in: $prefix/share/doc/geany-plugins/geanylua/ - but $prefix is currently Geany's install prefix, which works in most cases. Really this should be fixed by exposing GeanyLua's $DOCDIR to Lua scripts. Modified Paths: -------------- trunk/geany-plugins/geanylua/ChangeLog trunk/geany-plugins/geanylua/examples/scripting/help.lua Modified: trunk/geany-plugins/geanylua/ChangeLog =================================================================== --- trunk/geany-plugins/geanylua/ChangeLog 2009-06-23 12:34:24 UTC (rev 776) +++ trunk/geany-plugins/geanylua/ChangeLog 2009-06-23 14:46:30 UTC (rev 777) @@ -3,6 +3,10 @@ Read scripts from DATADIR/geany-plugins/geanylua. Init plugin_key_group fields to zero in case support library is not found. + Make Help script look in: + $prefix/share/doc/geany-plugins/geanylua/ - but $prefix is currently + Geany's install prefix, which works in most cases. Really this + should be fixed by exposing GeanyLua's $DOCDIR to Lua scripts. June 19, 2009 (ntrel) Move to geany-plugins project, add i18n support. Modified: trunk/geany-plugins/geanylua/examples/scripting/help.lua =================================================================== --- trunk/geany-plugins/geanylua/examples/scripting/help.lua 2009-06-23 12:34:24 UTC (rev 776) +++ trunk/geany-plugins/geanylua/examples/scripting/help.lua 2009-06-23 14:46:30 UTC (rev 777) @@ -9,8 +9,9 @@ local OwnHelpDir=AppInfo.scriptdir..DirSep.."support" -local SysHelpDir=geany.dirname(AppInfo.docdir:gsub("html", "")) - ..DirSep.."plugins"..DirSep.."geanylua" +-- FIXME: expose GeanyLua's $DOCDIR to Lua scripts. +local DocDir=geany.dirname(AppInfo.docdir:gsub("html", ""):gsub("geany", "geany-plugins")) +local SysHelpDir=DocDir..DirSep.."geanylua" local Browsers={ AppInfo.tools.browser, "firefox", "mozilla", "opera", 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:[776] trunk/geany-plugins/geanylua/Makefile.am
by hyperair＠users.sourceforge.net 23 Jun '09

23 Jun '09

Revision: 776 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=776&view=rev Author: hyperair Date: 2009-06-23 12:34:24 +0000 (Tue, 23 Jun 2009) Log Message: ----------- Update geanylua helper library path The path was previously $prefix/lib/geany/geanylua, and has been changed to $prefix/lib/geany-plugins/geanylua to prevent littering the geany plugins directory ($prefix/lib/geany) Modified Paths: -------------- trunk/geany-plugins/geanylua/Makefile.am Modified: trunk/geany-plugins/geanylua/Makefile.am =================================================================== --- trunk/geany-plugins/geanylua/Makefile.am 2009-06-23 12:24:31 UTC (rev 775) +++ trunk/geany-plugins/geanylua/Makefile.am 2009-06-23 12:34:24 UTC (rev 776) @@ -12,7 +12,7 @@ # don't build if disabled if ENABLE_GEANYLUA geanyplugins_LTLIBRARIES = geanylua.la -geanyluadir = $(geanypluginsdir)/geanylua +geanyluadir = $(pkglibdir)/geanylua geanylua_LTLIBRARIES = libgeanylua.la else EXTRA_LTLIBRARIES = geanylua.la libgeanylua.la 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:[775] trunk/geany-plugins/geanylua
by ntrel＠users.sourceforge.net 23 Jun '09

23 Jun '09

Revision: 775 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=775&view=rev Author: ntrel Date: 2009-06-23 12:24:31 +0000 (Tue, 23 Jun 2009) Log Message: ----------- Look for support library in LIBDIR/geany-plugins/geanylua. Read scripts from DATADIR/geany-plugins/geanylua. Init plugin_key_group fields to zero in case support library is not found. 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-06-22 18:43:31 UTC (rev 774) +++ trunk/geany-plugins/geanylua/ChangeLog 2009-06-23 12:24:31 UTC (rev 775) @@ -1,3 +1,9 @@ +June 23, 2009 (ntrel) + Look for support library in LIBDIR/geany-plugins/geanylua. + Read scripts from DATADIR/geany-plugins/geanylua. + Init plugin_key_group fields to zero in case support library is not + found. + June 19, 2009 (ntrel) Move to geany-plugins project, add i18n support. Rename from GeanyLua to 'Lua Script'. Modified: trunk/geany-plugins/geanylua/geanylua.c =================================================================== --- trunk/geany-plugins/geanylua/geanylua.c 2009-06-22 18:43:31 UTC (rev 774) +++ trunk/geany-plugins/geanylua/geanylua.c 2009-06-23 12:24:31 UTC (rev 775) @@ -48,7 +48,6 @@ #define GETSYM(name,ptr) ( g_module_symbol(libgeanylua, name, (gpointer) &ptr) && ptr ) -#define MKPATH(dir) g_build_path(G_DIR_SEPARATOR_S, dir, "plugins", "geanylua", SUPPORT_LIB, NULL); PLUGIN_EXPORT PLUGIN_VERSION_CHECK(MY_GEANY_API_VER) @@ -60,7 +59,7 @@ GeanyFunctions *geany_functions; PLUGIN_EXPORT -GeanyKeyGroup plugin_key_group[1]; +GeanyKeyGroup plugin_key_group[1] = {NULL, NULL, 0, NULL}; @@ -138,15 +137,15 @@ main_locale_init(LOCALEDIR, GETTEXT_PACKAGE); geany_data=data; - libname=MKPATH(data->app->configdir); + 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) ) { g_free(libname); - libname=MKPATH(data->app->datadir); + libname=g_build_path(G_DIR_SEPARATOR_S, LIBDIR, "geany-plugins", "geanylua", SUPPORT_LIB, NULL); } 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; - g_printerr(_("%s: Can't find support library!\n"), PLUGIN_NAME); return; } libgeanylua=g_module_open(libname,0); Modified: trunk/geany-plugins/geanylua/glspi_init.c =================================================================== --- trunk/geany-plugins/geanylua/glspi_init.c 2009-06-22 18:43:31 UTC (rev 774) +++ trunk/geany-plugins/geanylua/glspi_init.c 2009-06-23 12:24:31 UTC (rev 775) @@ -8,9 +8,9 @@ #define DIR_SEP G_DIR_SEPARATOR_S -#define SCRIPT_FOLDER DIR_SEP "plugins" DIR_SEP "geanylua" +#define USER_SCRIPT_FOLDER DIR_SEP "plugins" DIR_SEP "geanylua" -#define EVENTS_FOLDER SCRIPT_FOLDER DIR_SEP "events" DIR_SEP +#define EVENTS_FOLDER USER_SCRIPT_FOLDER DIR_SEP "events" DIR_SEP #define ON_SAVED_SCRIPT EVENTS_FOLDER "saved.lua" #define ON_OPENED_SCRIPT EVENTS_FOLDER "opened.lua" @@ -416,6 +416,7 @@ local_data.script_list=g_slist_concat(local_data.script_list,script_names); return menu_item; } + g_printerr("%s: No scripts found in %s\n", PLUGIN_NAME, script_dir); return NULL; } @@ -439,17 +440,17 @@ void glspi_init (GeanyData *data, GeanyFunctions *functions, GeanyKeyGroup *kg) { GeanyApp *app = data->app; - + glspi_geany_data = data; glspi_geany_functions = functions; local_data.script_dir = - g_strconcat(app->configdir, SCRIPT_FOLDER, NULL); + g_strconcat(app->configdir, USER_SCRIPT_FOLDER, NULL); if (!g_file_test(local_data.script_dir, G_FILE_TEST_IS_DIR)) { g_free(local_data.script_dir); local_data.script_dir = - g_strconcat(app->datadir, SCRIPT_FOLDER, NULL); + g_build_path(G_DIR_SEPARATOR_S, DATADIR, "geany-plugins", "geanylua", NULL); } if (app->debug_mode) { g_printerr(_(" ==>> %s: Building menu from '%s'\n"), 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:[774] trunk/geany-plugins/build/vars.docs.mk
by hyperair＠users.sourceforge.net 22 Jun '09

22 Jun '09

Revision: 774 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=774&view=rev Author: hyperair Date: 2009-06-22 18:43:31 +0000 (Mon, 22 Jun 2009) Log Message: ----------- Update install paths for examples and html docs * $prefix/share/geany-plugins/geanylua for examples * $prefix/share/doc/geany-plugins/geanylua for html docs Modified Paths: -------------- trunk/geany-plugins/build/vars.docs.mk Modified: trunk/geany-plugins/build/vars.docs.mk =================================================================== --- trunk/geany-plugins/build/vars.docs.mk 2009-06-22 10:04:03 UTC (rev 773) +++ trunk/geany-plugins/build/vars.docs.mk 2009-06-22 18:43:31 UTC (rev 774) @@ -1,6 +1,6 @@ plugindocdir = $(docdir)/$(plugin) -htmldocdir = $(plugindocdir)/html -examplesdir = $(plugindocdir)/examples +htmldocdir = $(plugindocdir) +examplesdir = $(pkgdatadir)/$(plugin) AUXFILES = \ README \ ChangeLog \ 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:[773] trunk/geany-plugins/geanylua
by hyperair＠users.sourceforge.net 22 Jun '09

22 Jun '09

Revision: 773 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=773&view=rev Author: hyperair Date: 2009-06-22 10:04:03 +0000 (Mon, 22 Jun 2009) Log Message: ----------- Avoid creating empty directories when disabled Modified Paths: -------------- trunk/geany-plugins/geanylua/Makefile.am trunk/geany-plugins/geanylua/docs/Makefile.am trunk/geany-plugins/geanylua/examples/dialogs/Makefile.am trunk/geany-plugins/geanylua/examples/edit/Makefile.am trunk/geany-plugins/geanylua/examples/info/Makefile.am trunk/geany-plugins/geanylua/examples/scripting/Makefile.am trunk/geany-plugins/geanylua/examples/work/Makefile.am Modified: trunk/geany-plugins/geanylua/Makefile.am =================================================================== --- trunk/geany-plugins/geanylua/Makefile.am 2009-06-22 10:02:26 UTC (rev 772) +++ trunk/geany-plugins/geanylua/Makefile.am 2009-06-22 10:04:03 UTC (rev 773) @@ -1,13 +1,13 @@ # don't install docs if disabled if ENABLE_GEANYLUA include $(top_srcdir)/build/vars.auxfiles.mk +plugin = geanylua else include $(top_srcdir)/build/vars.docs.mk EXTRA_DIST = $(AUXFILES) endif include $(top_srcdir)/build/vars.build.mk -plugin = geanylua # don't build if disabled if ENABLE_GEANYLUA Modified: trunk/geany-plugins/geanylua/docs/Makefile.am =================================================================== --- trunk/geany-plugins/geanylua/docs/Makefile.am 2009-06-22 10:02:26 UTC (rev 772) +++ trunk/geany-plugins/geanylua/docs/Makefile.am 2009-06-22 10:04:03 UTC (rev 773) @@ -1,4 +1,8 @@ +# don't include if geanylua's disabled, otherwise a whole bunch of empty +# directories will be created +if ENABLE_GEANYLUA include $(top_srcdir)/build/vars.docs.mk +endif plugin = geanylua Modified: trunk/geany-plugins/geanylua/examples/dialogs/Makefile.am =================================================================== --- trunk/geany-plugins/geanylua/examples/dialogs/Makefile.am 2009-06-22 10:02:26 UTC (rev 772) +++ trunk/geany-plugins/geanylua/examples/dialogs/Makefile.am 2009-06-22 10:04:03 UTC (rev 773) @@ -1,8 +1,9 @@ +# avoid creating empty directories if disabled +if ENABLE_GEANYLUA include $(top_srcdir)/build/vars.docs.mk - plugin = geanylua - dialogsdir = $(examplesdir)/dialogs +endif EXAMPLES = \ basic-dialogs.lua \ Modified: trunk/geany-plugins/geanylua/examples/edit/Makefile.am =================================================================== --- trunk/geany-plugins/geanylua/examples/edit/Makefile.am 2009-06-22 10:02:26 UTC (rev 772) +++ trunk/geany-plugins/geanylua/examples/edit/Makefile.am 2009-06-22 10:04:03 UTC (rev 773) @@ -1,7 +1,10 @@ +# avoid creating empty directories if disabled +if ENABLE_GEANYLUA include $(top_srcdir)/build/vars.docs.mk - plugin = geanylua editdir = $(examplesdir)/edit +endif + EXAMPLES = \ calculator.lua \ lua-replace.lua \ Modified: trunk/geany-plugins/geanylua/examples/info/Makefile.am =================================================================== --- trunk/geany-plugins/geanylua/examples/info/Makefile.am 2009-06-22 10:02:26 UTC (rev 772) +++ trunk/geany-plugins/geanylua/examples/info/Makefile.am 2009-06-22 10:04:03 UTC (rev 773) @@ -1,7 +1,10 @@ +# avoid creating empty directories if disabled +if ENABLE_GEANYLUA include $(top_srcdir)/build/vars.docs.mk - plugin = geanylua exampleinfodir = $(examplesdir)/info +endif + EXAMPLES = \ about.lua \ app-information.lua \ Modified: trunk/geany-plugins/geanylua/examples/scripting/Makefile.am =================================================================== --- trunk/geany-plugins/geanylua/examples/scripting/Makefile.am 2009-06-22 10:02:26 UTC (rev 772) +++ trunk/geany-plugins/geanylua/examples/scripting/Makefile.am 2009-06-22 10:04:03 UTC (rev 773) @@ -1,7 +1,10 @@ +# avoid creating empty directories if disabled +if ENABLE_GEANYLUA include $(top_srcdir)/build/vars.docs.mk - plugin = geanylua scriptingdir = $(examplesdir)/scripting +endif + EXAMPLES = \ help.lua \ open-script.lua \ Modified: trunk/geany-plugins/geanylua/examples/work/Makefile.am =================================================================== --- trunk/geany-plugins/geanylua/examples/work/Makefile.am 2009-06-22 10:02:26 UTC (rev 772) +++ trunk/geany-plugins/geanylua/examples/work/Makefile.am 2009-06-22 10:04:03 UTC (rev 773) @@ -1,7 +1,10 @@ +# avoid creating empty directories if disabled +if ENABLE_GEANYLUA include $(top_srcdir)/build/vars.docs.mk - plugin = geanylua workdir = $(examplesdir)/work +endif + EXAMPLES = \ 01.edit-test-script.lua \ 02.run-test-script.lua \ 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:[772] trunk/geany-plugins/geanylua/docs/Makefile. am
by hyperair＠users.sourceforge.net 22 Jun '09

22 Jun '09

Revision: 772 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=772&view=rev Author: hyperair Date: 2009-06-22 10:02:26 +0000 (Mon, 22 Jun 2009) Log Message: ----------- Distribute docfiles even if geanylua is disabled Modified Paths: -------------- trunk/geany-plugins/geanylua/docs/Makefile.am Modified: trunk/geany-plugins/geanylua/docs/Makefile.am =================================================================== --- trunk/geany-plugins/geanylua/docs/Makefile.am 2009-06-22 10:01:34 UTC (rev 771) +++ trunk/geany-plugins/geanylua/docs/Makefile.am 2009-06-22 10:02:26 UTC (rev 772) @@ -16,4 +16,4 @@ endif # make sure that these files are distributed as well -EXTRA_DIST = $(htmldoc_DATA) +EXTRA_DIST = $(DOCFILES) 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:[771] trunk/geany-plugins/build/geanylua.m4
by hyperair＠users.sourceforge.net 22 Jun '09

22 Jun '09

Revision: 771 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=771&view=rev Author: hyperair Date: 2009-06-22 10:01:34 +0000 (Mon, 22 Jun 2009) Log Message: ----------- --with-lua-pkg implicitly means --enable-geanylua Modified Paths: -------------- trunk/geany-plugins/build/geanylua.m4 Modified: trunk/geany-plugins/build/geanylua.m4 =================================================================== --- trunk/geany-plugins/build/geanylua.m4 2009-06-22 10:00:45 UTC (rev 770) +++ trunk/geany-plugins/build/geanylua.m4 2009-06-22 10:01:34 UTC (rev 771) @@ -2,13 +2,14 @@ [ AC_ARG_ENABLE(geanylua, AC_HELP_STRING([--enable-geanylua=ARG], - [Enable GeanyLua plugin [[default=auto]]),, + [Enable GeanyLua plugin [[default=auto]]]),, [enable_geanylua=auto]) AC_ARG_WITH([lua-pkg], AC_HELP_STRING([--with-lua-pkg=ARG], [name of Lua pkg-config script [[default=lua5.1]]]), - [LUA_PKG_NAME=${withval%.pc}], + [LUA_PKG_NAME=${withval%.pc} + enable_geanylua=yes], [LUA_PKG_NAME=lua5.1 for L in lua5.1 lua51 lua-5.1 lua; do 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:[770] trunk/geany-plugins
by hyperair＠users.sourceforge.net 22 Jun '09

22 Jun '09

Revision: 770 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=770&view=rev Author: hyperair Date: 2009-06-22 10:00:45 +0000 (Mon, 22 Jun 2009) Log Message: ----------- Automagic for geanylua Modified Paths: -------------- trunk/geany-plugins/build/geanylua.m4 trunk/geany-plugins/geanylua/Makefile.am trunk/geany-plugins/geanylua/docs/Makefile.am trunk/geany-plugins/geanylua/examples/dialogs/Makefile.am trunk/geany-plugins/geanylua/examples/edit/Makefile.am trunk/geany-plugins/geanylua/examples/info/Makefile.am trunk/geany-plugins/geanylua/examples/scripting/Makefile.am trunk/geany-plugins/geanylua/examples/work/Makefile.am Modified: trunk/geany-plugins/build/geanylua.m4 =================================================================== --- trunk/geany-plugins/build/geanylua.m4 2009-06-22 09:59:02 UTC (rev 769) +++ trunk/geany-plugins/build/geanylua.m4 2009-06-22 10:00:45 UTC (rev 770) @@ -1,5 +1,10 @@ AC_DEFUN([GP_CHECK_GEANYLUA], [ + AC_ARG_ENABLE(geanylua, + AC_HELP_STRING([--enable-geanylua=ARG], + [Enable GeanyLua plugin [[default=auto]]),, + [enable_geanylua=auto]) + AC_ARG_WITH([lua-pkg], AC_HELP_STRING([--with-lua-pkg=ARG], [name of Lua pkg-config script [[default=lua5.1]]]), @@ -11,8 +16,17 @@ [LUA_PKG_NAME=$L],[]) done]) - PKG_CHECK_MODULES(LUA, [${LUA_PKG_NAME} >= 5.1]) + LUA_VERSION=5.1 + if [[ x"$enable_geanylua" = "xauto" ]]; then + PKG_CHECK_MODULES(LUA, [${LUA_PKG_NAME} >= ${LUA_VERSION}], + [enable_geanylua=yes], + [enable_geanylua=no]) + elif [[ x"$enable_geanylua" = "xyes" ]]; then + PKG_CHECK_MODULES(LUA, [${LUA_PKG_NAME} >= ${LUA_VERSION}]) + fi + AM_CONDITIONAL(ENABLE_GEANYLUA, test $enable_geanylua = yes) + AC_CONFIG_FILES([ geanylua/examples/edit/Makefile geanylua/examples/scripting/Makefile Modified: trunk/geany-plugins/geanylua/Makefile.am =================================================================== --- trunk/geany-plugins/geanylua/Makefile.am 2009-06-22 09:59:02 UTC (rev 769) +++ trunk/geany-plugins/geanylua/Makefile.am 2009-06-22 10:00:45 UTC (rev 770) @@ -1,11 +1,22 @@ +# don't install docs if disabled +if ENABLE_GEANYLUA include $(top_srcdir)/build/vars.auxfiles.mk +else +include $(top_srcdir)/build/vars.docs.mk +EXTRA_DIST = $(AUXFILES) +endif include $(top_srcdir)/build/vars.build.mk plugin = geanylua +# don't build if disabled +if ENABLE_GEANYLUA geanyplugins_LTLIBRARIES = geanylua.la geanyluadir = $(geanypluginsdir)/geanylua geanylua_LTLIBRARIES = libgeanylua.la +else +EXTRA_LTLIBRARIES = geanylua.la libgeanylua.la +endif geanylua_la_SOURCES = geanylua.c libgeanylua_la_SOURCES = \ Modified: trunk/geany-plugins/geanylua/docs/Makefile.am =================================================================== --- trunk/geany-plugins/geanylua/docs/Makefile.am 2009-06-22 09:59:02 UTC (rev 769) +++ trunk/geany-plugins/geanylua/docs/Makefile.am 2009-06-22 10:00:45 UTC (rev 770) @@ -2,7 +2,7 @@ plugin = geanylua -htmldoc_DATA = \ +DOCFILES = \ geanylua-index.html \ geanylua-input.html \ geanylua-intro.html \ @@ -11,5 +11,9 @@ geanylua-ref.html \ luarefv51.html +if ENABLE_GEANYLUA +htmldoc_DATA = $(DOCFILES) +endif + # make sure that these files are distributed as well EXTRA_DIST = $(htmldoc_DATA) Modified: trunk/geany-plugins/geanylua/examples/dialogs/Makefile.am =================================================================== --- trunk/geany-plugins/geanylua/examples/dialogs/Makefile.am 2009-06-22 09:59:02 UTC (rev 769) +++ trunk/geany-plugins/geanylua/examples/dialogs/Makefile.am 2009-06-22 10:00:45 UTC (rev 770) @@ -3,9 +3,14 @@ plugin = geanylua dialogsdir = $(examplesdir)/dialogs -dialogs_DATA = \ + +EXAMPLES = \ basic-dialogs.lua \ complex-dialog.lua +if ENABLE_GEANYLUA +dialogs_DATA = $(EXAMPLES) +endif + # make sure that these files are distributed as well -EXTRA_DIST = $(dialogs_DATA) +EXTRA_DIST = $(EXAMPLES) Modified: trunk/geany-plugins/geanylua/examples/edit/Makefile.am =================================================================== --- trunk/geany-plugins/geanylua/examples/edit/Makefile.am 2009-06-22 09:59:02 UTC (rev 769) +++ trunk/geany-plugins/geanylua/examples/edit/Makefile.am 2009-06-22 10:00:45 UTC (rev 770) @@ -2,7 +2,7 @@ plugin = geanylua editdir = $(examplesdir)/edit -edit_DATA = \ +EXAMPLES = \ calculator.lua \ lua-replace.lua \ proper-case.lua \ @@ -10,5 +10,9 @@ right-trim.lua \ select-block.lua +if ENABLE_GEANYLUA +edit_DATA = $(EXAMPLES) +endif + # make sure that these files are distributed as well -EXTRA_DIST = $(edit_DATA) +EXTRA_DIST = $(EXAMPLES) Modified: trunk/geany-plugins/geanylua/examples/info/Makefile.am =================================================================== --- trunk/geany-plugins/geanylua/examples/info/Makefile.am 2009-06-22 09:59:02 UTC (rev 769) +++ trunk/geany-plugins/geanylua/examples/info/Makefile.am 2009-06-22 10:00:45 UTC (rev 770) @@ -2,7 +2,7 @@ plugin = geanylua exampleinfodir = $(examplesdir)/info -exampleinfo_DATA = \ +EXAMPLES = \ about.lua \ app-information.lua \ file-information.lua \ @@ -10,5 +10,9 @@ Makefile.am \ show-filename.lua +if ENABLE_GEANYLUA +exampleinfo_DATA = $(EXAMPLES) +endif + # make sure that these files are distributed as well -EXTRA_DIST = $(exampleinfo_DATA) +EXTRA_DIST = $(EXAMPLES) Modified: trunk/geany-plugins/geanylua/examples/scripting/Makefile.am =================================================================== --- trunk/geany-plugins/geanylua/examples/scripting/Makefile.am 2009-06-22 09:59:02 UTC (rev 769) +++ trunk/geany-plugins/geanylua/examples/scripting/Makefile.am 2009-06-22 10:00:45 UTC (rev 770) @@ -2,11 +2,15 @@ plugin = geanylua scriptingdir = $(examplesdir)/scripting -scripting_DATA = \ +EXAMPLES = \ help.lua \ open-script.lua \ rebuild-menu.lua \ show-examples.lua +if ENABLE_GEANYLUA +scripting_DATA = $(EXAMPLES) +endif + # make sure that these files are distributed as well -EXTRA_DIST = $(scripting_DATA) +EXTRA_DIST = $(EXAMPLES) Modified: trunk/geany-plugins/geanylua/examples/work/Makefile.am =================================================================== --- trunk/geany-plugins/geanylua/examples/work/Makefile.am 2009-06-22 09:59:02 UTC (rev 769) +++ trunk/geany-plugins/geanylua/examples/work/Makefile.am 2009-06-22 10:00:45 UTC (rev 770) @@ -2,10 +2,14 @@ plugin = geanylua workdir = $(examplesdir)/work -work_DATA = \ +EXAMPLES = \ 01.edit-test-script.lua \ 02.run-test-script.lua \ 03.install-test-script.lua +if ENABLE_GEANYLUA +work_DATA = $(EXAMPLES) +endif + # make sure that these files are distributed as well -EXTRA_DIST = $(work_DATA) +EXTRA_DIST = $(EXAMPLES) 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:[769] trunk/geany-plugins
by hyperair＠users.sourceforge.net 22 Jun '09

22 Jun '09

Revision: 769 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=769&view=rev Author: hyperair Date: 2009-06-22 09:59:02 +0000 (Mon, 22 Jun 2009) Log Message: ----------- Automagic detection of enchant If --enable-spellcheck=auto (default), then check if enchant exists, otherwise disable spellcheck without failing. If --enable-spellcheck=yes, or --enable-spellcheck, then fail if enchant does not exist. If --disable-spellcheck, or --enable-spellcheck=no, then don't build spellcheck at all. Modified Paths: -------------- trunk/geany-plugins/build/spellcheck.m4 trunk/geany-plugins/build/vars.auxfiles.mk trunk/geany-plugins/build/vars.docs.mk trunk/geany-plugins/spellcheck/Makefile.am trunk/geany-plugins/spellcheck/src/Makefile.am Modified: trunk/geany-plugins/build/spellcheck.m4 =================================================================== --- trunk/geany-plugins/build/spellcheck.m4 2009-06-22 09:57:49 UTC (rev 768) +++ trunk/geany-plugins/build/spellcheck.m4 2009-06-22 09:59:02 UTC (rev 769) @@ -1,6 +1,22 @@ AC_DEFUN([GP_CHECK_SPELLCHECK], [ - PKG_CHECK_MODULES(ENCHANT, [enchant >= 1.3]) + AC_ARG_ENABLE([spellcheck], + AC_HELP_STRING([--enable-spellcheck=ARG], + [Enable the spellcheck plugin [[default=auto]]]),, + enable_spellcheck=auto) + + ENCHANT_VERSION=1.3 + + if [[ x"$enable_spellcheck" = "xauto" ]]; then + PKG_CHECK_MODULES(ENCHANT, [enchant >= $ENCHANT_VERSION], + [enable_spellcheck=yes], + [enable_spellcheck=no]) + elif [[ x"$enable_spellcheck" = "xyes" ]]; then + PKG_CHECK_MODULES(ENCHANT, [enchant >= $ENCHANT_VERSION]) + fi + + AM_CONDITIONAL(ENABLE_SPELLCHECK, test $enable_spellcheck = yes) + AC_CONFIG_FILES([ spellcheck/Makefile spellcheck/src/Makefile Modified: trunk/geany-plugins/build/vars.auxfiles.mk =================================================================== --- trunk/geany-plugins/build/vars.auxfiles.mk 2009-06-22 09:57:49 UTC (rev 768) +++ trunk/geany-plugins/build/vars.auxfiles.mk 2009-06-22 09:59:02 UTC (rev 769) @@ -1,11 +1,6 @@ include $(top_srcdir)/build/vars.docs.mk -plugindoc_DATA = \ - README \ - ChangeLog \ - NEWS \ - COPYING \ - AUTHORS +plugindoc_DATA = $(AUXFILES) # TODO: make sure these files exist! README AUTHORS NEWS: Modified: trunk/geany-plugins/build/vars.docs.mk =================================================================== --- trunk/geany-plugins/build/vars.docs.mk 2009-06-22 09:57:49 UTC (rev 768) +++ trunk/geany-plugins/build/vars.docs.mk 2009-06-22 09:59:02 UTC (rev 769) @@ -1,3 +1,10 @@ plugindocdir = $(docdir)/$(plugin) htmldocdir = $(plugindocdir)/html examplesdir = $(plugindocdir)/examples +AUXFILES = \ + README \ + ChangeLog \ + NEWS \ + COPYING \ + AUTHORS + Modified: trunk/geany-plugins/spellcheck/Makefile.am =================================================================== --- trunk/geany-plugins/spellcheck/Makefile.am 2009-06-22 09:57:49 UTC (rev 768) +++ trunk/geany-plugins/spellcheck/Makefile.am 2009-06-22 09:59:02 UTC (rev 769) @@ -1,4 +1,10 @@ +# if spellcheck is disabled, we should distribute its files, but not install +if ENABLE_SPELLCHECK include $(top_srcdir)/build/vars.auxfiles.mk +else +include $(top_srcdir)/build/vars.docs.mk +EXTRA_DIST = $(AUXFILES) +endif SUBDIRS = src plugin = spellcheck Modified: trunk/geany-plugins/spellcheck/src/Makefile.am =================================================================== --- trunk/geany-plugins/spellcheck/src/Makefile.am 2009-06-22 09:57:49 UTC (rev 768) +++ trunk/geany-plugins/spellcheck/src/Makefile.am 2009-06-22 09:59:02 UTC (rev 769) @@ -1,6 +1,11 @@ include $(top_srcdir)/build/vars.build.mk +if ENABLE_SPELLCHECK geanyplugins_LTLIBRARIES = spellcheck.la +else +EXTRA_LTLIBRARIES = spellcheck.la +endif + spellcheck_la_SOURCES = \ scplugin.h \ speller.h \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits June 2009