rebase

cov_build.sh

@@ -6,6 +6,7 @@ apt-get update && apt-get install -y libsoup-3.0
 
 #Build rfc
 cd $ROOT
+rm -rf rfc
 git clone https://github.com/rdkcentral/rfc.git
 cd rfc
 autoreconf -i
@@ -21,13 +22,14 @@ cd ../utils
 make && make install
 
 #Build yajl - tr69 alone needs this specific version
-cd $ROOT 
+cd $ROOT
+rm -rf yajl
 git clone https://github.com/lloyd/yajl.git -b 1.x
 cd yajl
 mkdir build
 cd build
 cmake ..
-make 
+make
 make install
 
 cd $ROOT
@@ -40,18 +42,38 @@ git clone https://github.com/rdkcentral/rdkvhal-devicesettings-raspberrypi4.git
 git clone https://github.com/rdkcentral/iarmbus.git
 git clone https://github.com/rdkcentral/remote_debugger.git
 
-# Build devicesettings version with fixes for native build and use that as a stub
-# TODO This is not present in mainline versions. Component maintainers will have to provide this in future.
+cp $WORKDIR/src/unittest/stubs/telemetry_busmessage_sender.h /usr/local/include/
+cp $WORKDIR/src/unittest/stubs/dsVideoResolutionSettings.h /usr/rdk-halif-device_settings/include/dsVideoResolutionSettings.h
+cp $WORKDIR/src/unittest/stubs/dsAudioSettings.h /usr/rdkvhal-devicesettings-raspberrypi4/dsAudioSettings.h
+cp $WORKDIR/src/unittest/stubs/dsVideoPortSettings.h /usr/rdkvhal-devicesettings-raspberrypi4/dsVideoPortSettings.h
+cp $WORKDIR/src/unittest/stubs/dsVideoResolutionSettings.h /usr/rdkvhal-devicesettings-raspberrypi4/dsVideoResolutionSettings.h
+cp $WORKDIR/src/unittest/stubs/dsVideoDeviceSettings.h /usr/rdkvhal-devicesettings-raspberrypi4/dsVideoDeviceSettings.h
+
+gcc -fPIC -shared -o /usr/local/lib/libtelemetry_msgsender.so $WORKDIR/src/unittest/stubs/telemetry_msgsender_stub.c
+rm -f $WORKDIR/src/unittest/stubs/rdk_debug.h
+
 cd $ROOT
 rm -rf devicesettings
-git clone https://github.com/rdkcentral/devicesettings.git -b feature/RDKE-539
+git clone https://github.com/rdkcentral/devicesettings.git
 cd devicesettings
 autoreconf -i
 sed -i '/#include "dsAudio.h"/d' /usr/devicesettings/rpc/cli/dsAudio.c
 sed -i '/device::HdmiInput::getInstance().isPortConnected(portId);/d' /usr/devicesettings/ds/audioOutputPort.cpp
 ./configure
-make INCLUDE_FILES="-I/usr/rdk-halif-device_settings/include -I/usr/rpc/include -I/usr/devicesettings/rpc/cli -I/usr/devicesettings/rpc/include -I/usr/iarmbus/core/include -I$WORKDIR/src/unittest/stubs -I/usr/devicesettings/rpc/srv -I/usr/rdkvhal-devicesettings-raspberrypi4" libds_la_CPPFLAGS="-I/usr/rdk-halif-device_settings/include -I/usr/devicesettings/ds/include -I$WORKDIR/src/unittest/stubs/ -I/usr/rdkvhal-devicesettings-raspberrypi4 -I/usr/devicesettings/rpc/include -I/usr/devicesettings/rpc/cli/ -I/usr/devicesettings/rpc/srv -I/usr/devicesettings/ds/include -I/usr/devicesettings/ds/" CFLAGS="-fpermissive"
-make install
+DS_COMMON_INCLUDES="-I/usr/rdk-halif-device_settings/include \
+    -I/usr/rpc/include \
+    -I/usr/devicesettings/rpc/cli \
+    -I/usr/devicesettings/rpc/include \
+    -I/usr/iarmbus/core/include \
+    -I$WORKDIR/src/unittest/stubs \
+    -I/usr/devicesettings/rpc/srv \
+    -I/usr/rdkvhal-devicesettings-raspberrypi4"
+make \
+    CPPFLAGS="$DS_COMMON_INCLUDES" \
+    libds_la_CPPFLAGS="-I/usr/rdk-halif-device_settings/include -I/usr/devicesettings/ds/include -I$WORKDIR/src/unittest/stubs/ -I/usr/rdkvhal-devicesettings-raspberrypi4 -I/usr/devicesettings/rpc/include -I/usr/devicesettings/rpc/cli/ -I/usr/devicesettings/rpc/srv -I/usr/devicesettings/ds/include -I/usr/devicesettings/ds/ -DRDK_DSHAL_NAME='\"libdshal.so\"'" \
+    libdshalsrv_la_CPPFLAGS="-I/usr/iarmbus/core/include -I/usr/devicesettings/rpc/include -I/usr/devicesettings/rpc/srv -I/usr/rdk-halif-device_settings/include -I$WORKDIR/src/unittest/stubs -isystem $WORKDIR/src/unittest/stubs -DDSMGR_LOGGER_ENABLED=ON -DRDK_DSHAL_NAME='\"libdshal.so\"'" \
+    CFLAGS="-fpermissive" \
+    install
 
 # Build and deploy stubs for IARMBus
 echo "Building IARMBus stubs"
@@ -68,16 +90,16 @@ cp libWPEFrameworkPowerController.so /usr/local/lib/libWPEFrameworkPowerControll
 echo "##### Building tr69hostif module"
 cd $WORKDIR
 sed -i '/PKG_CHECK_MODULES(\[PROCPS\], \[libproc >= 3.2.8\])/s/^/#/' ./configure.ac
-rm -f ./src/unittest/stubs/rdk_debug.h
+
 autoreconf -i
 ./configure  --enable-IPv6=yes
 
 make AM_CXXFLAGS="-I$WORKDIR/src/unittest/stubs -I$WORKDIR/src/hostif/include -I/usr/include/cjson -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I$WORKDIR/src/hostif/handlers/include -I$WORKDIR/src/hostif/parodusClient/waldb -I$WORKDIR/src/hostif/profiles/DeviceInfo -I/usr/include/cjson -I$WORKDIR/src/hostif/profiles/Time -I$WORKDIR/src/hostif/profiles/Device -I/usr/include/libsoup-3.0 -I/usr/include/yajl -I$WORKDIR/src/hostif/profiles/STBService -I$WORKDIR/src/unittest/stubs/ds -I/usr/devicesettings/ds -I/usr/local/include -I$WORKDIR/src/hostif/profiles/IP -I$WORKDIR/src/hostif/profiles/Ethernet -I/usr/local/include/rbus -I$WORKDIR/src/hostif/parodusClient/pal -I/usr/rdk-halif-device_settings/include -I/usr/local/include/libparodus -I/usr/local/include -I/usr/rdkvhal-devicesettings-raspberrypi4 -I/usr/local/include/ -I/usr/include/yajl -I/usr/tinyxml2 -I/usr/devicesettings/ds -I/$WORKDIR/src/hostif/httpserver/include -I/usr/remote_debugger/src/ -DIPV6_SUPPORT" \
-AM_LDFLAGS="-L/usr/local/lib -lrbus -lsecure_wrapper -lcurl -lrfcapi -lrdkloggers -llibparodus -lglib-2.0 -lnanomsg  -lIARMBus -lWPEFrameworkPowerController -lds -ldshalcli -ldshalsrv  -lwrp-c -lwdmp-c -lprocps -ltrower-base64 -lcimplog -lsoup-3.0 -L/usr/lib/x86_64-linux-gnu -lyajl -L/usr/local/lib/x86_64-linux-gnu -ltinyxml2"  CXXFLAGS="-fpermissive -DPARODUS_ENABLE -DUSE_REMOTE_DEBUGGER"
-make install
+AM_LDFLAGS="-L/usr/local/lib -lrbus -lsecure_wrapper -lcurl -lrfcapi -lrdkloggers -llibparodus -lglib-2.0 -lnanomsg  -lIARMBus -lWPEFrameworkPowerController -lds -ldshalcli -ldshalsrv  -lwrp-c -lwdmp-c -lprocps -ltrower-base64 -lcimplog -lsoup-3.0 -L/usr/lib/x86_64-linux-gnu -lyajl -L/usr/local/lib/x86_64-linux-gnu -ltinyxml2"  CXXFLAGS="-fpermissive -DPARODUS_ENABLE -DUSE_REMOTE_DEBUGGER" \
+    install
 
 cd ./src/hostif/parodusClient/pal/mock-parodus/
 sh mock_parodus_build.sh
 
 ln -sf /usr/local/bin/tr181 /usr/bin/tr181Set
-rbuscli set Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.MOCASSH.Enable boolean true 
+rbuscli set Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.MOCASSH.Enable boolean true