From: Anthony Geay <anthony.geay@edf.fr>
Date: Tue, 23 Feb 2021 19:42:21 +0000 (+0100)
Subject: WIP
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e19b6d2692f1db5d1469b1ba2bb11ef0b90e7b31;p=modules%2Fgui.git

WIP
---

diff --git a/src/Session/CMakeLists.txt b/src/Session/CMakeLists.txt
index 4702f4e9a..8e525a27b 100644
--- a/src/Session/CMakeLists.txt
+++ b/src/Session/CMakeLists.txt
@@ -110,10 +110,14 @@ ADD_LIBRARY(SalomeSession ${SalomeSession_SOURCES})
 TARGET_LINK_LIBRARIES(SalomeSession ${_link_LIBRARIES})
 INSTALL(TARGETS SalomeSession EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) 
 
-ADD_EXECUTABLE(SALOME_Session_Server SALOME_Session_Server.cxx)
+ADD_EXECUTABLE(SALOME_Session_Server SALOME_Session_Server_With_Server.cxx)
 TARGET_LINK_LIBRARIES(SALOME_Session_Server ${_link_LIBRARIES} SalomeSession)
 INSTALL(TARGETS SALOME_Session_Server EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS})
 
+ADD_EXECUTABLE(SALOME_Session_Server_No_Server SALOME_Session_Server_No_Server.cxx)
+TARGET_LINK_LIBRARIES(SALOME_Session_Server_No_Server ${_link_LIBRARIES} SalomeSession)
+INSTALL(TARGETS SALOME_Session_Server_No_Server EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS})
+
 add_executable(salome2810 salome2810.cxx)
 target_link_libraries(salome2810 ${QT_LIBRARIES})
 install(TARGETS salome2810 DESTINATION ${SALOME_INSTALL_BINS})
diff --git a/src/Session/SALOME_Session_Server.cxx b/src/Session/SALOME_Session_Server.cxx
index 3d2a5ea41..13271628d 100644
--- a/src/Session/SALOME_Session_Server.cxx
+++ b/src/Session/SALOME_Session_Server.cxx
@@ -457,7 +457,7 @@ int AbstractGUIAppMain(int argc, char **argv)
   QApplication::setOrganizationName("salome");
   QApplication::setApplicationName("salome");
   QApplication::setApplicationVersion(salomeVersion());
-  
+
   // Install Qt debug messages handler
   MsgHandler msgHandler;
   qInstallMessageHandler(QtxMsgHandler);
@@ -813,8 +813,3 @@ int AbstractGUIAppMain(int argc, char **argv)
   MESSAGE("Salome_Session_Server:endofserver");
   return result;
 }
-
-int main(int argc, char **argv)
-{
-  return AbstractGUIAppMain<GUIAppNewStyle>(argc, argv);
-}
diff --git a/src/Session/SALOME_Session_Server_No_Server.cxx b/src/Session/SALOME_Session_Server_No_Server.cxx
new file mode 100644
index 000000000..596f9ad05
--- /dev/null
+++ b/src/Session/SALOME_Session_Server_No_Server.cxx
@@ -0,0 +1,26 @@
+// Copyright (C) 2021  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+#include "SALOME_Session_Server.cxx"
+
+
+int main(int argc, char **argv)
+{
+  return AbstractGUIAppMain<GUIAppNewStyle>(argc, argv);
+}
diff --git a/src/Session/SALOME_Session_Server_With_Server.cxx b/src/Session/SALOME_Session_Server_With_Server.cxx
new file mode 100644
index 000000000..1479f7549
--- /dev/null
+++ b/src/Session/SALOME_Session_Server_With_Server.cxx
@@ -0,0 +1,25 @@
+// Copyright (C) 2021  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+#include "SALOME_Session_Server.cxx"
+
+int main(int argc, char **argv)
+{
+  return AbstractGUIAppMain<GUIAppOldStyle>(argc, argv);
+}
diff --git a/src/Session/salome2810.cxx b/src/Session/salome2810.cxx
index 74591be66..3b36fa31d 100644
--- a/src/Session/salome2810.cxx
+++ b/src/Session/salome2810.cxx
@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
   //
   QProcess proc;
   proc.setProcessEnvironment(pe);
-  proc.setProgram("SALOME_Session_Server");
+  proc.setProgram("SALOME_Session_Server_No_Server");
 
   QStringList args({"--with","Registry","(","--salome_session","theSession",")","--with","ModuleCatalog","(","-common"});
   QStringList catalogs;