[geany/geany-plugins] 4a5a38: Merge pull request #192 from b4n/waf/tunable-plugin-name

[Frank Lanitz]

Branch:      refs/heads/master
Author:      Frank Lanitz <frank at frank.uvena.de>
Committer:   Frank Lanitz <frank at frank.uvena.de>
Date:        Tue, 10 Mar 2015 22:05:03 UTC
Commit:      4a5a38026162491bbc16a0094483df5896b3643d
             https://github.com/geany/geany-plugins/commit/4a5a38026162491bbc16a0094483df5896b3643d

Log Message:
-----------
Merge pull request #192 from b4n/waf/tunable-plugin-name

Waf: Allow to explicitly set plugin name


Modified Paths:
--------------
    build/wafutils.py
    git-changebar/wscript_build

Modified: build/wafutils.py
5 lines changed, 3 insertions(+), 2 deletions(-)
===================================================================
@@ -77,7 +77,7 @@ def add_to_env_and_define(conf, key, value, quote=False):
     conf.env[key] = value
 
 
-def build_plugin(ctx, name, sources=None, includes=None, defines=None, libraries=None, features=None):
+def build_plugin(ctx, name, plugin_name=None, sources=None, includes=None, defines=None, libraries=None, features=None):
     """
     Common build task for plugins, every plugin should call this in its wscript_build module
 
@@ -86,6 +86,7 @@ def build_plugin(ctx, name, sources=None, includes=None, defines=None, libraries
 
     @param ctx (waflib.Build.BuildContext)
     @param name (str)
+    @param plugin_name (str)
     @param sources (list)
     @param includes (list)
     @param defines (list)
@@ -93,7 +94,7 @@ def build_plugin(ctx, name, sources=None, includes=None, defines=None, libraries
     @param features (list)
     """
     log_domain = name
-    plugin_name = name.lower()
+    plugin_name = plugin_name or name.lower()
     includes = includes or []
     defines = defines or []
     libraries = libraries or []


Modified: git-changebar/wscript_build
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -32,6 +32,7 @@ defines = ['PLUGIN="%s"' % name_lower]
 libraries = ['GTK', 'GLIB', 'LIBGIT2']
 
 build_plugin(bld, name,
+    plugin_name=name_lower,
     sources=sources,
     includes=includes,
     defines=defines,



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).