[fix] Update the groovy library to the lastest 1.x version to fix the…

… "non-latin characters in the path" issue. Closes xbmc#13517
gnif · Mar 16, 2013 · 72eeac2 · 72eeac2
1 parent e4969fe
commit 72eeac2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/codegenerator.mk b/codegenerator.mk
@@ -32,7 +32,7 @@ GENERATE_DEPS += $(TOPDIR)/xbmc/interfaces/legacy/*.h $(TOPDIR)/xbmc/interfaces/
 vpath %.i $(INTERFACES_DIR)/swig
 
 $(GENDIR)/%.cpp: $(GENDIR)/%.xml $(JAVA) $(SWIG) $(DOXY_XML_PATH)
-	$(JAVA) -cp "$(GROOVY_DIR)/groovy-all-1.8.4.jar:$(GROOVY_DIR)/commons-lang-2.6.jar:$(TOPDIR)/tools/codegenerator:$(INTERFACES_DIR)/python" \
+	$(JAVA) -cp "$(GROOVY_DIR)/groovy-all-1.8.9.jar:$(GROOVY_DIR)/commons-lang-2.6.jar:$(TOPDIR)/tools/codegenerator:$(INTERFACES_DIR)/python" \
           groovy.ui.GroovyMain $(TOPDIR)/tools/codegenerator/Generator.groovy $< $(INTERFACES_DIR)/python/PythonSwig.cpp.template $@ $(DOXY_XML_PATH)
 	rm $<
 

diff --git a/lib/groovy/groovy-all-1.8.4.jar → lib/groovy/groovy-all-1.8.9.jar b/lib/groovy/groovy-all-1.8.4.jar → lib/groovy/groovy-all-1.8.9.jar
diff --git 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
@@ -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