Commit 5c5e1d49 authored by Yann Garcia's avatar Yann Garcia
Browse files

Update submodules

parent 7eec4f49

.gitmodules

+2 −0
Original line number Diff line number Diff line
@@ -56,3 +56,5 @@ 
	path = ttcn/AtsCPS

	url = https://forge.etsi.org/rep/ITS/ttcn/cps-ts-104-019-3.git

	branch = TTF_T036

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

	branch = origin/master

TS.ITS.TTF_T042.code-workspace

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
{

	"folders": [

		{

			"path": "."

		}

	]

}
 
 No newline at end of file

TS.ITS_TTF_T036.code-workspace

deleted100644 → 0
+0 −106
Original line number Diff line number Diff line 
{

	"folders": [

		{

			"path": "."

		},

		{

			"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",

			"mqtt.h": "c",

			"gps.h": "c",

			"unistd.h": "c",

			"msggen_mec.h": "c",

			"system.h": "c",

			"netfwd": "cpp",

			"msggen_comm.h": "c",

			"time.h": "c",

			"pthread.h": "c",

			"msggen.h": "c",

			"uri_port_utils.h": "c",

			"uppertester.h": "c"

		},

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

	},

	"extensions": {

		"recommendations": [

			"nokia.ttcn3"

		]

	}

}
 
 No newline at end of file

install.sh

+12 −4
Original line number Diff line number Diff line
@@ -3,11 +3,12 @@ 
#set -e # git checkout wil raise error when branch does not exist 

set -vx



BRANCH=TTF_T036

NEW_BRANCH=TTF_T05x

ORG_BRANCH=TTF_T036

ASN1_BRANCH=TTF_T036

BASE_PATH=`pwd`



#git checkout $BRANCH

#git checkout $ORG_BRANCH

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



for i in `find $BASE_PATH/ttcn -type d -name "Ats*"`
@@ -16,9 +17,9 @@ do 
    BS=`basename $i`

    if [ "$BS" == "AtsGeoNetworking" ]

    then

        git checkout --recurse-submodules TTF_T042

        git checkout --recurse-submodules origin/master

    else

        git checkout --recurse-submodules $BRANCH

        git checkout --recurse-submodules $ORG_BRANCH

    fi

done
@@ -92,4 +93,11 @@ cd $BASE_PATH/ttcn/LibCommon 
ln -sf ../patch_lib_common_titan/module.mk module.mk

cd $BASE_PATH



cd ./ttcn/modules/titan.TestPorts.Common_Components.Abstract_Socket/module/src

git apply ../../../../patch_abstract_socket/Abstract_Socket.hh.patch

git apply ../../../../patch_abstract_socket/Abstract_Socket.cc.patch

cd $BASE_PATH



# TODO Add other patch



exit 0

AtsCAM @ 5d967e0d

Compare 3a49ddad to 5d967e0d
Original line number Diff line number Diff line 
Subproject commit 3a49ddad6cc59694b4936d43dca49038325a01e7
 
Subproject commit 5d967e0d62cee074c4f6015697755cf8663f07fa