Commit 3fc07e0e authored by YannGarcia's avatar YannGarcia
Browse files

Merge branch 'master' of https://forge.etsi.org/gitlab/garciay/MEC.git

parents 60ba5323 9b4a46eb

scripts/mec_generate_makefile.bash

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ find .. -type f -name "*.bak" -exec rm {} \; 
find .. -type f -name "*.log" -exec rm {} \;



# Build JSON files if any and put them in objs directory

REFERENCES="LibCommon LibHttp LibMec LibMec/LocationAPI LibMec/RnisAPI LibMec/UEidentityAPI"

REFERENCES="LibCommon LibHttp LibMec LibMec/LocationAPI LibMec/RnisAPI LibMec/UEidentityAPI LibMec/BwManagementAPI"

for i in ${REFERENCES}

do

    # TTCN code

scripts/merge_mec_project.bash

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ done 
echo 'Update TTCN-3 files'

TTCN_3_ORG_PATH=${SRC_MEC_PATH}/ttcn

TTCN_3_DST_PATH=${PATH_DEV_MEC}/src

TTCN_3_ATS_LIST='AtsNg112 LibMec LibMec/LocationAPI LibMec/UEidentityAPI LibMec/RnisAPI LibHttp LibCommon'

TTCN_3_ATS_LIST='AtsNg112 LibMec LibMec/LocationAPI LibMec/UEidentityAPI LibMec/RnisAPI LibMec/BwManagementAPI LibHttp LibCommon'

for i in ${TTCN_3_ATS_LIST}

do

    # TTCN-3 files

scripts/update_mec_project.bash

+5 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ do 
done



# Update libraries & CC files

TTCN_3_LIB_LIST='LibMec LibMec/LocationAPI LibMec/UEidentityAPI LibMec/RnisAPI LibHttp LibCommon'

TTCN_3_LIB_LIST='LibMec LibMec/LocationAPI LibMec/UEidentityAPI LibMec/RnisAPI LibMec/BwManagementAPI LibHttp LibCommon'

for i in ${TTCN_3_LIB_LIST}

do

    if [ ! -d ${TTCN_3_DST_PATH}/$i ]
@@ -147,6 +147,10 @@ do 
        cp ${TTCN_3_ORG_PATH}/$i/ttcn/*.ttcn ${TTCN_3_DST_PATH}/$i/ttcn

        cp ${TTCN_3_ORG_PATH}/$i/json/*.json ${TTCN_3_DST_PATH}/$i/json

    elif [ "$i" == "LibMec/RnisAPI" ]

    then

        cp ${TTCN_3_ORG_PATH}/$i/ttcn/*.ttcn ${TTCN_3_DST_PATH}/$i/ttcn

        cp ${TTCN_3_ORG_PATH}/$i/json/*.json ${TTCN_3_DST_PATH}/$i/json

    elif [ "$i" == "LibMec/BwManagementAPI" ]

    then

        cp ${TTCN_3_ORG_PATH}/$i/ttcn/*.ttcn ${TTCN_3_DST_PATH}/$i/ttcn

        cp ${TTCN_3_ORG_PATH}/$i/json/*.json ${TTCN_3_DST_PATH}/$i/json