Commit 6f2a9d27 authored by Yann Garcia's avatar Yann Garcia
Browse files

Update ATS submodules

parent ddcd3ef7

.gitmodules

+7 −7
Original line number Diff line number Diff line
@@ -8,19 +8,19 @@ 
[submodule "ttcn/AtsCAM"]

	path = ttcn/AtsCAM

	url = https://forge.etsi.org/rep/ITS/ttcn/ats_cam_ts102868-3.git

	branch = devel2

	branch = TTF_T036

[submodule "ttcn/AtsDENM"]

	path = ttcn/AtsDENM

	url = https://forge.etsi.org/rep/ITS/ttcn/ats_denm_ts102869-3.git

	branch = devel2

	branch = TTF_T036

[submodule "ttcn/AtsGeoNetworking"]

	path = ttcn/AtsGeoNetworking

	url = https://forge.etsi.org/rep/ITS/ttcn/ats_gn_ts102871-3.git

	branch = devel2

	branch = TTF_T036

[submodule "ttcn/AtsBTP"]

	path = ttcn/AtsBTP

	url = https://forge.etsi.org/rep/ITS/ttcn/ats_btp_ts102870-3.git

	branch = devel

	branch = TTF_T036

[submodule "ttcn/AtsIPv6OverGeoNetworking"]

	path = ttcn/AtsIPv6OverGeoNetworking

	url = https://forge.etsi.org/rep/ITS/ttcn/ats_gnipv6_ts102859-3.git
@@ -28,15 +28,15 @@ 
[submodule "ttcn/AtsPki"]

	path = ttcn/AtsPki

	url = https://forge.etsi.org/rep/ITS/ttcn/ats_pki_ts103525-3.git

	branch = devel2

	branch = TTF_T036

[submodule "ttcn/AtsIS"]

	path = ttcn/AtsIS

	url = https://forge.etsi.org/rep/ITS/ttcn/ats_ts103191-3.git

	branch = devel2

	branch = TTF_T036

[submodule "ttcn/AtsSecurity"]

	path = ttcn/AtsSecurity

	url = https://forge.etsi.org/rep/ITS/ttcn/ats_sec_ts103096-3.git

	branch = devel2

	branch = TTF_T036

[submodule "ttcn/modules/titan.TestPorts.Common_Components.Abstract_Socket/module"]

	path = ttcn/modules/titan.TestPorts.Common_Components.Abstract_Socket/module

	url = https://gitlab.eclipse.org/eclipse/titan/titan.TestPorts.Common_Components.Abstract_Socket

TS.ITS_TTF_T036.code-workspace

0 → 100644
+104 −0
Original line number Diff line number Diff line 
{

	"folders": [

		{

			"path": "."

		},

		{

			"path": "../itsreadjs"

		},

		{

			"path": "../EtsiTs103759js"

		},

		{

			"path": "../itscertgen-r2"

		},

		{

			"path": "../../tmp/crypto-test-vectors"

		},

		{

			"path": "../../frameworks/openssl"

		},

		{

			"path": "../../frameworks/titan/titan.core"

		},

		{

			"path": "../../frameworks/fsmsggen"

		}

	],

	"settings": {

		"files.associations": {

			"array": "cpp",

			"bit": "cpp",

			"*.tcc": "cpp",

			"cctype": "cpp",

			"chrono": "cpp",

			"clocale": "cpp",

			"cmath": "cpp",

			"condition_variable": "cpp",

			"cstdint": "cpp",

			"cstdio": "cpp",

			"cstdlib": "cpp",

			"ctime": "cpp",

			"cwchar": "cpp",

			"cwctype": "cpp",

			"deque": "cpp",

			"map": "cpp",

			"unordered_map": "cpp",

			"vector": "cpp",

			"exception": "cpp",

			"fstream": "cpp",

			"functional": "cpp",

			"initializer_list": "cpp",

			"iomanip": "cpp",

			"iosfwd": "cpp",

			"iostream": "cpp",

			"istream": "cpp",

			"limits": "cpp",

			"memory": "cpp",

			"mutex": "cpp",

			"new": "cpp",

			"optional": "cpp",

			"ostream": "cpp",

			"ratio": "cpp",

			"sstream": "cpp",

			"stdexcept": "cpp",

			"streambuf": "cpp",

			"string": "cpp",

			"string_view": "cpp",

			"system_error": "cpp",

			"thread": "cpp",

			"type_traits": "cpp",

			"tuple": "cpp",

			"typeinfo": "cpp",

			"utility": "cpp",

			"atomic": "cpp",

			"bitset": "cpp",

			"codecvt": "cpp",

			"cstdarg": "cpp",

			"cstddef": "cpp",

			"cstring": "cpp",

			"algorithm": "cpp",

			"filesystem": "cpp",

			"iterator": "cpp",

			"memory_resource": "cpp",

			"numeric": "cpp",

			"random": "cpp",

			"regex": "cpp",

			"set": "cpp",

			"shared_mutex": "cpp",

			"cinttypes": "cpp",

			"*.inc": "c",

			"provider.h": "c",

			"sizes.h": "c",

			"compare": "cpp",

			"complex": "cpp",

			"concepts": "cpp",

			"list": "cpp",

			"numbers": "cpp",

			"semaphore": "cpp",

			"stop_token": "cpp",

			"hash_map": "cpp"

		},

		"java.compile.nullAnalysis.mode": "automatic"

	}

}
 
 No newline at end of file

switch_its_r2.sh

+25 −19
Original line number Diff line number Diff line 
#!/bin/bash



#set -e

#set -e # git checkout wil raise error when branch does not exist 

set -vx



BASE_PATH=`pwd`



git checkout ttf_t024

git checkout TTF_T036

git submodule update --init --recursive --remote



for i in `find $BASE_PATH/ttcn -type d -name "Ats*"`

do

    cd $i

    git checkout devel2

    git checkout TTF_T036

done



for i in `find $BASE_PATH/ttcn/Ats* -type d -name "asn1"`

do

    cd $i

    git checkout testing2

    git checkout TTF_T036

    if [ -f ETSI-ITS-CDD.asn ]

    then

        ln -sf ETSI-ITS-CDD.asn ETSI_ITS_CDD.asn

        ln ETSI-ITS-CDD.asn ETSI_ITS_CDD.asn

    elif [ -f CAM-PDU-Descriptions.asn ]

    then

        ln CAM-PDU-Descriptions.asn CAM_PDU_Descriptions.asn

    elif [ -f DENM-PDU-Description.asn ]

    then

        ln DENM-PDU-Description.asn DENM_PDU_Description.asn

    elif [ -f IVIM-PDU-Descriptions.asn ]

    then

        ln -sf IVIM-PDU-Descriptions.asn IVIM_PDU_Descriptions.asn

        ln -sf MAPEM-PDU-Descriptions.asn MAPEM_PDU_Descriptions.asn

        ln -sf RTCMEM-PDU-Descriptions.asn RTCMEM_PDU_Descriptions.asn

        ln -sf SPATEM-PDU-Descriptions.asn SPATEM_PDU_Descriptions.asn

        ln -sf SREM-PDU-Descriptions.asn SREM_PDU_Descriptions.asn

        ln -sf SSEM-PDU-Descriptions.asn SSEM_PDU_Descriptions.asn

        cd ./iso-patched

        ln -sf 'ISO14906(2018)EfcDsrcApplicationv6-patched.asn' EfcDsrcApplication.asn

        ln -sf 'ISO14906(2018)EfcDsrcGenericv7-patched.asn' EfcDsrcGeneric.asn

        ln -sf ISO24534-3_ElectronicRegistrationIdentificationVehicleDataModule-patched.asn ElectronicRegistrationIdentificationVehicleDataModule.asn

        ln -sf ISO14823-missing.asn GDD.asn

        ln IVIM-PDU-Descriptions.asn IVIM_PDU_Descriptions.asn

        ln MAPEM-PDU-Descriptions.asn MAPEM_PDU_Descriptions.asn

        ln RTCMEM-PDU-Descriptions.asn RTCMEM_PDU_Descriptions.asn

        ln SPATEM-PDU-Descriptions.asn SPATEM_PDU_Descriptions.asn

        ln SREM-PDU-Descriptions.asn SREM_PDU_Descriptions.asn

        ln SSEM-PDU-Descriptions.asn SSEM_PDU_Descriptions.asn

        #cd ./iso-patched

        #ln 'ISO14906(2018)EfcDsrcApplicationv6-patched.asn' EfcDsrcApplication.asn

        #ln 'ISO14906(2018)EfcDsrcGenericv7-patched.asn' EfcDsrcGeneric.asn

        #ln ISO24534-3_ElectronicRegistrationIdentificationVehicleDataModule-patched.asn ElectronicRegistrationIdentificationVehicleDataModule.asn

        #ln ISO14823-missing.asn GDD.asn

        cd -

    fi

    SUB_DIRS=`find . -type d`
@@ -41,7 +48,7 @@ do 
        for j in $SUB_DIRS

        do

            cd $j

            git checkout testing2

            git checkout release2

            cd -

        done

    fi
@@ -63,7 +70,6 @@ cd $BASE_PATH/ttcn/LibIts 
git checkout devel2



cd $BASE_PATH

ln ./ttcn/patch_lib_common_titan/module.mk ./ttcn/LibCommon/\



ln ./ttcn/patch_lib_common_titan/module.mk ./ttcn/LibCommon/module.mk



exit 0

titan-test-system-framework @ c579f7c7

Original line number Diff line number Diff line 
Subproject commit 6959b8be419f3755de6f888e24bfdc8de07383a7
 
Subproject commit c579f7c7175b34426e8392e1edd3885c4b9cd185

AtsCAM @ 3ca9b8c3

Compare 431b0284 to 3ca9b8c3
Original line number Diff line number Diff line 
Subproject commit 431b0284e7b2d7edc8b486b0ad823aceb90a44eb
 
Subproject commit 3ca9b8c3f25ea9a0d025e25098eacbe4560cb7b3