Merge pull request #21 from fledge-iot/FOGL-4900

FOGL-4900 fledge-gcp common package

Author: ashish-jabble

.gitignore

@@ -12,6 +12,7 @@
 packages/Debian/build/
 packages/RPM/build/
 others/paho.mqtt.c/
+others/jansson
 
 # 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
+This script is used to create the Debian package for to support other additional libraries as separately such as mqtt, gcp
 
 Arguments:
   -h	- Display this help text
@@ -94,7 +94,7 @@ arch_name=$(dpkg --print-architecture)
 package_name="${pkg_name}-${version}-${architecture}"
 
 if [ ! -d "${archive}/${architecture}" ]; then
-    mkdir -p "${archive}/${architecture}/${package_name}"
+    mkdir -p "${archive}/${architecture}"
 fi
 
 # Print the summary of findings
@@ -106,6 +106,9 @@ echo "The package name is                                  : ${package_name}"
 echo
 
 echo -n "Populating the package and updating version file..."
+if [ ! -d "${archive}/${architecture}/${package_name}" ]; then
+    mkdir -p "${archive}/${architecture}/${package_name}"
+fi
 cd "${archive}/${architecture}/${package_name}"
 mkdir -p DEBIAN
 cp -R ${PKG_ROOT}/packages/DEBIAN/* DEBIAN
@@ -120,6 +123,10 @@ 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
+fi
 echo "Done."
 
 # Build the package

others/scripts/gcp/Description

@@ -0,0 +1 @@
+libjwt which allows you to encode and decode JSON Web Tokens (JWT) and Jansson for encoding, decoding and manipulating JSON data are the additional libraries which will be used in GCP plugins.

others/scripts/gcp/VERSION

@@ -0,0 +1,2 @@
+fledge_gcp_version=1.8.2
+fledge_version>=1.8

others/scripts/gcp/requirements.sh

@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+
+##--------------------------------------------------------------------
+## Copyright (c) 2021 Dianomic Systems
+##
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
+##
+##     http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##--------------------------------------------------------------------
+
+##
+## Author: Ashish Jabble
+##
+
+set -e
+
+# Jansson for encoding, decoding and manipulating JSON data
+rm -rf jansson; git clone https://github.com/akheron/jansson.git
+cd jansson
+mkdir build
+cd build
+cmake ..
+make
+sudo make install
+cd -
+
+# libjwt which allows you to encode and decode JSON Web Tokens (JWT)
+rm -rf libjwt; git clone https://github.com/benmcollins/libjwt.git
+cd libjwt
+autoreconf -i
+./configure
+make
+sudo make install

plugins/make_deb

@@ -135,11 +135,6 @@ do
         service_notification_version=`cat ${GIT_ROOT}/service_notification.version | tr -d ' ' | grep 'service_notification_version' | head -1 | sed -e 's/\(.*\)version\(.*\)/\2/g'`
         echo "The Service notification required version             : ${service_notification_version}"
     fi
-    if [ -f "${GIT_ROOT}/additional_lib.version" ]; then
-        additional_lib_name=`cat additional_lib.version | cut -d ":" -f1`
-        additional_lib_version=`cat additional_lib.version | cut -d ":" -f2`
-        echo "The Additional ${additional_lib_name} Library required version          : ${additional_lib_version}"
-    fi
     echo
 
     # Create the package directory. If a directory with the same name exists,
@@ -196,9 +191,17 @@ do
     if [ ! -z "${service_notification_version}" ] ; then
         sed -i "s/fledge-service-notification/fledge-service-notification (${service_notification_version})/" ${deb_path}/control
     fi
-     if [ ! -z "${additional_lib_version}" ] ; then
-        sed -i "s/fledge-${additional_lib_name}/fledge-${additional_lib_name} (${additional_lib_version})/" ${deb_path}/control
+    if [ -f "${GIT_ROOT}/additional_lib.version" ]; then
+        while read line ; do
+            if [ ! -z "$line" ]; then
+                additional_lib_name=`echo ${line} | cut -d ":" -f1`
+                additional_lib_version=`echo ${line} | cut -d ":" -f2`
+                echo "The Additional ${additional_lib_name} Library required version: ${additional_lib_version}"
+                sed -i "s/fledge-${additional_lib_name}/fledge-${additional_lib_name} (${additional_lib_version})/" ${deb_path}/control
+            fi
+        done < "${GIT_ROOT}/additional_lib.version"
     fi
+
     # install notes
     if [ -f "${GIT_ROOT}/install_notes.txt" ]; then
         cat > /tmp/sed.script.$$ << EOF