Merge pull request #5707 from tautschnig/java-library-cleanup

Cleanup Java library build

Author: tautschnig

CMakeLists.txt

@@ -136,7 +136,6 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR
             COMMAND ${CODE_COVERAGE_LCOV} ${LCOV_FLAGS} --remove ${CODE_COVERAGE_INFO_FILE} '/usr/*' --output-file ${CODE_COVERAGE_INFO_FILE}
             COMMAND ${CODE_COVERAGE_GENHTML} ${CODE_COVERAGE_INFO_FILE} --output-directory ${CODE_COVERAGE_OUTPUT_DIR}
             DEPENDS
-              java-models-library
               "$<TARGET_FILE:java-unit>"
               "$<TARGET_FILE:unit>"
               "$<TARGET_FILE:goto-harness>"

jbmc/CMakeLists.txt

@@ -2,15 +2,8 @@ add_subdirectory(regression)
 add_subdirectory(src)
 add_subdirectory(unit)
 
-add_custom_target(java-models-library ALL
-    COMMAND mvn --quiet -Dmaven.test.skip=true package
-    COMMAND ${CMAKE_COMMAND} -E copy target/core-models.jar ${CMAKE_CURRENT_SOURCE_DIR}/src/java_bytecode/library/
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib/java-models-library
-)
-
 cprover_default_properties(
     java_bytecode
-    java-models-library
     jbmc
     jbmc-lib
     janalyzer
@@ -21,3 +14,25 @@ cprover_default_properties(
     java-unit
     miniz
 )
+
+# java models library
+find_program(MAVEN_PROGRAM mvn REQUIRED)
+
+file(GLOB_RECURSE java_models_sources "lib/java-models-library/src/*.java")
+
+add_custom_command(OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/lib/java-models-library/target/core-models.jar"
+    COMMAND ${MAVEN_PROGRAM} --quiet -Dmaven.test.skip=true package
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib/java-models-library
+    DEPENDS ${java_models_sources}
+)
+
+add_custom_target(java-models-library ALL
+    DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/lib/java-models-library/target/core-models.jar"
+)
+
+install(
+  FILES
+    "${CMAKE_CURRENT_SOURCE_DIR}/lib/java-models-library/target/core-models.jar"
+    "${CMAKE_CURRENT_SOURCE_DIR}/lib/java-models-library/target/cprover-api.jar"
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)

jbmc/src/java_bytecode/CMakeLists.txt

@@ -1,6 +1,3 @@
-# include here the targets defined in library/
-add_subdirectory(library)
-
 # target 'java_bytecode' depends on all .cpp and .h files
 file(GLOB sources "*.cpp")
 file(GLOB_RECURSE headers "*.h")

jbmc/src/java_bytecode/Makefile

@@ -68,13 +68,17 @@ all: library java_bytecode$(LIBEXT)
 
 clean: clean_library
 
+LIBRARY_DIR = ../../lib/java-models-library
+
 .PHONY: clean_library
 clean_library:
-	$(MAKE) clean -C library
+	if [ -d $(LIBRARY_DIR) ]; then cd $(LIBRARY_DIR); mvn --quiet clean; fi
 
 .PHONY: library
 library:
-	$(MAKE) -C library
+	if [ -d $(LIBRARY_DIR) ]; then \
+		(cd $(LIBRARY_DIR); mvn --quiet -Dmaven.test.skip=true package); \
+	fi
 
 ###############################################################################
 

jbmc/src/java_bytecode/library/CMakeLists.txt

@@ -31,3 +31,6 @@ target_link_libraries(jbmc-lib
 add_executable(jbmc jbmc_main.cpp)
 target_link_libraries(jbmc jbmc-lib)
 install(TARGETS jbmc DESTINATION ${CMAKE_INSTALL_BINDIR})
+
+# make sure java-models-library is built at least once
+add_dependencies(jbmc java-models-library)