Added install step of generated java files

This commit is contained in:
Sylvain Berfini 2017-10-12 14:41:55 +02:00
parent a342260c21
commit 8735c553eb
2 changed files with 4 additions and 7 deletions

View file

@ -38,4 +38,7 @@ add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/src/linphone_jni.cc"
add_custom_target(linphonej ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/src/linphone_jni.cc")
set(LINPHONE_JNI_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/src/linphone_jni.cc" PARENT_SCOPE)
set(LINPHONE_JNI_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/src/linphone_jni.cc" PARENT_SCOPE)
install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/java" DESTINATION "${CMAKE_INSTALL_DATADIR}/linphonej/")
install(DIRECTORY classes/ DESTINATION "${CMAKE_INSTALL_DATADIR}/linphonej/java/org/linphone/core/" FILES_MATCHING PATTERN "*.java")

View file

@ -800,7 +800,6 @@ class GenWrapper(object):
##########################################################################
def main():
import shutil
argparser = argparse.ArgumentParser(description='Generate source files for the Java wrapper')
argparser.add_argument('xmldir', type=str, help='Directory where the XML documentation of the Linphone\'s API generated by Doxygen is placed')
argparser.add_argument('-o --output', type=str, help='the directory where to generate the source files', dest='outputdir', default='.')
@ -831,10 +830,5 @@ def main():
genwrapper = GenWrapper(srcdir, javadir, args.package, args.xmldir)
genwrapper.render_all()
for f in os.listdir('./classes'):
src = os.path.join('./classes', f)
tgt = os.path.join(javadir, f)
shutil.copy(src, tgt)
if __name__ == '__main__':
main()