From 9ecb6cb6f6144ea172d00a5b9354b30790c3e25f Mon Sep 17 00:00:00 2001 From: YannGarcia Date: Mon, 6 Jan 2020 13:03:28 +0100 Subject: [PATCH] Bug fixed in scripts --- scripts/mec_generate_makefile.bash | 2 +- scripts/update_mec_project.bash | 7 ++++++- ttcn/LibIts | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/scripts/mec_generate_makefile.bash b/scripts/mec_generate_makefile.bash index 8553a04..9966740 100755 --- a/scripts/mec_generate_makefile.bash +++ b/scripts/mec_generate_makefile.bash @@ -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/Ams LibMec/AppEna LibMec/AppLCM LibMec/BwManagementAPI LibMec/FixedAccessInformationAPI LibMec/Grant LibMec/LocationAPI LibMec/MeoPkgm LibMec/MepmPkgm LibMec/RnisAPI LibMec/UEidentityAPI" +REFERENCES="LibMec LibMec/Ams LibMec/AppEna LibMec/AppLCM LibMec/BwManagementAPI LibMec/FixedAccessInformationAPI LibMec/Grant LibMec/LocationAPI LibMec/MeoPkgm LibMec/MepmPkgm LibMec/RnisAPI LibMec/UEAppInterfaceAPI LibMec/UEidentityAPI LibHttp LibCommon" for i in ${REFERENCES} do # TTCN code diff --git a/scripts/update_mec_project.bash b/scripts/update_mec_project.bash index e8fc9e7..c43de94 100755 --- a/scripts/update_mec_project.bash +++ b/scripts/update_mec_project.bash @@ -125,7 +125,7 @@ do done # Update libraries & CC files -TTCN_3_LIB_LIST='LibMec LibMec/Ams LibMec/AppEna LibMec/AppLCM LibMec/BwManagementAPI LibMec/FixedAccessInformationAPI LibMec/Grant LibMec/LocationAPI LibMec/MeoPkgm LibMec/MepmPkgm LibMec/RnisAPI LibMec/UEAppInterfaceAPI LibMec/UEidentityAPI LibHttp LibCommon' +TTCN_3_LIB_LIST='LibMec LibMec/Ams LibMec/AppEna LibMec/AppLCM LibMec/BwManagementAPI LibMec/FixedAccessInformationAPI LibMec/Grant LibMec/LocationAPI LibMec/MeoPkgm LibMec/MepmPkgm LibMec/RnisAPI LibMec/UEAppInterfaceAPI LibMec/UEidentityAPI LibHttp LibCommon' for i in ${TTCN_3_LIB_LIST} do if [ ! -d ${TTCN_3_DST_PATH}/$i ] @@ -154,6 +154,11 @@ 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 rm -f ${TTCN_3_DST_PATH}/$i/ttcn/Ams_sEncdecDeclarations.ttcn + elif [ "$i" == "LibMec" ] + then + cp ${CC_SRC_PATH}/externals/LibMec_ExternalFunctions.cc ${TTCN_3_DST_PATH}/$i/src + 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 else 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 diff --git a/ttcn/LibIts b/ttcn/LibIts index 77f9d4c..9ccad87 160000 --- a/ttcn/LibIts +++ b/ttcn/LibIts @@ -1 +1 @@ -Subproject commit 77f9d4cf66a865cf5809503bc3e1f1039fe750cd +Subproject commit 9ccad87d3e34ec870bf80c5991bf73757f998340 -- GitLab