diff options
Diffstat (limited to 'deps')
-rw-r--r-- | deps/Makefile | 124 |
1 files changed, 71 insertions, 53 deletions
diff --git a/deps/Makefile b/deps/Makefile index 5435da2d..11ff460b 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -13,24 +13,42 @@ # See the License for the specific language governing permissions and # limitations under the License. -ECLIPSEGITHUB:=https://github.com/eclipse -ECLIPSEGIT2:=https://git.eclipse.org/r/titan +ECLIPSEGITLAB:=https://gitlab.eclipse.org/eclipse/titan OSMOGITHUB:=https://github.com/osmocom -OSMOGIT:=git://git.osmocom.org +OSMOGERRIT:=https://gerrit.osmocom.org +OSMOGITEA:=https://gitea.osmocom.org/ttcn3 -ECLIPSEGITHUB_REPOS= titan.Libraries.TCCUsefulFunctions \ +ECLIPSEGITLAB_REPOS= titan.Libraries.TCCUsefulFunctions \ + titan.ProtocolEmulations.M3UA \ + titan.ProtocolModules.BSSAPP_v7.3.0 \ + titan.ProtocolModules.DIAMETER_ProtocolModule_Generator \ titan.ProtocolModules.DNS \ + titan.ProtocolModules.GRE \ + titan.ProtocolModules.GTP_v13.5.0 \ + titan.ProtocolModules.GTPv2_v13.7.0 \ titan.ProtocolModules.ICMP \ 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 \ + titan.ProtocolModules.MobileL3_v13.4.0 \ titan.ProtocolModules.SMPP \ titan.ProtocolModules.TCP \ titan.ProtocolModules.UDP \ titan.ProtocolModules.RTP \ - titan.ProtocolModules.DIAMETER_ProtocolModule_Generator \ + titan.ProtocolModules.M2PA \ + titan.ProtocolModules.ROSE \ + titan.ProtocolModules.SCTP \ + titan.ProtocolModules.SDP \ + titan.ProtocolModules.SUA \ + titan.ProtocolModules.NAS_EPS_15.2.0.1 \ + titan.ProtocolModules.NS_v7.3.0 \ + titan.ProtocolModules.SGsAP_13.2.0 \ + titan.ProtocolModules.SNDCP_v7.0.0 \ + titan.ProtocolModules.PFCP_v15.1.0 \ titan.TestPorts.Common_Components.Socket-API \ titan.TestPorts.Common_Components.Abstract_Socket \ titan.TestPorts.HTTPmsg \ @@ -41,52 +59,40 @@ ECLIPSEGITHUB_REPOS= titan.Libraries.TCCUsefulFunctions \ titan.TestPorts.SIPmsg \ titan.TestPorts.TELNETasp \ titan.TestPorts.TCPasp \ + titan.TestPorts.UDPasp \ titan.TestPorts.UNIX_DOMAIN_SOCKETasp -ECLIPSEGIT2_REPOS= titan.ProtocolEmulations.M3UA \ - titan.ProtocolModules.GRE \ - titan.ProtocolModules.M2PA \ - titan.ProtocolModules.ROSE \ - titan.ProtocolModules.SCTP \ - titan.ProtocolModules.SUA \ - titan.ProtocolModules.SDP \ - titan.ProtocolModules.BSSAPP_v7.3.0 \ - titan.ProtocolModules.BSSGP_v13.0.0 \ - titan.ProtocolModules.GTP_v13.5.0 \ - titan.ProtocolModules.GTPv2_v13.7.0 \ - titan.ProtocolModules.ISUP_Q.762 \ - titan.ProtocolModules.LLC_v7.1.0 \ - titan.ProtocolModules.MobileL3_v13.4.0 \ - titan.ProtocolModules.NAS_EPS_15.2.0.1 \ - titan.ProtocolModules.NS_v7.3.0 \ - titan.ProtocolModules.SGsAP_13.2.0 \ - titan.ProtocolModules.SNDCP_v7.0.0 - OSMOGITHUB_REPOS= titan.TestPorts.SCTPasp \ titan.TestPorts.MTP3asp \ - titan.TestPorts.UDPasp \ - titan.ProtocolEmulations.SCCP + titan.ProtocolEmulations.SCCP \ + titan.ProtocolModules.BSSGP_v13.0.0 -OSMOGIT_REPOS= titan.ProtocolModules.MAP \ - titan.ProtocolModules.BSSMAP \ +OSMOGERRIT_REPOS= osmo-uecups + +OSMOGITEA_REPOS= titan.ProtocolModules.BSSMAP \ + titan.ProtocolModules.MAP \ titan.TestPorts.USB \ - titan.TestPorts.AF_PACKET \ - osmo-uecups + titan.TestPorts.AF_PACKET -ALL_REPOS=$(ECLIPSEGITHUB_REPOS) $(ECLIPSEGIT2_REPOS) $(OSMOGITHUB_REPOS) $(OSMOGIT_REPOS) +ALL_REPOS= $(ECLIPSEGITLAB_REPOS) \ + $(OSMOGITHUB_REPOS) \ + $(OSMOGERRIT_REPOS) \ + $(OSMOGITEA_REPOS) \ + $(FORKEDGITLAB_REPOS) # Tag names from 'git-describe --tags'; if not available, a commit hash may be used instead. -# In order to keep local changes in the repository of a dependency, set its commit to the -# name of a local branch here (e.g. 'master'). +# Do not put references to branches here, except for local testing: this breaks the caching +# logic of docker containers, which only invalidate their cached ttcn3 dependencies if this +# file changed. titan.Libraries.TCCUsefulFunctions_commit= R.35.B-6-gb3687da titan.ProtocolEmulations.M3UA_commit= f086e78d74defa044d864f17adaad9433fedc961 -titan.ProtocolEmulations.SCCP_commit= R.7.A-9-g9e70fba +titan.ProtocolEmulations.SCCP_commit= f8a44f2cdef44d0c3adf787ab3184c293a9a58be titan.ProtocolModules.BSSAPP_v7.3.0_commit= R.2.A-4-g20cfaf8 -titan.ProtocolModules.BSSGP_v13.0.0_commit= R.2.A-6-gc447f28 -titan.ProtocolModules.BSSMAP_commit= master +titan.ProtocolModules.BSSGP_v13.0.0_commit= e97d92a8b66bec399babea52f593771b76cb175a +titan.ProtocolModules.BSSMAP_commit= 4acb6ab5f058477f0b90c2da182d52054e3614b0 titan.ProtocolModules.DNS_commit= R.7.B titan.ProtocolModules.GRE_commit= R.2.A-5-g654c446 -titan.ProtocolModules.GTP_v13.5.0_commit= R.2.A-5-ge120ace +titan.ProtocolModules.GTP_v13.5.0_commit= 6b769f985eb91bf5a4332f29faa4a043b23ce62e titan.ProtocolModules.GTPv2_v13.7.0_commit= R.2.A-5-g85cb124 titan.ProtocolModules.ICMP_commit= e49d9fb9f7de637b4bf4803dc6b6e911a8661640 titan.ProtocolModules.ICMPv6_commit= 46f4d9b6e1e3c794294a92588401a81e4881dd27 @@ -98,7 +104,7 @@ titan.ProtocolModules.LLC_v7.1.0_commit= 09817f113255d7fb56f1d45d3dd629a093d9248 titan.ProtocolModules.MAP_commit= R.2.A-1-g79c6a3d titan.ProtocolModules.M2PA_commit= R.2.A-5-ga75b589 titan.ProtocolModules.M3UA_commit= c496d298876fed55c2b730278b7ee77982555563 -titan.ProtocolModules.MobileL3_v13.4.0_commit= badbad680df216b3211260d56b14734eeb2c9028 +titan.ProtocolModules.MobileL3_v13.4.0_commit= b6602eb357673f097ea1a1d22edd568ecd239da1 titan.ProtocolModules.NAS_EPS_15.2.0.1_commit= R.1.A-2-g2ba853c titan.ProtocolModules.NS_v7.3.0_commit= R.2.A-6-gf73f195 titan.ProtocolModules.RTP_commit= R.5.A-4-g83ee83a @@ -112,23 +118,24 @@ titan.ProtocolModules.SNDCP_v7.0.0_commit= R.2.A-5-gd0f0ce6 titan.ProtocolModules.SUA_commit= R.5.A-5-gcf1137a titan.ProtocolModules.TCP_commit= R.3.A-5-g39e5f45 titan.ProtocolModules.UDP_commit= R.4.A-5-geea8aa3 -titan.TestPorts.AF_PACKET_commit= 0.1 +titan.ProtocolModules.PFCP_v15.1.0_commit= d550ad9ddb6f9c823c9a555254cd76cf0e738d18 +titan.TestPorts.AF_PACKET_commit= 0.1-5-g89ebea6 titan.TestPorts.Common_Components.Socket-API_commit= R.6.A-6-gf4380d0 titan.TestPorts.Common_Components.Abstract_Socket_commit= R.9.B-4-gbd41994 titan.TestPorts.HTTPmsg_commit= R.9.B-4-g9a0dfde -titan.TestPorts.IPL4asp_commit= R.30.E +titan.TestPorts.IPL4asp_commit= R.30.E-7-g029bccb titan.TestPorts.LANL2asp_commit= R.8.C-3-gb07c265 titan.TestPorts.MTP3asp_commit= 1cecdad6f3641a5f19b3833703bff6e5005eff11 titan.TestPorts.PCAPasp_commit= R.8.A-3-g9ad320f titan.TestPorts.PIPEasp_commit= R.7.D-3-g8b01154 -titan.TestPorts.SCTPasp_commit= R.11.A-2-g2faa9cf +titan.TestPorts.SCTPasp_commit= R.11.A-8-g2e911c3 titan.TestPorts.SIPmsg_commit= R.15.A-1-ge4f9dd0 titan.TestPorts.TCPasp_commit= R.9.A-5-g2c91bc6 titan.TestPorts.TELNETasp_commit= 873fe539642542cd9a901c208f1ec11c6d2f5387 -titan.TestPorts.UDPasp_commit= c20d77a34f288dd70dd4aaa30e520778876e9336 -titan.TestPorts.UNIX_DOMAIN_SOCKETasp_commit= R.2.A-8-g7ec4fe0 -titan.TestPorts.USB_commit= master -osmo-uecups_commit= master +titan.TestPorts.UDPasp_commit= 54176e95850654e5e8b0ffa2f1b5f35c412b949c +titan.TestPorts.UNIX_DOMAIN_SOCKETasp_commit= R.2.A-13-gd34ab71 +titan.TestPorts.USB_commit= a9470fdc99c82fbf988f4508c3161118c9106e28 +osmo-uecups_commit= 8362efef7c6fa341eb947a75786878e0685767b7 all: $(foreach dir,$(ALL_REPOS),$(dir)/update) clean: $(foreach dir,$(ALL_REPOS),$(dir)/clean) @@ -151,7 +158,15 @@ ifneq ($$($(1)_ORIGIN),$(2)/$(1)) cd $(1) && git remote set-url origin $(2)/$(1) && git fetch endif ifneq ($$($(1)_HEAD),$($(1)_commit)) - cd $(1) && git fetch && git checkout -q -f "$($(1)_commit)" + cd $(1) && \ + git fetch && \ + if git rev-parse "origin/$($(1)_commit)" 2>/dev/null; then \ + set -x && \ + git checkout -q -f "origin/$($(1)_commit)"; \ + else \ + set -x && \ + git checkout -q -f "$($(1)_commit)"; \ + fi endif endif @@ -172,14 +187,17 @@ else endif endef -$(foreach dir,$(ECLIPSEGITHUB_REPOS), \ - $(eval $(call GIT_template,$(dir),$(ECLIPSEGITHUB)))) - -$(foreach dir,$(ECLIPSEGIT2_REPOS), \ - $(eval $(call GIT_template,$(dir),$(ECLIPSEGIT2)))) +$(foreach dir,$(ECLIPSEGITLAB_REPOS), \ + $(eval $(call GIT_template,$(dir),$(ECLIPSEGITLAB)))) $(foreach dir,$(OSMOGITHUB_REPOS), \ $(eval $(call GIT_template,$(dir),$(OSMOGITHUB)))) -$(foreach dir,$(OSMOGIT_REPOS), \ - $(eval $(call GIT_template,$(dir),$(OSMOGIT)))) +$(foreach dir,$(OSMOGERRIT_REPOS), \ + $(eval $(call GIT_template,$(dir),$(OSMOGERRIT)))) + +$(foreach dir,$(OSMOGITEA_REPOS), \ + $(eval $(call GIT_template,$(dir),$(OSMOGITEA)))) + +$(foreach dir,$(FORKEDGITLAB_REPOS), \ + $(eval $(call GIT_template,$(dir),$(FORKEDGITLAB)))) |