From fe0c6083bd7176b8375fafc6d6399772d85a70a3 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Mon, 20 May 2019 19:20:55 +0200 Subject: Depend on our own fork of titan.ProtocolModules.BSSMAP Since we use some BSSMAP extensions to signal Osmux, we need to maintain our own fork of BSSMAP_Types in order to supports those IEs in BSSMAP RESET and BSSMAP Assin Req/Compl. Hence, switch all build componenets to fetch and use our fork. Depends: titan.ProtocolModules.BSSMAP Iaf1e137269c0da20b2c96fd104b57edf336693af Change-Id: Ic8debe5f3ffe8e1d4258fa6b4632a3871b99af40 --- bsc-nat/gen_links.sh | 2 +- bsc/gen_links.sh | 2 +- deps/Makefile | 6 +++--- msc/gen_links.sh | 2 +- selftest/gen_links.sh | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bsc-nat/gen_links.sh b/bsc-nat/gen_links.sh index 16e32b78..7b7f9283 100755 --- a/bsc-nat/gen_links.sh +++ b/bsc-nat/gen_links.sh @@ -29,7 +29,7 @@ DIR=$BASEDIR/titan.ProtocolEmulations.SCCP/src FILES="SCCP_Emulation.ttcn SCCP_EncDec.cc SCCP_Mapping.ttcnpp SCCP_Types.ttcn SCCPasp_Types.ttcn" gen_links $DIR $FILES -DIR=$BASEDIR/titan.ProtocolModules.BSSMAP_v11.2.0/src +DIR=$BASEDIR/titan.ProtocolModules.BSSMAP/src FILES="BSSAP_Types.ttcn" gen_links $DIR $FILES diff --git a/bsc/gen_links.sh b/bsc/gen_links.sh index a4f09f4d..c71b31ab 100755 --- a/bsc/gen_links.sh +++ b/bsc/gen_links.sh @@ -45,7 +45,7 @@ DIR=$BASEDIR/titan.ProtocolEmulations.SCCP/src FILES="SCCP_Emulation.ttcn SCCP_Mapping.ttcnpp SCCP_Types.ttcn SCCPasp_Types.ttcn" gen_links $DIR $FILES -DIR=$BASEDIR/titan.ProtocolModules.BSSMAP_v11.2.0/src +DIR=$BASEDIR/titan.ProtocolModules.BSSMAP/src FILES="BSSAP_Types.ttcn" gen_links $DIR $FILES diff --git a/deps/Makefile b/deps/Makefile index 6b19cf3e..23f7b64c 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -33,7 +33,6 @@ ECLIPSEGIT2_REPOS= titan.ProtocolModules.GRE \ titan.TestPorts.GPIO \ titan.ProtocolModules.BSSAPP_v7.3.0 \ titan.ProtocolModules.BSSGP_v13.0.0 \ - titan.ProtocolModules.BSSMAP_v11.2.0 \ titan.ProtocolModules.GTP_v13.5.0 \ titan.ProtocolModules.GTPv2_v13.7.0 \ titan.ProtocolModules.ISUP_Q.762 \ @@ -48,7 +47,8 @@ OSMOGITHUB_REPOS= titan.TestPorts.SCTPasp \ titan.TestPorts.MTP3asp \ titan.ProtocolEmulations.M3UA -OSMOGIT_REPOS= titan.ProtocolModules.MAP +OSMOGIT_REPOS= titan.ProtocolModules.MAP \ + titan.ProtocolModules.BSSMAP ALL_REPOS=$(ECLIPSEGIT_REPOS) $(ECLIPSEGIT2_REPOS) $(OSMOGITHUB_REPOS) $(OSMOGIT_REPOS) @@ -60,7 +60,7 @@ titan.ProtocolEmulations.M3UA_commit= R.2.A-2-g742cf02 titan.ProtocolEmulations.SCCP_commit= R.7.A-2-g724c83f titan.ProtocolModules.BSSAPP_v7.3.0_commit= R.2.A titan.ProtocolModules.BSSGP_v13.0.0_commit= R.2.A -titan.ProtocolModules.BSSMAP_v11.2.0_commit= R.2.A +titan.ProtocolModules.BSSMAP_commit= master titan.ProtocolModules.GRE_commit= R.2.A titan.ProtocolModules.GTP_v13.5.0_commit= R.2.A titan.ProtocolModules.GTPv2_v13.7.0_commit= R.2.A diff --git a/msc/gen_links.sh b/msc/gen_links.sh index 7ba190a9..7aaba2bb 100755 --- a/msc/gen_links.sh +++ b/msc/gen_links.sh @@ -46,7 +46,7 @@ DIR=$BASEDIR/titan.ProtocolEmulations.SCCP/src FILES="SCCP_Emulation.ttcn SCCP_EncDec.cc SCCP_Mapping.ttcnpp SCCP_Types.ttcn SCCPasp_Types.ttcn" gen_links $DIR $FILES -DIR=$BASEDIR/titan.ProtocolModules.BSSMAP_v11.2.0/src +DIR=$BASEDIR/titan.ProtocolModules.BSSMAP/src FILES="BSSAP_Types.ttcn" gen_links $DIR $FILES diff --git a/selftest/gen_links.sh b/selftest/gen_links.sh index 09d2f268..c590de69 100755 --- a/selftest/gen_links.sh +++ b/selftest/gen_links.sh @@ -30,7 +30,7 @@ DIR=$BASEDIR/titan.ProtocolEmulations.SCCP/src FILES="SCCP_Emulation.ttcn SCCP_Mapping.ttcnpp SCCP_Types.ttcn SCCPasp_Types.ttcn" gen_links $DIR $FILES -DIR=$BASEDIR/titan.ProtocolModules.BSSMAP_v11.2.0/src +DIR=$BASEDIR/titan.ProtocolModules.BSSMAP/src FILES="BSSAP_Types.ttcn" gen_links $DIR $FILES -- cgit v1.2.3