Index: build/build.sh =================================================================== diff -u -r5b8a94c072ce47fb3b4a43f2939e28ac9dfac2d4 -r0b3115493d59a51c7cd7fe9cc8b2bb8d0828d6c3 --- build/build.sh (.../build.sh) (revision 5b8a94c072ce47fb3b4a43f2939e28ac9dfac2d4) +++ build/build.sh (.../build.sh) (revision 0b3115493d59a51c7cd7fe9cc8b2bb8d0828d6c3) @@ -101,8 +101,8 @@ getAlarmMapping() { local currentDir=$(pwd) - - scripts/build/alarmMapping $currentDir/ucommon/AlarmDefs.h $currentDir/application/sources/model/hd/alarm/MAlarmMapping.cpp + echo "Path $PATH" + scripts/build/alarmMapping $currentDir/common/AlarmDefs.h $currentDir/application/sources/model/hd/alarm/MAlarmMapping.cpp } function getManualCases() @@ -219,7 +219,7 @@ echo " ------------------------------Setting upt the project" git clone ssh://git@dvm-linux02:7999/bl/setupscript.git ./setupscript/projectsetup.sh ${buildSpecs[$PROJECT_NAME_INDEX]} ${buildSpecs[$PROJECT_CHECKOUT_INDEX]} \ - ${buildSpecs[$COMMON_CHECKOUT_INDEX]} + ${buildSpecs[$COMMON_CHECKOUT_INDEX]} cd application cppCheckStatus=$(runCppcheck $(pwd) $REMOTE_DIR $STATUS_REPORT) if [[ $cppCheckStatus -eq 1 ]] Index: build/unittest.sh =================================================================== diff -u -r239a830f7d07eabdec836c43ca20cd30b5891719 -r0b3115493d59a51c7cd7fe9cc8b2bb8d0828d6c3 --- build/unittest.sh (.../unittest.sh) (revision 239a830f7d07eabdec836c43ca20cd30b5891719) +++ build/unittest.sh (.../unittest.sh) (revision 0b3115493d59a51c7cd7fe9cc8b2bb8d0828d6c3) @@ -77,13 +77,15 @@ PROJECT_CHECKOUT_INDEX=8 COMMON_CHECKOUT_INDEX=9 + local isBuildLocal=false + setBuildVariables ${buildSpecs[@]} REPORT_DIR=$(getRemoteCopyAddress "DEN_UI" ${buildSpecs[$PROJECT_CHECKOUT_INDEX]}) - STATUS_REPORT=$(createStatusReport "application" $REPORT_DIR) + STATUS_REPORT=$(createStatusReport "application" $REPORT_DIR $isBuildLocal) # Call this function to check if the repository has to be tagged or not tagUIRepository getCommitHashes $STATUS_REPORT ${buildSpecs[$PROJECT_NAME_INDEX]} ${buildSpecs[$PROJECT_CHECKOUT_INDEX]} \ - ${buildSpecs[$COMMON_CHECKOUT_INDEX]} "" ${buildSpecs[$PROJECT_CHECKOUT_INDEX]} + ${buildSpecs[$COMMON_CHECKOUT_INDEX]} "" ${buildSpecs[$PROJECT_CHECKOUT_INDEX]} BUID_DIR=build BUILD_PATH=$WORKING_DIR/$BUID_DIR