diff options
| -rw-r--r-- | codegenerator.mk | 2 | ||||
| -rw-r--r-- | lib/groovy/groovy-all-2.1.7.jar (renamed from lib/groovy/groovy-all-1.8.9.jar) | bin | 6222384 -> 6375081 bytes | |||
| -rw-r--r-- | tools/codegenerator/GenerateSWIGBindings.bat | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/codegenerator.mk b/codegenerator.mk index 7eddb3817a..9615aa3f80 100644 --- 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.9.jar:$(GROOVY_DIR)/commons-lang-2.6.jar:$(TOPDIR)/tools/codegenerator:$(INTERFACES_DIR)/python" \ + $(JAVA) -cp "$(GROOVY_DIR)/groovy-all-2.1.7.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.9.jar b/lib/groovy/groovy-all-2.1.7.jar Binary files differindex 0052e2b056..e24f300562 100644 --- a/lib/groovy/groovy-all-1.8.9.jar +++ b/lib/groovy/groovy-all-2.1.7.jar diff --git a/tools/codegenerator/GenerateSWIGBindings.bat b/tools/codegenerator/GenerateSWIGBindings.bat index 73d4519824..822b0ca0f6 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.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%" +java.exe -cp "%groovy_dir%\groovy-all-2.1.7.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 |