fdroiddata/metadata/org.xbmc.kodi/groovy.patch
2019-03-04 16:33:15 +00:00

22 lines
1.4 KiB
Diff

--- a/xbmc/interfaces/swig/CMakeLists.txt
+++ b/xbmc/interfaces/swig/CMakeLists.txt
@@ -1,6 +1,5 @@
function(generate_file file)
- set(classpath ${GROOVY_DIR}/groovy-all-${GROOVY_VER}.jar
- ${GROOVY_DIR}/commons-lang-${COMMONS_VER}.jar
+ set(classpath /usr/share/java/commons-lang.jar
${CMAKE_SOURCE_DIR}/tools/codegenerator
${CMAKE_CURRENT_SOURCE_DIR}/../python)
if(NOT CORE_SYSTEM_NAME STREQUAL windows AND NOT CORE_SYSTEM_NAME STREQUAL windowsstore)
@@ -14,8 +13,8 @@
add_custom_command(OUTPUT ${CPP_FILE}
COMMAND ${SWIG_EXECUTABLE}
ARGS -w401 -c++ -o ${file}.xml -xml -I${CMAKE_SOURCE_DIR}/xbmc -xmllang python ${CMAKE_CURRENT_SOURCE_DIR}/../swig/${file}
- COMMAND ${Java_JAVA_EXECUTABLE}
- ARGS -cp "${classpath}" groovy.ui.GroovyMain ${CMAKE_SOURCE_DIR}/tools/codegenerator/Generator.groovy ${file}.xml ${CMAKE_CURRENT_SOURCE_DIR}/../python/PythonSwig.cpp.template ${file}.cpp > ${devnull}
+ COMMAND groovy
+ ARGS -cp "${classpath}" ${CMAKE_SOURCE_DIR}/tools/codegenerator/Generator.groovy ${file}.xml ${CMAKE_CURRENT_SOURCE_DIR}/../python/PythonSwig.cpp.template ${file}.cpp > ${devnull}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../swig/${file} ${CMAKE_CURRENT_SOURCE_DIR}/../python/PythonSwig.cpp.template)
set(SOURCES ${SOURCES} "${CPP_FILE}" PARENT_SCOPE)
endfunction()