[BH-2088] Add build stage for BellHybridPro

* Added PR build stage for BellHybridPro.
* Changed naming of update and flash
packages for Pro config.

Author: Lefucjusz

Jenkinsfile

@@ -59,6 +59,15 @@ pipeline {
             }
         }
 
+        stage('Build RT1051 - BellHybridPro') {
+            steps {
+                script{
+                    common.checkIfBranchIsRebased("false")
+                    buildSteps.build("rt1051","BellHybrid","Release","-DENABLE_VERSION_PRO=1")
+                }
+            }
+        }
+
         stage('Build Linux - PurePhone') {
             when {
                 expression {

cmake/modules/AddPackage.cmake

@@ -23,12 +23,12 @@ macro(set_cpack_vars)
 
 endmacro()
 
-function(add_standalone_image SOURCE_TARGET)
+function(add_standalone_image SOURCE_TARGET IMAGE_NAME)
     if (NOT ${PROJECT_TARGET} STREQUAL "TARGET_RT1051")
         return()
     endif()
     set(BIN_FILE ${SOURCE_TARGET}-boot.bin)
-    set(CPACK_PACKAGE_NAME ${SOURCE_TARGET})
+    set(CPACK_PACKAGE_NAME ${IMAGE_NAME})
     set_cpack_vars()
 
     set(STANDALONE_PKG ${PACKAGE_COMMON_NAME}-image.tar.xz)
@@ -37,8 +37,8 @@ function(add_standalone_image SOURCE_TARGET)
 
     add_custom_target(${PACKAGE_COMMON_NAME}-package-standalone
         # please do not:
-        # 1. change compression to -9 (or higher) as i will have detrimental effects on compression times with not much gain
-        # 2. change -T parameter to explicit thread count - xz with T0 will adjust thread count to your machine capatibilies
+        # 1. change compression to -9 (or higher) as it will have detrimental effects on compression times with not much gain
+        # 2. change -T parameter to explicit thread count - xz with T0 will adjust thread count to your machine capabilities
         COMMAND tar Scf - ${SOURCE_TARGET}.img | xz -T0 > ${STANDALONE_PKG}
         WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
         DEPENDS ${BIN_FILE}
@@ -57,13 +57,13 @@ function(add_standalone_image SOURCE_TARGET)
 endfunction()
 
 
-function(add_update_package SOURCE_TARGET)
+function(add_update_package SOURCE_TARGET IMAGE_NAME)
     if (NOT ${PROJECT_TARGET} STREQUAL "TARGET_RT1051")
         return()
     endif()
-    set(CPACK_PACKAGE_NAME ${SOURCE_TARGET})
+    set(CPACK_PACKAGE_NAME ${IMAGE_NAME})
     set_cpack_vars()
-    set(UPDATE_PKG "${SOURCE_TARGET}-${PROJECT_VERSION}-RT1051-Update.tar")
+    set(UPDATE_PKG "${IMAGE_NAME}-${PROJECT_VERSION}-RT1051-Update.tar")
 
     set(PACKAGE_UPDATE_FILE_NAME ${UPDATE_PKG} PARENT_SCOPE)
     set(PACKAGE_UPDATE_MIME "application/x-tar" PARENT_SCOPE)
@@ -76,7 +76,7 @@ function(add_update_package SOURCE_TARGET)
                 ecoboot.bin-target
                 recovery.bin-target
                 assets
-        COMMAND python3 ${CMAKE_SOURCE_DIR}/tools/generate_update_package.py --output_path ${CMAKE_BINARY_DIR} --system_path ${SYSROOT_PATH}/system_a --product ${SOURCE_TARGET}
+        COMMAND python3 ${CMAKE_SOURCE_DIR}/tools/generate_update_package.py --output_path ${CMAKE_BINARY_DIR} --system_path ${SYSROOT_PATH}/system_a --product ${IMAGE_NAME}
         WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
         COMMENT "Generating update image: ${UPDATE_PKG}"
     )

products/BellHybrid/CMakeLists.txt

@@ -163,9 +163,13 @@ download_asset_json(json-rt1051-target
 download_asset_release(PureRecovery.bin recovery.bin PureRecovery ${RECOVERY_BIN_VERSION}  ${MUDITA_CACHE_DIR})
 download_asset_release(ecoboot.bin ecoboot.bin ecoboot ${ECOBOOT_BIN_VERSION}  ${MUDITA_CACHE_DIR})
 
-
-add_standalone_image(BellHybrid)
-add_update_package(BellHybrid)
+if (ENABLE_VERSION_PRO)
+    add_standalone_image(BellHybrid BellHybridPro)
+    add_update_package(BellHybrid BellHybridPro)
+else ()
+    add_standalone_image(BellHybrid BellHybrid)
+    add_update_package(BellHybrid BellHybrid)
+endif ()
 
 add_subdirectory(alarms)
 add_subdirectory(apps)

products/PurePhone/CMakeLists.txt

@@ -180,8 +180,8 @@ download_asset_release(PureRecovery.bin recovery.bin PureRecovery ${RECOVERY_BIN
 download_asset_release(ecoboot.bin ecoboot.bin ecoboot ${ECOBOOT_BIN_VERSION} ${MUDITA_CACHE_DIR})
 
 
-add_standalone_image(PurePhone)
-add_update_package(PurePhone)
+add_standalone_image(PurePhone PurePhone)
+add_update_package(PurePhone PurePhone)
 
 include(GitHubWorkerMessages)
 github_message_standalone()