build.sh: Use ci script to generate version lables

Signed-off-by: Maxim Polyakov <[email protected]>

build.sh

@@ -4,6 +4,7 @@ RTEMS_ARCH="i386"
 RTEMS_BSP="pc386"
 
 ROOT_DIR="$(dirname $(realpath ${BASH_SOURCE[0]}))"
+CI_DIR="${ROOT_DIR}/ci"
 RTEMS_DIR="${ROOT_DIR}/rtems_rtos"
 RTEMS_VERSION="5.1"
 OUT_EXE_NAME="rtems-ec-cli.exe"
@@ -13,21 +14,6 @@ FLAG_REBUILD_APP=0
 FLAG_BUILD_RTEMS=0
 FLAG_BUILD_CROSS=0
 
-function get_version_lable_rtems_os
-{
- base=$(git -C ${RTEMS_DIR}/rtems describe --tags --dirty)
- branch=$(git -C ${RTEMS_DIR}/rtems branch | grep \* | cut -d ' ' -f2-)
- echo ${RTEMS_ARCH}"-"${RTEMS_BSP}"-"$branch"-"$base
-}
-
-function get_version_lable_proj
-{
- version_rtems=$(git -C ${RTEMS_DIR}/rtems describe --always --abbrev=6)
- version_base=$(git -C ${ROOT_DIR} describe --tags --dirty --abbrev=4)
- branch=$(git -C ${ROOT_DIR} branch | grep \* | cut -d ' ' -f2-)
- echo ${RTEMS_ARCH}"-"${RTEMS_BSP}"-"$version_rtems"-"$branch"-"$version_base
-}
-
 function build_cross_compiler
 {
  rm -Rf ${RTEMS_DIR}/rtems-exe
@@ -49,6 +35,8 @@ function build_cross_compiler
 
 function build_rtems_os
 {
+ rtems_os_version_lable=$(bash ${CI_DIR}/ci-generate-version.sh rtems --arch ${RTEMS_ARCH} --bsp ${RTEMS_BSP})
+ echo "version: $rtems_os_version_lable"
  rm -Rf ${RTEMS_DIR}/tmp ${RTEMS_DIR}/build-*
  export PATH=${RTEMS_DIR}/rtems-exe/bin:$PATH
  export PATH=${RTEMS_DIR}/rtems-exe/${RTEMS_ARCH}-rtems5/bin:$PATH
@@ -62,7 +50,7 @@ function build_rtems_os
  mkdir -p ${RTEMS_DIR}/tmp; cd ${RTEMS_DIR}/tmp
  ${RTEMS_DIR}/rtems/rtems-bsps
  ${RTEMS_DIR}/rtems/configure --target=${RTEMS_ARCH}-rtems5 \
- --prefix=${RTEMS_DIR}/build-$(get_version_lable_rtems_os) \
+ --prefix=${RTEMS_DIR}/build-$rtems_os_version_lable \
  --disable-multiprocessing \
  --disable-cxx \
  --disable-rdbg \
@@ -85,15 +73,17 @@ function build_rtems_os
 function build_application
 {
  cd ${ROOT_DIR}
- ${ROOT_DIR}/waf --project-version=$(get_version_lable_proj) \
- configure --rtems=${RTEMS_DIR}/build-$(get_version_lable_rtems_os) \
+ project_version_lable=$(bash ${CI_DIR}/ci-generate-version.sh --arch ${RTEMS_ARCH} --bsp ${RTEMS_BSP})
+ rtems_os_version_lable=$(bash ${CI_DIR}/ci-generate-version.sh rtems --arch ${RTEMS_ARCH} --bsp ${RTEMS_BSP})
+ ${ROOT_DIR}/waf --project-version=$project_version_lable \
+ configure --rtems=${RTEMS_DIR}/build-$rtems_os_version_lable \
  --rtems-tools=${RTEMS_DIR}/rtems-exe \
  --rtems-bsps=${RTEMS_ARCH}/${RTEMS_BSP}
  ${ROOT_DIR}/waf --version
  ${ROOT_DIR}/waf -vvv
  cp ${ROOT_DIR}/build/${RTEMS_ARCH}-rtems5-${RTEMS_BSP}/${OUT_EXE_NAME} \
  ${ROOT_DIR}/${OUT_EXE_NAME}
- tar -C ${ROOT_DIR} -zcvf ${ROOT_DIR}/$(get_version_lable_proj).tar.gz ${OUT_EXE_NAME}
+ tar -C ${ROOT_DIR} -zcvf ${ROOT_DIR}/${project_version_lable}.tar.gz ${OUT_EXE_NAME}
 }
 
 function print_help
@@ -166,9 +156,10 @@ if [[ ${FLAG_BUILD_ALL} -eq 1 ]] ; then
 fi;
 
 if [[ ${FLAG_REBUILD_APP} -eq 1 ]] ; then
+ project_version_lable=$(bash ${CI_DIR}/ci-generate-version.sh --arch ${RTEMS_ARCH} --bsp ${RTEMS_BSP})
  rm -rf ${ROOT_DIR}/${OUT_EXE_NAME} \
  ${ROOT_DIR}/build/ \
- ${ROOT_DIR}/$(get_version_lable_proj).tar.gz
+ ${ROOT_DIR}/${project_version_lable}.tar.gz
 fi;
 
 build_application