Revision: 128 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=128&view=rev Author: eht16 Date: 2008-07-20 17:36:18 +0000 (Sun, 20 Jul 2008)

Log Message: ----------- Fix build of geanylua, build the separate support library.

Modified Paths: -------------- trunk/wscript

Modified: trunk/wscript =================================================================== --- trunk/wscript 2008-07-18 18:44:07 UTC (rev 127) +++ trunk/wscript 2008-07-20 17:36:18 UTC (rev 128) @@ -77,9 +77,7 @@ [ 'geanylatex' ], # include dirs '0.2-dev'), Plugin('geanylua', - [ 'geanylua/geanylua.c', 'geanylua/glspi_init.c', 'geanylua/glspi_app.c', - 'geanylua/glspi_dlg.c', 'geanylua/glspi_doc.c', 'geanylua/glspi_kfile.c', - 'geanylua/glspi_run.c', 'geanylua/glspi_sci.c', 'geanylua/gsdlg_lua.c' ], + [ 'geanylua/geanylua.c' ], # the other source files are listed in build_lua() [ 'geanylua' ], # include dirs # maybe you need to modify the package name of Lua, try one of these: lua5.1 lua51 lua-5.1 '0.7.0', [ [ 'lua', '5.1', True ] ]), @@ -228,6 +226,9 @@ for l in p.libs: # add plugin specific libs libs += ' %s' % l[0].upper()

+ if p.name == 'geanylua': + build_lua(bld, p, libs) # build additional lib for the lua plugin + obj = bld.new_task_gen('cc', 'shlib') obj.source = p.sources obj.includes = p.includes @@ -245,6 +246,24 @@ obj.appname = p.name

+ + +def build_lua(bld, p, libs): + lua_sources = [ 'geanylua/glspi_init.c', 'geanylua/glspi_app.c', 'geanylua/glspi_dlg.c', + 'geanylua/glspi_doc.c', 'geanylua/glspi_kfile.c', 'geanylua/glspi_run.c', + 'geanylua/glspi_sci.c', 'geanylua/gsdlg_lua.c' ] + + obj = bld.new_task_gen('cc', 'shlib') + obj.source = lua_sources + obj.includes = p.includes + obj.env['shlib_PATTERN'] = '%s.so' + obj.target = 'libgeanylua' + obj.uselib = libs + obj.inst_var = 'DATADIR' + obj.inst_dir = '/geany/plugins/geanylua' + + + def init(): if Options.options.list_plugins: Utils.pprint('GREEN', \

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.