AtsPki support in cygwin

.gitmodules

@@ -6,3 +6,9 @@
 	path = ttcn/LibCommon
 	url = ../../LIBS/LibCommon.git
 	branch = cygwin
+[submodule "ttcn/modules/titan.TestPorts.HTTPmsg"]
+	path = ttcn/modules/titan.TestPorts.HTTPmsg/module
+	url = https://github.com/eclipse/titan.TestPorts.HTTPmsg.git
+[submodule "ttcn/modules/titan.TestPorts.Common_Components.Abstract_Socket"]
+	path = ttcn/modules/titan.TestPorts.Common_Components.Abstract_Socket/module
+	url = https://github.com/eclipse/titan.TestPorts.Common_Components.Abstract_Socket.git

Makefile

@@ -11,6 +11,7 @@ endif
 ifeq (,$(TTCN3_DIR))
  $(error TTCN3_DIR shall be defined in config.mk)
 endif
+first: all
 
 define IncludeModule
 undefine sources
@@ -19,7 +20,7 @@ undefine includes
 include $(1)/module.mk
 $$(foreach S, $$(sources),  $$(eval all_sources +=  $(1)/$$(S)))
 $$(foreach I, $$(includes), $$(eval all_includes += $(1)/$$(I)))
-$$(foreach M, $$(modules),  $$(eval $$(call IncludeModule, $(1)/$$(M))))
+$$(foreach M, $$(modules),  $$(eval $$(call IncludeModule, $$(if $$(filter /%, $$(M)), $$(M), $(1)/$$(M)))))
 endef
 
 all_includes := $(TTCN3_DIR)/include $(TTCN3_DIR)/src $(TOPDIR)/ccsrc/Framework

ccsrc/EncDec/module.mk

@@ -52,7 +52,12 @@ sources += LibItsRtcmem_Encdec.cc
 endif
 
 ifeq (AtsPki, $(ATS))
-sources += LibItsPki_Encdec.cc
+sources := \
+           LibItsGeoNetworking_Encdec.cc \
+           LibItsIpv6OverGeoNetworking_Encdec.cc \
+           LibItsSecurity_Encdec.cc \
+           LibItsPki_Encdec.cc \
+           LibItsHttp_Encdec.cc
 endif
 
 #           LibItsPki_Encdec.cc

ccsrc/Ports/LibIts_ports/AdapterControlPort.hh

@@ -28,6 +28,9 @@
 #ifdef LibItsV2G__TestSystem_HH
 #include "V2G_ports/AdapterControlPort_V2G.hh"
 #endif
+//#ifdef LibItsPki__TestSystem_HH
+//#include "Pki_ports/AdapterControlPort_Pki.hh"
+//#endif
 
 #else //_NO_SOFTLINKS_
 

ccsrc/Ports/LibIts_ports/UpperTesterPort.hh

@@ -32,6 +32,15 @@
   #include "DENM_ports/UpperTesterPort_DENM.hh"
 #endif
 
+#ifdef AtsPki
+  #include "GN_ports/UpperTesterPort_GN.hh"
+#ifndef LibItsGeoNetworking__TestSystem_HH  
+  #include "Pki_ports/UpperTesterPkiPort.hh"
+#endif
+//  #include "BTP_ports/UpperTesterPort_BTP.hh"
+//  #include "CAM_ports/UpperTesterPort_CAM.hh"
+#endif
+
 #ifdef AtsSremSsem
   #include "GN_ports/UpperTesterPort_GN.hh"
   #include "BTP_ports/UpperTesterPort_BTP.hh"
@@ -80,6 +89,13 @@
   #include "UpperTesterPort_DENM.hh"
 #endif
 
+#ifdef AtsPki
+  #include "UpperTesterPort_GN.hh"
+  #include "UpperTesterPort_BTP.hh"
+  #include "UpperTesterPort_CAM.hh"
+  #include "UpperTesterPort_DENM.hh"
+#endif
+
 #ifdef AtsSremSsem
   #include "UpperTesterPort_GN.hh"
   #include "UpperTesterPort_BTP.hh"

ttcn/AtsSecurity/module.mk

 suite := AtsSecurity
 
 sources := ItsSecurity_Functions.ttcn \
-           ItsSecurity_Pics.ttcn \
            ItsSecurity_Templates.ttcn \
            ItsSecurity_TestCases.ttcn \
            ItsSecurity_TestControl.ttcn \
            ItsSecurity_TestSystem.ttcn
+#           ItsSecurity_Pics.ttcn \
 
 modules :=  ../LibCommon \
             ../LibIts  \

module @ bd41994a

+Subproject commit bd41994ab31af385c0b87a8074bf9f768c28c514

ttcn/modules/titan.TestPorts.Common_Components.Abstract_Socket/module.mk

+sources := module/src/Abstract_Socket.cc
+includes := module/src
\ No newline at end of file

module @ 9a0dfdec

+Subproject commit 9a0dfdecfd33cf083890aa537015de718f960642

ttcn/modules/titan.TestPorts.HTTPmsg/module.mk

+sources := module/src/HTTPmsg_MessageLen.ttcn \
+           module/src/HTTPmsg_MessageLen_Function.cc \
+           module/src/HTTPmsg_PortType.ttcn \
+           module/src/HTTPmsg_PT.cc \
+           module/src/HTTPmsg_PT.hh \
+           module/src/HTTPmsg_Types.ttcn
+includes := module/src
+
+modules :=  ../titan.TestPorts.Common_Components.Abstract_Socket