Commit 08e784ca authored by garciay's avatar garciay
Browse files

Bug fiexd in scripts & Dockerfile

parent 3c92274e

docker/Dockerfile

+4 −3
Original line number Diff line number Diff line
@@ -78,10 +78,11 @@ USER etsi 


RUN cd /home/etsi \

    && mkdir -p .ssh bin lib include tmp frameworks docs man dev \

    && echo "$ssh_pub_key" > /home/etsi/.ssh/id_rsa.pub \

    && cat /home/etsi/.ssh/id_rsa.pub \

    && echo "$ssh_pub_key" > /home/etsi/.ssh/id_rsa \

    && chmod 755 /home/etsi/.ssh/id_rsa \

    && cat /home/etsi/.ssh/id_rsa \

    && cd /home/etsi/dev \

    && svn co --non-interactive https://oldforge.etsi.org/svn/ITS/branches/STF525 ./STF525_Its \

    && svn co --non-interactive svn+ssh://oldforge.etsi.org/svn/ITS/branches/STF525 ./STF525_Its \

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

    && chmod 775 *.bash devenv.bash.* \

    && cd /home/etsi \

scripts/pki_generate_makefile.bash

+9 −9
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ then 
    fi

fi



REFERENCES="LibCommon LibIts/Common LibIts/BTP LibIts/GeoNetworking LibIts/Ipv6OverGeoNetworking LibIts/Security LibIts/CAM LibIts/DENM LibIts/IVIM LibIts/MapemSpatem LibIts/SremSsem LibIts/Http LibItsPki"

REFERENCES="LibCommon LibIts/Common LibIts/BTP LibIts/GeoNetworking LibIts/Ipv6OverGeoNetworking LibIts/Security LibIts/CAM LibIts/DENM LibIts/IVIM LibIts/MapemSpatem LibIts/SremSsem LibIts/Http LibIts/Pki"

for i in ${REFERENCES}

do

    # TTCN code
@@ -120,13 +120,13 @@ TTCN_FILES=`find .. -name '*.ttcn*'` 
if [ "${OSTYPE}" == "cygwin" ]

then

    rm ../bin/*.exe ../lib/*.dll

    compiler.exe -d -e -f -g -j -l -L -t -R -U none -x -X ${TTCN_FILES} ${ASN1_FILES} 2>&1 3>&1 | tee build.log

    compiler.exe -d -e -f -g -j -l -L -n -t -R -U none -x -X ${TTCN_FILES} ${ASN1_FILES} 2>&1 3>&1 | tee build.log

    if [ "$?" == "1" ]

    then

        f_exit "Failed to compile ATS" 4

    fi

else

    compiler -d -e -f -g -l -L -t -R -U none -x -X ${TTCN_FILES} ${ASN1_FILES} 2>&1 3>&1 | tee build.log

    compiler -d -e -f -g -l -L -n -t -R -U none -x -X ${TTCN_FILES} ${ASN1_FILES} 2>&1 3>&1 | tee build.log

    if [ "$?" == "1" ]

    then 

        f_exit "Failed to generate ATS source code" 6
@@ -184,19 +184,19 @@ if [ "$1" == "prof" ] 
then

    if [ "${OSTYPE}" == "cygwin" ]

    then

        CXXFLAGS_DEBUG_MODE='s/-Wall/-pg -Wall -std=c++11 -DAS_USE_SSL -D_XOPEN_SOURCE=700 -pthreads -fstack-check -fstack-protector/g'

        CXXFLAGS_DEBUG_MODE='s/-Wall/-pg -Wall -std=c++11 -DAS_USE_SSL -D_XOPEN_SOURCE=700 -pthreads -fstack-check -fstack-protector -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g'

    else

        CXXFLAGS_DEBUG_MODE='s/-Wall/-pg -Wall -std=c++11 -DAS_USE_SSL -pthreads -fstack-check -fstack-protector/g'

        CXXFLAGS_DEBUG_MODE='s/-Wall/-pg -Wall -std=c++11 -DAS_USE_SSL -pthreads -fstack-check -fstack-protector -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g'

    fi

    LDFLAGS_DEBUG_MODE='s/LDFLAGS = /LDFLAGS = -pg -pthread -fstack-check -fstack-protector/g'

    LDFLAGS_DEBUG_MODE='s/LDFLAGS = /LDFLAGS = -pg -pthread -fstack-check -fstack-protector -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g'

else

    if [ "${OSTYPE}" == "cygwin" ]

    then

        CXXFLAGS_DEBUG_MODE='s/-Wall/-ggdb -O0 -Wall -std=c++11 -DAS_USE_SSL -D_XOPEN_SOURCE=700 -pthread -fstack-check -fstack-protector/g'

        CXXFLAGS_DEBUG_MODE='s/-Wall/-ggdb -O0 -Wall -std=c++11 -DAS_USE_SSL -D_XOPEN_SOURCE=700 -pthread -fstack-check -fstack-protector -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g'

    else

        CXXFLAGS_DEBUG_MODE='s/-Wall/-ggdb -O0 -Wall -std=c++11 -DAS_USE_SSL -pthread -fstack-check -fstack-protector/g'

        CXXFLAGS_DEBUG_MODE='s/-Wall/-ggdb -O0 -Wall -std=c++11 -DAS_USE_SSL -pthread -fstack-check -fstack-protector -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g'

    fi

    LDFLAGS_DEBUG_MODE='s/LDFLAGS = /LDFLAGS = -g -pthread -fstack-check -fstack-protector/g'

    LDFLAGS_DEBUG_MODE='s/LDFLAGS = /LDFLAGS = -g -pthread -fstack-check -fstack-protector -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g'

fi

ADD_INCLUDE='/CPPFLAGS = /a\\CPPFLAGS += -I/usr/local/share -I$(PATH_DEV_ITS)/include -I$(PATH_DEV_ITS)/include/asn1 -I$(PATH_DEV_ITS)/framework/include -I../include -I../../LibIts/Common/include -I../../LibIts/BTP/include -I../../LibIts/CAM/include -I../../LibIts/DENM/include -I$(HOME_INC) -I.'

ADD_LIBRARIES='s/LINUX_LIBS = -lxml2/LINUX_LIBS = -lrt -lxml2 -lssl -lstdc++fs -lpcap -L$(PATH_DEV_ITS)\/lib -lItsAsn /g'

scripts/update_its_project.bash

+29 −10
Original line number Diff line number Diff line
@@ -4,27 +4,45 @@ 
#set -e

#set -vx



# Usage: sudo ./update_project.bash

# TODO Use git clone in temporary directory



OLDPWD=`pwd`



# Execution path

RUN_PATH="${0%/*}"



WHOAMI=`whoami`

if [ "${WHOAMI}" == "etsi" ]

then # docket-titan

    CHOWN_USER_GROUP=etsi:etsi

    SRC_ITS_PATH=${HOME}/dev/STF525_Its

elif [ "${WHOAMI}" == "etsi" ]

then # vagrant

UNAME=`uname -n`

if [ "${UNAME}" == "Ubuntu64" ]

then # Win7 Virtualbox Ubuntu 16.04

    CHOWN_USER_GROUP=yann:yann

    SRC_ITS_PATH=/media/sf_F_DRIVE/FSCOM/ETSI/ITS/STF525_Auto_Interop/workspace_titan/STF525_Auto_Interop/src

elif [ "${UNAME}" == "ubuntu-xenial" ]

then # Vqgrant xenial-ubuntu

    CHOWN_USER_GROUP=ubuntu:ubuntu

    SRC_ITS_PATH=/media/sf_F_DRIVE/FSCOM/ETSI/ITS/STF525_Auto_Interop/workspace_titan/STF525_Auto_Interop/src

elif [ "${UNAME}" == "vagrant" ]

then # Vagrant xenial-ubuntu

    CHOWN_USER_GROUP=vagrant:vagrant

    SRC_ITS_PATH=/media/sf_F_DRIVE/FSCOM/ETSI/ITS/STF525_Auto_Interop/workspace_titan/STF525_Auto_Interop/src

elif [ "${UNAME}" == "vagrant-prov" ]

then # Vagrant ubuntu 16.04 with provisioner script to automate ITS project build & test

    CHOWN_USER_GROUP=vagrant:vagrant

    SRC_ITS_PATH=${HOME}/dev/STF525_Its

#    CHOWN_USER_GROUP=ubuntu:ubuntu

    SRC_ITS_PATH=${HOME}/tmp/STF525

elif [ "${UNAME}" == "yann-FSCOM" ]

then # Win7 cygwin64

    CHOWN_USER_GROUP=yann:None

    SRC_ITS_PATH=/cygdrive/f/FSCOM/ETSI/ITS/STF525_Auto_Interop/workspace_titan/STF525_Auto_Interop/src

else # docket-titan

    CHOWN_USER_GROUP=root:root

    SRC_ITS_PATH=${HOME}/tmp/STF525

fi

if [ "${PATH_DEV_ITS}" == "" ]

then

    PATH_DEV_ITS=${HOME}/dev/etsi_its

    PATH_DEV_ITS=`pwd`/../etsi_its

fi



# Backup existing project if any

if [ -d ${PATH_DEV_ITS} ]

then

    if [ -f ${HOME}/tmp/etsi_its.tar.bz2 ]
@@ -231,6 +249,7 @@ do 
	      cp ${CC_SRC_PATH}/Ports/LibIts_ports/Http_ports/*.hh ${TTCN_3_DST_PATH}/LibIts/$i/include

    elif [ "$i" == "Pki" ]

    then

	      cp ${CC_SRC_PATH}/EncDec/LibItsPki_Encdec.cc ${TTCN_3_DST_PATH}/LibIts/$i/src

	      cp ${CC_SRC_PATH}/EncDec/LibItsSecurity_Encdec.cc ${TTCN_3_DST_PATH}/LibIts/$i/src

	      cp ${CC_SRC_PATH}/Externals/LibItsSecurity_externals.cc ${TTCN_3_DST_PATH}/LibIts/$i/src

    elif [ "$i" == "MapemSpatem" ]