fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29831 )
Change subject: {ns,sgsn,gbproxy}: gen_links.sh: do not link unused modules ......................................................................
{ns,sgsn,gbproxy}: gen_links.sh: do not link unused modules
Change-Id: I8fddd010e2a3ce88c892887fc571ae54d84e931f --- M gbproxy/GBProxy_Tests.ttcn M gbproxy/gen_links.sh M gbproxy/regen_makefile.sh M ns/gen_links.sh M ns/regen_makefile.sh M sgsn/SGSN_Tests.ttcn M sgsn/gen_links.sh M sgsn/regen_makefile.sh 8 files changed, 6 insertions(+), 16 deletions(-)
Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified
diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn index 3f822c2..9f7d17a 100644 --- a/gbproxy/GBProxy_Tests.ttcn +++ b/gbproxy/GBProxy_Tests.ttcn @@ -38,8 +38,6 @@ import from LLC_Types all; import from LLC_Templates all;
-import from GSM_RR_Types all; - /* mcc_mnc is 24.008 10.5.5.15 encoded. 262 42 */ const BcdMccMnc c_mcc_mnc := '262F42'H;
diff --git a/gbproxy/gen_links.sh b/gbproxy/gen_links.sh index 6d4ab81..b880d63 100755 --- a/gbproxy/gen_links.sh +++ b/gbproxy/gen_links.sh @@ -83,15 +83,14 @@ gen_links $DIR $FILES
DIR=../library -FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn GSM_RR_Types.ttcn Osmocom_Types.ttcn RLCMAC_Templates.ttcn RLCMAC_Types.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn RLCMAC_EncDec.cc " +FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn " FILES+="RAW_NS.ttcnpp NS_Provider_IPL4.ttcn NS_Provider_FR.ttcn NS_Emulation.ttcnpp " FILES+="BSSGP_Emulation.ttcnpp Osmocom_Gb_Types.ttcn " -FILES+="PCUIF_Types.ttcn " FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn " FILES+="Osmocom_VTY_Functions.ttcn " FILES+="LLC_Templates.ttcn L3_Templates.ttcn L3_Common.ttcn " # IPA_Emulation + dependencies -FILES+="IPA_Types.ttcn IPA_Emulation.ttcnpp IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc Native_Functions.ttcn Native_FunctionDefs.cc GSUP_Types.ttcn GSUP_Emulation.ttcn " +FILES+="IPA_Types.ttcn IPA_Emulation.ttcnpp IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc Native_Functions.ttcn Native_FunctionDefs.cc " FILES+="GTP_CodecPort.ttcn GTP_CodecPort_CtrlFunct.ttcn GTP_CodecPort_CtrlFunctDef.cc GTP_Emulation.ttcn GTP_Templates.ttcn IPCP_Types.ttcn " gen_links $DIR $FILES diff --git a/gbproxy/regen_makefile.sh b/gbproxy/regen_makefile.sh index 78910a4..e4982ae 100755 --- a/gbproxy/regen_makefile.sh +++ b/gbproxy/regen_makefile.sh @@ -16,7 +16,6 @@ IPL4asp_discovery.cc LLC_EncDec.cc Native_FunctionDefs.cc - RLCMAC_EncDec.cc SCCP_EncDec.cc SCTPasp_PT.cc TCCConversion.cc @@ -27,7 +26,6 @@ export CPPFLAGS_TTCN3=" -DBSSGP_EM_L3 -DIPA_EMULATION_CTRL - -DIPA_EMULATION_GSUP -DNS_EMULATION_FR -DUSE_MTP3_DISTRIBUTOR " diff --git a/ns/gen_links.sh b/ns/gen_links.sh index 42e5547..8d78ddf 100755 --- a/ns/gen_links.sh +++ b/ns/gen_links.sh @@ -50,12 +50,11 @@ gen_links $DIR $FILES
DIR=../library -FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc GSM_Types.ttcn GSM_RR_Types.ttcn Osmocom_Types.ttcn RLCMAC_Templates.ttcn RLCMAC_Types.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn RLCMAC_EncDec.cc " +FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc GSM_Types.ttcn Osmocom_Types.ttcn " FILES+="StatsD_Types.ttcn StatsD_CodecPort.ttcn StatsD_CodecPort_CtrlFunct.ttcn StatsD_CodecPort_CtrlFunctdef.cc StatsD_Checker.ttcn " FILES+="RAW_NS.ttcnpp NS_Provider_IPL4.ttcn NS_Provider_FR.ttcn NS_Emulation.ttcnpp " FILES+="BSSGP_Emulation.ttcnpp Osmocom_Gb_Types.ttcn " -FILES+="LLC_Templates.ttcn L3_Templates.ttcn L3_Common.ttcn " -FILES+="PCUIF_Types.ttcn PCUIF_CodecPort.ttcn RAW_NS.ttcnpp " +FILES+="LLC_Templates.ttcn " gen_links $DIR $FILES
ignore_pp_results diff --git a/ns/regen_makefile.sh b/ns/regen_makefile.sh index 88360d8..ad86d71 100755 --- a/ns/regen_makefile.sh +++ b/ns/regen_makefile.sh @@ -12,7 +12,6 @@ IPL4asp_discovery.cc LLC_EncDec.cc Native_FunctionDefs.cc - RLCMAC_EncDec.cc StatsD_CodecPort_CtrlFunctdef.cc TCCConversion.cc TCCInterface.cc diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 5238068..f633101 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -55,8 +55,6 @@ import from TELNETasp_PortType all; import from Osmocom_VTY_Functions all;
-import from GSM_RR_Types all; - import from MobileL3_MM_Types all;
diff --git a/sgsn/gen_links.sh b/sgsn/gen_links.sh index 510b449..41e1ff1 100755 --- a/sgsn/gen_links.sh +++ b/sgsn/gen_links.sh @@ -83,8 +83,8 @@ gen_links $DIR $FILES
DIR=../library -FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn GSM_RR_Types.ttcn Osmocom_Types.ttcn RLCMAC_Templates.ttcn RLCMAC_Types.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn RLCMAC_EncDec.cc " -FILES+="RAW_NS.ttcnpp NS_Provider_IPL4.ttcn NS_Emulation.ttcnpp PCUIF_Types.ttcn " +FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn " +FILES+="RAW_NS.ttcnpp NS_Provider_IPL4.ttcn NS_Emulation.ttcnpp " FILES+="BSSGP_Emulation.ttcnpp Osmocom_Gb_Types.ttcn " FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn " FILES+="Osmocom_VTY_Functions.ttcn " diff --git a/sgsn/regen_makefile.sh b/sgsn/regen_makefile.sh index a1f702a..4ac7d40 100755 --- a/sgsn/regen_makefile.sh +++ b/sgsn/regen_makefile.sh @@ -16,7 +16,6 @@ LLC_EncDec.cc Native_FunctionDefs.cc RANAP_EncDec.cc - RLCMAC_EncDec.cc SCCP_EncDec.cc SCTPasp_PT.cc TCCConversion.cc