Commit 7170f4fa authored by YannGarcia's avatar YannGarcia
Browse files

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

parents 50848da8 cb8cf8a4

.TITAN_properties

+1 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
      <preprocessorIncludes>

        <listItem>./bin</listItem>

        <listItem>./src/bin</listItem>

        <listItem>./src/bin/asn1</listItem>

        <listItem>C:\ProgramFiles\OpenSSL-Win64\include</listItem>

        <listItem>C:\npcap-sdk-0.1\Include</listItem>

        <listItem>/Users/yann/Documents/wireshark/cygwin64/usr/lib/gcc/x86_64-pc-cygwin/7.3.0/include/c++</listItem>
@@ -30,8 +29,8 @@ 
      <disableJSON>true</disableJSON>

      <includeSourceInfo>true</includeSourceInfo>

      <addSourceLineInfo>true</addSourceLineInfo>

      <enableLegacyEncoding>true</enableLegacyEncoding>

      <activateDebugger>true</activateDebugger>

      <enableLegacyEncoding>true</enableLegacyEncoding>

      <otherOptimizationFlags>-std=c++11</otherOptimizationFlags>

      <additionalObjects>

        <listItem>./src/bin/asn1/libItsAsn.so</listItem>

docker/v2/build.cmd

+4 −4
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ for /f "delims=" %%i in ('docker images -q stfubuntu') do set STFUBUNTU=%%i 
if "x%STFUBUNTU%"=="x" (

  echo Build the stfubuntu:18.04 base on ubuntu:18.04

  docker build --tag stfubuntu:18.04 -f Dockerfile.stfubuntu --force-rm  .

  if %ERRORLEVEL% NEQ 0 exit 1

  if %ERRORLEVEL% NEQ 0 return 1

) else (

  echo The stfubuntu:18.04 is already built. Skip this stage

)
@@ -13,14 +13,14 @@ docker build --tag stf525_its --force-rm . 
set RC=%ERRORLEVEL%

if %RC% NEQ 0 (

  echo Docker build failed: %RC%

  exit 1

  return 1

)

docker images

docker inspect stf525_its:latest 

set RC=%ERRORLEVEL%

if %RC% NEQ 0 (

  echo Docker inspect failed: %RC%

  exit 1

  return 1

)

exit 0

return 0