Merge 7ed7a9a into 8e5a9cb

slic3r · Jan 1, 2019 · 898b4ea · 898b4ea
2 parents 8e5a9cb + 7ed7a9a
commit 898b4ea
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 21 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -36,8 +36,8 @@ addons:
     packages:
     - g++-7
     - gcc-7
-    - g++-4.9
-    - gcc-4.9
+    - g++-8
+    - gcc-8
     - libgtk2.0-0 
     - libgtk2.0-dev
     - freeglut3
@@ -54,12 +54,12 @@ matrix:
             - TARGET=main
           cache:
             directories:
-              - $HOME/boost_1_63_0
+              - $HOME/boost_1_69_0
               - $HOME/perl5
               - $HOME/wx302
               - local-lib
           after_success:
-            - if [[ "${TRAVIS_BRANCH}" != "cppgui" ]]; then source ${HOME}/perl5/perlbrew/etc/bashrc; perlbrew switch slic3r-perl; ./package/linux/travis-deploy-main.sh || travis_terminate 1; fi
+            - if [[ "${TRAVIS_BRANCH}" != "cppgui" ]]; then source ${HOME}/perl5/perlbrew/etc/bashrc; perlbrew switch slic3r-perl-gcc8; ./package/linux/travis-deploy-main.sh || travis_terminate 1; fi
 
         - os: linux
           env: 

diff --git a/package/linux/build_shell.mk b/package/linux/build_shell.mk
@@ -4,10 +4,10 @@ src=../common/shell.cpp
 CXX ?= g++
 
 # Path to perl header files
-INCLUDEDIR ?= ${HOME}/perl5/perlbrew/perls/slic3r-perl/lib/5.24.0/x86_64-linux-thread-multi/CORE
+INCLUDEDIR ?= ${HOME}/perl5/perlbrew/perls/slic3r-perl-gcc8/lib/5.28.1/x86_64-linux-thread-multi/CORE
 
 # path to library files for perl
-LIBDIR ?= ${HOME}/perl5/perlbrew/perls/slic3r-perl/lib/5.24.0/x86_64-linux-thread-multi/CORE
+LIBDIR ?= ${HOME}/perl5/perlbrew/perls/slic3r-perl-gcc8/lib/5.28.1/x86_64-linux-thread-multi/CORE
 
 LIBS += -lperl -lpthread -lcrypt
 

diff --git a/package/linux/travis-build-main.sh b/package/linux/travis-build-main.sh
@@ -4,32 +4,32 @@
 ### set -euo pipefail
 set -eo pipefail
 
-if [ ! -d $HOME/perl5/perlbrew/perls/slic3r-perl ]; then
-    echo "Downloading slic3r-perlbrew-5.24.tar.bz2"
-    curl -L "http://www.siusgs.com/slic3r/buildserver/slic3r-perl.524.gcc49.travis.tar.bz2" -o /tmp/slic3r-perlbrew-5.24.tar.bz2; 
-    tar -C$HOME/perl5/perlbrew/perls -xjf /tmp/slic3r-perlbrew-5.24.tar.bz2
+if [ ! -d $HOME/perl5/perlbrew/perls/slic3r-perl-gcc8 ]; then
+    echo "Downloading slic3r-perlbrew-5.28.tar.bz2"
+    curl -L "http://www.siusgs.com/slic3r/buildserver/slic3r-perl.528.gcc81.travis.tar.bz2" -o /tmp/slic3r-perlbrew-5.28.tar.bz2;
+    tar -C$HOME/perl5/perlbrew/perls -xjf /tmp/slic3r-perlbrew-5.28.tar.bz2
 fi
 
 source $HOME/perl5/perlbrew/etc/bashrc
-perlbrew switch slic3r-perl
+perlbrew switch slic3r-perl-gcc8
 
-if [ ! -e $HOME/boost_1_63_0/boost/version.hpp ]; then
-    echo "Downloading boost_1_63_0.built.gcc-4.9.4-buildserver.tar.bz2"
-    curl -L "http://www.siusgs.com/slic3r/buildserver/boost_1_63_0.built.gcc-4.9.4-buildserver.tar.bz2" -o /tmp/boost-compiled.tar.bz2
+if [ ! -e $HOME/boost_1_69_0/boost/version.hpp ]; then
+    echo "Downloading boost_1_69_0.built.gcc-8.1.0-buildserver.tar.bz2"
+    curl -L "http://www.siusgs.com/slic3r/buildserver/boost_1_69_0.built.gcc-8.1.0-buildserver.tar.bz2" -o /tmp/boost-compiled.tar.bz2
     tar -C$HOME -xjf /tmp/boost-compiled.tar.bz2
 fi
 
 if [ ! -e ./local-lib/lib/perl5/x86_64-linux-thread-multi/Wx.pm ]; then
-    echo "Downloading slic3r-dependencies.gcc49.travis-wx302.tar.bz2"
-    curl -L "http://www.siusgs.com/slic3r/buildserver/slic3r-dependencies.travis-wx302.tar.bz2" -o /tmp/local-lib-wx302.tar.bz2
+    echo "Downloading slic3r-dependencies.gcc81.travis-wx302.tar.bz2"
+    curl -L "http://www.siusgs.com/slic3r/buildserver/slic3r-dependencies.gcc81.travis-wx302.tar.bz2" -o /tmp/local-lib-wx302.tar.bz2
     tar -C$TRAVIS_BUILD_DIR -xjf /tmp/local-lib-wx302.tar.bz2
-    
+
     echo "Downloading buildserver/wx302-libs.tar.bz2"
     curl -L "http://www.siusgs.com/slic3r/buildserver/wx302-libs.tar.bz2" -o /tmp/wx302.tar.bz2
     tar -C$HOME -xjf /tmp/wx302.tar.bz2
 fi
 
-SLIC3R_STATIC=1 CC=g++-4.9 CXX=g++-4.9 BOOST_DIR=$HOME/boost_1_63_0 perl ./Build.PL
+SLIC3R_STATIC=1 CC=g++-8 CXX=g++-8 BOOST_DIR=$HOME/boost_1_69_0 perl ./Build.PL
 excode=$?
 if [ $excode -ne 0 ]; then exit $excode; fi
 perl ./Build.PL --gui

diff --git a/package/linux/travis-deploy-main.sh b/package/linux/travis-deploy-main.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -euo pipefail
 
-perlbrew switch slic3r-perl
+perlbrew switch slic3r-perl-gcc8
 cpanm local::lib
 eval $(perl -Mlocal::lib=$TRAVIS_BUILD_DIR/local-lib)
 cd package/linux && make -f build_shell.mk && mv Slic3r* $TRAVIS_BUILD_DIR && cd $TRAVIS_BUILD_DIR

diff --git a/xs/Build.PL b/xs/Build.PL
@@ -27,7 +27,7 @@ if ($cpp_guess->is_gcc)	{
 	push @cflags, qw(-U__STRICT_ANSI__);
 }
 
-# std=c++11 Enforce usage of C++11 (required now). Minimum compiler supported: gcc 4.9, clang 3.3, MSVC 14.0
+# std=c++11 Enforce usage of C++11 (required now). Minimum compiler supported: gcc 7, clang 3.3, MSVC 14.0
 push @cflags, qw(-std=c++11);
 
 my @ldflags = ();
@@ -36,7 +36,7 @@ if ($linux && (defined $ENV{SLIC3R_STATIC} && $ENV{SLIC3R_STATIC})) {
     push @ldflags, qw(-static-libgcc -static-libstdc++);
     if ($ENV{TRAVIS}) {
         # On the build server, link to the actual static libraries to make sure we get them in the list.
-    	push @ldflags, qw(/usr/lib/gcc/x86_64-linux-gnu/4.9/libstdc++.a /usr/lib/gcc/x86_64-linux-gnu/4.9/libgcc.a);
+        push @ldflags, qw(/usr/lib/gcc/x86_64-linux-gnu/8/libstdc++.a /usr/lib/gcc/x86_64-linux-gnu/8/libgcc.a);
     }
     # ExtUtils::CppGuess has a hard-coded -lstdc++, so we filter it out
     {

diff --git a/xs/src/admesh/stl.h b/xs/src/admesh/stl.h
@@ -26,7 +26,11 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <stddef.h>
+#if BOOST_VERSION >= 106900
+#include <boost/predef/other/endian.h>
+#else
 #include <boost/detail/endian.hpp>
+#endif
 
 #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
     #include "windows.h"

diff --git a/xs/src/libslic3r/GCodeSender.hpp b/xs/src/libslic3r/GCodeSender.hpp
@@ -9,6 +9,7 @@
 #include <boost/asio.hpp>
 #include <boost/bind.hpp>
 #include <boost/thread.hpp>
+#include <boost/core/noncopyable.hpp>
 
 namespace Slic3r {