diff options
| author | Martin Braun <martin.braun@kit.edu> | 2013-02-14 17:56:36 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@kit.edu> | 2013-02-14 17:56:36 +0100 |
| commit | 788df86eb06bf5e39707ff0974bcbb0743e3d3a2 (patch) | |
| tree | b17a43bd7142c089eb9a5bb4a84e4be03ae82966 | |
| parent | 58c765e889a570885db4c0315c75d9f435a82834 (diff) | |
modtool: fixed order for both 3.6 and 3.7 API versions
| -rw-r--r-- | gr-utils/src/python/modtool/templates.py | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/gr-utils/src/python/modtool/templates.py b/gr-utils/src/python/modtool/templates.py index 8777357112..bfdba19c0f 100644 --- a/gr-utils/src/python/modtool/templates.py +++ b/gr-utils/src/python/modtool/templates.py @@ -495,15 +495,13 @@ gr_modtool help -- Show a list of commands. gr_modtool help <command> -- Shows the help for a given command. ''' # SWIG string -Templates['swig_block_magic'] = """#if $version == '37' -#set $mod_block_sep = '/' -#set $block_magic_version = '2' +Templates['swig_block_magic'] = """#if $version == '36' +GR_SWIG_BLOCK_MAGIC($modname, $blockname); +%include "${modname}_${blockname}.h" #else -#set $mod_block_sep = '_' -#set $block_magic_version = '' -#end if -%include "${modname}${mod_block_sep}${blockname}.h" -GR_SWIG_BLOCK_MAGIC${block_magic_version}($modname, $blockname); +%include "${modname}/${blockname}.h" +GR_SWIG_BLOCK_MAGIC2($modname, $blockname); +#end """ ## Old stuff |