Commit ac8fdef9 authored by vagrant's avatar vagrant
Browse files

Bugs fixed in scripts

parent 4e9ca04a

docker/Dockerfile

+118 −117
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ RUN echo "docker-titan-STF549" > /etc/hostname \ 
    && cd /home/etsi \

    && echo "" >> /home/etsi/.bashrc \

    && echo "export HOME=/home/etsi" >> /home/etsi/.bashrc \

    && echo "export LD_LIBRARY_PATH=/home/etsi/dev/etsi_its/lib:$LD_LIBRARY_PATH" >> /home/etsi/.bashrc \

    && echo "export LD_LIBRARY_PATH=/home/etsi/dev/etsi_emco/lib:$LD_LIBRARY_PATH" >> /home/etsi/.bashrc \

    && echo "export PATH=/home/etsi/bin:$PATH" >> /home/etsi/.bashrc \

    && echo "cd /home/etsi" >> /home/etsi/.bashrc \

    && echo ". ./devenv.bash" >> /home/etsi/.bashrc \
@@ -95,10 +95,11 @@ RUN cd /home/etsi/dev \ 
    && ls -ltr /home/etsi \

    && export HOME=/home/etsi \

    && cd /home/etsi/frameworks \

    && git clone https://github.com/YannGarcia/osip.git osip \

    && git clone https://github.com/YannGarcia/osip.git ./osip \

    && cd osip \

    && ./autogen.sh \

    && ./configure --prefix=/home/etsi \

    && make \

    && make && make install \

    && cd /home/etsi/frameworks \

    && wget 'http://ftp.halifax.rwth-aachen.de/eclipse//technology/epp/downloads/release/oxygen/2/eclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz' -Oeclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz \

    && tar -zxvf ./eclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz \

scripts/merge_emcom_project.bash

+239 −261
Original line number Diff line number Diff line
@@ -10,12 +10,12 @@ set -vx 
OLDPWD=`pwd`



# Storing path

VAGRANT_DIR=/vagrant

VAGRANT_DIR=~/tmp

if [ ! -d ${VAGRANT_DIR} ]

then

  exit -1

else

	  VAGRANT_DIR=/vagrant/to_be_merged

  VAGRANT_DIR=$VAGRANT_DIR/to_be_merged

  if [ -d ${VAGRANT_DIR} ]

  then

      rm -f ${VAGRANT_DIR}/*
@@ -26,30 +26,8 @@ fi 


# Execution path

RUN_PATH="${0%/*}"

UNAME=`uname -n`

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

then # Win7 Virtualbox Ubuntu 16.04

    SRC_EMCOM_PATH=/media/sf_F_DRIVE/FSCOM/ETSI/EMCOM/STF549/workspace_titan/STF549_ng112

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

then # Vqgrant xenial-ubuntu

    SRC_EMCOM_PATH=/media/sf_F_DRIVE/FSCOM/ETSI/EMCOM/STF549/workspace_titan/STF549_ng112

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

then # Vagrant xenial-ubuntu

    SRC_EMCOM_PATH=/media/sf_F_DRIVE/FSCOM/ETSI/EMCOM/STF549/workspace_titan/STF549_ng112

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

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

#    CHOWN_USER_GROUP=ubuntu:ubuntu

    SRC_EMCOM_PATH=${HOME}/tmp/STF549

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

then # Win7 cygwin64

    SRC_EMCOM_PATH=/cygdrive/f/FSCOM/ETSI/EMCOM/STF549/workspace_titan/STF549_ng112

else # docket-titan

    SRC_EMCOM_PATH=${HOME}/tmp/STF549_ng112

fi

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

then

PATH_DEV_EMCOM=`pwd`/../etsi_emcom

fi





# Update ETSI Framework files

echo 'Merging ETSI Framework files'

scripts/ng112.bash

+242 −242
Original line number Diff line number Diff line
@@ -178,19 +178,19 @@ if [ "$1" == "prof" ] 
then

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

    then

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

        CXXFLAGS_DEBUG_MODE='s/-Wall/-pg -Wall -std=c++11 -fPIC -D_XOPEN_SOURCE=700 -DAS_USE_SSL -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 -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g'

        CXXFLAGS_DEBUG_MODE='s/-Wall/-pg -Wall -std=c++11 -fPIC -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 -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g'

    LDFLAGS_DEBUG_MODE='s/LDFLAGS = /LDFLAGS = -pg -pthread -fPIC -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 -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g'

        CXXFLAGS_DEBUG_MODE='s/-Wall/-ggdb -O0 -Wall -std=c++11 -fPIC -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 -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g'

        CXXFLAGS_DEBUG_MODE='s/-Wall/-ggdb -O0 -Wall -std=c++11 -fPIC -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 -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g'

    LDFLAGS_DEBUG_MODE='s/LDFLAGS = /LDFLAGS = -g -pthread -fPIC -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_EMCOM)/include -I$(PATH_DEV_EMCOM)/framework/include -I../include -I../../LibEmcom/Common/include -I../../LibEmcom/LibNg112/include -I$(HOME_FRAMEWORKS)/osip/include -I$(HOME_INC) -I.'

ADD_LIBRARIES='s/LINUX_LIBS = -lxml2/LINUX_LIBS = -lrt -lxml2 -lpcap -lstdc++fs -lssl -L\$\(HOME_FRAMEWORKS\)\/osip\/src\/osipparser2\/\.libs -losipparser2/g'

scripts/testcodec_generate_makefile.bash

+242 −242
Original line number Diff line number Diff line
@@ -178,19 +178,19 @@ if [ "$1" == "prof" ] 
then

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

    then

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

        CXXFLAGS_DEBUG_MODE='s/-Wall/-pg -Wall -std=c++11 -fPIC -D_XOPEN_SOURCE=700 -DAS_USE_SSL -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 -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g'

        CXXFLAGS_DEBUG_MODE='s/-Wall/-pg -Wall -std=c++11 -fPIC -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 -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g'

    LDFLAGS_DEBUG_MODE='s/LDFLAGS = /LDFLAGS = -pg -pthread -fPIC -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 -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g'

        CXXFLAGS_DEBUG_MODE='s/-Wall/-ggdb -O0 -Wall -std=c++11 -fPIC -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 -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g'

        CXXFLAGS_DEBUG_MODE='s/-Wall/-ggdb -O0 -Wall -std=c++11 -fPIC -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 -fsanitize=address -fno-omit-frame-pointer -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g'

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

fi

ADD_INCLUDE='/CPPFLAGS = /a\\CPPFLAGS += -I/usr/local/share -I$(PATH_DEV_EMCOM)/include -I$(PATH_DEV_EMCOM)/framework/include -I../include -I../../LibEmcom/Common/include -I../../LibEmcom/LibNg112/include -I$(HOME_FRAMEWORKS)/osip/include -I$(HOME_INC) -I.'

ADD_LIBRARIES='s/LINUX_LIBS = -lxml2/LINUX_LIBS = -lrt -lxml2 -lpcap -lstdc++fs -lssl -L\$\(HOME_FRAMEWORKS\)\/osip\/src\/osipparser2\/\.libs -losipparser2/g'

vagrant/provisioner.bash

+10 −15
Original line number Diff line number Diff line
@@ -75,9 +75,9 @@ fi 


cd /home/vagrant/dev 

git clone https://forge.etsi.org/gitlab/emergency-communications/NG112 ./STF549_Ng112

cd /home/etsi/dev/STF549_Ng112

cd /home/vagrant/dev/STF549_Ng112

git checkout TTCN_3_Developments

cd /home/etsi/dev/STF549_Ng112/ttcn

cd /home/vagrant/dev/STF549_Ng112/ttcn

svn co --username svnusers --password svnusers --non-interactive https://oldforge.etsi.org/svn/LibSip/trunk ./LibSip \

svn co --username svnusers --password svnusers --non-interactive https://oldforge.etsi.org/svn/LibCommon/trunk/ttcn ./LibCommon/ttcn \

cd /home/vagrant/dev/STF549_Ng112/scripts
@@ -92,13 +92,13 @@ ln -sf /home/vagrant/dev/STF549_Ng112/scripts/devenv.bash.ubuntu /home/vagrant/d 


# Install all frameworks



# Install asn1c

# Install osip

cd ${HOME_FRAMEWORKS}

git clone https://github.com/vlm/asn1c.git asn1c

cd ${HOME_FRAMEWORKS}/asn1c

test -f configure || autoreconf -iv

./configure

make && sudo make install

git clone https://github.com/YannGarcia/osip.git ./osip 

cd ./osip 

./autogen.sh 

./configure --prefix=/home/vagrant 

make && make install



# Install GoogleTest

cd ${HOME_FRAMEWORKS}
@@ -130,11 +130,9 @@ rm -f ./eclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz 


cd /home/vagrant

echo "" >> /home/vagrant/.bashrc 

echo "export HOME=/home/vagrant" >> /home/vagrant/.bashrc 

echo "export LD_LIBRARY_PATH=/home/vagrant/dev/etsi_its/lib:$LD_LIBRARY_PATH" >> /home/vagrant/.bashrc 

echo "export LD_LIBRARY_PATH=/home/vagrant/dev/etsi_emco/lib:$LD_LIBRARY_PATH" >> /home/vagrant/.bashrc 

echo "export PATH=/home/vagrant/bin:$PATH" >> /home/vagrant/.bashrc 

echo "cd /home/vagrant" >> /home/vagrant/.bashrc 

echo ". ./devenv.bash" >> /home/vagrant/.bashrc 

echo ". ~/devenv.bash" >> /home/vagrant/.bashrc 



. /home/vagrant/.bashrc

cd /home/vagrant/dev/STF549_Ng112/scripts
@@ -147,9 +145,6 @@ cd /home/vagrant/dev/etsi_emco/src/TestCodec/objs 


cd ${OLD_PWD}



unset USERNAME

unset PASSWORD



sudo init 6



exit 0

scripts/build_titan.bash

+103 −103

File changed.

Contains only whitespace changes.

scripts/run_all.bash

+47 −47

File changed.

Contains only whitespace changes.

scripts/run_ptcs.bash

+38 −38

File changed.

Contains only whitespace changes.

scripts/run_tshark.bash

+7 −7

File changed.

Contains only whitespace changes.

scripts/run_mtc.bash

+55 −55

File changed.

Contains only whitespace changes.

scripts/update_emcom_project.bash

+201 −201

File changed.

Contains only whitespace changes.