Merge pull request #882 from lukaszstolarczuk/merge-stable-1.7-into-stable-1.8

Merge stable 1.7 into stable 1.8

Author: lukaszstolarczuk

CMakeLists.txt

@@ -205,7 +205,7 @@ add_custom_target(tests)
 
 if(DEVELOPER_MODE)
 	add_flag(-Werror) # XXX: WX for windows
-	find_program(CLANG_FORMAT NAMES clang-format clang-format-8.0)
+	find_program(CLANG_FORMAT NAMES clang-format clang-format-8 clang-format-8.0)
 	set(CLANG_FORMAT_REQUIRED "8.0")
 	if(CLANG_FORMAT)
 		get_program_version(${CLANG_FORMAT} CLANG_FORMAT_VERSION)

doc/libpmemobj++.Doxyfile.in

@@ -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

@@ -9,16 +9,16 @@ services:
 
 env:
   matrix:
-    - TYPE=debug OS=fedora OS_VER=30 PUSH_IMAGE=1 AUTO_DOC_UPDATE=1
-    - TYPE=debug OS=ubuntu OS_VER=19.04 PUSH_IMAGE=1
-    - TYPE=debug OS=ubuntu OS_VER=19.04 COVERAGE=1
-    - TYPE=release OS=fedora OS_VER=30
-    - TYPE=release OS=ubuntu OS_VER=19.04
-    - TYPE=valgrind OS=ubuntu OS_VER=19.04
-    - TYPE=memcheck_drd OS=ubuntu OS_VER=19.04
-    - TYPE=coverity OS=ubuntu OS_VER=19.04
-    - TYPE=package OS=ubuntu OS_VER=19.04
-    - TYPE=package OS=fedora OS_VER=30
+    - TYPE=debug OS=fedora OS_VER=32 PUSH_IMAGE=1 AUTO_DOC_UPDATE=1
+    - TYPE=debug OS=ubuntu OS_VER=20.04 PUSH_IMAGE=1
+    - TYPE=debug OS=ubuntu OS_VER=20.04 COVERAGE=1
+    - TYPE=release OS=fedora OS_VER=32
+    - TYPE=release OS=ubuntu OS_VER=20.04
+    - TYPE=valgrind OS=ubuntu OS_VER=20.04
+    - TYPE=memcheck_drd OS=ubuntu OS_VER=20.04
+    - TYPE=coverity OS=ubuntu OS_VER=20.04
+    - TYPE=package OS=ubuntu OS_VER=20.04
+    - TYPE=package OS=fedora OS_VER=32
 
 before_install:
   - echo $TRAVIS_COMMIT_RANGE

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

@@ -35,7 +35,7 @@
 #
 
 # Pull base image
-FROM fedora:30
+FROM fedora:32
 MAINTAINER marcin.slusarz@intel.com
 
 # Additional parameters to build docker without building components
@@ -51,6 +51,7 @@ RUN dnf update -y \
 	bash-completion \
 	clang \
 	cmake \
+	daxctl-devel \
 	doxygen \
 	gcc \
 	gdb \
@@ -65,6 +66,7 @@ RUN dnf update -y \
 	make \
 	man \
 	ncurses-devel \
+	ndctl-devel \
 	open-sans-fonts \
 	passwd \
 	perl-Text-Diff \
@@ -80,10 +82,6 @@ RUN dnf update -y \
 	xmlto \
  && 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
@@ -102,7 +100,7 @@ USER $USER
 
 # Set required environment variables
 ENV OS fedora
-ENV OS_VER 30
+ENV OS_VER 32
 ENV PACKAGE_MANAGER rpm
 ENV NOTTY 1
 

…ls/docker/images/Dockerfile.ubuntu-19.04 …ls/docker/images/Dockerfile.ubuntu-20.04utils/docker/images/Dockerfile.ubuntu-19.04 renamed to utils/docker/images/Dockerfile.ubuntu-20.04 utils/docker/images/Dockerfile.ubuntu-19.04 renamed to utils/docker/images/Dockerfile.ubuntu-20.04

@@ -35,7 +35,7 @@
 #
 
 # Pull base image
-FROM ubuntu:19.04
+FROM ubuntu:20.04
 MAINTAINER marcin.slusarz@intel.com
 
 # Additional parameters to build docker without building components
@@ -50,7 +50,7 @@ RUN apt-get update \
 	asciidoc \
 	autoconf \
 	clang \
-	clang-format \
+	clang-format-8 \
 	cmake \
 	curl \
 	debhelper \
@@ -60,9 +60,11 @@ RUN apt-get update \
 	gdb \
 	git \
 	graphviz \
+	libdaxctl-dev \
 	libjson-c-dev \
 	libkmod-dev \
 	libncurses5-dev \
+	libndctl-dev \
 	libsfml-dev \
 	libtbb-dev \
 	libtext-diff-perl \
@@ -78,10 +80,6 @@ RUN apt-get update \
 	whois \
  && 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
@@ -98,6 +96,6 @@ USER $USER
 
 # Set required environment variables
 ENV OS ubuntu
-ENV OS_VER 19.04
+ENV OS_VER 20.04
 ENV PACKAGE_MANAGER deb
 ENV NOTTY 1

utils/docker/images/build-image.sh

@@ -49,20 +49,20 @@ function usage {
 		"current directory."
 }
 
-# Check if the first and second argument is nonempty
-if [[ -z "$1" || -z "$2" ]]; then
+echo "Check if the first and second argument are nonempty: \"${1}\", \"${2}\""
+if [[ -z "${1}" || -z "${2}" ]]; then
 	usage
 	exit 1
 fi
 
-# Check if the file Dockerfile.OS-VER exists
+echo "Check if the file Dockerfile.${1}-${2} exists"
 if [[ ! -f "Dockerfile.$2" ]]; then
 	echo "ERROR: wrong argument."
 	usage
 	exit 1
 fi
 
-# Build a Docker image tagged with ${DOCKERHUB_REPO}:1.8-OS-VER
+echo "Build a Docker image tagged with ${DOCKERHUB_REPO}:1.8-${1}-${2}"
 docker build -t $1:1.8-$2 \
 	--build-arg http_proxy=$http_proxy \
 	--build-arg https_proxy=$https_proxy \

utils/docker/images/install-libndctl.sh

@@ -43,11 +43,12 @@ fi
 
 git clone --recursive https://github.com/pmem/valgrind.git
 cd valgrind
-# pmem-3.14: fix memcheck failure on Ubuntu-19.04
-git checkout 0965e35d7fd5c7941dc3f2a0c981cb8386c479d3
+# pmem-3.15: Merge pull request #81 from marcinslusarz/pmem-3.15
+git checkout 09f75f69683d862f8456f75484fcdc0dc5508900
+
 ./autogen.sh
 ./configure --prefix=/usr
 make -j$(nproc)
-make -j$(nproc) install
+sudo make -j$(nproc) install
 cd ..
 rm -rf valgrind

utils/docker/images/install-valgrind.sh

@@ -49,23 +49,24 @@ function usage {
 		"locally."
 }
 
-# Check if the first argument is nonempty
-if [[ -z "$1" ]]; then
+OS__OS_VER=${1}
+echo "Check if the first argument (OS-VER) is nonempty: \"${OS__OS_VER}\""
+if [[ -z "${OS__OS_VER}" ]]; then
 	usage
 	exit 1
 fi
 
-# Check if the image tagged with ${DOCKERHUB_REPO}:1.8-OS-VER exists locally
-if [[ ! $(docker images -a | awk -v pattern="^${DOCKERHUB_REPO}:1.8-$1\$" \
+echo "Check if the image tagged with ${DOCKERHUB_REPO}:1.8-${OS__OS_VER} exists locally"
+if [[ ! $(docker images -a | awk -v pattern="^${DOCKERHUB_REPO}:1.8-${OS__OS_VER}\$" \
 	'$1":"$2 ~ pattern') ]]
 then
 	echo "ERROR: wrong argument."
 	usage
 	exit 1
 fi
 
-# Log in to the Docker Hub
+echo "Log in to the Docker Hub"
 docker login -u="$DOCKERHUB_USER" -p="$DOCKERHUB_PASSWORD"
 
-# Push the image to the repository
-docker push ${DOCKERHUB_REPO}:1.8-$1
+echo "Push the image to the repository"
+docker push ${DOCKERHUB_REPO}:1.8-${OS__OS_VER}