diff options
| author | hudokkow <hudokkow@gmail.com> | 2015-08-26 15:50:25 +0100 |
|---|---|---|
| committer | hudokkow <hudokkow@gmail.com> | 2015-08-26 15:50:25 +0100 |
| commit | adb140cf3480fc156b4853bd8924f3e3a20fc694 (patch) | |
| tree | 915f1459a7d0d5573ba9f1a0b2793b71a5401c0c | |
| parent | dab498e63e0a210ed2a6afef55034c2c2434795b (diff) | |
[groovy] Update to 2.4.4
| -rw-r--r-- | codegenerator.mk | 4 | ||||
| -rw-r--r-- | lib/groovy/groovy-all-2.1.7.jar | bin | 6375081 -> 0 bytes | |||
| -rw-r--r-- | lib/groovy/groovy-all-2.4.4.jar | bin | 0 -> 6998724 bytes | |||
| -rw-r--r-- | tools/codegenerator/GenerateSWIGBindings.bat | 4 |
4 files changed, 4 insertions, 4 deletions
diff --git a/codegenerator.mk b/codegenerator.mk index 895c0e81e9..246f283bb1 100644 --- a/codegenerator.mk +++ b/codegenerator.mk @@ -42,9 +42,9 @@ vpath %.i $(INTERFACES_DIR)/swig $(GENDIR)/%.cpp: $(GENDIR)/%.xml $(JAVA) $(SWIG) $(DOXY_XML_PATH) # Work around potential groovy bug reported at: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=733234 - $(JAVA) -cp "$(GROOVY_DIR)/groovy-all-2.1.7.jar:$(GROOVY_DIR)/commons-lang-2.6.jar:$(TOPDIR)/tools/codegenerator:$(INTERFACES_DIR)/python" \ + $(JAVA) -cp "$(GROOVY_DIR)/groovy-all-2.4.4.jar:$(GROOVY_DIR)/commons-lang-2.6.jar:$(TOPDIR)/tools/codegenerator:$(INTERFACES_DIR)/python" \ org.codehaus.groovy.tools.FileSystemCompiler -d $(TOPDIR)/tools/codegenerator $(TOPDIR)/tools/codegenerator/Helper.groovy $(TOPDIR)/tools/codegenerator/SwigTypeParser.groovy $(INTERFACES_DIR)/python/MethodType.groovy $(INTERFACES_DIR)/python/PythonTools.groovy - $(JAVA) -cp "$(GROOVY_DIR)/groovy-all-2.1.7.jar:$(GROOVY_DIR)/commons-lang-2.6.jar:$(TOPDIR)/tools/codegenerator:$(INTERFACES_DIR)/python" \ + $(JAVA) -cp "$(GROOVY_DIR)/groovy-all-2.4.4.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-2.1.7.jar b/lib/groovy/groovy-all-2.1.7.jar Binary files differdeleted file mode 100644 index e24f300562..0000000000 --- a/lib/groovy/groovy-all-2.1.7.jar +++ /dev/null diff --git a/lib/groovy/groovy-all-2.4.4.jar b/lib/groovy/groovy-all-2.4.4.jar Binary files differnew file mode 100644 index 0000000000..0f5412639b --- /dev/null +++ b/lib/groovy/groovy-all-2.4.4.jar diff --git a/tools/codegenerator/GenerateSWIGBindings.bat b/tools/codegenerator/GenerateSWIGBindings.bat index da45bdb809..aa5f00a7a7 100644 --- a/tools/codegenerator/GenerateSWIGBindings.bat +++ b/tools/codegenerator/GenerateSWIGBindings.bat @@ -29,7 +29,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-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%" +"%java_exe%" -cp "%groovy_dir%\groovy-all-2.4.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%" rem delete the XML file generated by SWIG as it's not needed anymore del "%python_generated_dir%\%2.xml" > NUL @@ -37,4 +37,4 @@ rem delete the generated doxygen files rmdir "%doxygen_dir%" /S /Q > NUL rem go back to the initial directory -cd "%cur_dir%"
\ No newline at end of file +cd "%cur_dir%" |