diff options
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | Requirements/Makefile | 14 | ||||
| -rw-r--r-- | docs/jvpp.rst | 1 | ||||
| -rw-r--r-- | java/CMakeLists.txt | 6 |
4 files changed, 11 insertions, 18 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2074565..f313ca7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,9 +12,6 @@ # limitations under the License. cmake_minimum_required(VERSION 3.5 FATAL_ERROR) -add_custom_target(install-dep COMMAND make install-dep - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Requirements - ) project(jvpp) @@ -110,9 +107,10 @@ message(" Java home: $ENV{JAVA_HOME}") find_package(Java 1.8 REQUIRED COMPONENTS Development) get_filename_component(jvm_path ${Java_JAVAC_EXECUTABLE} DIRECTORY) set(Java_INCLUDE_DIRS ${jvm_path}/../include ${jvm_path}/../include/linux) - +message(" Java: ${Java_JAVA_EXECUTABLE}") +message(" Java version: ${Java_VERSION_STRING}") message(" Java headers: ${Java_INCLUDE_DIRS}") -message(" Java compiler: ${Java_JAVAC_EXECUTABLE}") +message(" Javac: ${Java_JAVAC_EXECUTABLE}") execute_process(COMMAND ./scripts/verify-installed vpp* OUTPUT_VARIABLE VPP_INSTALLED) string(STRIP "${VPP_INSTALLED}" VPP_INSTALLED) diff --git a/Requirements/Makefile b/Requirements/Makefile index 7cb01b7..34ad3fa 100644 --- a/Requirements/Makefile +++ b/Requirements/Makefile @@ -28,6 +28,8 @@ SUDO?=sudo ifneq ($(shell uname),Darwin) OS_ID = $(shell grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g') OS_VERSION_ID= $(shell grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g') +$(info Operating system: $(OS_ID)) +$(info Operating system version: $(OS_VERSION_ID)) endif ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID)) @@ -47,10 +49,7 @@ DEB_DEPENDS += libboost-all-dev libffi-dev python-ply libmbedtls-dev DEB_DEPENDS += cmake ninja-build # ADD JDK for JVPP -ifeq ($(OS_VERSION_ID),14.04) - DEB_DEPENDS += openjdk-8-jdk-headless - DEB_DEPENDS += libssl-dev -else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8) +ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8) DEB_DEPENDS += openjdk-8-jdk-headless DEB_DEPENDS += libssl-dev APT_ARGS = -t jessie-backports @@ -151,18 +150,13 @@ TARGETS = jvpp .PHONY: help .PHONY: install-dep - help: @echo "Make Targets:" @echo " install-dep - install software dependencies" @echo "" install-dep: -ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID)) -ifeq ($(OS_VERSION_ID),14.04) - @sudo -E apt-get $(CONFIRM) $(FORCE) install software-properties-common - @sudo -E add-apt-repository ppa:openjdk-r/ppa $(CONFIRM) -endif +ifeq ($(filter ubuntu debian linuxmint,$(OS_ID)),$(OS_ID)) ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8) @grep -q jessie-backports /etc/apt/sources.list /etc/apt/sources.list.d/* 2> /dev/null \ || ( echo "Please install jessie-backports" ; exit 1 ) diff --git a/docs/jvpp.rst b/docs/jvpp.rst index ffa996a..02a8e69 100644 --- a/docs/jvpp.rst +++ b/docs/jvpp.rst @@ -33,6 +33,7 @@ You can install all dependencies using provided install-dep target: .. code-block:: console + cd Requirements make install-dep Cleanup (Optional) diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt index bd590e2..701a65c 100644 --- a/java/CMakeLists.txt +++ b/java/CMakeLists.txt @@ -49,7 +49,7 @@ add_custom_command(TARGET jvpp-registry-classes COMMAND mkdir -p jvpp-registry/target COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/jvpp-registry COMMAND ${Java_JAVAC_EXECUTABLE} - ARGS -d ${CMAKE_CURRENT_SOURCE_DIR}/jvpp-registry/target -h jvpp-registry ${files} + ARGS -source 1.8 -target 1.8 -d ${CMAKE_CURRENT_SOURCE_DIR}/jvpp-registry/target -h jvpp-registry ${files} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) @@ -90,7 +90,7 @@ function(japigen name) ARGS --plugin_name ${name} --root_dir jvpp-${name} -i ${ARGN} COMMAND find jvpp-${name} -name \*.java > jvpp-${name}/jvpp-${name}.files COMMAND ${Java_JAVAC_EXECUTABLE} - ARGS -cp ${CMAKE_CURRENT_BINARY_DIR}/jvpp-registry-${JAPI_LIB_VERSION}.jar -d + ARGS -source 1.8 -target 1.8 -cp ${CMAKE_CURRENT_BINARY_DIR}/jvpp-registry-${JAPI_LIB_VERSION}.jar -d ${CMAKE_CURRENT_SOURCE_DIR}/jvpp-${name}/target -h jvpp-${name} @jvpp-${name}/jvpp-${name}.files WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} @@ -282,7 +282,7 @@ set(CPACK_PACKAGE_NAME "vpp-api-java") set(CPACK_PACKAGE_VERSION "${JVPP_VERSION}") set(CPACK_PACKAGE_SECTION net) set(CPACK_PACKAGE_VENDOR "Cisco") -set(CPACK_PACKAGE_CONTACT "hc2vpp@lists.fd.io") +set(CPACK_PACKAGE_CONTACT "jvpp-dev@lists.fd.io") set(CPACK_OUTPUT_FILE_PREFIX build-root/packages) set(CPACK_PACKAGE_FILE_NAME "vpp-api-java_${JVPP_VERSION}") if (${RELEASE_ID} IN_LIST DebianBasedOS) |