pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43527?usp=email )
Change subject: deps: Remove unused titan.ProtocolModules.JSON_v07_2006 ......................................................................
deps: Remove unused titan.ProtocolModules.JSON_v07_2006
While looking at updating titan.ProtocolModules.JSON_v07_2006 to R.2.A, which includes an API breakage from R.1.A and which will be needed once we add SBI interface support, I found out none of the testsuites importing it is actually using it, so remove it for now.
Change-Id: I1beec8727d9f35103df1053a5377cfb5f087ff88 --- M cbc/gen_links.sh M cbc/regen_makefile.sh M deps/Makefile M remsim/RemsimServer_Tests.ttcn M remsim/gen_links.sh M remsim/regen_makefile.sh M s1gw/gen_links.sh M s1gw/regen_makefile.sh 8 files changed, 0 insertions(+), 18 deletions(-)
Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved
diff --git a/cbc/gen_links.sh b/cbc/gen_links.sh index 129de44..6021abe 100755 --- a/cbc/gen_links.sh +++ b/cbc/gen_links.sh @@ -47,10 +47,6 @@ FILES="HTTPmsg_MessageLen.ttcn HTTPmsg_MessageLen_Function.cc HTTPmsg_PT.cc HTTPmsg_PT.hh HTTPmsg_PortType.ttcn HTTPmsg_Types.ttcn " gen_links $DIR $FILES
-DIR=$BASEDIR/titan.ProtocolModules.JSON_v07_2006/src -FILES="JSON_EncDec.cc JSON_Types.ttcn " -gen_links $DIR $FILES - DIR=../library FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc " FILES+="HTTP_Adapter.ttcn " diff --git a/cbc/regen_makefile.sh b/cbc/regen_makefile.sh index 4189a6a..dc68141 100755 --- a/cbc/regen_makefile.sh +++ b/cbc/regen_makefile.sh @@ -11,7 +11,6 @@ HTTPmsg_PT.cc IPL4asp_PT.cc IPL4asp_discovery.cc - JSON_EncDec.cc Native_FunctionDefs.cc SABP_CodecPort_CtrlFunctDef.cc SABP_EncDec.cc diff --git a/deps/Makefile b/deps/Makefile index 7dc6659..f230577 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -20,7 +20,6 @@ titan.ProtocolModules.ICMPv6 \ titan.ProtocolModules.IP \ titan.ProtocolModules.ISUP_Q.762 \ - titan.ProtocolModules.JSON_v07_2006 \ titan.ProtocolModules.L2TP \ titan.ProtocolModules.LLC_v7.1.0 \ titan.ProtocolModules.M3UA \ @@ -87,7 +86,6 @@ titan.ProtocolModules.ICMPv6_commit= 46f4d9b6e1e3c794294a92588401a81e4881dd27 titan.ProtocolModules.IP_commit= 1be86705f39ae38f3c04b2109806ee20d25e91d0 titan.ProtocolModules.ISUP_Q.762_commit= R.8.A-5-g42d428b -titan.ProtocolModules.JSON_v07_2006_commit= R.1.A titan.ProtocolModules.L2TP_commit= 17e76d3662bd0bb815158e8a9de1ec413f21b530 titan.ProtocolModules.LLC_v7.1.0_commit= 09817f113255d7fb56f1d45d3dd629a093d9248d titan.ProtocolModules.MAP_commit= R.2.A-1-g79c6a3d diff --git a/remsim/RemsimServer_Tests.ttcn b/remsim/RemsimServer_Tests.ttcn index 2fd420e..4dce01f 100644 --- a/remsim/RemsimServer_Tests.ttcn +++ b/remsim/RemsimServer_Tests.ttcn @@ -27,7 +27,6 @@ import from HTTPmsg_Types all; import from HTTPmsg_PortType all; import from HTTP_Adapter all; -import from JSON_Types all;
/* run a HTTP GET on specified URL expecting json in RSRES format as response */ function f_rsres_get(charstring url, template integer exp_sts := 200) diff --git a/remsim/gen_links.sh b/remsim/gen_links.sh index e013a77..cbe4bc3 100755 --- a/remsim/gen_links.sh +++ b/remsim/gen_links.sh @@ -28,10 +28,6 @@ FILES="HTTPmsg_MessageLen.ttcn HTTPmsg_MessageLen_Function.cc HTTPmsg_PT.cc HTTPmsg_PT.hh HTTPmsg_PortType.ttcn HTTPmsg_Types.ttcn " gen_links $DIR $FILES
-DIR=$BASEDIR/titan.ProtocolModules.JSON_v07_2006/src -FILES="JSON_EncDec.cc JSON_Types.ttcn " -gen_links $DIR $FILES - DIR=$BASEDIR/titan.TestPorts.PIPEasp/src FILES="PIPEasp_PT.cc PIPEasp_PT.hh PIPEasp_Types.ttcn PIPEasp_PortType.ttcn " gen_links $DIR $FILES diff --git a/remsim/regen_makefile.sh b/remsim/regen_makefile.sh index 9d4df3e..fadc599 100755 --- a/remsim/regen_makefile.sh +++ b/remsim/regen_makefile.sh @@ -12,7 +12,6 @@ IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc - JSON_EncDec.cc Native_FunctionDefs.cc PIPEasp_PT.cc RSPRO_EncDec.cc diff --git a/s1gw/gen_links.sh b/s1gw/gen_links.sh index ac58c3b..bcdd1f9 100755 --- a/s1gw/gen_links.sh +++ b/s1gw/gen_links.sh @@ -34,10 +34,6 @@ FILES="HTTPmsg_MessageLen.ttcn HTTPmsg_MessageLen_Function.cc HTTPmsg_PT.cc HTTPmsg_PT.hh HTTPmsg_PortType.ttcn HTTPmsg_Types.ttcn " gen_links $DIR $FILES
-DIR=$BASEDIR/titan.ProtocolModules.JSON_v07_2006/src -FILES="JSON_EncDec.cc JSON_Types.ttcn " -gen_links $DIR $FILES - DIR=../library/s1ap FILES="S1AP_CommonDataTypes.asn S1AP_Constants.asn S1AP_Containers.asn S1AP_IEs.asn " FILES+="S1AP_PDU_Contents.asn S1AP_PDU_Descriptions.asn " diff --git a/s1gw/regen_makefile.sh b/s1gw/regen_makefile.sh index 8b46384..01f5cd4 100755 --- a/s1gw/regen_makefile.sh +++ b/s1gw/regen_makefile.sh @@ -11,7 +11,6 @@ HTTPmsg_PT.cc IPL4asp_PT.cc IPL4asp_discovery.cc - JSON_EncDec.cc Native_FunctionDefs.cc PFCP_CodecPort_CtrlFunctDef.cc S1AP_CodecPort_CtrlFunctDef.cc