From 06e41bab0b6f83eacf248005a72bd928fe0ed244 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Thu, 18 Oct 2018 10:48:56 +0200
Subject: [PATCH] remove gepetto-viewer-server, fix #74

---
 include/gepetto/viewer/corba/doc.hh |  2 +-
 src/CMakeLists.txt                  |  9 -----
 src/corbaserver.cc                  | 51 -----------------------------
 3 files changed, 1 insertion(+), 61 deletions(-)
 delete mode 100644 src/corbaserver.cc

diff --git a/include/gepetto/viewer/corba/doc.hh b/include/gepetto/viewer/corba/doc.hh
index 12e1faa..f70f7a9 100644
--- a/include/gepetto/viewer/corba/doc.hh
+++ b/include/gepetto/viewer/corba/doc.hh
@@ -6,7 +6,7 @@
 ///
 /// To use the graphical interface via python,
 /// \li start executable
-///     \code{bash} gepetto-viewer-server \endcode.
+///     \code{bash} gepetto-gui \endcode.
 /// \li in a python terminal, create a client
 /// \code{py}
 /// from gepetto.corbaserver import Client
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6759083..95c65bd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -78,15 +78,6 @@ IF(NOT CLIENT_ONLY)
 
   INSTALL(TARGETS ${LIBRARY_NAME} DESTINATION lib)
 
-  # Standalone corba server
-  ADD_EXECUTABLE (gepetto-viewer-server corbaserver.cc)
-  TARGET_LINK_LIBRARIES(gepetto-viewer-server ${LIBRARY_NAME})
-  PKG_CONFIG_USE_DEPENDENCY(gepetto-viewer-server omniORB4)
-  PKG_CONFIG_USE_DEPENDENCY(gepetto-viewer-server gepetto-viewer)
-  #TARGET_LINK_LIBRARIES(gepetto-viewer-server ${Boost_LIBRARIES})
-
-  INSTALL (TARGETS gepetto-viewer-server DESTINATION bin)
-
 ELSE(NOT CLIENT_ONLY)
 
   ADD_CUSTOM_TARGET(generate_idl_cpp ALL DEPENDS ${ALL_IDL_CPP_STUBS})
diff --git a/src/corbaserver.cc b/src/corbaserver.cc
deleted file mode 100644
index 6291a8b..0000000
--- a/src/corbaserver.cc
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (C) 14 by Mathieu Geisert LAAS-CNRS.
-//
-// This file is part of the SceneViewer-corba.
-//
-// This software is provided "as is" without warranty of any kind,
-// either expressed or implied, including but not limited to the
-// implied warranties of fitness for a particular purpose.
-//
-// See the COPYING file for more information.
-
-#include <iostream>
-#include <osg/DisplaySettings>
-#include <osg/ArgumentParser>
-#include "gepetto/viewer/corba/server.hh"
-
-using graphics::corbaServer::Server;
-
-int
-main (int argc, char* argv[])
-{
-  osg::ArgumentParser arguments(&argc, argv);
-  osg::DisplaySettings* ds = osg::DisplaySettings::instance().get();
-
-  // This should not be done here. Two osg built-in way:
-  // - Environment variable OSG_MULTI_SAMPLES  : a bit tedious
-  // - Command line option --samples           : slight better with an alias
-#ifndef DISABLE_SAMPLING
-  ds->setNumMultiSamples(4);
-#else
-  ds->setNumMultiSamples(0);
-#endif
-
-  // set up the usage document, in case we need to print out how to use this program.
-  arguments.getApplicationUsage()->setApplicationName(arguments.getApplicationName());
-  // arguments.getApplicationUsage()->setDescription(arguments.getApplicationName()+" is an OpenSceneGraph example that shows how to use the accumulation buffer to achieve a simple motion blur effect.");
-  arguments.getApplicationUsage()->setCommandLineUsage(arguments.getApplicationName()+" [options]");
-  arguments.getApplicationUsage()->addCommandLineOption("-h or --help","Display this information");
-  ds->readCommandLine (arguments); // populate the help message.
-
-  // if user request help write it out to cout.
-  if (arguments.read("-h") || arguments.read("--help")) {
-    arguments.getApplicationUsage()->write(std::cout);
-    return 1;
-  }
-
-  graphics::WindowsManagerPtr_t wm = graphics::WindowsManager::create ();
-  Server server (wm, argc, (const char**)argv, false); // dernier arg : autorise ou non multithread (original = true)
-
-  server.startCorbaServer ();
-  server.processRequest(true);
-}