Size of the wipe tower

.gitignore

@@ -9,4 +9,5 @@ xs/buildtmp
 MANIFEST.bak
 xs/MANIFEST.bak
 xs/assertlib*
-.init_bundle.ini
+.init_bundle.ini
+local-lib

Build.PL

@@ -8,14 +8,14 @@ use File::Spec;
 
 my %prereqs = qw(
     Devel::CheckLib                 0
-    Encode                          0
-    Encode::Locale                  1.05
     ExtUtils::MakeMaker             6.80
     ExtUtils::ParseXS               3.22
+    ExtUtils::XSpp                  0
+    ExtUtils::Typemaps              0
+    ExtUtils::Typemaps::Basic       0
     File::Basename                  0
     File::Spec                      0
     Getopt::Long                    0
-    Math::PlanePath                 53
     Module::Build::WithXSpp         0.14
     Moo                             1.003001
     POSIX                           0
@@ -25,38 +25,29 @@ my %prereqs = qw(
     IO::Scalar                      0
     threads                         1.96
     Time::HiRes                     0
-    Unicode::Normalize              0
 );
 my %recommends = qw(
     Class::XSAccessor               0
-    XML::SAX::ExpatXS               0
     Test::Harness                   0
 );
 
 my $sudo    = grep { $_ eq '--sudo' } @ARGV;
 my $gui     = grep { $_ eq '--gui' } @ARGV;
-my $xs_only = grep { $_ eq '--xs' }  @ARGV;
+my $nolocal = grep { $_ eq '--nolocal' }  @ARGV;
 if ($gui) {
     %prereqs = qw(
     Class::Accessor                 0
     Wx                              0.9918
     Socket                          2.016
     );
     %recommends = qw(
-    Growl::GNTP                     0.15
     Wx::GLCanvas                    0
-    OpenGL                          0
-    LWP::UserAgent                  0
-    Net::Bonjour                    0
     );
     if ($^O eq 'MSWin32') {
         $recommends{"Win32::TieRegistry"} = 0;
-
         # we need an up-to-date Win32::API because older aren't thread-safe (GH #2517)
         $prereqs{'Win32::API'} = 0.79;
     }
-} elsif ($xs_only) {
-    %prereqs = %recommends = ();
 }
 
 my @missing_prereqs = ();
@@ -109,33 +100,29 @@ EOF
     my @cpanm_args = ();
     push @cpanm_args, "--sudo" if $sudo;
 
+    # install local::lib without --local-lib otherwise it's not usable afterwards
+    if (!eval "use local::lib qw(local-lib); 1") {
+        my $res = system $cpanm, @cpanm_args, 'local::lib';
+        warn "Warning: local::lib is required. You might need to run the `cpanm --sudo local::lib` command in order to install it.\n"
+            if $res != 0;
+    }
+
+    push @cpanm_args, ('--local-lib', 'local-lib') if ! $nolocal;
+
     # make sure our cpanm is updated (old ones don't support the ~ syntax)
     system $cpanm, @cpanm_args, 'App::cpanminus';
 
-    # install the Windows-compatible Math::Libm
-    if ($^O eq 'MSWin32' && !eval "use Math::Libm; 1") {
-        system $cpanm, @cpanm_args, 'https://github.com/alexrj/Math-Libm/tarball/master';
-    }
-
     my %modules = (%prereqs, %recommends);
     foreach my $module (sort keys %modules) {
         my $version = $modules{$module};
         my @cmd = ($cpanm, @cpanm_args);
 
         # temporary workaround for upstream bug in test
         push @cmd, '--notest'
-            if $module =~ /^(?:OpenGL|Math::PlanePath|Test::Harness)$/;
+            if $module =~ /^(?:OpenGL|Test::Harness)$/;
 
         push @cmd, "$module~$version";
-        if ($module eq 'XML::SAX::ExpatXS' && $^O eq 'MSWin32') {
-            my $mingw = 'C:\dev\CitrusPerl\mingw64';
-            $mingw = 'C:\dev\CitrusPerl\mingw32' if !-d $mingw;
-            if (!-d $mingw) {
-                print "Could not find the MinGW directory at $mingw; skipping XML::SAX::ExpatXS (only needed for faster parsing of AMF files)\n";
-            } else {
-                push @cmd, sprintf('--configure-args="EXPATLIBPATH=%s\lib EXPATINCPATH=%s\include"', $mingw, $mingw);
-            }
-        }
+
         my $res = system @cmd;
         if ($res != 0) {
             if (exists $prereqs{$module}) {
@@ -145,36 +132,19 @@ EOF
             }
         }
     }
-
-    if (!$gui) {
-        # clean xs directory before reinstalling, to make sure Build is called
-        # with current perl binary
-        if (-e './xs/Build') {
-            if ($^O eq 'MSWin32') {
-                system '.\xs\Build', 'distclean';
-            } else {
-                system './xs/Build', 'distclean';
-            }
-        }
-        my $res = system $cpanm, @cpanm_args, '--reinstall', '--verbose', './xs';
-        if ($res != 0) {
-            die "The XS/C++ code failed to compile, aborting\n";
-        }
-    }
 }
 
-if (@missing_prereqs) {
-    printf "The following prerequisites failed to install: %s\n", join(', ', @missing_prereqs);
-    exit 1;
-} elsif (!$gui) {
-    eval "use App::Prove; 1" or die "Failed to load App::Prove";
-    my $res = App::Prove->new->run ? 0 : 1;
-    if ($res == 0) {
-        print "If you also want to use the GUI you can now run `perl Build.PL --gui` to install the required modules.\n";
-    } else {
-        print "Some tests failed. Please report the failure to the author!\n";
-    }
-    exit $res;
+print "\n";
+if ($gui) {
+    print "Perl dependencies for the Slic3r GUI were installed.\n";
+} else {
+    print "Perl dependencies for Slic3r were installed.\n";
+    print "If you also want to use the GUI you can now run `perl Build.PL --gui` to install the required modules.\n";
 }
-
+print "\n";
+print "In the next step, you need to build the Slic3r C++ library.\n";
+print "1) Create a build directory and change to it\n";
+print "2) run cmake .. -DCMAKE_BUILD_TYPE=Release\n";
+print "3) run make\n";
+print "4) to execute the automatic tests, run ctest --verbose\n";
 __END__

CMakeLists.txt

@@ -0,0 +1,75 @@
+# Boost 1.63 requires CMake 3.7 or newer
+cmake_minimum_required(VERSION 2.8)
+
+project(Slic3r)
+
+if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+  message(STATUS "No build type selected, default to Release")
+  set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build type (default Release)" FORCE)
+endif()
+
+if(DEFINED ENV{SLIC3R_STATIC})
+	set(SLIC3R_STATIC_INITIAL $ENV{SLIC3R_STATIC})
+else()
+	if (MSVC OR MINGW OR APPLE)
+		set(SLIC3R_STATIC_INITIAL 1)
+	else()
+		set(SLIC3R_STATIC_INITIAL 0)
+	endif()
+endif()
+
+option(SLIC3R_STATIC 			"Compile Slic3r with static libraries (Boost, TBB, glew)" ${SLIC3R_STATIC_INITIAL})
+option(SLIC3R_GUI    			"Compile Slic3r with GUI components (OpenGL, wxWidgets)" 1)
+option(SLIC3R_PRUSACONTROL		"Compile Slic3r with the PrusaControl prject file format (requires wxWidgets base library)" 1)
+option(SLIC3R_PROFILE 			"Compile Slic3r with an invasive Shiny profiler" 0)
+option(SLIC3R_MSVC_COMPILE_PARALLEL "Compile on Visual Studio in parallel" 1)
+
+if (MSVC AND SLIC3R_MSVC_COMPILE_PARALLEL)
+	add_compile_options(/MP)
+endif ()
+
+# Find the Perl interpreter, add local-lib to PATH and PERL5LIB environment variables,
+# so the locally installed modules (mainly the Alien::wxPerl) will be reached.
+if (WIN32)
+    set(ENV_PATH_SEPARATOR ";")
+else()
+    set(ENV_PATH_SEPARATOR ":")
+endif()
+set(ENV{PATH}     "${PROJECT_SOURCE_DIR}/local-lib/bin${ENV_PATH_SEPARATOR}$ENV{PATH}")
+set(ENV{PERL5LIB} "${PROJECT_SOURCE_DIR}/local-lib/lib/perl${ENV_PATH_SEPARATOR}$ENV{PERL5LIB}")
+message("PATH: $ENV{PATH}")
+message("PERL5LIB: $ENV{PERL5LIB}")
+find_package(Perl REQUIRED)
+
+# CMAKE_PREFIX_PATH is used to point CMake to the remaining dependencies (Boost, TBB, ...)
+# We pick it from environment if it is not defined in another way
+if(NOT DEFINED CMAKE_PREFIX_PATH)
+	if(DEFINED ENV{CMAKE_PREFIX_PATH})
+		set(CMAKE_PREFIX_PATH "$ENV{CMAKE_PREFIX_PATH}")
+	endif()
+endif()
+
+add_subdirectory(xs)
+
+get_filename_component(PERL_BIN_PATH "${PERL_EXECUTABLE}" DIRECTORY)
+if (MSVC)
+	# By default the startup project in MSVC is the 'ALL_BUILD' cmake-created project,
+	# but we want 'slic3r' as the startup one because debugging run command is associated with it.
+	# (Unfortunatelly it cannot be associated with ALL_BUILD using CMake.)
+	# Note: For some reason this needs to be set in the top-level CMakeLists.txt
+	set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT XS)
+	set(PERL_PROVE "${PERL_BIN_PATH}/prove.bat")
+else ()
+	set(PERL_PROVE "${PERL_BIN_PATH}/prove")
+endif ()
+
+enable_testing ()
+add_test (NAME xs COMMAND "${PERL_EXECUTABLE}" ${PERL_PROVE} -I ${PROJECT_SOURCE_DIR}/local-lib/lib/perl5 WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/xs)
+add_test (NAME integration COMMAND "${PERL_EXECUTABLE}" ${PERL_PROVE} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
+
+install(PROGRAMS slic3r.pl DESTINATION bin RENAME slic3r-prusa3d)
+
+file(GLOB MyVar var/*.png)
+install(FILES ${MyVar} DESTINATION share/slic3r-prusa3d)
+install(FILES lib/Slic3r.pm DESTINATION lib/slic3r-prusa3d)
+install(DIRECTORY lib/Slic3r DESTINATION lib/slic3r-prusa3d)