Master

.gitignore

@@ -1,18 +1,29 @@
-# Emacs temp files
+# Emacs
 *~
+\#*\#
+/.emacs.desktop
+/.emacs.desktop.lock
+*.elc
+.\#*
 
-# macOS stuff
-.DS_*
+# Visual Studio Code
+.vscode/
 
-# waf build system
-.waf-1*
-.waf3-*
-.lock*
-build/
+# macOS
+.DS_Store
+.AppleDouble
+.LSOverride
+._*
+
+# Waf build system
+/build/
+.waf-*-*/
+.waf3-*-*/
+.lock-waf*
 
 # Compiled python code
-*.pyc
-*.pyo
+__pycache__/
+*.py[cod]
 
 # Other
-VERSION
+/VERSION

.jenkins

@@ -1,10 +1,27 @@
 #!/usr/bin/env bash
 set -e
 
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+nanos() {
+    # Cannot use date(1) because macOS does not support %N format specifier
+    python -c 'import time; print(int(time.time() * 1e9))'
+}
 
-for file in "$DIR"/.jenkins.d/*; do
+for file in .jenkins.d/*; do
     [[ -f $file && -x $file ]] || continue
-    echo "Run: $file"
+
+    if [[ -n $TRAVIS ]]; then
+        label=$(basename "$file" | sed -E 's/[[:digit:]]+-(.*)\..*/\1/')
+        echo -ne "travis_fold:start:${label}\r"
+        echo -ne "travis_time:start:${label}\r"
+        start=$(nanos)
+    fi
+
+    echo "\$ $file"
     "$file"
+
+    if [[ -n $TRAVIS ]]; then
+        finish=$(nanos)
+        echo -ne "travis_time:end:${label}:start=${start},finish=${finish},duration=$((finish-start)),event=${label}\r"
+        echo -ne "travis_fold:end:${label}\r"
+    fi
 done

.jenkins.d/00-deps.sh

@@ -7,14 +7,47 @@ source "$JDIR"/util.sh
 set -x
 
 if has OSX $NODE_LABELS; then
+    FORMULAE=(boost pkg-config)
+    if [[ -n $USE_OPENSSL_1_1 ]]; then
+        FORMULAE+=([email protected])
+    else
+        FORMULAE+=(openssl)
+    fi
+
     brew update
-    brew upgrade
-    brew install boost pkg-config cryptopp openssl
+    if [[ -n $TRAVIS ]]; then
+        # Travis images come with a large number of brew packages
+        # pre-installed, don't waste time upgrading all of them
+        for FORMULA in "${FORMULAE[@]}"; do
+            brew outdated $FORMULA || brew upgrade $FORMULA
+        done
+    else
+        brew upgrade
+    fi
+    brew install "${FORMULAE[@]}"
     brew cleanup
 fi
 
 if has Ubuntu $NODE_LABELS; then
     sudo apt-get -qq update
-    sudo apt-get -qq install build-essential pkg-config libboost-all-dev \
-                             libcrypto++-dev libsqlite3-dev libssl-dev
+    sudo apt-get -qy install build-essential pkg-config libboost-all-dev \
+                             libsqlite3-dev libssl-dev
+
+    if [[ $JOB_NAME == *"code-coverage" ]]; then
+        sudo apt-get -qy install gcovr lcov libgd-perl
+    fi
+fi
+
+if has CentOS-7 $NODE_LABELS; then
+    sudo yum -y install yum-utils pkgconfig \
+                        openssl-devel libtranslit-icu \
+                        python-devel sqlite-devel \
+                        devtoolset-7-libasan-devel \
+                        devtoolset-7-liblsan-devel
+    sudo yum -y groupinstall 'Development Tools'
+
+    svn checkout https://github.com/cmscaltech/sandie-ndn/trunk/packaging/RPMS/x86_64/boost1_58_0
+    pushd boost1_58_0 >/dev/null
+    sudo rpm -Uv --replacepkgs --replacefiles boost-devel* boost-license* libboost_*
+    popd >/dev/null
 fi

.jenkins.d/10-build.sh

@@ -6,45 +6,49 @@ source "$JDIR"/util.sh
 
 set -x
 
-sudo rm -Rf /usr/local/include/ndn-cxx
-sudo rm -f /usr/local/lib/libndn-cxx*
-sudo rm -f /usr/local/lib/pkgconfig/libndn-cxx*
+sudo rm -f /usr/local/bin/ndnsec*
+sudo rm -fr /usr/local/include/ndn-cxx
+sudo rm -f /usr/local/lib{,64}/libndn-cxx*
+sudo rm -f /usr/local/lib{,64}/pkgconfig/libndn-cxx.pc
+
+if [[ $JOB_NAME == *"code-coverage" ]]; then
+    COVERAGE="--with-coverage"
+elif [[ -z $DISABLE_ASAN ]]; then
+    ASAN="--with-sanitizer=address"
+fi
+if [[ -n $USE_OPENSSL_1_1 ]] && has OSX $NODE_LABELS; then
+    OPENSSL="--with-openssl=/usr/local/opt/[email protected]"
+fi
 
 # Cleanup
-sudo ./waf -j1 --color=yes distclean
+sudo_preserve_env PATH -- ./waf --color=yes distclean
 
 if [[ $JOB_NAME != *"code-coverage" && $JOB_NAME != *"limited-build" ]]; then
   # Configure/build static library in optimized mode with tests
-  ./waf -j1 --color=yes configure --enable-static --disable-shared --with-tests
-  ./waf -j1 --color=yes build
+  ./waf --color=yes configure --enable-static --disable-shared --with-tests $OPENSSL
+  ./waf --color=yes build -j${WAF_JOBS:-1}
 
   # Cleanup
-  sudo ./waf -j1 --color=yes distclean
+  sudo_preserve_env PATH -- ./waf --color=yes distclean
 
   # Configure/build static and shared library in optimized mode without tests
-  ./waf -j1 --color=yes configure --enable-static --enable-shared
-  ./waf -j1 --color=yes build
+  ./waf --color=yes configure --enable-static --enable-shared $OPENSSL
+  ./waf --color=yes build -j${WAF_JOBS:-1}
 
   # Cleanup
-  sudo ./waf -j1 --color=yes distclean
+  sudo_preserve_env PATH -- ./waf --color=yes distclean
 fi
 
 # Configure/build shared library in debug mode with tests/examples and without precompiled headers
-if [[ $JOB_NAME == *"code-coverage" ]]; then
-    COVERAGE="--with-coverage"
-elif ! has OSX-10.9 $NODE_LABELS && ! has OSX-10.11 $NODE_LABELS; then
-    ASAN="--with-sanitizer=address"
-fi
-./waf -j1 --color=yes configure --disable-static --enable-shared --debug --with-tests --with-examples --without-pch $COVERAGE $ASAN
-./waf -j1 --color=yes build
+./waf --color=yes configure --disable-static --enable-shared --debug --with-tests \
+                            --with-examples --without-pch $ASAN $COVERAGE $OPENSSL
+./waf --color=yes build -j${WAF_JOBS:-1}
 
 # (tests will be run against debug version)
 
 # Install
-sudo ./waf -j1 --color=yes install
+sudo_preserve_env PATH -- ./waf --color=yes install
 
 if has Linux $NODE_LABELS; then
     sudo ldconfig
-elif has FreeBSD $NODE_LABELS; then
-    sudo ldconfig -a
 fi

.jenkins.d/20-tests.sh

@@ -31,7 +31,6 @@ ut_log_args() {
 }
 
 ASAN_OPTIONS="color=always"
-ASAN_OPTIONS+=":detect_leaks=false"
 ASAN_OPTIONS+=":detect_stack_use_after_return=true"
 ASAN_OPTIONS+=":check_initialization_order=true"
 ASAN_OPTIONS+=":strict_init_order=true"
@@ -41,5 +40,8 @@ ASAN_OPTIONS+=":strict_string_checks=true"
 ASAN_OPTIONS+=":strip_path_prefix=${PWD}/"
 export ASAN_OPTIONS
 
+export BOOST_TEST_BUILD_INFO=1
+export BOOST_TEST_COLOR_OUTPUT=1
+
 # Run unit tests
 ./build/unit-tests $(ut_log_args)

.jenkins.d/30-coverage.sh

@@ -9,7 +9,28 @@ set -x
 if [[ $JOB_NAME == *"code-coverage" ]]; then
     gcovr --object-directory=build \
           --output=build/coverage.xml \
-          --filter="$PWD/src" \
+          --exclude="$PWD/(examples|tests)" \
           --root=. \
           --xml
+
+    # Generate also a detailed HTML output, but using lcov (better results)
+    lcov --quiet \
+         --capture \
+         --directory . \
+         --no-external \
+         --rc lcov_branch_coverage=1 \
+         --output-file build/coverage-with-tests.info
+
+    lcov --quiet \
+         --remove build/coverage-with-tests.info "$PWD/tests/*" \
+         --rc lcov_branch_coverage=1 \
+         --output-file build/coverage.info
+
+    genhtml --branch-coverage \
+            --demangle-cpp \
+            --frames \
+            --legend \
+            --output-directory build/coverage \
+            --title "ndn-cxx unit tests" \
+            build/coverage.info
 fi

.jenkins.d/40-standalone-header-compilation.sh

@@ -6,37 +6,29 @@
 # (similar to running all test cases), instead of failing at the first error.
 
 CXX=${CXX:-g++}
+STD=-std=c++14
+CXXFLAGS="-O2 -Wall -Wno-unused-const-variable -Wno-unused-local-typedef $(pkg-config --cflags libndn-cxx)"
+INCLUDEDIR="$(pkg-config --variable=includedir libndn-cxx)"/ndn-cxx
 
-STD=
-if $CXX -xc++ /dev/null -o /dev/null -c -std=c++11 &>/dev/null; then
-  STD=-std=c++11
-elif $CXX  -xc++ /dev/null -o /dev/null -c -std=c++0x &>/dev/null; then
-  STD=-std=c++0x
-fi
-
-STDLIB=
-if $CXX -xc++ /dev/null -o /dev/null -c $STD -stdlib=libc++ &>/dev/null; then
-  STDLIB=-stdlib=libc++
-fi
-
-echo 'Compiler flags:' $CXX $STD $STDLIB
+echo "Using: $CXX $STD $CXXFLAGS"
 
-INCLUDEDIR=/usr/local/include/ndn-cxx
 NCHECKED=0
 NERRORS=0
 while IFS= read -r -d '' H; do
-  echo 'Verifying standalone header compilation for' $H
-  $CXX -xc++ "$INCLUDEDIR/$H" -o /dev/null -c $STD $STDLIB $(pkg-config --cflags libndn-cxx)
+  echo "Verifying standalone header compilation for ${H#${INCLUDEDIR}/}"
+  "$CXX" -xc++ $STD $CXXFLAGS -c -o /dev/null "$H"
   [[ $? -eq 0 ]] || ((NERRORS++))
   ((NCHECKED++))
-done < <(cd "$INCLUDEDIR" && find * -name '*.hpp' -type f -print0 2>/dev/null)
+done < <(find "$INCLUDEDIR" -name '*.hpp' -type f -print0 2>/dev/null)
 
 if [[ $NCHECKED -eq 0 ]]; then
   echo 'No header found. Is ndn-cxx installed?'
   exit 1
+else
+  echo "$NCHECKED headers checked."
 fi
 
 if [[ $NERRORS -gt 0 ]]; then
-  echo $NERRORS 'headers cannot compile on its own'
+  echo "$NERRORS headers could not be compiled."
   exit 1
 fi

.jenkins.d/README.md

@@ -13,19 +13,21 @@ Environment Variables Used in Build Scripts
 
   * `[OS_TYPE]`: `Linux`
   * `[DISTRO_TYPE]`: `Ubuntu`
-  * `[DISTRO_VERSION]`: `Ubuntu-14.04`, `Ubuntu-16.04`
+  * `[DISTRO_VERSION]`: `Ubuntu-16.04`, `Ubuntu-18.04`
 
-  Possible values for OS X / macOS:
+  Possible values for macOS:
 
   * `[OS_TYPE]`: `OSX`
   * `[DISTRO_TYPE]`: `OSX` (can be absent)
-  * `[DISTRO_VERSION]`: `OSX-10.10`, `OSX-10.11`, `OSX-10.12`
+  * `[DISTRO_VERSION]`: `OSX-10.12`, `OSX-10.13`, `OSX-10.14`
 
 - `JOB_NAME`: optional variable to define type of the job.  Depending on the defined job type,
   the build scripts can perform different tasks.
 
   Possible values:
 
   * empty: default build process
-  * `code-coverage` (Linux OS is assumed): debug build with tests and code coverage analysis
+  * `code-coverage` (Ubuntu Linux is assumed): debug build with tests and code coverage analysis
   * `limited-build`: only a single debug build with tests
+
+- `WAF_JOBS`: number of parallel build jobs used by waf, defaults to 1.

.jenkins.d/util.sh

@@ -16,3 +16,22 @@ has() {
     set ${saved_xtrace}
     return ${ret}
 }
+
+sudo_preserve_env() {
+    local saved_xtrace
+    [[ $- == *x* ]] && saved_xtrace=-x || saved_xtrace=+x
+    set +x
+
+    local vars=()
+    while [[ $# -gt 0 ]]; do
+        local arg=$1
+        shift
+        case ${arg} in
+            --) break ;;
+            *)  vars+=("${arg}=${!arg}") ;;
+        esac
+    done
+
+    set ${saved_xtrace}
+    sudo env "${vars[@]}" "$@"
+}

.mailmap

@@ -0,0 +1,8 @@
+<[email protected]> <[email protected]>
+<[email protected]> <[email protected]>
+<[email protected]> <[email protected]>
+<[email protected]> <[email protected]>
+Teng Liang <[email protected]>
+<[email protected]> <[email protected]>
+Hila Ben Abraham <[email protected]>
+Laqin Fan <[email protected]>