Travis test
diff --git a/.travis.yml b/.travis.yml index 8e8a4c2..c97077a 100644 --- a/.travis.yml +++ b/.travis.yml
@@ -15,9 +15,9 @@ sources: - ubuntu-toolchain-r-test packages: - - g++-6 + - g++-7 env: - - MATRIX_EVAL="CC=gcc-6 && CXX=g++-6" + - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" before_install: - sudo apt-get install ant
diff --git a/SVIncCompil/README b/SVIncCompil/README index 6362be1..cda3f9d 100644 --- a/SVIncCompil/README +++ b/SVIncCompil/README
@@ -13,6 +13,7 @@ 2) The following tools need to be installed on your machine: - Java jdk (For Antlr generation) sudo apt-get install default-jdk +- g++-7 - uuid - uuid-dev - cmake
diff --git a/SVIncCompil/buildantlr.sh b/SVIncCompil/buildantlr.sh index 7f6490e..95cd616 100755 --- a/SVIncCompil/buildantlr.sh +++ b/SVIncCompil/buildantlr.sh
@@ -22,13 +22,14 @@ cp -R ../third_party/antlr4/runtime/* antlr4-4.7.2/runtime cd antlr4-4.7.2 - +export CC=`which gcc-7` +export CXX=`which g++-7` # Optimized version cd runtime/Cpp rm -rf build run mkdir build && mkdir run && cd build -cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free" +cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=/usr/bin/g++-7 -DCMAKE_CXX_FLAGS="-fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free" make -j 4 DESTDIR=../../../runtime/Cpp/run make install @@ -38,7 +39,7 @@ cd Cpp-Debug rm -rf build run mkdir build && mkdir run && cd build -cmake .. -DCMAKE_BUILD_TYPE=Debug +cmake .. -DCMAKE_CXX_COMPILER=/usr/bin/g++-7 -DCMAKE_BUILD_TYPE=Debug make -j 4 DESTDIR=../../../runtime/Cpp-Debug/run make install @@ -48,6 +49,6 @@ cd Cpp-AdvancedDebug rm -rf build run mkdir build && mkdir run && cd build -cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS="-D_GLIBCXX_DEBUG=1 -fsanitize=address -fno-omit-frame-pointer" +cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=/usr/bin/g++-7 -DCMAKE_CXX_FLAGS="-D_GLIBCXX_DEBUG=1 -fsanitize=address -fno-omit-frame-pointer" make -j 4 DESTDIR=../../../runtime/Cpp-AdvancedDebug/run make install
diff --git a/SVIncCompil/buildantlr_mini.sh b/SVIncCompil/buildantlr_mini.sh index fbc75b0..ae56d65 100755 --- a/SVIncCompil/buildantlr_mini.sh +++ b/SVIncCompil/buildantlr_mini.sh
@@ -9,11 +9,14 @@ cp ../third_party/antlr4/antlr4-4.7.2-complete.jar antlr4-4.7.2/tool/target/ cp -R ../third_party/antlr4/runtime/* antlr4-4.7.2/runtime cd antlr4-4.7.2 -export CXX=`which g++` + +export CC=`which gcc-7` +export CXX=`which g++-7` + # Optimized version cd runtime/Cpp rm -rf build run mkdir build && mkdir run && cd build -cmake .. -DCMAKE_CXX_COMPILER=/usr/bin/c++ -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free" +cmake .. -DCMAKE_CXX_COMPILER=/usr/bin/g++-7 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free" make -j 4 DESTDIR=../../../runtime/Cpp/run make install
diff --git a/SVIncCompil/buildflatbuffer.sh b/SVIncCompil/buildflatbuffer.sh index 7e071a7..b7ebfa9 100755 --- a/SVIncCompil/buildflatbuffer.sh +++ b/SVIncCompil/buildflatbuffer.sh
@@ -3,11 +3,12 @@ ######################################################################### echo "Making Flatbuffers" -export CXX=`which g++` +export CC=`which gcc-7` +export CXX=`which g++-7` mkdir -p ../flatbuffers cd ../flatbuffers cp -Rf ../third_party/flatbuffers/* . -cmake -G "Unix Makefiles" -DCMAKE_CXX_COMPILER=/usr/bin/c++ -DCMAKE_CXX_FLAGS="-Wimplicit-fallthrough=0" +cmake -G "Unix Makefiles" -DCMAKE_CXX_COMPILER=/usr/bin/g++-7 -DCMAKE_CXX_FLAGS="-Wimplicit-fallthrough=0" make -j 4 ./flattests
diff --git a/SVIncCompil/buildrelease.sh b/SVIncCompil/buildrelease.sh index 7fe0e88..c28a2b4 100755 --- a/SVIncCompil/buildrelease.sh +++ b/SVIncCompil/buildrelease.sh
@@ -18,8 +18,10 @@ SourceCompile/generate_parser_listener.tcl API/generate_python_listener_api.tcl API/embed_python_api.tcl -export CXX=`which g++` -export CC=`which g++` + +export CXX=`which g++-7` +export CC=`which gcc-7` + echo "Make" make CONF=Release -j 4;