move meshlabserver to unsupported

src/CMakeLists.txt

@@ -7,7 +7,6 @@ project(MeshLab)
 
 ### Build options
 option(BUILD_MINI "Build only a minimal set of plugins" OFF)
-option(BUILD_SERVER "Build a command-line server application" OFF)
 option(BUILD_STRICT "Strictly enforce resolution of all symbols" ON)
 option(BUILD_WITH_DOUBLE_SCALAR "Use double type instead of float type for scalars" OFF)
 
@@ -113,9 +112,6 @@ add_subdirectory(common)
 
 if (NOT BUILD_ONLY_MESHLAB_LIBRARIES)
 	add_subdirectory(meshlab)
-	if(BUILD_SERVER)
-		add_subdirectory(meshlabserver)
-	endif()
 	if(WIN32 AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/use_cpu_opengl")
 		add_subdirectory(use_cpu_opengl)
 	endif()

src/README.md

@@ -8,7 +8,6 @@ The source code of MeshLab is structured in the following directories:
  * [external](https://github.com/cnr-isti-vclab/meshlab/tree/master/src/external): it contains a series of external libraries needed by several plugins. Some of these libraries are compiled before the compilation of meshlab, if a corresponding system library is not found and then linked; other are header-only libraries that are just included;
  * [common](https://github.com/cnr-isti-vclab/meshlab/tree/master/src/common): a series of utility classes and functions used by MeshLab and its plugins;
  * [meshlab](https://github.com/cnr-isti-vclab/meshlab/tree/master/src/meshlab): GUI and core of MeshLab;
- * [meshlabserver](https://github.com/cnr-isti-vclab/meshlab/tree/master/src/meshlabserver): a tool that allows to compute mesh operations through command line;
  * [meshlabplugins](https://github.com/cnr-isti-vclab/meshlab/tree/master/src/meshlabplugins): all the plugins that can be added to MeshLab;
  * [use_cpu_opengl](https://github.com/cnr-isti-vclab/meshlab/tree/master/src/use_cpu_opengl): a tool compiled only under windows that allows to use non-GPU accelerated OpenGL calls;
  * [vcglib](https://github.com/cnr-isti-vclab/meshlab/tree/master/src/vcglib): submodule containing the vcglib.

src/common/plugins/interfaces/filter_plugin.h

@@ -98,7 +98,8 @@ public:
 	 * This string is printed in the top of the parameter window
 	 * so it should be at least one or two paragraphs long. The more the better.
 	 * you can use simple html formatting tags (like "<br>" "<b>" and "<i>") to improve readability.
-	 * This string is used in the 'About plugin' dialog and by meshlabserver to create the filter list wiki page and the doxygen documentation of the filters.
+	 * This string is used in the 'About plugin' dialog and by pymeshlab to create
+	 * the filter list documentation page of the filters.
 	 * Here is the place where you should put you bibliographic references in a form like this:
 	 * <br>
 	 * See: <br />

src/meshlab.pro

@@ -25,7 +25,6 @@ SUBDIRS = \ #sub projects names
 	external \
 	common \
 	meshlab \
-	#meshlabserver \
 	io_base \ # a few basic file formats (ply, obj, off), without this you cannot open anything
 	decorate_base \
 	filter_measure \
@@ -118,7 +117,6 @@ win32 {
 external.subdir = external
 common.subdir = common
 meshlab.subdir = meshlab
-meshlabserver.subdir = meshlabserver
 io_base.subdir = meshlabplugins/io_base
 decorate_base.subdir = meshlabplugins/decorate_base
 filter_measure.subdir = meshlabplugins/filter_measure
@@ -195,7 +193,6 @@ edit_pickpoints.subdir = meshlabplugins/edit_pickpoints
 # meshlab_mini subdirs
 #common.depends = external
 meshlab.depends = common
-meshlabserver.depends = common
 io_base.depends = common
 decorate_base.depends = common
 filter_measure.depends = common

src/meshlab_mini.pro

@@ -19,7 +19,6 @@ message("DISTRIB_DIRECTORY: "$$MESHLAB_DISTRIB_DIRECTORY)
 SUBDIRS = \ #sub projects names
     common \
     meshlab \
-    meshlabserver \
     io_base \        # a few basic file formats (ply, obj, off), without this you cannot open anything
     decorate_base \
     filter_measure \
@@ -27,14 +26,12 @@ SUBDIRS = \ #sub projects names
     
 common.subdir = common
 meshlab.subdir = meshlab
-meshlabserver.subdir = meshlabserver
 io_base.subdir = meshlabplugins/io_base
 decorate_base.subdir = meshlabplugins/decorate_base
 filter_measure.subdir = meshlabplugins/filter_measure
 filter_meshing.subdir = meshlabplugins/filter_meshing
 
 meshlab.depends = common
-meshlabserver.depends = common
 io_base.depends = common
 decorate_base.depends = common
 filter_measure.depends = common

unsupported/meshlabserver/mainserver.cpp

@@ -27,8 +27,6 @@
 #include <common/plugins/plugin_manager.h>
 #include <common/globals.h>
 #include <common/filterscript.h>
-#include <common/meshlabdocumentxml.h>
-#include <common/meshlabdocumentbundler.h>
 #include <common/mlexception.h>
 #include <common/parameters/rich_parameter_list.h>
 #include <wrap/qt/qt_thread_safe_memory_info.h>