diff options
| author | Jim Carroll <thecarrolls@jiminger.com> | 2013-03-16 13:22:57 -0400 |
|---|---|---|
| committer | Jim Carroll <thecarrolls@jiminger.com> | 2013-03-16 13:27:02 -0400 |
| commit | 72eeac20ce3854eab48d9ef5411cbedc086cc1ff (patch) | |
| tree | cf74ef256fa4d1df5d6755bf0c44562c6f0b86c3 /tools | |
| parent | e4969fefef9f47d6f0fd4c018e66801b5d5a4ca2 (diff) | |
[fix] Update the groovy library to the lastest 1.x version to fix the "non-latin characters in the path" issue. Closes #13517
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/codegenerator/GenerateSWIGBindings.bat | 2 | ||||
| -rw-r--r-- | tools/codegenerator/Helper.groovy | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tools/codegenerator/GenerateSWIGBindings.bat b/tools/codegenerator/GenerateSWIGBindings.bat index 00b576c35e..73d4519824 100644 --- a/tools/codegenerator/GenerateSWIGBindings.bat +++ b/tools/codegenerator/GenerateSWIGBindings.bat @@ -27,7 +27,7 @@ rem run doxygen rem run swig to generate the XML used by groovy to generate the python bindings "%bin_dir%\swig\swig.exe" -w401 -c++ -outdir "%python_generated_dir%" -o "%python_generated_dir%\%2.xml" -xml -I"%base_Dir%\xbmc" -xmllang python "%swig_dir%\%2.i" rem run groovy to generate the python bindings -java.exe -cp "%groovy_dir%\groovy-all-1.8.4.jar;%groovy_dir%\commons-lang-2.6.jar;%generator_dir%;%python_dir%" groovy.ui.GroovyMain "%generator_dir%\Generator.groovy" "%python_generated_dir%\%2.xml" "%python_dir%\PythonSwig.cpp.template" "%python_generated_dir%\%2.cpp" "%doxygen_dir%" +java.exe -cp "%groovy_dir%\groovy-all-1.8.9.jar;%groovy_dir%\commons-lang-2.6.jar;%generator_dir%;%python_dir%" groovy.ui.GroovyMain "%generator_dir%\Generator.groovy" "%python_generated_dir%\%2.xml" "%python_dir%\PythonSwig.cpp.template" "%python_generated_dir%\%2.cpp" "%doxygen_dir%" rem delete the XML file generated by SWIG as it's not needed anymore del "%python_generated_dir%\%2.xml" > NUL diff --git a/tools/codegenerator/Helper.groovy b/tools/codegenerator/Helper.groovy index 09ed4edbe8..23391e4f62 100644 --- a/tools/codegenerator/Helper.groovy +++ b/tools/codegenerator/Helper.groovy @@ -106,8 +106,9 @@ public class Helper else // it's a method of some sort ... or it better be { Node memberdef = docspec.depthFirst().find { - return ((it.name() == 'memberdef' && it.@kind == 'function' && it.@id.startsWith(doxygenId)) && - (it.name != null && it.name.text().trim() == methodOrClass.@sym_name)) + return (it instanceof String) ? false : + ((it.name() == 'memberdef' && it.@kind == 'function' && it.@id.startsWith(doxygenId)) && + (it.name != null && it.name.text().trim() == methodOrClass.@sym_name)) } doc = memberdef != null ? memberdef.detaileddescription[0] : null |