Merge pull request #88 from fledge-iot/2.3.0RC

2.3.0RC

Author: dianomicbot

.gitignore

@@ -19,6 +19,7 @@ others/S2OPC
 others/check-0.15.2.tar.gz
 others/check-0.15.2
 others/libexpat
+others/scripts/mqtt/paho.mqtt.c*
 
 # Archived packages
 plugins/archive

others/make_deb

@@ -22,7 +22,7 @@
 set -e
 
 USAGE="$(basename "$0") [-h] [-a] ...
-This script is used to create the Debian package for to support other additional libraries as separately such as mqtt, gcp
+This script is used to create the Debian package for to support other additional libraries as separately such as mqtt, s2opcua etc.
 
 Arguments:
   -h	- Display this help text
@@ -99,9 +99,12 @@ if [[ ${branch_name} != "main" ]] && [[ ! ${branch_name} =~ ^[0-9]+\.[0-9]+\.[0-
 if [ ! -d "${archive}/${architecture}" ]; then
     mkdir -p "${archive}/${architecture}"
 fi
+
 os_name=`(grep -o '^NAME=.*' /etc/os-release | cut -f2 -d\" | sed 's/"//g')`
 os_version=`(grep -o '^VERSION_ID=.*' /etc/os-release | cut -f2 -d\" | sed 's/"//g')`
-echo "Platform is ${os_name}, Version: ${os_version}"
+v_name=`(grep -o '^VERSION_CODENAME=.*' /etc/os-release | cut -f2 -d\" | sed 's/VERSION_CODENAME=//g')`
+echo "Platform is ${os_name}, Version: ${os_version}, Version code name: ${v_name}"
+
 # Print the summary of findings
 echo "Additional ${ADDITIONAL_LIB_NAME} Package version is : ${version}"
 echo "The Fledge required version is                       : ${fledge_version}"
@@ -127,15 +130,21 @@ if [[ ${branch_name} = "main" ]] || [[ ${branch_name} =~ ^[0-9]+\.[0-9]+\.[0-9]+
 # Debian file structure
 mkdir -p usr/local/lib
 if [ "${ADDITIONAL_LIB_NAME}" == "mqtt" ];  then
-    cp -R --preserve=links /usr/local/lib/libpaho* usr/local/lib
-fi
-if [ "${ADDITIONAL_LIB_NAME}" == "gcp" ];  then
-    cp -R --preserve=links /usr/local/lib/libjwt* usr/local/lib
-    cp -R --preserve=links /usr/local/lib/libjansson* usr/local/lib
+    # For Raspberry Pi OS Bullseye
+    if [[ ${v_name} == *"bullseye"* ]]; then # Verify Ubuntu20.04 aarch64
+      if [[ ${architecture} == *"armv7l"* ]]; then
+        cp -R --preserve=links /usr/local/lib/arm-linux-gnueabihf/libpaho* usr/local/lib
+      else # aarch64
+        cp -R --preserve=links /usr/local/lib/aarch64-linux-gnu/libpaho* usr/local/lib
+      fi
+    else
+      cp -R --preserve=links /usr/local/lib/libpaho* usr/local/lib
+    fi
 fi
 if [ "${ADDITIONAL_LIB_NAME}" == "iec" ];  then
-    # For Raspbian bullseye
-    if [[ ${os_name} == *"Raspbian"* && ${os_version} == *"11"* ]]; then
+    # For Raspberry Pi OS Bullseye
+    if [[ ${v_name} == *"bullseye"* ]]; then
+      # arch based check?
       cp -R --preserve=links /usr/local/lib/arm-linux-gnueabihf/libiec61850* usr/local/lib
     else
       cp -R --preserve=links /usr/local/lib/libiec61850* usr/local/lib

others/make_rpm

@@ -148,11 +148,7 @@ mkdir -p usr/local/lib64
 if [ "${ADDITIONAL_LIB_NAME}" == "mqtt" ];  then
     cp -R --preserve=links /usr/local/lib64/libpaho* usr/local/lib64
 fi
-# TODO: FOGL-3632 - Blocked with its compilation
-#if [ "${ADDITIONAL_LIB_NAME}" == "gcp" ];  then
-#    cp -R --preserve=links /usr/local/lib64/libjwt* usr/local/lib64
-#    cp -R --preserve=links /usr/local/lib64/libjansson* usr/local/lib64
-#fi
+
 if [ "${ADDITIONAL_LIB_NAME}" == "iec" ];  then
     mkdir -p usr/local/lib
     cp -R --preserve=links /usr/local/lib/liblib60870* usr/local/lib

others/scripts/gcp/Description

@@ -1,2 +1,2 @@
-fledge_iec_version=2.2.0
-fledge_version>=2.2
+fledge_iec_version=2.3.0
+fledge_version>=2.3

others/scripts/gcp/VERSION

@@ -1,2 +1,2 @@
-fledge_mqtt_version=2.2.0
-fledge_version>=2.2
+fledge_mqtt_version=2.3.0
+fledge_version>=2.3

others/scripts/gcp/requirements.sh

@@ -0,0 +1,13 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index e2b934a..9d5e9a0 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -94,7 +94,7 @@ target_compile_definitions(paho-cpp-objs PRIVATE PAHO_MQTTPP_EXPORTS)
+ target_compile_options(paho-cpp-objs PRIVATE
+   $<$<CXX_COMPILER_ID:MSVC>:/W3>
+   $<$<CXX_COMPILER_ID:Clang>:-Wall -Wextra -Wdocumentation>
+-  $<$<NOT:$<CXX_COMPILER_ID:MSVC,Clang>>:-Wall -Wextra>
++  $<$<NOT:$<OR:$<CXX_COMPILER_ID:MSVC>,$<CXX_COMPILER_ID:Clang>>>:-Wall -Wextra>
+ )
+ 
+ ## --- Build the shared library, if requested ---

others/scripts/iec/VERSION

@@ -49,10 +49,24 @@ else
 	  echo "Requirements are not supported for platform: ${os_name} and having version: ${os_version}"
 fi
 rm -rf paho.mqtt.c
-git clone https://github.com/eclipse/paho.mqtt.c.git
+git clone --depth 1 --branch v1.3.13 https://github.com/eclipse/paho.mqtt.c.git
 cd paho.mqtt.c
 mkdir build
 cd build
-cmake -DPAHO_BUILD_DOCUMENTATION=FALSE -DPAHO_WITH_SSL=FALSE ..
+cmake -DPAHO_BUILD_DOCUMENTATION=FALSE -DPAHO_WITH_SSL=TRUE ..
 make
 sudo make install
+
+cd ..
+cd ..
+
+rm -rf paho.mqtt.cpp
+git clone --depth 1 --branch v1.3.1 https://github.com/eclipse/paho.mqtt.cpp
+cd paho.mqtt.cpp
+cp ../scripts/mqtt/paho-mqtt-cpp.patch .
+git apply paho-mqtt-cpp.patch
+cmake -Bbuild -H. -DPAHO_WITH_SSL=ON -DPAHO_BUILD_DOCUMENTATION=FALSE -DPAHO_BUILD_SAMPLES=FALSE
+sudo cmake --build build/ --target install
+sudo ldconfig
+cd ..
+