From 59a568c7cf2dc26d4d882f39edaa1e5523c5c558 Mon Sep 17 00:00:00 2001 From: jfa Date: Fri, 7 Apr 2006 14:11:17 +0000 Subject: [PATCH] Move SALOME_Session.idl from GUI_SRC/idl to KERNEL_SRC/idl. --- Makefile.in | 24 ++++----- idl/Makefile.in | 67 ------------------------ idl/SALOME_Session.idl | 113 ----------------------------------------- 3 files changed, 9 insertions(+), 195 deletions(-) delete mode 100644 idl/Makefile.in delete mode 100644 idl/SALOME_Session.idl diff --git a/Makefile.in b/Makefile.in index c1bc6bff4..344e86514 100644 --- a/Makefile.in +++ b/Makefile.in @@ -14,13 +14,7 @@ VPATH=.:@srcdir@:@top_srcdir@/bin:./bin/salome:@top_srcdir@/resources:./bin:@top @COMMENCE@ -SUBDIRS = src - -ifeq ($(GUI_DISABLE_CORBA),no) - SUBDIRS+= idl -endif - -SUBDIRS+= doc adm_local +SUBDIRS = src doc adm_local RESOURCES_FILES = \ back.xpm \ @@ -124,10 +118,10 @@ include/salome/sstream: salome_adm/unix/sstream -$(RM) $@ $(LN_S) ../../$< $@ -depend: depend_idl - -depend_idl: - (cd idl ; $(MAKE) $@) || exit 1 +depend: +#depend: depend_idl +#depend_idl: +# (cd idl ; $(MAKE) $@) || exit 1 # doc is already build : if you want to had documents, go manually to doc and run 'make doc' #doc: @@ -156,10 +150,10 @@ install-bin: $(BIN_SCRIPT) $(INSTALL) -d $(bindir) $(INSTALL_PROGRAM) $^ $(bindir) -uninstall: uninstall-idl - -uninstall-idl: - $(RM) $(idldir)/*.idl +uninstall: +#uninstall: uninstall-idl +#uninstall-idl: +# $(RM) $(idldir)/*.idl distclean: distclean-other diff --git a/idl/Makefile.in b/idl/Makefile.in deleted file mode 100644 index 6954d4bc0..000000000 --- a/idl/Makefile.in +++ /dev/null @@ -1,67 +0,0 @@ -# -# generate dependencies for idl file : -# - -# source path -top_srcdir=@top_srcdir@ -top_builddir=.. -srcdir=@srcdir@ -VPATH=. - -@COMMENCE@ - -IDL_FILES = SALOME_Session.idl - -PY_CLIENT_IDL = $(IDL_FILES) - -# we copy all idl file in $(top_builddir)/idl -inc: $(top_builddir)/idl/salome $(IDL_FILES:%=$(top_builddir)/idl/salome/%) - -$(top_builddir)/idl/salome: - mkdir -p $@ - -$(IDL_FILES:%=$(top_builddir)/idl/salome/%):$(IDL_FILES:%=$(top_srcdir)/idl/%) -# $(CP) $< $@ - cp -f $^ $(top_builddir)/idl/salome - - -lib: pyidl - -PYTHON_BUILD_SITE=$(top_builddir)/lib/python$(PYTHON_VERSION)/site-packages/@PACKAGE@ - -pyidl: $(PYTHON_BUILD_SITE) $(IDL_FILES:%.idl=$(PYTHON_BUILD_SITE)/%_idl.py) - -$(PYTHON_BUILD_SITE): - $(INSTALL) -d $@ - -$(PYTHON_BUILD_SITE)/%_idl.py: $(top_builddir)/idl/salome/%.idl - $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(PYTHON_BUILD_SITE) $< - - -# install python client (generated from idl file -install: $(top_builddir)/idl/salome install-pyidl install-idl - -# create directory $(idldir) and copy idl files into it -install-idl: $(IDL_FILES:%=$(top_builddir)/idl/salome/%) - $(INSTALL) -d $(idldir) - cp -p -f $^ $(idldir) - - -install-pyidl: $(IDL_FILES:%=$(top_builddir)/idl/salome/%) - $(INSTALL) -d $(PYTHON_SITE_INSTALL) - @for file in $^ dummy; do \ - if [ $$file != "dummy" ]; then \ - $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(PYTHON_SITE_INSTALL) $$file ; \ - fi ; \ - done ; - -#@ CONCLUDE @ - -cleandep: - -$(RM) .dep* - -distclean: - -$(RM) *.py - -$(RM) $(IDL_FILES:%=$(top_builddir)/idl/salome/%) - -$(RM) Makefile - diff --git a/idl/SALOME_Session.idl b/idl/SALOME_Session.idl deleted file mode 100644 index f067b753a..000000000 --- a/idl/SALOME_Session.idl +++ /dev/null @@ -1,113 +0,0 @@ -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// 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. -// -// 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -// -// -// -// File : SALOME_Session.idl -// Author : Paul RASCLE, EDF -// $Header$ - -#include "SALOME_Component.idl" - -/*! - This package contains interfaces used for management of the session in %SALOME application. -*/ -module SALOME -{ -/*! \brief State of the session - - This enumeration contains values defining the state of the session - -*/ - enum SessionState {asleep, /*! Session is inactive */ - running /*! Session is running */ - } ; - -/*! \brief %Session State and Statistics - - - This struct contains a field list with general information about the session -*/ - - struct StatSession - { -/*! \brief State of the session - - It can be: - * -# asleep : no running study - * -# running : one or more running studies -*/ - SessionState state ; -/*! Number of running studies -*/ - short runningStudies ; -/*! It is True if GUI is active in the session -*/ - boolean activeGUI ; - } ; -/*! \brief Interface of the session - - The %session Server launches and stops GUI (Graphical User Interface). - The %session can be active without GUI (It can contain one or more running studies) -*/ - - interface Session - { -/*! - This exception is raised when trying to stop the %session with active GUI -*/ - exception GUIActive {} ; -/*! - This exception is raised when trying to stop the %session with a number of running studies. -*/ - exception RunningStudies {} ; - -/*! - Launches GUI in the session -*/ - void GetInterface(); - -/*! - Returns a standalone component -*/ - Engines::Component GetComponent(in string theLibraryName); - -/*! - Stops the %Session (It must be idle) -*/ - void StopSession() raises(GUIActive, RunningStudies) ; - -/*! - Gets Session State -*/ - StatSession GetStatSession() ; -/*! - Determines whether the server has already been loaded or not. -*/ - void ping(); -/*! - Get Active study ID -*/ - long GetActiveStudyId(); -/*! - Restores a state of the study at theSavePoint -*/ - boolean restoreVisualState(in long theSavePoint); - } ; -} ; -- 2.39.2