S2OPC clientwrapper and commonwrapper links removed and also fix shared libs for libexpat

Signed-off-by: ashish-jabble <[email protected]>

Author: ashish-jabble

.gitignore

@@ -16,7 +16,7 @@ others/jansson
 others/lib60870
 others/libiec61850
 others/S2OPC
-others/libexpat
+others/expat-2.6.0
 others/check-0.15.2
 others/mbedtls-2.28.7
 others/*.tar.gz

others/make_deb

@@ -154,8 +154,6 @@ fi
 if [ "${ADDITIONAL_LIB_NAME}" == "s2opcua" ];  then
     cp -R --preserve=links /usr/local/lib/libs2opc_common.so usr/local/lib
     cp -R --preserve=links /usr/local/lib/libs2opc_clientserver.so usr/local/lib
-    cp -R --preserve=links /usr/local/lib/libs2opc_clientwrapper.so usr/local/lib
-    cp -R --preserve=links /usr/local/lib/libs2opc_commonwrapper.so usr/local/lib
     cp -R --preserve=links /usr/local/lib/libexpat.so.1 usr/local/lib
 fi
 echo "Done."

others/scripts/s2opcua/requirements.sh

@@ -25,8 +25,10 @@ set -e
 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}"
+git_root=$(pwd)
 
 # mbedtls-dev:
+cd ${git_root}
 mbetls_version='2.28.7'
 if [[  $os_name == *"Red Hat"* || $os_name == *"CentOS"* ]]; then
     echo "RHEL/CentOS platform is not currently supported by this plugin."
@@ -44,6 +46,7 @@ else
 fi
 
 # libexpat:
+cd ${git_root}
 libexpat_version="2.6.0"
 rm -rf expat-${libexpat_version}.tar.gz expat-${libexpat_version}
 wget https://github.com/libexpat/libexpat/releases/download/R_2_6_0/expat-${libexpat_version}.tar.gz
@@ -52,19 +55,20 @@ tar xzvf expat-${libexpat_version}.tar.gz
 	cd expat-${libexpat_version}
 	mkdir build
 	cd build
-	cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DEXPAT_SHARED_LIBS=OFF ..
+	cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DEXPAT_SHARED_LIBS=ON ..
 	make
 	sudo make install
 )
 
 # libcheck:
+cd ${git_root}
 lib_check_version="0.15.2"
 rm -rf check-${lib_check_version}.tar.gz check-${lib_check_version}
 wget https://github.com/libcheck/check/releases/download/${lib_check_version}/check-${lib_check_version}.tar.gz
 tar xf check-${lib_check_version}.tar.gz
 (
 	cd check-${lib_check_version}
-	cp ../../../scripts/s2opcua/check-${lib_check_version}_CMakeLists.txt.patch .
+	cp ${git_root}/scripts/s2opcua/check-${lib_check_version}_CMakeLists.txt.patch .
 	patch < check-${lib_check_version}_CMakeLists.txt.patch  # update the CMakeLists.txt file
 	rm -f CMakeCache.txt
 	mkdir -p build
@@ -73,6 +77,7 @@ tar xf check-${lib_check_version}.tar.gz
 )
 
 # S2OPC
+cd ${git_root}
 s2opc_toolkit_version="1.5.0"
 rm -rf S2OPC
 git clone https://gitlab.com/systerel/S2OPC.git --branch S2OPC_Toolkit_${s2opc_toolkit_version} --depth 1