From 55c655b077c4b0ba2d81def38e072882b092ef20 Mon Sep 17 00:00:00 2001 From: HaseenaSainul Date: Fri, 16 Feb 2024 01:52:03 -0500 Subject: [PATCH] CPPSDK: proceed to install only the build is successfully done and some cleanup --- languages/cpp/templates/modules/src/module_impl.cpp | 2 -- languages/cpp/templates/schemas/src/module_common.cpp | 4 +--- languages/cpp/templates/sdk/scripts/build.sh | 6 +++++- languages/cpp/templates/sections/enum.cpp | 5 ----- 4 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 languages/cpp/templates/sections/enum.cpp diff --git a/languages/cpp/templates/modules/src/module_impl.cpp b/languages/cpp/templates/modules/src/module_impl.cpp index 36c9b123..abdbecd6 100644 --- a/languages/cpp/templates/modules/src/module_impl.cpp +++ b/languages/cpp/templates/modules/src/module_impl.cpp @@ -35,7 +35,5 @@ namespace ${info.Title} { namespace WPEFramework { - /* ${ENUMS} */ - }${end.if.enums} diff --git a/languages/cpp/templates/schemas/src/module_common.cpp b/languages/cpp/templates/schemas/src/module_common.cpp index 87498ab8..7d9d13af 100644 --- a/languages/cpp/templates/schemas/src/module_common.cpp +++ b/languages/cpp/templates/schemas/src/module_common.cpp @@ -23,7 +23,5 @@ namespace WPEFramework { - /* ${ENUMS} */ - -}${end.if.enums} +}${end.if.enums} \ No newline at end of file diff --git a/languages/cpp/templates/sdk/scripts/build.sh b/languages/cpp/templates/sdk/scripts/build.sh index 149cd1ae..296ae5dd 100755 --- a/languages/cpp/templates/sdk/scripts/build.sh +++ b/languages/cpp/templates/sdk/scripts/build.sh @@ -35,6 +35,10 @@ then rm -rf ${SdkPath}/build fi +rm -rf ${SdkPath}/build/src/libFireboltSDK.so cmake -B${SdkPath}/build -S${SdkPath} -DSYSROOT_PATH=${SysrootPath} -DENABLE_TESTS=${EnableTest} -DHIDE_NON_EXTERNAL_SYMBOLS=OFF -DFIREBOLT_ENABLE_STATIC_LIB=${EnableStaticLib} cmake --build ${SdkPath}/build -cmake --install ${SdkPath}/build --prefix=${SdkPath}/build/Firebolt/usr +if [ -f "${SdkPath}/build/src/libFireboltSDK.so" ]; +then + cmake --install ${SdkPath}/build --prefix=${SdkPath}/build/Firebolt/usr +fi diff --git a/languages/cpp/templates/sections/enum.cpp b/languages/cpp/templates/sections/enum.cpp deleted file mode 100644 index e5165c61..00000000 --- a/languages/cpp/templates/sections/enum.cpp +++ /dev/null @@ -1,5 +0,0 @@ -namespace WPEFramework { - -${schema.list} - -}