Commit d83db2fb authored by Yann Garcia's avatar Yann Garcia
Browse files

Bug fixed on LinearRing/LinearRingType naming

parent e7b3dc5d

docker/Dockerfile

+5 −1
Original line number Diff line number Diff line
@@ -124,6 +124,10 @@ RUN cd /home/etsi/frameworks \ 
    && export HOME=/home/etsi \

    && . /home/etsi/devenv.bash \

    && cd /home/etsi/dev/STF549_Ng112/scripts \

    && ./build_titan.bash

    && ./build_titan.bash \

    && ./update_emcom_project.bash \

    && cd /home/etsi/dev/etsi_emcom/src/AtsNg112/objs \

    && find /home/etsi/dev/etsi_emcom -type f -name "*.ttcn" -exec grep timestamp {} \; \

    && ../bin/ng112_generate_makefile.bash



# That's all Floks

docker/build-container.sh

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
DOCKER_FILE=./docker/Dockerfile

if [ -f ${DOCKER_FILE} ]

then

    docker build --tag stf549_ng112  -f ${DOCKER_FILE} .

    docker build --tag stf549_ng112 --force-rm -f ${DOCKER_FILE} .

    if [ "$?" != "0" ]

    then

        echo "Docker build failed: $?"

docker/run-container.sh

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ docker run stf549_ng112:latest "/bin/bash" \ 
	    && cd /home/etsi/dev/STF549_Ng112/scripts \

        && ./update_emcom_project.bash \

	    && cd /home/etsi/dev/etsi_emcom/src/AtsNg112/objs \

	    && ../bin/ng112_generate_makefile.bash \

	    && ../bin/run_all.bash"



# That's all Floks

scripts/update_emcom_project.bash

+1 −2
Original line number Diff line number Diff line
@@ -161,8 +161,7 @@ do 
    elif [ "$i" == "LibCommon" ]

    then

        cp ${TTCN_3_ORG_PATH}/$i/ttcn/*.ttcn ${TTCN_3_DST_PATH}/$i/ttcn

        cp ${TTCN_3_ORG_PATH}/$i/ttcn/*.ttcn ${TTCN_3_DST_PATH}/$i/ttcn

        # Patch TITAN due to issues in xsd2ttcn

        # Patch TITAN due to TTCN-3 compiler issues

        cp ${SRC_EMCOM_PATH}/ttcn/patch_lib_common_titan/*.ttcn ${TTCN_3_DST_PATH}/$i/ttcn

    fi

done

ttcn/LibEmcom/LibNg112/xsd/http_www_opengis_net_gml.ttcn

+1 −0
Original line number Diff line number Diff line
@@ -529,6 +529,7 @@ with { 


type LinearRingType LinearRing

with {

  variant "name as 'LinearRing'";

  variant "element";

};