preparation for AtsIs (f68f7405) · Commits · ITS - Intelligent Transport Systems / ITS Test Suite

Makefile

+4 −1

Original line number	Diff line number	Diff line
		@@ -11,6 +11,9 @@ endif
		ifeq (,$(TTCN3_DIR))
		$(error TTCN3_DIR shall be defined in config.mk)
		endif

		export ASN1C_PATH

		first: all

		define IncludeModule
		@@ -130,7 +133,7 @@ $(cc_objects) : $(outdir)/%.o : %.cc
		$(gen_sources): $(outdir)/.generate

		$(outdir)/.generate: Makefile $(tt_sources)
		$(TTCN3_DIR)/bin/compiler -w -d -e -f -g -l -L -R -U none -x -X -o $(outdir) $(tt_sources)
		$(TTCN3_DIR)/bin/compiler -w -d -e -f -g -l -L -R -U none -x -X -V 255 -o $(outdir) $(tt_sources)
		touch $@

		$(bindir)/libItsAsn.so: $(outdir)/asn1/libItsAsn.so

asn1/Makefile

+14 −3

Original line number	Diff line number	Diff line
		@@ -25,11 +25,15 @@ ASN_FILES = AtsCAM/lib/asn1/CAM_PDU_Descriptions.asn \
		AtsIS/lib/asn1/iso-patched/EfcDsrcGeneric.asn \
		AtsIS/lib/asn1/iso-patched/ElectronicRegistrationIdentificationVehicleDataModule.asn \
		AtsIS/lib/asn1/iso-patched/GDD.asn \
		AtsIS/lib/asn1/iso-patched/DSRC.asn \
		AtsIS/lib/asn1/iso-patched/DSRC_noCircular.asn \
		AtsIS/lib/asn1/iso-patched/REGION.asn \
		AtsIS/lib/asn1/iso-patched/AddGrpC.asn \
		../build/asn1/ISO_TS_14816/AVIAEINumberingAndDataStructures.asn \
		../build/asn1/ISO_TS_17419/CITSapplMgmtIDs.asn \
		../build/asn1/ISO_TS_19321/IVI.asn \
		../build/asn1/ISO_TS_19091/ISO-TS-19091-addgrp-C-2018-patched.asn \

		# ../build/asn1/ISO_TS_19091/ISO-TS-19091-addgrp-C-2018-patched.asn \
		# ../build/asn1/ISO_TS_19091/AddGrpC.asn \
		# ../build/asn1/ISO_TS_19091/AddGrpC_noCircular.asn \
		# ../build/asn1/ISO_TS_19091/DSRC.asn \
		@@ -139,7 +143,8 @@ Makefile: $(SCRIPT_DIR)/Makefile
		##########################################################

		$(ASN_DIR)/../build/asn1/ISO_TS_14816/AVIAEINumberingAndDataStructures.asn: $(ASN_DIR)/../build/asn1/ISO_TS_14816
		curl -o "$@" 'https://standards.iso.org/iso/14816/ISO14816%20ASN.1%20repository/ISO14816_AVIAEINumberingAndDataStructures.asn'
		curl 'https://standards.iso.org/iso/14816/ISO14816%20ASN.1%20repository/ISO14816_AVIAEINumberingAndDataStructures.asn' \| \
		sed -e 's/IssuerIdentifier/AVIAEIIssuerIdentifier/g' > "$@"

		#../build/asn1/ISO_TS_14906/EfcDsrcApplication.asn: $(ASN_DIR)/../build/asn1/ISO_TS_14906
		# curl -o "$@" 'https://standards.iso.org/iso/14906/ed-3/en/ISO14906(2018)EfcDsrcApplicationv6.asn'
		@@ -156,6 +161,12 @@ $(ASN_DIR)/../build/asn1/ISO_TS_19091/ISO-TS-19091-addgrp-C-2018-patched.asn: $(
		-e 's/\bSpeedConfidence\b/SpeedConfidenceDSRC/g' \
		-e 's/\bHeading\b/HeadingDSRC/g' > "$@"

		$(ASN_DIR)/../build/asn1/ISO_TS_17419/CITSdataDictionary1.asn: $(ASN_DIR)/../build/asn1/ISO_TS_17419
		curl -o "$@" 'https://standards.iso.org/iso/17419/ed-1/en/17419.1.asn'

		$(ASN_DIR)/../build/asn1/ISO_TS_17419/CITSdataDictionary2.asn: $(ASN_DIR)/../build/asn1/ISO_TS_17419
		curl -o "$@" 'https://standards.iso.org/iso/17419/ed-1/en/17419.2.asn'

		#../build/asn1/ISO_TS_19091/AddGrpC.asn:
		#../build/asn1/ISO_TS_19091/AddGrpC_noCircular.asn:
		#../build/asn1/ISO_TS_19091/DSRC.asn:
		@@ -163,7 +174,7 @@ $(ASN_DIR)/../build/asn1/ISO_TS_19091/ISO-TS-19091-addgrp-C-2018-patched.asn: $(
		#../build/asn1/ISO_TS_19091/REGION.asn

		$(ASN_DIR)/../build/asn1/ISO_TS_19321/IVI.asn: $(ASN_DIR)/../build/asn1/ISO_TS_19321
		curl -o "$@" 'https://standards.iso.org/iso/ts/19321/ed-2/en/ISO19321IVIv2.asn'
		curl 'https://standards.iso.org/iso/ts/19321/ed-2/en/ISO19321IVIv2.asn' \| sed -s 's/\bCITSdataDictionary1\b/CITSapplMgmtIDs/g' > "$@"


		#../build/asn1/ISO_TS_24534-3/ElectronicRegistrationIdentificationVehicleDataModule.asn: ../build/asn1/ISO_TS_24534-3

ccsrc/EncDec/module.mk

+5 −14

Original line number	Diff line number	Diff line
		@@ -18,10 +18,6 @@ ifeq (AtsDENM, $(ATS))
		sources += LibItsDenm_Encdec.cc LibItsBtp_Encdec.cc
		endif

		ifeq (AtsIVIM, $(ATS))
		sources += LibItsIvim_Encdec.cc LibItsBtp_Encdec.cc
		endif

		ifeq (AtsRSUsSimulator, $(ATS))
		sources += \
		LibItsBtp_Encdec.cc \
		@@ -43,16 +39,11 @@ sources += \
		LibItsDenm_Encdec.cc
		endif

		ifeq (AtsSremSsem, $(ATS))
		sources += LibItsSremSsem_Encdec.cc LibItsBtp_Encdec.cc
		endif

		ifeq (AtsMapemSpatem, $(ATS))
		sources += LibItsMapemSpatem_Encdec.cc LibItsBtp_Encdec.cc
		endif

		ifeq (AtsRtcmem, $(ATS))
		sources += LibItsRtcmem_Encdec.cc LibItsBtp_Encdec.cc
		ifeq (AtsIS, $(ATS))
		sources += LibItsIvim_Encdec.cc LibItsBtp_Encdec.cc \
		LibItsSremSsem_Encdec.cc LibItsBtp_Encdec.cc \
		LibItsMapemSpatem_Encdec.cc LibItsBtp_Encdec.cc \
		LibItsRtcmem_Encdec.cc LibItsBtp_Encdec.cc
		endif

		ifeq (AtsPki, $(ATS))

ccsrc/Ports/LibIts_ports/UpperTesterPort.hh

+3 −33

Original line number	Diff line number	Diff line
		@@ -41,27 +41,12 @@
		// #include "CAM_ports/UpperTesterPort_CAM.hh"
		#endif

		#ifdef AtsSremSsem
		#include "GN_ports/UpperTesterPort_GN.hh"
		#include "BTP_ports/UpperTesterPort_BTP.hh"
		#include "SremSsem_ports/UpperTesterPort_SremSsem.hh"
		#endif

		#ifdef AtsIVIM
		#ifdef AtsIS
		#include "GN_ports/UpperTesterPort_GN.hh"
		#include "BTP_ports/UpperTesterPort_BTP.hh"
		#include "IVIM_ports/UpperTesterPort_IVIM.hh"
		#endif

		#ifdef AtsMapemSpatem
		#include "GN_ports/UpperTesterPort_GN.hh"
		#include "BTP_ports/UpperTesterPort_BTP.hh"
		#include "MapemSpatem_ports/UpperTesterPort_MapemSpatem.hh"
		#endif

		#ifdef AtsRtcmem
		#include "GN_ports/UpperTesterPort_GN.hh"
		#include "BTP_ports/UpperTesterPort_BTP.hh"
		#include "SremSsem_ports/UpperTesterPort_SremSsem.hh"
		#include "Rtcmem_ports/UpperTesterPort_Rtcmem.hh"
		#endif

		@@ -113,27 +98,12 @@
		#include "UpperTesterPort_DENM.hh"
		#endif

		#ifdef AtsIVIM
		#ifdef AtsIS
		#include "UpperTesterPort_GN.hh"
		#include "UpperTesterPort_BTP.hh"
		#include "UpperTesterPort_IVIM.hh"
		#endif

		#ifdef AtsMapemSpatem
		#include "UpperTesterPort_GN.hh"
		#include "UpperTesterPort_BTP.hh"
		#include "UpperTesterPort_MapemSpatem.hh"
		#endif

		#ifdef AtsSremSsem
		#include "UpperTesterPort_GN.hh"
		#include "UpperTesterPort_BTP.hh"
		#include "UpperTesterPort_SremSsem.hh"
		#endif

		#ifdef AtsRtcmem
		#include "UpperTesterPort_GN.hh"
		#include "UpperTesterPort_BTP.hh"
		#include "UpperTesterPort_Rtcmem.hh"
		#endif

AtsCAM @ f3a20d0a

Original line number	Diff line number	Diff line
		Subproject commit 81a1888ef452f3db065794147ec71adb1110e464
		Subproject commit f3a20d0a2fe5bbbbb5b82e2e234d5a19c74fac4a

Admin message