From f0ce8769561e1b487ab7b909b23510604bebbdc9 Mon Sep 17 00:00:00 2001 From: Tibor Král Date: Tue, 16 Apr 2019 13:22:39 +0000 Subject: Revert "Implementation of jvpp-stats plugin" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 34f365fdc926ca9abda25db43a7a45c68e9aeb67. Change-Id: Ia2cf9715379e2dc35ce1660dac2471871fd39e71 Signed-off-by: Tibor Král --- java/CMakeLists.txt | 45 --------------------------------------------- 1 file changed, 45 deletions(-) (limited to 'java/CMakeLists.txt') diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt index e0dc673..cc59910 100644 --- a/java/CMakeLists.txt +++ b/java/CMakeLists.txt @@ -185,51 +185,6 @@ FILE(GLOB_RECURSE files RELATIVE # message("COREFILES: ${corefiles}") java_api_binding(core core ${files}) -############# Stats package ################## -set(PACKAGE_DIR_JVPP_STATS io/fd/jvpp) -unset(files) -FILE(GLOB files RELATIVE - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/jvpp-stats/${PACKAGE_DIR_JVPP_STATS}/*.java - ${CMAKE_CURRENT_SOURCE_DIR}/jvpp-stats/${PACKAGE_DIR_JVPP_STATS}/*/*.java - ${CMAKE_CURRENT_SOURCE_DIR}/jvpp-stats/${PACKAGE_DIR_JVPP_STATS}/*/*/*.java - ) - -add_custom_target(jvpp-stats-classes ALL) -add_dependencies(jvpp-stats-classes jvpp-registry) -add_custom_command(TARGET jvpp-stats-classes - PRE_BUILD - COMMAND mkdir -p jvpp-stats/target - COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/jvpp-stats - COMMAND ${Java_JAVAC_EXECUTABLE} - ARGS -source 1.8 -target 1.8 -cp ${CMAKE_CURRENT_BINARY_DIR}/jvpp-registry-${JAPI_LIB_VERSION}.jar - -d ${CMAKE_CURRENT_SOURCE_DIR}/jvpp-stats/target -h jvpp-stats ${files} - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - -add_library(jvpp_stats SHARED jvpp-stats/jvpp_stats.c) -target_link_libraries(jvpp_stats ${JVPP_LIBS} vppapiclient vppinfra) -include_directories(jvpp-stats) -add_dependencies(jvpp_stats jvpp_common jvpp_registry jvpp-stats-classes) - -add_custom_target(jvpp-stats ALL) -add_dependencies(jvpp-stats jvpp_stats jvpp-stats-classes) -add_custom_command(TARGET jvpp-stats - PRE_BUILD - COMMAND cp ${CMAKE_BINARY_DIR}/build-root/lib/libjvpp_stats.so jvpp-stats/target - COMMAND ${Java_JAR_EXECUTABLE} ARGS cf - ${CMAKE_CURRENT_BINARY_DIR}/jvpp-stats-${JAPI_LIB_VERSION}.jar - -C jvpp-stats/target . - COMMAND rm ARGS -rf jvpp-stats/target - jvpp-stats/io_fd_jvpp_*.h - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - COMMENT "JAR_GEN stats" - ) -install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/jvpp-stats-${JAPI_LIB_VERSION}.jar - DESTINATION share/java -) - ############ Plugin Packages ####################### unset(files) unset(pluginfiles) -- cgit 1.2.3-korg