From 8735c553eb8b200c0375e32c1be64ad8f9e88c08 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 12 Oct 2017 14:41:55 +0200 Subject: [PATCH] Added install step of generated java files --- wrappers/java/CMakeLists.txt | 5 ++++- wrappers/java/genwrapper.py | 6 ------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/wrappers/java/CMakeLists.txt b/wrappers/java/CMakeLists.txt index 78c6a1e1a..7dcb317fb 100644 --- a/wrappers/java/CMakeLists.txt +++ b/wrappers/java/CMakeLists.txt @@ -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) \ No newline at end of file +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") \ No newline at end of file diff --git a/wrappers/java/genwrapper.py b/wrappers/java/genwrapper.py index 256e17ef0..7ad4279d1 100644 --- a/wrappers/java/genwrapper.py +++ b/wrappers/java/genwrapper.py @@ -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()