Revision: 133
http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=133&view=rev
Author: eht16
Date: 2008-07-22 13:53:07 +0000 (Tue, 22 Jul 2008)
Log Message:
-----------
Prefer Geany's libdir over a possibly given prefix argument when installing plugin binaries.
Modified Paths:
--------------
trunk/wscript
Modified: trunk/wscript
===================================================================
--- trunk/wscript 2008-07-21 20:52:21 UTC (rev 132)
+++ trunk/wscript 2008-07-22 13:53:07 UTC (rev 133)
@@ -159,6 +159,8 @@
enabled_plugins.remove(p.name)
conf_define_from_opt('LIBDIR', Options.options.libdir, conf.env['PREFIX'] + '/lib')
+ # get and define Geany's libdir for use as plugin binary installation dir
+ conf.define('GEANY_LIBDIR', conf.pkgconfig_fetch_variable('geany', 'libdir'), 1)
svn_rev = conf_get_svn_rev()
conf.define('ENABLE_NLS', 1)
@@ -235,7 +237,7 @@
obj.env['shlib_PATTERN'] = '%s.so'
obj.target = p.name
obj.uselib = libs
- obj.inst_var = 'LIBDIR'
+ obj.inst_var = 'GEANY_LIBDIR'
obj.inst_dir = '/geany/'
# if we are compiling more than one plugin, allow some of to fail
#~ Runner.Parallel.error_handler = error_handler
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 127
http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=127&view=rev
Author: eht16
Date: 2008-07-18 18:44:07 +0000 (Fri, 18 Jul 2008)
Log Message:
-----------
Add configure option --skip-plugins to specify a list of plugins which should not be built.
Modified Paths:
--------------
trunk/wscript
Modified: trunk/wscript
===================================================================
--- trunk/wscript 2008-07-17 12:18:58 UTC (rev 126)
+++ trunk/wscript 2008-07-18 18:44:07 UTC (rev 127)
@@ -81,6 +81,7 @@
'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' ], # 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 ] ]),
Plugin('geanyprj',
[ 'geanyprj/src/geanyprj.c', 'geanyprj/src/menu.c', 'geanyprj/src/project.c',
@@ -146,8 +147,10 @@
for p_name in Options.options.enable_plugins.split(','):
enabled_plugins.append(p_name.strip())
else:
+ skipped_plugins = Options.options.skip_plugins.split(',')
for p in plugins:
- enabled_plugins.append(p.name)
+ if not p.name in skipped_plugins:
+ enabled_plugins.append(p.name)
# check for plugin deps
for p in plugins:
@@ -207,7 +210,14 @@
opt.add_option('--enable-plugins', action='store', default='',
help='plugins to be built [plugins in CSV format, e.g. "%(1)s,%(2)s"]' % \
{ '1' : plugins[0].name, '2' : plugins[1].name }, dest='enable_plugins')
+ opt.add_option('--skip-plugins', action='store', default='',
+ help='plugins which should not be built, ignored when --enable-plugins is set, same format as --enable-plugins' % \
+ { '1' : plugins[0].name, '2' : plugins[1].name }, dest='skip_plugins')
+#~ future code
+#~ def error_handler(self, tsk):
+ #~ print "haha, %r failed" % tsk
+ #~ self.error = 0
def build(bld):
for p in plugins:
@@ -226,6 +236,8 @@
obj.uselib = libs
obj.inst_var = 'LIBDIR'
obj.inst_dir = '/geany/'
+ # if we are compiling more than one plugin, allow some of to fail
+ #~ Runner.Parallel.error_handler = error_handler
if os.path.exists(os.path.join(p.name, 'po')):
obj = bld.new_task_gen('intltool_po')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.