Merge pull request #864 from lukaszstolarczuk/merge-stable-1.5-into-stable-1.6

Merge stable-1.5 into stable-1.6

Author: igchor

CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright 2018-2019, Intel Corporation
+# Copyright 2018-2020, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -181,7 +181,7 @@ if(DEVELOPER_MODE)
 		get_program_version(${CLANG_FORMAT} CLANG_FORMAT_VERSION)
 		if(NOT (CLANG_FORMAT_VERSION VERSION_EQUAL CLANG_FORMAT_REQUIRED))
 			message(WARNING "required clang-format version is ${CLANG_FORMAT_REQUIRED}")
-			unset(CLANG_FORMAT)
+			unset(CLANG_FORMAT CACHE)
 		endif()
 	else()
 		message(WARNING "clang-format not found - C++ sources will not be checked (needed version: ${CLANG_FORMAT_REQUIRED})")

doc/libpmemobj++.Doxyfile.in

@@ -23,7 +23,7 @@ PROJECT_NAME = "PMDK C++ bindings"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER = "1.2.0"
+PROJECT_NUMBER = @VERSION@
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -73,7 +73,12 @@ HIDE_UNDOC_CLASSES = YES
 # standard output by doxygen. If QUIET is set to YES this implies that the
 # messages are off.
 
-QUIET = YES
+QUIET = NO
+
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
+# in which the alphabetical index list will be split.
+
+COLS_IN_ALPHA_INDEX = 1
 
 #---------------------------------------------------------------------------
 # Configuration options related to the input files

travis.yml

@@ -10,7 +10,7 @@ services:
 env:
   matrix:
     - TYPE=normal OS=ubuntu OS_VER=18.04 PUSH_IMAGE=1
-    - TYPE=normal OS=fedora OS_VER=28 PUSH_IMAGE=1 AUTO_DOC_UPDATE=1
+    - TYPE=normal OS=fedora OS_VER=32 PUSH_IMAGE=1 AUTO_DOC_UPDATE=1
     - TYPE=normal OS=ubuntu OS_VER=18.04 COVERAGE=1
     - TYPE=coverity OS=ubuntu OS_VER=18.04
 

utils/docker/images/Dockerfile.fedora-28 utils/docker/images/Dockerfile.fedora-32utils/docker/images/Dockerfile.fedora-28 renamed to utils/docker/images/Dockerfile.fedora-32

@@ -1,5 +1,5 @@
 #
-# Copyright 2016-2018, Intel Corporation
+# Copyright 2016-2020, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -35,7 +35,7 @@
 #
 
 # Pull base image
-FROM fedora:28
+FROM fedora:32
 MAINTAINER [email protected]
 
 # Install basic tools
@@ -45,6 +45,7 @@ RUN dnf update -y \
 	automake \
 	clang \
 	cmake \
+	daxctl-devel \
 	doxygen \
 	gcc \
 	gdb \
@@ -54,6 +55,7 @@ RUN dnf update -y \
 	make \
 	man \
 	ncurses-devel \
+	ndctl-devel \
 	open-sans-fonts \
 	passwd \
 	perl-Text-Diff \
@@ -75,10 +77,6 @@ RUN dnf update -y \
 	bash-completion \
  && dnf clean all
 
-# Install libndctl
-COPY install-libndctl.sh install-libndctl.sh
-RUN ./install-libndctl.sh fedora
-
 # Install valgrind
 COPY install-valgrind.sh install-valgrind.sh
 RUN ./install-valgrind.sh
@@ -97,7 +95,7 @@ USER $USER
 
 # Set required environment variables
 ENV OS fedora
-ENV OS_VER 28
+ENV OS_VER 32
 ENV PACKAGE_MANAGER rpm
 ENV NOTTY 1
 

utils/docker/images/Dockerfile.ubuntu-18.04

@@ -1,5 +1,5 @@
 #
-# Copyright 2016-2018, Intel Corporation
+# Copyright 2016-2020, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -46,7 +46,7 @@ RUN apt-get update \
 	tzdata \
 	autoconf \
 	clang \
-	clang-format \
+	clang-format-6.0 \
 	cmake \
 	curl \
 	debhelper \
@@ -57,6 +57,8 @@ RUN apt-get update \
 	gdb \
 	git \
 	graphviz \
+	libdaxctl-dev \
+	libndctl-dev \
 	libunwind-dev \
 	libtext-diff-perl \
 	pkg-config \
@@ -73,10 +75,6 @@ RUN apt-get update \
 	libudev-dev \
  && rm -rf /var/lib/apt/lists/*
 
-# Install libndctl
-COPY install-libndctl.sh install-libndctl.sh
-RUN ./install-libndctl.sh
-
 # Install valgrind
 COPY install-valgrind.sh install-valgrind.sh
 RUN ./install-valgrind.sh

utils/docker/images/install-libndctl.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2018-2019, Intel Corporation
+# Copyright 2018-2020, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -38,7 +38,7 @@ set -e
 
 git clone https://github.com/pmem/pmdk
 cd pmdk
-git checkout 1.6
+git checkout 1.6.1
 
 sudo make EXTRA_CFLAGS="-DUSE_COW_ENV" -j2 install prefix=/opt/pmdk
 

utils/docker/images/install-pmdk.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2016-2019, Intel Corporation
+# Copyright 2016-2020, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -38,11 +38,12 @@ set -e
 
 git clone --recursive https://github.com/pmem/valgrind.git
 cd valgrind
-# pmem-3.14: pmemcheck: add missing Ist_Flush IRStmt handling
-git checkout 332b3975989d9130486d09493a9571528d66eaf7
+# pmem-3.15: Merge pull request #81 from marcinslusarz/pmem-3.15
+git checkout 09f75f69683d862f8456f75484fcdc0dc5508900
+
 ./autogen.sh
 ./configure --prefix=/usr
-make
-make install
+make -j$(nproc)
+sudo make -j$(nproc) install
 cd ..
 rm -rf valgrind