Merge branch 'devel'

lnls-dig · Jun 17, 2020 · f0e558b · f0e558b
2 parents fb72b6d + 1b9dfce
commit f0e558b
Show file tree

Hide file tree

Showing 16 changed files with 37 additions and 22 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,6 +13,7 @@ os: linux
 env:
   - PURE_MAKE=yes BOARD=afcv3_1 EXAMPLES=yes SYSTEM_INTEGRATION=no APP=halcsd
   - COMPILE_SCRIPT=yes BOARD=afcv3_1 EXAMPLES=yes SYSTEM_INTEGRATION=no APP=halcsd
+  - SONARQUBE=yes CMAKE=yes BOARD=afcv3_1
   - CMAKE=yes BOARD=ml605
   - CMAKE=yes BOARD=afcv3
   - CMAKE=yes BOARD=afcv3_1
@@ -92,7 +93,7 @@ install:
 script:
   - ./ci_build.sh
   - ./ci_show_err_logs.sh
-  - ./ci_scanner.sh
+  - if [ $SONARQUBE == "yes" ] ; then ./ci_scanner.sh; fi
 
 # Generate and deploy documentation
 after_success:

diff --git a/ci_build.sh b/ci_build.sh
@@ -23,6 +23,12 @@ BUILD_PREFIX=$PWD/${BUILD_PREFIX_BASENAME}
 SCRIPTS_ETC_PREFIX=$PWD/${BUILD_PREFIX_BASENAME}
 SCRIPTS_SHARE_PREFIX=$PWD/${BUILD_PREFIX_BASENAME}/usr/local
 
+# With sonarqube or not
+STATIC_ANALYSIS_WRAPPER=""
+if [ "$SONARQUBE" = yes ]; then
+    STATIC_ANALYSIS_WRAPPER="build-wrapper-linux-x86-64 --out-dir bw-output"
+fi
+
 # CCache setup
 PATH="`echo "$PATH" | sed -e 's,^/usr/lib/ccache/?:,,' -e 's,:/usr/lib/ccache/?:,,' -e 's,:/usr/lib/ccache/?$,,' -e 's,^/usr/lib/ccache/?$,,'2`"
 CCACHE_PATH="$PATH"
@@ -321,8 +327,8 @@ fi
 
 ########## HALCS
 if [ "$PURE_MAKE" = yes ]; then
-    build-wrapper-linux-x86-64 --out-dir bw-output \
-        make BOARD="$BOARD" APPS="${APP}" ${HALCS_OPTS[*]}
+    ${STATIC_ANALYSIS_WRAPPER} make \
+        BOARD="$BOARD" APPS="${APP}" ${HALCS_OPTS[*]}
     make ${HALCS_OPTS[*]} install
 
     if [ "$EXAMPLES" = yes ]; then
@@ -334,8 +340,7 @@ if [ "$PURE_MAKE" = yes ]; then
     fi
 
 elif [ "$COMPILE_SCRIPT" = yes ]; then
-    build-wrapper-linux-x86-64 --out-dir bw-output \
-        ./compile.sh \
+    ${STATIC_ANALYSIS_WRAPPER} ./compile.sh \
             -b $BOARD \
             -a "${APP}" \
             -e $EXAMPLES \
@@ -348,8 +353,8 @@ elif [ "$CMAKE" = yes ]; then
         -DCMAKE_PREFIX_PATH="${BUILD_PREFIX}" \
         -DBUILD_PCIE_DRIVER=OFF \
         -Dhalcs_BOARD_OPT="$BOARD" ../
-    build-wrapper-linux-x86-64 --out-dir bw-output \
-        make VERBOSE=1
+    ${STATIC_ANALYSIS_WRAPPER} make \
+        VERBOSE=1
     make DESTDIR="${BUILD_PREFIX}" install
     cd "${BASE_PWD}"
 elif [ "$CPACK" = yes ]; then
@@ -372,8 +377,8 @@ else
         -DCMAKE_PREFIX_PATH="${BUILD_PREFIX}" \
         -DBUILD_PCIE_DRIVER=OFF \
         -Dhalcs_BOARD_OPT="$BOARD" ../
-    build-wrapper-linux-x86-64 --out-dir bw-output \
-        make VERBOSE=1
+    ${STATIC_ANALYSIS_WRAPPER} make \
+        VERBOSE=1
     make DESTDIR="${BUILD_PREFIX}" install
     cd "${BASE_PWD}"
 fi

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -511,7 +511,7 @@ if(ENABLE_CPACK)
         /etc/udev/rules.d
     )
     set(CPACK_PACKAGE_NAME "halcs_examples")
-    set(halcs_examples_DISTRO_VERSION "")
+    set(halcs_examples_DISTRO_VERSION "" CACHE STRING "halcs_examples distribution version")
     string(APPEND halcs_examples_VERSION "${halcs_examples_DISTRO_VERSION}")
     set(CPACK_PACKAGE_FILE_NAME
         "${CPACK_PACKAGE_NAME}_${halcs_examples_VERSION}_${arch_name}"

diff --git a/libs/acqclient/CMakeLists.txt b/libs/acqclient/CMakeLists.txt
@@ -518,7 +518,7 @@ if(ENABLE_CPACK)
         /etc/udev/rules.d
     )
     set(CPACK_PACKAGE_NAME "acqclient")
-    set(acqclient_DISTRO_VERSION "")
+    set(acqclient_DISTRO_VERSION "" CACHE STRING "acqclient distribution version")
     string(APPEND acqclient_VERSION "${acqclient_DISTRO_VERSION}")
     set(CPACK_PACKAGE_FILE_NAME
         "${CPACK_PACKAGE_NAME}_${acqclient_VERSION}_${arch_name}"

diff --git a/libs/bpmclient/CMakeLists.txt b/libs/bpmclient/CMakeLists.txt
@@ -541,7 +541,7 @@ if(ENABLE_CPACK)
         /etc/udev/rules.d
     )
     set(CPACK_PACKAGE_NAME "bpmclient")
-    set(bpmclient_DISTRO_VERSION "")
+    set(bpmclient_DISTRO_VERSION "" CACHE STRING "bpmclient distribution version")
     string(APPEND bpmclient_VERSION "${bpmclient_DISTRO_VERSION}")
     set(CPACK_PACKAGE_FILE_NAME
         "${CPACK_PACKAGE_NAME}_${bpmclient_VERSION}_${arch_name}"

diff --git a/libs/convc/CMakeLists.txt b/libs/convc/CMakeLists.txt
@@ -412,7 +412,7 @@ if(ENABLE_CPACK)
         /etc/udev/rules.d
     )
     set(CPACK_PACKAGE_NAME "convc")
-    set(convc_DISTRO_VERSION "")
+    set(convc_DISTRO_VERSION "" CACHE STRING "convc distribution version")
     string(APPEND convc_VERSION "${convc_DISTRO_VERSION}")
     set(CPACK_PACKAGE_FILE_NAME
         "${CPACK_PACKAGE_NAME}_${convc_VERSION}_${arch_name}"

diff --git a/libs/disptable/CMakeLists.txt b/libs/disptable/CMakeLists.txt
@@ -435,7 +435,7 @@ if(ENABLE_CPACK)
         /etc/udev/rules.d
     )
     set(CPACK_PACKAGE_NAME "disptable")
-    set(disptable_DISTRO_VERSION "")
+    set(disptable_DISTRO_VERSION "" CACHE STRING "disptable distribution version")
     string(APPEND disptable_VERSION "${disptable_DISTRO_VERSION}")
     set(CPACK_PACKAGE_FILE_NAME
         "${CPACK_PACKAGE_NAME}_${disptable_VERSION}_${arch_name}"

diff --git a/libs/errhand/CMakeLists.txt b/libs/errhand/CMakeLists.txt
@@ -456,7 +456,7 @@ if(ENABLE_CPACK)
         /etc/udev/rules.d
     )
     set(CPACK_PACKAGE_NAME "errhand")
-    set(errhand_DISTRO_VERSION "")
+    set(errhand_DISTRO_VERSION "" CACHE STRING "errhand distribution version")
     string(APPEND errhand_VERSION "${errhand_DISTRO_VERSION}")
     set(CPACK_PACKAGE_FILE_NAME
         "${CPACK_PACKAGE_NAME}_${errhand_VERSION}_${arch_name}"

diff --git a/libs/hutils/CMakeLists.txt b/libs/hutils/CMakeLists.txt
@@ -443,7 +443,7 @@ if(ENABLE_CPACK)
         /etc/udev/rules.d
     )
     set(CPACK_PACKAGE_NAME "hutils")
-    set(hutils_DISTRO_VERSION "")
+    set(hutils_DISTRO_VERSION "" CACHE STRING "hutils distribution version")
     string(APPEND hutils_VERSION "${hutils_DISTRO_VERSION}")
     set(CPACK_PACKAGE_FILE_NAME
         "${CPACK_PACKAGE_NAME}_${hutils_VERSION}_${arch_name}"

diff --git a/libs/llio/CMakeLists.txt b/libs/llio/CMakeLists.txt
@@ -502,7 +502,7 @@ if(ENABLE_CPACK)
         /etc/udev/rules.d
     )
     set(CPACK_PACKAGE_NAME "llio")
-    set(llio_DISTRO_VERSION "")
+    set(llio_DISTRO_VERSION "" CACHE STRING "llio distribution version")
     string(APPEND llio_VERSION "${llio_DISTRO_VERSION}")
     set(CPACK_PACKAGE_FILE_NAME
         "${CPACK_PACKAGE_NAME}_${llio_VERSION}_${arch_name}"

diff --git a/libs/sdbfs/CMakeLists.txt b/libs/sdbfs/CMakeLists.txt
@@ -646,7 +646,7 @@ if(ENABLE_CPACK)
         /etc/udev/rules.d
     )
     set(CPACK_PACKAGE_NAME "sdbfs")
-    set(sdbfs_DISTRO_VERSION "")
+    set(sdbfs_DISTRO_VERSION "" CACHE STRING "sdbfs distribution version")
     string(APPEND sdbfs_VERSION "${sdbfs_DISTRO_VERSION}")
     set(CPACK_PACKAGE_FILE_NAME
         "${CPACK_PACKAGE_NAME}_${sdbfs_VERSION}_${arch_name}"

diff --git a/libs/sdbutils/CMakeLists.txt b/libs/sdbutils/CMakeLists.txt
@@ -389,7 +389,7 @@ if(ENABLE_CPACK)
         /etc/udev/rules.d
     )
     set(CPACK_PACKAGE_NAME "sdbutils")
-    set(sdbutils_DISTRO_VERSION "")
+    set(sdbutils_DISTRO_VERSION "" CACHE STRING "sdbutils distribution version")
     string(APPEND sdbutils_VERSION "${sdbutils_DISTRO_VERSION}")
     set(CPACK_PACKAGE_FILE_NAME
         "${CPACK_PACKAGE_NAME}_${sdbutils_VERSION}_${arch_name}"

diff --git a/packpack b/packpack
@@ -147,6 +147,15 @@ chmod a+x ${BUILDDIR}/userwrapper.sh
     echo "shift 1";
     echo "CMAKE_OPTS=\"\$@\"";
     echo "cd /build";
+    echo "if [ -f \"/etc/debian_version\" ]; then";
+    echo "    case \"\$(cat /etc/debian_version)\" in";
+    echo "        *stretch* | 9.* )";
+    echo "            echo \"deb http://deb.debian.org/debian stretch-backports main\" | sudo tee -a /etc/apt/sources.list";
+    echo "            sudo apt-get update";
+    echo "            sudo apt-get install cmake -t stretch-backports";
+    echo "        ;;"
+    echo "    esac";
+    echo "fi";
     echo "sudo apt-get -y update && \\";
     echo "    sudo apt-get -y install pkg-config systemd uuid-dev libsodium-dev libzmq3-dev libczmq-dev";
     echo "if [ \"\$?\" -ne 0 ]; then"

diff --git a/src/apps/halcs_generic_udev/CMakeLists.txt b/src/apps/halcs_generic_udev/CMakeLists.txt
@@ -158,7 +158,7 @@ if(ENABLE_CPACK)
         /etc/udev/rules.d
     )
     set(CPACK_PACKAGE_NAME "halcs_generic_udev")
-    set(halcs_DISTRO_VERSION "")
+    set(halcs_DISTRO_VERSION "" CACHE STRING "halcs distribution version")
     string(APPEND halcs_VERSION "${halcs_DISTRO_VERSION}")
     set(CPACK_PACKAGE_FILE_NAME
         "${CPACK_PACKAGE_NAME}_${halcs_VERSION}_${arch_name}"

diff --git a/src/apps/halcsd/CMakeLists.txt b/src/apps/halcsd/CMakeLists.txt
@@ -491,7 +491,7 @@ if(ENABLE_CPACK)
         /etc/udev/rules.d
     )
     set(CPACK_PACKAGE_NAME "halcsd")
-    set(halcs_DISTRO_VERSION "")
+    set(halcs_DISTRO_VERSION "" CACHE STRING "halcs distribution version")
     string(APPEND halcs_VERSION "${halcs_DISTRO_VERSION}")
     set(CPACK_PACKAGE_FILE_NAME
         "${CPACK_PACKAGE_NAME}-${halcs_BOARD_OPT}_${halcs_VERSION}_${arch_name}"

diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
@@ -795,7 +795,7 @@ if(ENABLE_CPACK)
         /etc/udev/rules.d
     )
     set(CPACK_PACKAGE_NAME "halcsclient")
-    set(halcsclient_DISTRO_VERSION "")
+    set(halcsclient_DISTRO_VERSION "" CACHE STRING "halcsclient distribution version")
     string(APPEND halcsclient_VERSION "${halcsclient_DISTRO_VERSION}")
     set(CPACK_PACKAGE_FILE_NAME
         "${CPACK_PACKAGE_NAME}_${halcsclient_VERSION}_${arch_name}"