Merge branch 'develop' into FOGL-4103

Author: ashish-jabble

make_deb

@@ -129,7 +129,7 @@ fi
 version=`cat ${FLEDGE_ROOT}/VERSION | tr -d ' ' | grep 'fledge_version=' | head -1 | sed -e 's/\(.*\)=\(.*\)/\2/g'`
 BUILD_ROOT="${PKG_ROOT}/packages/Debian/build/${architecture}"
 # Final package name
-if [[ $skip_build == 0 ]] && ([[ ${branch} != "main" ]] && [[ ! ${branch} =~ ^[0-9]+\.[0-9]+\.[0-9]+RC ]]); then package_name="fledge_${version}-${commit_count}_${architecture}"; version=${git_tag_info:1}; else package_name="fledge_${version}_${architecture}"; fi
+if [[ $skip_build == 0 ]] && ([[ ${branch} != "main" ]] && [[ ! ${branch} =~ ^[0-9]+\.[0-9]+\.[0-9]+RC ]] && [[ ! ${branch} =~ ^v[0-9]+\.[0-9]+\.[0-9]+ ]]); then package_name="fledge_${version}-${commit_count}_${architecture}"; version=${git_tag_info:1}; else package_name="fledge_${version}_${architecture}"; fi
 
 # Print the summary of findings
 echo "The package root directory is : ${PKG_ROOT}"
@@ -165,7 +165,7 @@ cd "${package_name}"
 cp -R ${PKG_ROOT}/packages/Debian/common/* .
 cp -R ${PKG_ROOT}/packages/Debian/${architecture}/* .
 sed -i "s/Version: 1.0.0/Version: ${version}/g" DEBIAN/control
-if [[ $skip_build == 0 ]] && ([[ ${branch} = "main" ]] || [[ ${branch} =~ ^[0-9]+\.[0-9]+\.[0-9]+RC ]]); then echo "Build: ${git_tag_info:1}" >> DEBIAN/control; fi
+if [[ $skip_build == 0 ]] && ([[ ${branch} = "main" ]] || [[ ${branch} =~ ^[0-9]+\.[0-9]+\.[0-9]+RC ]] || [[ ${branch} =~ ^v[0-9]+\.[0-9]+\.[0-9]+ ]]); then echo "Build: ${git_tag_info:1}" >> DEBIAN/control; fi
 mkdir -p usr/local/fledge
 cd usr/local/fledge
 cp -R ${FLEDGE_ROOT}/* .

make_rpm

@@ -174,7 +174,7 @@ BUILD_ROOT="${PKG_ROOT}/packages/RPM/build/BUILDROOT"
 mkdir -p ${PKG_ROOT}/packages/RPM/build/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
 mkdir -p ${PKG_ROOT}/packages/RPM/build/RPMS/x86_64
 
-if [[ $skip_build == 1 ]] || ([[ ${branch} = "main" ]] || [[ ${branch} =~ ^[0-9]+\.[0-9]+\.[0-9]+RC ]]); then commit_count=1; fi
+if [[ $skip_build == 1 ]] || ([[ ${branch} = "main" ]] || [[ ${branch} =~ ^[0-9]+\.[0-9]+\.[0-9]+RC ]] || [[ ${branch} =~ ^v[0-9]+\.[0-9]+\.[0-9]+ ]]); then commit_count=1; fi
 # Final package name
 package_name="${pkg_name}-${version}-${commit_count}.${architecture}"
 

others/make_deb

@@ -93,7 +93,8 @@ pkg_name="fledge-${ADDITIONAL_LIB_NAME}"
 arch_name=$(dpkg --print-architecture)
 git_tag_info=$(git describe --tags) && commit_count=$(echo ${git_tag_info} | cut -d- -f2) || { commit_count=$(git rev-list --count HEAD); git_tag_info="v$version-$commit_count-g$(git rev-parse --short HEAD)"; }
 branch_name=$(git rev-parse --abbrev-ref HEAD)
-if [[ ${branch_name} != "main" ]] && [[ ! ${branch_name} =~ ^[0-9]+\.[0-9]+\.[0-9]+RC ]]; then package_name="${pkg_name}_${version}-${commit_count}_${architecture}"; version=${git_tag_info:1}; else package_name="${pkg_name}_${version}_${architecture}"; fi
+if [[ $branch_name == "HEAD" ]]; then branch_name=$(git describe --tags); fi
+if [[ ${branch_name} != "main" ]] && [[ ! ${branch_name} =~ ^[0-9]+\.[0-9]+\.[0-9]+RC ]] && [[ ! ${branch_name} =~ ^v[0-9]+\.[0-9]+\.[0-9]+ ]]; then package_name="${pkg_name}_${version}-${commit_count}_${architecture}"; version=${git_tag_info:1}; else package_name="${pkg_name}_${version}_${architecture}"; fi
 
 if [ ! -d "${archive}/${architecture}" ]; then
     mkdir -p "${archive}/${architecture}"
@@ -119,7 +120,7 @@ sed -i "s/__NAME__/${pkg_name}/g" DEBIAN/control
 sed -i "s/__ARCH__/${arch_name}/g" DEBIAN/control
 sed -i "s/__REQUIRES__/fledge (${fledge_version})/g" DEBIAN/control
 sed -i "s/__DESCRIPTION__/${description}/g" DEBIAN/control
-if [[ ${branch_name} = "main" ]] || [[ ${branch_name} =~ ^[0-9]+\.[0-9]+\.[0-9]+RC ]]; then echo "Build: ${git_tag_info:1}" >> DEBIAN/control; fi
+if [[ ${branch_name} = "main" ]] || [[ ${branch_name} =~ ^[0-9]+\.[0-9]+\.[0-9]+RC ]] || [[ ${branch_name} =~ ^v[0-9]+\.[0-9]+\.[0-9]+ ]]; then echo "Build: ${git_tag_info:1}" >> DEBIAN/control; fi
 
 # Debian file structure
 mkdir -p usr/local/lib

others/make_rpm

@@ -96,7 +96,8 @@ BUILD_ROOT="${GIT_ROOT}/packages/build"
 # Note: git describe command fails when repo does not have release/tag
 GIT_TAG_INFO=$(git describe --tags) && GIT_TAG_INFO=$(echo ${GIT_TAG_INFO} | sed 's/-/_/g') && COMMIT_COUNT=$(echo ${GIT_TAG_INFO} | cut -d_ -f2) || { COMMIT_COUNT=$(git rev-list --count HEAD); GIT_TAG_INFO="v${VERSION}_${COMMIT_COUNT}_g$(git rev-parse --short HEAD)"; }
 branch_name=$(git rev-parse --abbrev-ref HEAD)
-if [[ ${branch_name} = "main" ]] || [[ ${branch_name} =~ ^[0-9]+\.[0-9]+\.[0-9]+RC ]]; then COMMIT_COUNT=1; fi
+if [[ $branch_name == "HEAD" ]]; then branch_name=$(git describe --tags); fi
+if [[ ${branch_name} = "main" ]] || [[ ${branch_name} =~ ^[0-9]+\.[0-9]+\.[0-9]+RC ]] || [[ ${branch_name} =~ ^v[0-9]+\.[0-9]+\.[0-9]+ ]]; then COMMIT_COUNT=1; fi
 PACKAGE_NAME="${PKG_NAME}-${VERSION}-${COMMIT_COUNT}"
 
 if [ ! -d "${ARCHIVE_PATH}/${ARCHITECTURE}" ]; then

plugins/make_deb

@@ -126,7 +126,7 @@ do
     git_tag_info=$(git describe --tags) && commit_count=$(echo ${git_tag_info} | cut -d- -f2) || { commit_count=$(git rev-list --count HEAD); git_tag_info="v$version-$commit_count-g$(git rev-parse --short HEAD)"; }
     # Final package name
     archname=$(dpkg --print-architecture)
-    if [[ ${BRANCH_NAME} != "main" ]] && [[ ! ${BRANCH_NAME} =~ ^[0-9]+\.[0-9]+\.[0-9]+RC ]]; then package_name="${pkg_name}_${version}-${commit_count}_${arch}"; version=${git_tag_info:1}; else package_name="${pkg_name}_${version}_${arch}"; fi
+    if [[ ${BRANCH_NAME} != "main" ]] && [[ ! ${BRANCH_NAME} =~ ^[0-9]+\.[0-9]+\.[0-9]+RC ]] && [[ ! ${BRANCH_NAME} =~ ^v[0-9]+\.[0-9]+\.[0-9]+ ]]; then package_name="${pkg_name}_${version}-${commit_count}_${arch}"; version=${git_tag_info:1}; else package_name="${pkg_name}_${version}_${arch}"; fi
 
     # Print the summary of findings
     echo "The package root directory is                         : ${GIT_ROOT}"
@@ -204,7 +204,7 @@ do
             fi
         done < "${GIT_ROOT}/additional_lib.version"
     fi
-    if [[ ${BRANCH_NAME} = "main" ]] || [[ ${BRANCH_NAME} =~ ^[0-9]+\.[0-9]+\.[0-9]+RC ]]; then echo "Build: ${git_tag_info:1}" >> ${deb_path}/control; fi
+    if [[ ${BRANCH_NAME} = "main" ]] || [[ ${BRANCH_NAME} =~ ^[0-9]+\.[0-9]+\.[0-9]+RC ]] || [[ ${BRANCH_NAME} =~ ^v[0-9]+\.[0-9]+\.[0-9]+ ]]; then echo "Build: ${git_tag_info:1}" >> ${deb_path}/control; fi
 
     # install notes
     if [ -f "${GIT_ROOT}/install_notes.txt" ]; then

plugins/make_rpm

@@ -138,7 +138,7 @@ do
   # Get git tag info from "git describe" cmd and if that fails try another method
   # Note: git describe command fails when repo does not have release/tag
   git_tag_info=$(git describe --tags) && git_tag_info=$(echo ${git_tag_info} | sed 's/-/_/g') && commit_count=$(echo ${git_tag_info} | cut -d_ -f2) || { commit_count=$(git rev-list --count HEAD); git_tag_info="v${version}_${commit_count}_g$(git rev-parse --short HEAD)"; }
-  if [[ ${BRANCH_NAME} = "main" ]] || [[ ${BRANCH_NAME} =~ ^[0-9]+\.[0-9]+\.[0-9]+RC ]]; then commit_count=1; fi
+  if [[ ${BRANCH_NAME} = "main" ]] || [[ ${BRANCH_NAME} =~ ^[0-9]+\.[0-9]+\.[0-9]+RC ]] || [[ ${BRANCH_NAME} =~ ^v[0-9]+\.[0-9]+\.[0-9]+ ]]; then commit_count=1; fi
   # Final package name
   package_name="${pkg_name}-${version}-${commit_count}"
 

service/make_deb

@@ -127,7 +127,7 @@ do
     git_tag_info=$(git describe --tags) && commit_count=$(echo ${git_tag_info} | cut -d- -f2) || { commit_count=$(git rev-list --count HEAD); git_tag_info="v$version-$commit_count-g$(git rev-parse --short HEAD)"; }
     # Final package name
     archname=$(dpkg --print-architecture)
-    if [[ ${BRANCH_NAME} != "main" ]] && [[ ! ${BRANCH_NAME} =~ ^[0-9]+\.[0-9]+\.[0-9]+RC ]]; then package_name="${pkg_name}_${version}-${commit_count}_${architecture}"; version=${git_tag_info:1}; else package_name="${pkg_name}_${version}_${architecture}"; fi
+    if [[ ${BRANCH_NAME} != "main" ]] && [[ ! ${BRANCH_NAME} =~ ^[0-9]+\.[0-9]+\.[0-9]+RC ]]  && [[ ! ${BRANCH_NAME} =~ ^v[0-9]+\.[0-9]+\.[0-9]+ ]]; then package_name="${pkg_name}_${version}-${commit_count}_${architecture}"; version=${git_tag_info:1}; else package_name="${pkg_name}_${version}_${architecture}"; fi
 
     # Print the summary of findings
     echo "The package root directory is                           : ${GIT_ROOT}"
@@ -189,7 +189,7 @@ do
     desc=`cat "${GIT_ROOT}/Description"`
     sed -i "s/__DESCRIPTION__/${desc}/g" ${deb_path}/control
     sed -i "s|__INSTALL_DIR__|${install_dir}|g" ${deb_path}/postinst
-    if [[ ${BRANCH_NAME} = "main" ]] || [[ ${BRANCH_NAME} =~ ^[0-9]+\.[0-9]+\.[0-9]+RC ]]; then echo "Build: ${git_tag_info:1}" >> ${deb_path}/control; fi
+    if [[ ${BRANCH_NAME} = "main" ]] || [[ ${BRANCH_NAME} =~ ^[0-9]+\.[0-9]+\.[0-9]+RC ]] || [[ ${BRANCH_NAME} =~ ^v[0-9]+\.[0-9]+\.[0-9]+ ]]; then echo "Build: ${git_tag_info:1}" >> ${deb_path}/control; fi
 
     # Debian file structure
     mkdir -p usr/local/fledge

service/make_rpm

@@ -154,7 +154,7 @@ do
     # Get git tag info from "git describe" cmd and if that fails try another method
     # Note: git describe command fails when repo does not have release/tag
     git_tag_info=$(git describe --tags) && git_tag_info=$(echo ${git_tag_info} | sed 's/-/_/g') && commit_count=$(echo ${git_tag_info} | cut -d_ -f2) || { commit_count=$(git rev-list --count HEAD); git_tag_info="v${version}_${commit_count}_g$(git rev-parse --short HEAD)"; }
-    if [[ ${BRANCH_NAME} = "main" ]] || [[ ${BRANCH_NAME} =~ ^[0-9]+\.[0-9]+\.[0-9]+RC ]]; then commit_count=1; fi
+    if [[ ${BRANCH_NAME} = "main" ]] || [[ ${BRANCH_NAME} =~ ^[0-9]+\.[0-9]+\.[0-9]+RC ]] || [[ ${BRANCH_NAME} =~ ^v[0-9]+\.[0-9]+\.[0-9]+ ]]; then commit_count=1; fi
     package_name="${pkg_name}-${version}-${commit_count}"
 
     # Print the summary of findings