Commit 5a76dcaf authored by YannGarcia's avatar YannGarcia
Browse files

Merge branch 'STF525' of https://forge.etsi.org/gitlab/ITS/ITS into STF525

parents efc8ad21 d6cda5eb
......@@ -111,8 +111,15 @@ Pre-requisites on your host machine:
Procedure for a Windows host machine:
- On your host machine, open a the Docker Quickstart Terminal
- On your host machine, clone the ETSI ITS protocols project. NOTE that only Docker folder and .jenkins.sh script file are required
- From the ETSI ITS protocols project root directory, execute the following commands:
Procedure for a Linux host machine:
- On your host machine, open a terminal and change to a working folder such as $HOME/temp
On your host machine, clone the following items from ETSI ITS protocols project:
- The docket folder
- The .jenkins.sh script file (hidden file)
From the your current directory, execute the following commands:
```sh
$ ./.jenkins.sh
......
......@@ -108,8 +108,8 @@ RUN cd /home/etsi/dev \
&& ./build_titan.bash \
&& . /home/etsi/devenv.bash \
&& ./update_its_project.bash \
&& cd ${HOME}/dev/etsi_its/src/TestCodec/objs \
&& ../bin/testcodec_generate_makefile.bash \
&& cd ${HOME}/dev/etsi_its/src/AtsPki/objs \
&& ../bin/pki_generate_makefile.bash \
&& ../bin/run_all.bash
CMD ["/bin/bash"]
......
......@@ -26,11 +26,11 @@ export HOME_INC=${HOME}/include
export PATH=${HOME_BIN}:${PATH}
# Update LD_LIBRARY_PATH environment variable
if [ "${LD_LIBRARY_PATH}" == "" ]
if [ -z "${LD_LIBRARY_PATH}" ]
then
export LD_LIBRARY_PATH=${HOME_LIB}:/usr/local/lib:/home/vagrant/dev/etsi_its/lib
export LD_LIBRARY_PATH=${HOME_LIB}:/usr/local/lib:${HOME}/dev/etsi_its/lib
else
export LD_LIBRARY_PATH=${HOME_LIB}:/usr/local/lib:/home/vagrant/dev/etsi_its/lib:${LD_LIBRARY_PATH}
export LD_LIBRARY_PATH=${HOME_LIB}:/usr/local/lib:${HOME}/dev/etsi_its/lib:${LD_LIBRARY_PATH}
fi
......
......@@ -241,9 +241,13 @@ sed --in-place "${ADD_RUN_LINE_3}" ./Makefile
# Build all
make all 2>&1 3>&1 | tee --append build.log
if [ "$?" == "1" ]
if [ "$?" != "0" ]
then
f_exit "Failed to generate ATS source code" 9
fi
../bin/Ats${ATS_NAME} -v
if [ "$?" != "1" ]
then
f_exit "Failed to executte binary file Ats${ATS_NAME}" 10
fi
f_exit "Build done successfully" 0
......@@ -381,6 +381,8 @@ do
cp $i ${PATH_DEV_ITS}/include/asn1
done
ln -sf ${PATH_DEV_ITS}/bin/asn1/libItsAsn.so ${PATH_DEV_ITS}/lib/libItsAsn.so
ls -ltr ${PATH_DEV_ITS}/lib
echo ${LD_LIBRARY_PATH}
#cp ${HOME}/frameworks/asn1c/skeletons/ANY.h ${PATH_DEV_ITS}/include/asn1
cd ${OLDPWD}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment