From: vsr Date: Thu, 9 Aug 2012 05:17:32 +0000 (+0000) Subject: Merge from V6_main_20120808 08Aug12 X-Git-Tag: V7_0_0~7 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e07448c48ea5b2127e34fc7b8c3427d01c7ce17b;p=modules%2Fgui.git Merge from V6_main_20120808 08Aug12 --- diff --git a/GUI_version.h.in b/GUI_version.h.in index 9669a71af..f01d60122 100644 --- a/GUI_version.h.in +++ b/GUI_version.h.in @@ -1,24 +1,25 @@ -// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// Copyright (C) 2003-2007 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 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. +// 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 +// 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // + // File : GUI_version.h // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) // @@ -31,5 +32,6 @@ #define GUI_VERSION_STR "@VERSION@" #define GUI_VERSION @XVERSION@ +#define GUI_DEVELOPMENT @VERSION_DEV@ #endif // __GUI_VERSION_H__ diff --git a/Makefile.am b/Makefile.am index 38c49561a..b14bfd85b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,28 +1,28 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2003-2007 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 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. +# 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 +# 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # -* Makefile *- # Author : Patrick GOLDBRONN (CEA) # Date : 28/06/2001 -# $Header$ # include $(top_srcdir)/adm_local/unix/make_common_starter.am @@ -35,15 +35,17 @@ else !GUI_ENABLE_CORBA IDLDIR = endif -SUBDIRS = $(IDLDIR) adm_local resources src doc bin +SUBDIRS = $(IDLDIR) adm_local resources src doc bin tools -DIST_SUBDIRS = idl adm_local resources src doc bin +DIST_SUBDIRS = idl adm_local resources src doc bin tools -DISTCLEANFILES = a.out aclocal.m4 configure +DISTCLEANFILES = a.out aclocal.m4 configure local-install.sh hack_libtool adm_local/unix/config_files/config.guess adm_local/unix/config_files/config.sub adm_local/unix/config_files/depcomp adm_local/unix/config_files/install-sh adm_local/unix/config_files/libtool.m4 adm_local/unix/config_files/ltmain.sh adm_local/unix/config_files/ltoptions.m4 adm_local/unix/config_files/ltsugar.m4 adm_local/unix/config_files/ltversion.m4 adm_local/unix/config_files/lt~obsolete.m4 adm_local/unix/config_files/missing adm_local/unix/config_files/py-compile salomeinclude_DATA = GUI_version.h EXTRA_DIST += \ + build_cmake \ + build_cmake.bat \ build_configure \ clean_configure \ LICENCE diff --git a/SUIT.pro b/SUIT.pro deleted file mode 100644 index 307a12511..000000000 --- a/SUIT.pro +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -TEMPLATE = subdirs -CONFIG += ordered - -SUBDIRS = src diff --git a/adm_local/Makefile.am b/adm_local/Makefile.am index c3877a440..4781976b7 100644 --- a/adm_local/Makefile.am +++ b/adm_local/Makefile.am @@ -1,22 +1,23 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2003-2007 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 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. +# 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 +# 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + SUBDIRS = unix cmake_files diff --git a/adm_local/cmake_files/FindCAS.cmake b/adm_local/cmake_files/FindCAS.cmake index 8490c7c66..4b72de6eb 100644 --- a/adm_local/cmake_files/FindCAS.cmake +++ b/adm_local/cmake_files/FindCAS.cmake @@ -1,43 +1,70 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # -# Copyright (C) 2003-2007 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 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. # -# 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 # -# 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # SET(CASROOT $ENV{CASROOT}) -SET(OCC_VERSION_MAJOR 6) -SET(OCC_VERSION_MINOR 3) -SET(OCC_VERSION_MAINTENANCE 0) +# SET(OCC_VERSION_MAJOR 6) +# SET(OCC_VERSION_MINOR 3) +# SET(OCC_VERSION_MAINTENANCE 10) +SET(OCC_VERSION_DEVELOPMENT 0) + +FIND_FILE(ff Standard_Version.hxx ${CASROOT}/include/opencascade ${CASROOT}/inc) +IF(ff) + FILE(STRINGS ${ff} OCC_VERSION_DEVELOPMENT_STR + REGEX "^ *#define OCC_VERSION_DEVELOPMENT.*$") + IF(OCC_VERSION_DEVELOPMENT_STR) + SET(OCC_VERSION_DEVELOPMENT 1) + ENDIF(OCC_VERSION_DEVELOPMENT_STR) +ENDIF(ff) SET(CAS_CPPFLAGS) -SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DOCC_VERSION_MAJOR=${OCC_VERSION_MAJOR}) -SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DOCC_VERSION_MINOR=${OCC_VERSION_MINOR}) -SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DOCC_VERSION_MAINTENANCE=${OCC_VERSION_MAINTENANCE}) +# SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DOCC_VERSION_MAJOR=${OCC_VERSION_MAJOR}) +# SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DOCC_VERSION_MINOR=${OCC_VERSION_MINOR}) +# SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DOCC_VERSION_MAINTENANCE=${OCC_VERSION_MAINTENANCE}) SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DLIN -DLINTEL -DCSFDB) +SET(CAS_DEFINITIONS "-DLIN -DLINTEL -DCSFDB") SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DNo_exception) +SET(CAS_DEFINITIONS "${CAS_DEFINITIONS} -DNo_exception") SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DHAVE_CONFIG_H) +SET(CAS_DEFINITIONS "${CAS_DEFINITIONS} -DHAVE_CONFIG_H") SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DHAVE_LIMITS_H) -SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -I${CASROOT}/inc) +SET(CAS_DEFINITIONS "${CAS_DEFINITIONS} -DHAVE_LIMITS_H") +SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -I${CASROOT}/inc) # to be removed +SET(CAS_INCLUDE_DIRS ${CASROOT}/inc) + +IF(CMAKE_SIZEOF_VOID_P STREQUAL 8) + SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -D_OCC64) +ENDIF(CMAKE_SIZEOF_VOID_P STREQUAL 8) + +IF(NOT WINDOWS) + FIND_LIBRARY(Xmu Xmu) + IF(Xmu) + SET(CAS_LDPATH ${Xmu}) + ENDIF(Xmu) +ENDIF(NOT WINDOWS) IF(WINDOWS) - SET(CASROOT_LIBDIR ${CASROOT}/win32/libd) + IF(CMAKE_BUILD_TYPE STREQUAL Debug) + SET(CASROOT_LIBDIR ${CASROOT}/win32/libd) + ELSE(CMAKE_BUILD_TYPE STREQUAL Debug) + SET(CASROOT_LIBDIR ${CASROOT}/win32/lib) + ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug) ELSE(WINDOWS) SET(CASROOT_LIBDIR ${CASROOT}/lib) ENDIF(WINDOWS) diff --git a/adm_local/cmake_files/FindGUI.cmake b/adm_local/cmake_files/FindGUI.cmake index 14ca37915..fa255f786 100644 --- a/adm_local/cmake_files/FindGUI.cmake +++ b/adm_local/cmake_files/FindGUI.cmake @@ -1,23 +1,20 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # -# Copyright (C) 2003-2007 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 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. # -# 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 # -# 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # SET(GUI_CXXFLAGS -I${GUI_ROOT_DIR}/include/salome) @@ -32,6 +29,7 @@ FIND_LIBRARY(LightApp LightApp ${GUI_ROOT_DIR}/lib/salome) FIND_LIBRARY(LogWindow LogWindow ${GUI_ROOT_DIR}/lib/salome) FIND_LIBRARY(ObjBrowser ObjBrowser ${GUI_ROOT_DIR}/lib/salome) FIND_LIBRARY(OCCViewer OCCViewer ${GUI_ROOT_DIR}/lib/salome) +FIND_LIBRARY(OpenGLUtils OpenGLUtils ${GUI_ROOT_DIR}/lib/salome) FIND_LIBRARY(Plot2d Plot2d ${GUI_ROOT_DIR}/lib/salome) FIND_LIBRARY(PyConsole PyConsole ${GUI_ROOT_DIR}/lib/salome) FIND_LIBRARY(PyInterp PyInterp ${GUI_ROOT_DIR}/lib/salome) @@ -39,9 +37,14 @@ FIND_LIBRARY(QDS QDS ${GUI_ROOT_DIR}/lib/salome) FIND_LIBRARY(qtx qtx ${GUI_ROOT_DIR}/lib/salome) FIND_LIBRARY(QxScene QxScene ${GUI_ROOT_DIR}/lib/salome) FIND_LIBRARY(SalomeApp SalomeApp ${GUI_ROOT_DIR}/lib/salome) +FIND_LIBRARY(SalomeAppTest SalomeAppTest ${GUI_ROOT_DIR}/lib/salome) FIND_LIBRARY(SalomeIDLGUI SalomeIDLGUI ${GUI_ROOT_DIR}/lib/salome) FIND_LIBRARY(SalomeObject SalomeObject ${GUI_ROOT_DIR}/lib/salome) FIND_LIBRARY(SalomePrs SalomePrs ${GUI_ROOT_DIR}/lib/salome) +FIND_LIBRARY(SalomePyQtGUILight SalomePyQtGUILight ${GUI_ROOT_DIR}/lib/salome) +FIND_LIBRARY(SalomePyQtGUI SalomePyQtGUI ${GUI_ROOT_DIR}/lib/salome) +FIND_LIBRARY(SalomePyQt SalomePyQt ${GUI_ROOT_DIR}/lib/salome) +FIND_LIBRARY(SalomePy SalomePy ${GUI_ROOT_DIR}/lib/salome) FIND_LIBRARY(SalomeSession SalomeSession ${GUI_ROOT_DIR}/lib/salome) FIND_LIBRARY(SalomeStyle SalomeStyle ${GUI_ROOT_DIR}/lib/salome) FIND_LIBRARY(SOCC SOCC ${GUI_ROOT_DIR}/lib/salome) @@ -52,4 +55,7 @@ FIND_LIBRARY(suit suit ${GUI_ROOT_DIR}/lib/salome) FIND_LIBRARY(SUPERVGraph SUPERVGraph ${GUI_ROOT_DIR}/lib/salome) FIND_LIBRARY(SVTK SVTK ${GUI_ROOT_DIR}/lib/salome) FIND_LIBRARY(ToolsGUI ToolsGUI ${GUI_ROOT_DIR}/lib/salome) +FIND_LIBRARY(ViewerTools ViewerTools ${GUI_ROOT_DIR}/lib/salome) FIND_LIBRARY(VTKViewer VTKViewer ${GUI_ROOT_DIR}/lib/salome) +FIND_LIBRARY(vtkEDFOverloads vtkEDFOverloads ${GUI_ROOT_DIR}/lib/paraview) +FIND_LIBRARY(vtkTools vtkTools ${GUI_ROOT_DIR}/lib/salome) diff --git a/adm_local/cmake_files/FindOPENGL.cmake b/adm_local/cmake_files/FindOPENGL.cmake index 14584056e..d7e8d4fed 100644 --- a/adm_local/cmake_files/FindOPENGL.cmake +++ b/adm_local/cmake_files/FindOPENGL.cmake @@ -1,27 +1,27 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # -# Copyright (C) 2003-2007 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 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. # -# 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 # -# 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # IF(${WINDOWS}) FIND_LIBRARY(OpenGL_LIB OpenGL32 "C:/Program Files/Microsoft SDKs/Windows/v6.0A/lib") FIND_LIBRARY(GlU_LIB GlU32 "C:/Program Files/Microsoft SDKs/Windows/v6.0A/lib") - SET(OGL_LIBS ${OpenGL_LIB} ${GlU_LIB}) +ELSE(${WINDOWS}) + FIND_LIBRARY(OpenGL_LIB GL) + FIND_LIBRARY(GlU_LIB GLU) ENDIF(${WINDOWS}) +SET(OGL_LIBS ${OpenGL_LIB} ${GlU_LIB}) diff --git a/adm_local/cmake_files/FindQT4.cmake b/adm_local/cmake_files/FindQT4.cmake index 6b98c5f31..bf713c01f 100644 --- a/adm_local/cmake_files/FindQT4.cmake +++ b/adm_local/cmake_files/FindQT4.cmake @@ -1,23 +1,20 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # -# Copyright (C) 2003-2007 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 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. # -# 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 # -# 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # INCLUDE(FindQt4) @@ -28,6 +25,8 @@ SET(DIRS ${DIRS} -I${D}) ENDFOREACH(D ${QT_INCLUDES}) SET(QT_INCLUDES ${DIRS}) SET(QT_INCLUDES ${QT_INCLUDES} -DQT_THREAD_SUPPORT) -SET(QT_MT_LIBS ${QT_LIBRARIES} ${QT_QTXML_LIBRARY} ${QT_QTOPENGL_LIBRARY}) +SET(QT_MT_LIBS ${QT_LIBRARIES} ${QT_QTXML_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${QT_QTWEBKIT_LIBRARY}) +SET(QT_LIBS ${QT_MT_LIBS}) +SET(qt4_ldflags ${QT_MT_LIBS}) FIND_PROGRAM(QT_LRELEASE_EXECUTABLE lrelease) diff --git a/adm_local/cmake_files/FindQWT.cmake b/adm_local/cmake_files/FindQWT.cmake index ea5f11dd8..186341267 100644 --- a/adm_local/cmake_files/FindQWT.cmake +++ b/adm_local/cmake_files/FindQWT.cmake @@ -1,33 +1,39 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # -# Copyright (C) 2003-2007 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 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. # -# 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 # -# 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # SET(QWTHOME $ENV{QWTHOME}) -FIND_PATH(QWT_INCLUDE_DIR qwt_plot.h ${QWTHOME}/include) +IF(NOT QWTHOME) + SET(QWTHOME /usr) +ENDIF(NOT QWTHOME) + +FIND_PATH(QWT_INCLUDE_DIR qwt_plot.h PATHS ${QWTHOME}/include ${QWTHOME}/include/qwt) SET(QWT_INCLUDES -I${QWT_INCLUDE_DIR}) IF(WINDOWS) SET(QWT_INCLUDES ${QWT_INCLUDES} -DQWT_DLL) ENDIF(WINDOWS) + IF(WINDOWS) +IF(CMAKE_BUILD_TYPE STREQUAL Debug) +FIND_LIBRARY(QWT_LIBS qwtd5 ${QWTHOME}/lib) +ELSE(CMAKE_BUILD_TYPE STREQUAL Debug) FIND_LIBRARY(QWT_LIBS qwt5 ${QWTHOME}/lib) +ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug) ELSE(WINDOWS) -FIND_LIBRARY(QWT_LIBS qwt ${QWTHOME}/lib) +FIND_LIBRARY(QWT_LIBS qwt PATHS ${QWTHOME}/lib ${QWTHOME}/lib64) ENDIF(WINDOWS) diff --git a/adm_local/cmake_files/FindSIPPYQT.cmake b/adm_local/cmake_files/FindSIPPYQT.cmake index 1f4ff9503..6a76d6a7e 100644 --- a/adm_local/cmake_files/FindSIPPYQT.cmake +++ b/adm_local/cmake_files/FindSIPPYQT.cmake @@ -1,23 +1,20 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # -# Copyright (C) 2003-2007 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 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. # -# 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 # -# 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # FIND_PROGRAM(SIP_EXECUTABLE sip) @@ -29,8 +26,15 @@ GET_FILENAME_COMPONENT(SIP_ROOT ${SIP_ROOT} PATH) ENDIF(SIP_ROOT) SET(SIP_INCLUDES -I${SIP_ROOT}/include/python${PYTHON_VERSION}) +IF(WINDOWS) + SET(SIP_INCLUDES ${SIP_INCLUDES} -I${SIP_ROOT}/include) +ENDIF(WINDOWS) -FIND_PROGRAM(PYUIC_EXECUTABLE pyuic4) +IF(WINDOWS) + FIND_PROGRAM(PYUIC_EXECUTABLE NAMES pyuic4 pyuic4.bat) +ELSE(WINDOWS) + FIND_PROGRAM(PYUIC_EXECUTABLE NAMES pyuic4) +ENDIF(WINDOWS) SET(PYUIC_ROOT ${PYUIC_EXECUTABLE}) IF(PYUIC_ROOT) @@ -38,11 +42,18 @@ GET_FILENAME_COMPONENT(PYUIC_ROOT ${PYUIC_ROOT} PATH) GET_FILENAME_COMPONENT(PYUIC_ROOT ${PYUIC_ROOT} PATH) ENDIF(PYUIC_ROOT) -IF(WINDOWS) - SET(PYQT_SIPS ${PYUIC_ROOT}/sip) -ELSE(WINDOWS) - SET(PYQT_SIPS ${PYUIC_ROOT}/share/sip) -ENDIF(WINDOWS) +SET(PYQT_SIPS $ENV{PYQT_SIPS}) +IF(NOT PYQT_SIPS) + IF(WINDOWS) + SET(PYQT_SIPS ${PYUIC_ROOT}/sip) + ELSE(WINDOWS) + IF(PYUIC_ROOT STREQUAL /usr) + SET(PYQT_SIPS ${PYUIC_ROOT}/share/sip/PyQt4) + ELSE(PYUIC_ROOT STREQUAL /usr) + SET(PYQT_SIPS ${PYUIC_ROOT}/share/sip) + ENDIF(PYUIC_ROOT STREQUAL /usr) + ENDIF(WINDOWS) +ENDIF(NOT PYQT_SIPS) SET(PYQT_INCLUDES -I${PYQT_SIPS}) SET(PYQT_INCLUDES ${PYQT_INCLUDES} -I${PYQT_SIPS}/QtCore -I${PYQT_SIPS}/QtGui) @@ -51,5 +62,15 @@ SET(PYQT_INCLUDES ${PYQT_INCLUDES} -I${PYQT_SIPS}/QtAssistant -I${PYQT_SIPS}/QtD SET(PYQT_INCLUDES ${PYQT_INCLUDES} -I${PYQT_SIPS}/QtNetwork -I${PYQT_SIPS}/QtSql) SET(PYQT_INCLUDES ${PYQT_INCLUDES} -I${PYQT_SIPS}/QtSvg -I${PYQT_SIPS}/QtTest) -SET(PYQT_SIPFLAGS -x VendorID -x PyQt_NoPrintRangeBug -t WS_X11 -t Qt_4_4_1 -g -s .cc -c .) -SET(PYQT_SIPFLAGS ${PYQT_SIPFLAGS} ${PYQT_INCLUDES}) +EXECUTE_PROCESS( + COMMAND ${PYTHON_EXECUTABLE} -c "import re, PyQt4.pyqtconfig ; s = PyQt4.pyqtconfig.Configuration().pyqt_sip_flags ; print s;" + OUTPUT_VARIABLE COMPILE_FLAGS + OUTPUT_STRIP_TRAILING_WHITESPACE + ) +string(REPLACE " " ";" FLAGS_LIST ${COMPILE_FLAGS}) +FOREACH(FLG ${FLAGS_LIST}) +SET( PYQT_SIPFLAGS ${PYQT_SIPFLAGS} ${FLG}) +ENDFOREACH(FLG ${FLAGS_LIST}) + +SET( PYQT_SIPFLAGS ${PYQT_SIPFLAGS} -s .cc -c . ) +SET( PYQT_SIPFLAGS ${PYQT_SIPFLAGS} ${PYQT_INCLUDES} ) \ No newline at end of file diff --git a/adm_local/cmake_files/FindVTK.cmake b/adm_local/cmake_files/FindVTK.cmake index 550256c72..4e0871c89 100644 --- a/adm_local/cmake_files/FindVTK.cmake +++ b/adm_local/cmake_files/FindVTK.cmake @@ -1,23 +1,20 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # -# Copyright (C) 2003-2007 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 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. # -# 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 # -# 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # INCLUDE(FindVTK) @@ -28,21 +25,44 @@ FOREACH(dir ${VTK_INCLUDE_DIRS}) ENDFOREACH(dir ${VTK_INCLUDE_DIRS}) SET(VTK_LIBS) -FIND_LIBRARY(VTK_COMMON vtkCommon ${VTK_LIBRARY_DIRS}) +FIND_LIBRARY(VTK_COMMON vtkCommon PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH) SET(VTK_LIBS ${VTK_LIBS} ${VTK_COMMON}) -FIND_LIBRARY(VTK_GRAPHICS vtkGraphics ${VTK_LIBRARY_DIRS}) +FIND_LIBRARY(VTK_GRAPHICS vtkGraphics PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH) SET(VTK_LIBS ${VTK_LIBS} ${VTK_GRAPHICS}) -FIND_LIBRARY(VTK_IMAGING vtkImaging ${VTK_LIBRARY_DIRS}) +FIND_LIBRARY(VTK_IMAGING vtkImaging PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH) SET(VTK_LIBS ${VTK_LIBS} ${VTK_IMAGING}) -FIND_LIBRARY(VTK_FILTERING vtkFiltering ${VTK_LIBRARY_DIRS}) +FIND_LIBRARY(VTK_FILTERING vtkFiltering PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH) SET(VTK_LIBS ${VTK_LIBS} ${VTK_FILTERING}) -FIND_LIBRARY(VTK_IO vtkIO ${VTK_LIBRARY_DIRS}) +FIND_LIBRARY(VTK_IO vtkIO PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH) SET(VTK_LIBS ${VTK_LIBS} ${VTK_IO}) -FIND_LIBRARY(VTK_RENDERING vtkRendering ${VTK_LIBRARY_DIRS}) +FIND_LIBRARY(VTK_RENDERING vtkRendering PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH) SET(VTK_LIBS ${VTK_LIBS} ${VTK_RENDERING}) -FIND_LIBRARY(VTK_HYBRID vtkHybrid ${VTK_LIBRARY_DIRS}) +FIND_LIBRARY(VTK_HYBRID vtkHybrid PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH) SET(VTK_LIBS ${VTK_LIBS} ${VTK_HYBRID}) -FIND_LIBRARY(VTK_PARALLEL vtkParallel ${VTK_LIBRARY_DIRS}) +FIND_LIBRARY(VTK_PARALLEL vtkParallel PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH) SET(VTK_LIBS ${VTK_LIBS} ${VTK_PARALLEL}) -FIND_LIBRARY(VTK_WIDGETS vtkWidgets ${VTK_LIBRARY_DIRS}) +FIND_LIBRARY(VTK_WIDGETS vtkWidgets PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH) SET(VTK_LIBS ${VTK_LIBS} ${VTK_WIDGETS}) +FIND_LIBRARY(VTK_GENERIC_FILTERING vtkGenericFiltering PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH) +SET(VTK_LIBS ${VTK_LIBS} ${VTK_GENERIC_FILTERING}) +FIND_LIBRARY(VTK_INFOVIS vtkInfovis PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH) +SET(VTK_LIBS ${VTK_LIBS} ${VTK_INFOVIS}) +FIND_LIBRARY(VTK_VOLUME_RENDERING vtkVolumeRendering PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH) +SET(VTK_LIBS ${VTK_LIBS} ${VTK_VOLUME_RENDERING}) + +FIND_LIBRARY(vtkCommonPythonD vtkCommonPythonD PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH) +FIND_LIBRARY(vtkGraphicsPythonD vtkGraphicsPythonD PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH) +FIND_LIBRARY(vtkImagingPythonD vtkImagingPythonD PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH) +FIND_LIBRARY(vtkPythonCore vtkPythonCore PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH) + + +#IF(NOT WINDOWS) +# IF(VTK_MAJOR_VERSION STREQUAL 5) +# IF(VTK_MINOR_VERSION STREQUAL 0) +# SET(VTK_INCLUDES ${VTK_INCLUDES} -Wno-deprecated) +# ENDIF(VTK_MINOR_VERSION STREQUAL 0) +# ENDIF(VTK_MAJOR_VERSION STREQUAL 5) +#ENDIF(NOT WINDOWS) + +SET(VTK_INCLUDES ${VTK_INCLUDES} -DVTK_EXCLUDE_STRSTREAM_HEADERS) +SET(VTK_DEFINITIONS -DVTK_EXCLUDE_STRSTREAM_HEADERS) \ No newline at end of file diff --git a/adm_local/cmake_files/Makefile.am b/adm_local/cmake_files/Makefile.am index d94ed4ebf..11f2ecd87 100644 --- a/adm_local/cmake_files/Makefile.am +++ b/adm_local/cmake_files/Makefile.am @@ -1,30 +1,29 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # -# Copyright (C) 2003-2007 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 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. # -# 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 # -# 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + include $(top_srcdir)/adm_local/unix/make_common_starter.am dist_admlocal_cmake_DATA = \ FindCAS.cmake \ FindOPENGL.cmake \ FindQT4.cmake \ +UseQT4EXT.cmake \ FindQWT.cmake \ FindSIPPYQT.cmake \ FindVTK.cmake \ diff --git a/adm_local/unix/Makefile.am b/adm_local/unix/Makefile.am index 5f6d5f753..dc81a356d 100644 --- a/adm_local/unix/Makefile.am +++ b/adm_local/unix/Makefile.am @@ -1,24 +1,25 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2003-2007 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 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. +# 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 +# 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + include $(top_srcdir)/adm_local/unix/make_common_starter.am SUBDIRS = config_files diff --git a/adm_local/unix/config_files/Makefile.am b/adm_local/unix/config_files/Makefile.am index c37053179..fab65aae3 100644 --- a/adm_local/unix/config_files/Makefile.am +++ b/adm_local/unix/config_files/Makefile.am @@ -1,24 +1,25 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2003-2007 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 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. +# 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 +# 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + include $(top_srcdir)/adm_local/unix/make_common_starter.am dist_admlocalm4_DATA = \ @@ -36,8 +37,7 @@ check_qwt.m4 \ check_SalomeObject.m4 \ check_sip.m4 \ check_SupervGraphViewer.m4 \ -check_vtk.m4 \ check_VTKViewer.m4 \ -check_corba_in_GUI.m4 \ check_QxGraphViewer.m4 \ -check_TestRecorder.m4 +check_TestRecorder.m4 \ +check_salome_version.m4 diff --git a/adm_local/unix/config_files/check_GLViewer.m4 b/adm_local/unix/config_files/check_GLViewer.m4 index 064a60ae0..48dc02092 100644 --- a/adm_local/unix/config_files/check_GLViewer.m4 +++ b/adm_local/unix/config_files/check_GLViewer.m4 @@ -1,24 +1,25 @@ -dnl Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE dnl -dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License. +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License. dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl -dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com dnl + # # Check configure option --disable-glViewer=[yes|no|DIR] taking into account that # DISABLE_GLVIEWER may be already set during build_configure, diff --git a/adm_local/unix/config_files/check_GUI.m4 b/adm_local/unix/config_files/check_GUI.m4 index ec07762f3..ef1836958 100755 --- a/adm_local/unix/config_files/check_GUI.m4 +++ b/adm_local/unix/config_files/check_GUI.m4 @@ -1,84 +1,106 @@ -dnl Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE dnl -dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License. +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License. dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl -dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com dnl + # Check availability of Salome binary distribution # # Author : Marc Tajchman (CEA, 2002) #------------------------------------------------------------ -AC_DEFUN([CHECK_GUI],[ +AC_DEFUN([CHECK_GUI_MODULE],[ AC_REQUIRE([AC_LINKER_OPTIONS])dnl -AC_CHECKING(for $2 $1 ) - -SalomeGUI_ok=no +LightGUI_ok=no +FullGUI_ok=no GUI_LDFLAGS="" GUI_CXXFLAGS="" -AC_ARG_WITH(gui, - --with-salome_gui=DIR root directory path of SALOME GUI installation, - SALOME_GUI_DIR="$withval",SALOME_GUI_DIR="") +SALOME_GUI_DIR="" -if test "x${SALOME_GUI_DIR}" = "x" ; then - # no --with-gui-dir option used - AC_MSG_RESULT(try \${GUI_ROOT_DIR}: ${GUI_ROOT_DIR}) - if test "x${GUI_ROOT_DIR}" != "x" ; then - # SALOME_ROOT_DIR environment variable defined - SALOME_GUI_DIR=${GUI_ROOT_DIR} +AC_ARG_WITH(gui, + [--with-gui=DIR root directory path of SALOME GUI installation], + [], + [with_gui=auto]) + +if test "${with_gui}" = "no"; then + SalomeGUI_need=no +else + # define SALOME_GUI_DIR + if test "${with_gui}" = "yes" -o "${with_gui}" = "auto"; then + SalomeGUI_need="$with_gui" + AC_MSG_RESULT(try \${GUI_ROOT_DIR}: ${GUI_ROOT_DIR}) + if test "x${GUI_ROOT_DIR}" != "x" ; then + # GUI_ROOT_DIR environment variable defined + SALOME_GUI_DIR=${GUI_ROOT_DIR} + else + # search Salome binaries in PATH variable + AC_PATH_PROG(TEMP, SUITApp) + if test "x${TEMP}" != "x" ; then + AC_MSG_RESULT(SUITApp was found at : ${TEMP}) + SALOME_BIN_DIR=`dirname ${TEMP}` + SALOME_GUI_DIR=`cd ${SALOME_BIN_DIR}/../..; pwd` + fi + fi else - # search Salome binaries in PATH variable - AC_PATH_PROG(TEMP, $1) - if test "x${TEMP}" != "x" ; then - AC_MSG_RESULT($1 was found at : ${TEMP}) - SALOME_BIN_DIR=`dirname ${TEMP}` - SALOME_GUI_DIR=`cd ${SALOME_BIN_DIR}/../..; pwd` - fi + # GUI directory defined by user + SalomeGUI_need=yes + SALOME_GUI_DIR="$with_gui" fi -fi -if test -f ${SALOME_GUI_DIR}/bin/salome/$1 ; then - SalomeGUI_ok=yes - AC_MSG_RESULT(Using SALOME GUI distribution in ${SALOME_GUI_DIR}) - - if test "x${GUI_ROOT_DIR}" == "x" ; then + # check GUI installation + AC_CHECKING(for light GUI) + if test -f ${SALOME_GUI_DIR}/bin/salome/SUITApp ; then + LightGUI_ok=yes + AC_MSG_RESULT(Using SALOME GUI distribution in ${SALOME_GUI_DIR}) + GUI_ROOT_DIR=${SALOME_GUI_DIR} - fi - AC_SUBST(GUI_ROOT_DIR) + GUI_LDFLAGS=-L${SALOME_GUI_DIR}/lib${LIB_LOCATION_SUFFIX}/salome + GUI_CXXFLAGS=-I${SALOME_GUI_DIR}/include/salome - GUI_LDFLAGS=-L${SALOME_GUI_DIR}/lib${LIB_LOCATION_SUFFIX}/salome - GUI_CXXFLAGS=-I${SALOME_GUI_DIR}/include/salome - - AC_SUBST(GUI_LDFLAGS) - AC_SUBST(GUI_CXXFLAGS) -else - AC_MSG_WARN("Cannot find compiled SALOME GUI distribution") + AC_CHECKING(for full GUI) + if test -f ${SALOME_GUI_DIR}/bin/salome/SALOME_Session_Server ; then + FullGUI_ok=yes + fi + else + AC_MSG_WARN("Cannot find compiled SALOME GUI distribution") + fi + AC_MSG_RESULT(for light GUI: ${LightGUI_ok}) + AC_MSG_RESULT(for full GUI: ${FullGUI_ok}) fi - -AC_MSG_RESULT(for $2: ${SalomeGUI_ok}) + +AC_SUBST(GUI_LDFLAGS) +AC_SUBST(GUI_CXXFLAGS) +AC_SUBST(GUI_ROOT_DIR) ])dnl AC_DEFUN([CHECK_SALOME_GUI],[ - CHECK_GUI([SUITApp], - [SALOME GUI]) + CHECK_GUI_MODULE() + SalomeGUI_ok=${LightGUI_ok} +])dnl + +AC_DEFUN([CHECK_CORBA_IN_GUI],[ + CHECK_GUI_MODULE() + CORBA_IN_GUI=${FullGUI_ok} + AC_SUBST(CORBA_IN_GUI) ])dnl diff --git a/adm_local/unix/config_files/check_OCCViewer.m4 b/adm_local/unix/config_files/check_OCCViewer.m4 index ee23fd53d..6f1ca7109 100644 --- a/adm_local/unix/config_files/check_OCCViewer.m4 +++ b/adm_local/unix/config_files/check_OCCViewer.m4 @@ -1,24 +1,25 @@ -dnl Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE dnl -dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License. +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License. dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl -dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com dnl + # # Check configure option --disable-occViewer=[yes|no|DIR] taking into account that # DISABLE_OCCVIEWER may be already set during build_configure, diff --git a/adm_local/unix/config_files/check_Plot2dViewer.m4 b/adm_local/unix/config_files/check_Plot2dViewer.m4 index ebef27068..72915af59 100644 --- a/adm_local/unix/config_files/check_Plot2dViewer.m4 +++ b/adm_local/unix/config_files/check_Plot2dViewer.m4 @@ -1,24 +1,25 @@ -dnl Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE dnl -dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License. +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License. dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl -dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com dnl + # # Check configure option --disable-plot2dViewer=[yes|no|DIR] taking into account that # DISABLE_PLOT2DVIEWER may be already set during build_configure, diff --git a/adm_local/unix/config_files/check_PyConsole.m4 b/adm_local/unix/config_files/check_PyConsole.m4 index 304867485..fcb4223a4 100644 --- a/adm_local/unix/config_files/check_PyConsole.m4 +++ b/adm_local/unix/config_files/check_PyConsole.m4 @@ -1,24 +1,25 @@ -dnl Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE dnl -dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License. +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License. dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl -dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com dnl + # # Check configure option --disable-pyConsole=[yes|no|DIR] taking into account that # DISABLE_PYCONSOLE may be already set during build_configure, diff --git a/adm_local/unix/config_files/check_QxGraphViewer.m4 b/adm_local/unix/config_files/check_QxGraphViewer.m4 index ddd2a3c94..2ec1403fa 100644 --- a/adm_local/unix/config_files/check_QxGraphViewer.m4 +++ b/adm_local/unix/config_files/check_QxGraphViewer.m4 @@ -1,24 +1,25 @@ -dnl Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE dnl -dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License. +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License. dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl -dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com dnl + # # Check configure option --disable-qxGraphViewer=[yes|no|DIR] taking into account that # DISABLE_QXGRAPHVIEWER may be already set during build_configure, diff --git a/adm_local/unix/config_files/check_SalomeObject.m4 b/adm_local/unix/config_files/check_SalomeObject.m4 index 76d83431f..14c93dffe 100644 --- a/adm_local/unix/config_files/check_SalomeObject.m4 +++ b/adm_local/unix/config_files/check_SalomeObject.m4 @@ -1,24 +1,25 @@ -dnl Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE dnl -dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License. +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License. dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl -dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com dnl + # # Check configure option --disable-salomeObject=[yes|no|DIR] taking into account that # DISABLE_SALOMEOBJECT may be already set during build_configure, diff --git a/adm_local/unix/config_files/check_SupervGraphViewer.m4 b/adm_local/unix/config_files/check_SupervGraphViewer.m4 index 2ba31b6fa..f73979a7c 100644 --- a/adm_local/unix/config_files/check_SupervGraphViewer.m4 +++ b/adm_local/unix/config_files/check_SupervGraphViewer.m4 @@ -1,24 +1,25 @@ -dnl Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE dnl -dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License. +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License. dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl -dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com dnl + # # Check configure option --disable-supervGraphViewer=[yes|no|DIR] taking into account that # DISABLE_SUPERVGRAPHVIEWER may be already set during build_configure, diff --git a/adm_local/unix/config_files/check_TestRecorder.m4 b/adm_local/unix/config_files/check_TestRecorder.m4 index 0dbe0b6ae..6baec44f6 100644 --- a/adm_local/unix/config_files/check_TestRecorder.m4 +++ b/adm_local/unix/config_files/check_TestRecorder.m4 @@ -1,24 +1,22 @@ -dnl Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE dnl -dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License. dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License. +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -dnl -dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com dnl + # # Check existence of Test recorder sources and libraries. # Set ENABLE_TESTRECORDER to yes|no diff --git a/adm_local/unix/config_files/check_VTKViewer.m4 b/adm_local/unix/config_files/check_VTKViewer.m4 index 774de209f..56065212c 100644 --- a/adm_local/unix/config_files/check_VTKViewer.m4 +++ b/adm_local/unix/config_files/check_VTKViewer.m4 @@ -1,24 +1,25 @@ -dnl Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE dnl -dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License. +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License. dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl -dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com dnl + # # Check configure option --disable-vtkViewer=[yes|no|DIR] taking into account that # DISABLE_VTKVIEWER may be already set during build_configure, diff --git a/adm_local/unix/config_files/check_corba_in_GUI.m4 b/adm_local/unix/config_files/check_corba_in_GUI.m4 deleted file mode 100755 index cfa4a04d7..000000000 --- a/adm_local/unix/config_files/check_corba_in_GUI.m4 +++ /dev/null @@ -1,33 +0,0 @@ -dnl Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -dnl -dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -dnl -dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -dnl -# Check availability of full Salome binary distribution -# -# Author : Marc Tajchman (CEA, 2002) -#------------------------------------------------------------ - -AC_DEFUN([CHECK_CORBA_IN_GUI],[ - CHECK_GUI([SALOME_Session_Server], - [CORBA SALOME GUI]) - CORBA_IN_GUI=${SalomeGUI_ok} - AC_SUBST(CORBA_IN_GUI) -])dnl - diff --git a/adm_local/unix/config_files/check_disable_Corba.m4 b/adm_local/unix/config_files/check_disable_Corba.m4 index 94105766b..eea675cdc 100644 --- a/adm_local/unix/config_files/check_disable_Corba.m4 +++ b/adm_local/unix/config_files/check_disable_Corba.m4 @@ -1,24 +1,25 @@ -dnl Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE dnl -dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License. +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License. dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl -dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com dnl + # # Check configure option --disable-corba=[yes|no|DIR] taking into account that # GUI_DISABLE_CORBA may be already set during build_configure, diff --git a/adm_local/unix/config_files/check_msg2qm.m4 b/adm_local/unix/config_files/check_msg2qm.m4 index afda71bea..a8eea4e14 100755 --- a/adm_local/unix/config_files/check_msg2qm.m4 +++ b/adm_local/unix/config_files/check_msg2qm.m4 @@ -1,24 +1,25 @@ -dnl Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE dnl -dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License. +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License. dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl -dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com dnl + # Check availability of Qt's msg2qm tool binary distribution # # Author : Jerome Roy (CEA, 2003) diff --git a/adm_local/unix/config_files/check_opengl.m4 b/adm_local/unix/config_files/check_opengl.m4 index dc94b1271..f003684c1 100644 --- a/adm_local/unix/config_files/check_opengl.m4 +++ b/adm_local/unix/config_files/check_opengl.m4 @@ -1,24 +1,25 @@ -dnl Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE dnl -dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License. +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License. dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl -dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com dnl + AC_DEFUN([CHECK_OPENGL],[ AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_PROG_CPP])dnl diff --git a/adm_local/unix/config_files/check_pyqt.m4 b/adm_local/unix/config_files/check_pyqt.m4 index 9f201a915..ec0acce59 100644 --- a/adm_local/unix/config_files/check_pyqt.m4 +++ b/adm_local/unix/config_files/check_pyqt.m4 @@ -1,24 +1,25 @@ -dnl Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE dnl -dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License. +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License. dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl -dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com dnl + AC_DEFUN([CHECK_PYQT],[ AC_REQUIRE([CHECK_PYTHON])dnl AC_REQUIRE([CHECK_QT])dnl @@ -46,28 +47,34 @@ AC_ARG_WITH(pyuic4, AC_MSG_RESULT([Try $withval as pyuic4 executable]) ]) +AC_ARG_WITH(pyrcc4, + [ --with-pyrcc4=EXEC pyrcc4 executable ], + [PYRCC="$withval" + AC_MSG_RESULT([Try $withval as pyrcc4 executable]) + ]) + AC_CHECKING(for pyqt) pyqt_ok=no +TEST_BIN_DIRS="" +if test "x${PYQTDIR}" != "x" ; then + TEST_BIN_DIRS="${TEST_BIN_DIRS} ${PYQTDIR} ${PYQTDIR}/bin" +fi +TEST_BIN_DIRS="${TEST_BIN_DIRS} __CHECK__PATH__" +if test "x${SIPDIR}" != "x" ; then + TEST_BIN_DIRS="${TEST_BIN_DIRS} ${SIPDIR} ${SIPDIR}/bin" +fi +if test "x${PYTHONHOME}" != "x" ; then + TEST_BIN_DIRS="${TEST_BIN_DIRS} ${PYTHONHOME}/bin" +fi +TEST_BIN_DIRS="${TEST_BIN_DIRS} /usr/bin" + dnl check pyuic4 if test "x$PYUIC" != "x" ; then dnl try $withval value AC_CHECK_FILE($PYUIC,pyqt_ok=yes,pyqt_ok=no) else - TEST_BIN_DIRS="" - if test "x${PYQTDIR}" != "x" ; then - TEST_BIN_DIRS="${TEST_BIN_DIRS} ${PYQTDIR} ${PYQTDIR}/bin" - fi - TEST_BIN_DIRS="${TEST_BIN_DIRS} __CHECK__PATH__" - if test "x${SIPDIR}" != "x" ; then - TEST_BIN_DIRS="${TEST_BIN_DIRS} ${SIPDIR} ${SIPDIR}/bin" - fi - if test "x${PYTHONHOME}" != "x" ; then - TEST_BIN_DIRS="${TEST_BIN_DIRS} ${PYTHONHOME}/bin" - fi - TEST_BIN_DIRS="${TEST_BIN_DIRS} /usr/bin" - dnl search pyuic4 pyqt_ok=no for d in ${TEST_BIN_DIRS} ; do @@ -120,6 +127,37 @@ else AC_MSG_RESULT(Warning! pyuic4 is not found!) fi +dnl check pyrcc4 +if test "x$PYRCC" != "x" ; then + dnl try $withval value + AC_CHECK_FILE($PYRCC,pyqt_ok=yes,pyqt_ok=no) +else + dnl search pyrcc4 + pyqt_ok=no + for d in ${TEST_BIN_DIRS} ; do + if test "x${d}" = "x__CHECK__PATH__" ; then + AC_PATH_PROG(TEMP, pyrcc4) + if test "x${TEMP}" != "x" ; then + PYRCC=${TEMP} + if test "x$PYQTDIR" = "x" ; then + PYQTDIR=`dirname ${PYRCC}` + PYQTDIR=`dirname ${PYQTDIR}` + fi + pyqt_ok=yes + break + fi + else + if test -d $d ; then + AC_CHECK_FILE(${d}/pyrcc4,pyqt_ok=yes,pyqt_ok=no) + if test "x$pyqt_ok" == "xyes" ; then + PYRCC=${d}/pyrcc4 + break + fi + fi + fi + done +fi + if test "x$pyqt_ok" == "xyes" ; then TESTLIBFILE=QtCore.so TESTSIPFILE=QtCore/QtCoremod.sip @@ -148,6 +186,11 @@ if test "x$pyqt_ok" == "xyes" ; then fi TEST_LIB_DIRS="${TEST_LIB_DIRS} /usr/lib${LIB_LOCATION_SUFFIX} /usr/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages" TEST_LIB_DIRS="${TEST_LIB_DIRS} /usr/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages/PyQt4" + TEST_LIB_DIRS="${TEST_LIB_DIRS} /usr/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/dist-packages/PyQt4" + TEST_LIB_DIRS="${TEST_LIB_DIRS} /usr/lib${LIB_LOCATION_SUFFIX}/pymodules/python${PYTHON_VERSION}/PyQt4" + if test "${build_cpu::6}" = "x86_64" ; then + TEST_LIB_DIRS="${TEST_LIB_DIRS} /usr/lib64/python2.6/site-packages/PyQt4" + fi TEST_SIPS_DIRS="${TEST_SIPS_DIRS} /usr/share/sip" TEST_SIPS_DIRS="${TEST_SIPS_DIRS} /usr/share/sip/PyQt4" @@ -183,17 +226,18 @@ if test "x$pyqt_ok" == "xyes" ; then PYQT_INCLUDES="${PYQT_INCLUDES} -I ${d}/QtSvg -I ${d}/QtTest" # check compatibility with Qt - SUPPORTED=`grep -e "[[[:space:]]]*Qt_[[[:digit:]_]]\+}" ${PYQT_SIPS}/QtCore/QtCoremod.sip | sed -e "s/\(.*\)[[[:space:]]]*\(Qt_[[[:digit:]_]]\+\)}/\2/g"` - SUPPORTED=`echo $SUPPORTED | sed -e "s/Qt_//g" -e "s/_/./g"` - SUPPORTED_ID=`echo $SUPPORTED | awk -F. '{v=$[1]*10000+$[2]*100+$[3];print v}'` - if test $SUPPORTED_ID -lt $QT_VERSION_ID ; then - AC_MSG_RESULT(Warning! Used Qt version ($QT_VERSION) is not supported by PyQt) - AC_MSG_RESULT(Latest supported Qt version is ${SUPPORTED}) - else - SUPPORTED=${QT_VERSION} - fi - SUPPORTED="Qt_`echo ${SUPPORTED} | sed -e 's/\./_/g'`" - PYQT_SIPFLAGS="-x VendorID -x PyQt_NoPrintRangeBug -t WS_X11 -t ${SUPPORTED} -g -s ".cc" -c . ${PYQT_INCLUDES}" + #SUPPORTED=`grep -e "[[[:space:]]]*Qt_[[[:digit:]_]]\+}" ${PYQT_SIPS}/QtCore/QtCoremod.sip | sed -e "s/\(.*\)[[[:space:]]]*\(Qt_[[[:digit:]_]]\+\)}/\2/g"` + #SUPPORTED=`echo $SUPPORTED | sed -e "s/Qt_//g" -e "s/_/./g"` + #SUPPORTED_ID=`echo $SUPPORTED | awk -F. '{v=$[1]*10000+$[2]*100+$[3];print v}'` + #if test $SUPPORTED_ID -lt $QT_VERSION_ID ; then + # AC_MSG_RESULT(Warning! Used Qt version ($QT_VERSION) is not supported by PyQt) + # AC_MSG_RESULT(Latest supported Qt version is ${SUPPORTED}) + #else + # SUPPORTED=${QT_VERSION} + #fi + #SUPPORTED="Qt_`echo ${SUPPORTED} | sed -e 's/\./_/g'`" + PYQT_SIPFLAGS=`python -c "from PyQt4 import pyqtconfig; print pyqtconfig.Configuration().pyqt_sip_flags"` + PYQT_SIPFLAGS="${PYQT_SIPFLAGS} -s .cc -c . ${PYQT_INCLUDES}" break fi fi @@ -205,6 +249,7 @@ AC_SUBST(PYQT_INCLUDES) AC_SUBST(PYQT_LIBS) AC_SUBST(PYQT_SIPS) AC_SUBST(PYUIC) +AC_SUBST(PYRCC) AC_SUBST(PYQT_SIPFLAGS) dnl AC_LANG_RESTORE @@ -214,4 +259,3 @@ AC_MSG_RESULT(for pyqt: $pyqt_ok) ])dnl dnl - diff --git a/adm_local/unix/config_files/check_qt.m4 b/adm_local/unix/config_files/check_qt.m4 index 5859b6afc..c1e1d3e08 100644 --- a/adm_local/unix/config_files/check_qt.m4 +++ b/adm_local/unix/config_files/check_qt.m4 @@ -1,24 +1,25 @@ -dnl Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE dnl -dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License. +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License. dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl -dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com dnl + dnl OPTIONS_QT dnl ------------------------------------------------------------------------ dnl Adds the --with-qt=path @@ -40,6 +41,7 @@ AC_REQUIRE([AC_PROG_CPP])dnl AC_REQUIRE([AC_PROG_CXXCPP])dnl AC_REQUIRE([CHECK_OPENGL])dnl AC_REQUIRE([AC_LINKER_OPTIONS])dnl +AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl AC_REQUIRE([OPTIONS_QT])dnl @@ -51,6 +53,8 @@ fi qt_ok=yes +QTDIR=$(echo $QTDIR | sed 's%[/]\+$%%') + AC_LANG_SAVE AC_LANG_CPLUSPLUS @@ -75,32 +79,79 @@ fi if test "x$with_qt" != "x" ; then dnl Using "--with-qt" prefix path QTDIR="$with_qt" -else - if test -z $QTDIR ; then - AC_MSG_WARN(undefined QTDIR variable which specify where Qt product was installed) - for d in /usr/local/lib/qt4 /usr/lib/qt4 ; do - if test -f ${d}/include/Qt/qconfig.h ; then - AC_MSG_RESULT(trying ${d}) - QTDIR="${d}" - break +elif test "$QTDIR" = "/usr/lib/qt3" ; then + dnl Using QTDIR environment variable + AC_MSG_RESULT(current QTDIR is $QTDIR) + dnl + if test -d /usr/lib/qt4 ; then + AC_MSG_RESULT(it is strange for a qt4 installation !) + AC_MSG_RESULT(/usr/lib/qt4 is present) + AC_MSG_RESULT(replacing QTDIR by /usr/lib/qt4) + QTDIR=/usr/lib/qt4 + fi +elif test -z $QTDIR ; then + AC_MSG_WARN(undefined QTDIR variable which specify where Qt product was installed, trying to guess using pkg-config) + PKG_PROG_PKG_CONFIG() + AS_IF([test "x$PKG_CONFIG" != "x"], + [ + QT_REQUIRED_VERSION=4.0.0 + if $PKG_CONFIG --exists "QtCore >= $QT_REQUIRED_VERSION" + then + QT_USING_PKGCONFIG=yes + QT_VERSION=`$PKG_CONFIG --modversion QtCore --atleast-version=$QT_REQUIRED_VERSION` + QT_VERSION_ID=`echo $QT_VERSION | awk -F. '{v=$[1]*10000+$[2]*100+$[3];print v}'` + + MOC=`$PKG_CONFIG --variable=moc_location "QtCore >= $QT_REQUIRED_VERSION"` + UIC=`$PKG_CONFIG --variable=uic_location "QtCore >= $QT_REQUIRED_VERSION"` + QRCC=`$PKG_CONFIG --variable=rcc_location "QtCore >= $QT_REQUIRED_VERSION"` + LRELEASE=`$PKG_CONFIG --variable=lrelease_location "QtCore >= $QT_REQUIRED_VERSION"` + + QTCORE_CPPFLAGS=`$PKG_CONFIG --cflags "QtCore >= $QT_REQUIRED_VERSION"` + QTGUI_CPPFLAGS=`$PKG_CONFIG --cflags "QtGui >= $QT_REQUIRED_VERSION"` + QTOPENGL_CPPFLAGS=`$PKG_CONFIG --cflags "QtOpenGL >= $QT_REQUIRED_VERSION"` + QTXML_CPPFLAGS=`$PKG_CONFIG --cflags "QtXml >= $QT_REQUIRED_VERSION"` + QTASSISTANT_CPPFLAGS=`$PKG_CONFIG --cflags "QtAssistant >= $QT_REQUIRED_VERSION"` + QTNETWORK_CPPFLAGS=`$PKG_CONFIG --cflags "QtNetwork >= $QT_REQUIRED_VERSION"` + QTWEBKIT_CPPFLAGS=`$PKG_CONFIG --cflags "QtWebKit >= $QT_REQUIRED_VERSION"` + + QTCORE_LDFLAGS=`$PKG_CONFIG --libs "QtCore >= $QT_REQUIRED_VERSION"` + QTGUI_LDFLAGS=`$PKG_CONFIG --libs "QtGui >= $QT_REQUIRED_VERSION"` + QTOPENGL_LDFLAGS=`$PKG_CONFIG --libs "QtOpenGL >= $QT_REQUIRED_VERSION"` + QTXML_LDFLAGS=`$PKG_CONFIG --libs "QtXml >= $QT_REQUIRED_VERSION"` + QTASSISTANT_LDFLAGS=`$PKG_CONFIG --libs "QtAssistant >= $QT_REQUIRED_VERSION"` + QTNETWORK_LDFLAGS=`$PKG_CONFIG --libs "QtNetwork >= $QT_REQUIRED_VERSION"` + QTWEBKIT_LDFLAGS=`$PKG_CONFIG --libs "QtWebKit >= $QT_REQUIRED_VERSION"` else - if test -f ${d}/include/qconfig.h ; then - AC_MSG_RESULT(trying ${d}) - QTDIR="${d}" - break - fi + AC_MSG_WARN(Qt not found) fi - done - else - dnl Using QTDIR environment variable - AC_MSG_RESULT(QTDIR is $QTDIR) - fi + ], + [ + AC_MSG_WARN([pkg-config not found]) + ] + ) +fi +if test -z $QTDIR ; then + AC_MSG_WARN(undefined QTDIR variable which specify where Qt product was installed) + for d in /usr/local/lib/qt4 /usr/lib/qt4 /usr ; do + if test -f ${d}/lib/libQtCore.so ; then + AC_MSG_RESULT(trying ${d}) + QTDIR="${d}" + break + elif test -f ${d}/lib64/libQtCore.so ; then + AC_MSG_RESULT(trying ${d}) + QTDIR="${d}" + break + elif test -f ${d}/libQtCore.so ; then + AC_MSG_RESULT(trying ${d}) + QTDIR="${d}" + break + fi + done fi - # # check QTDIR environment variable # -if test "x$QTDIR" = "x" +if test "x$QTDIR" = "x" -a "x$QT_USING_PKGCONFIG" != "xyes" then AC_MSG_RESULT(Please define correct path in "--with-qt" option or use correct $QTDIR variable) qt_ok=no @@ -111,19 +162,28 @@ fi # if test "x$qt_ok" = "xyes" then - qt_inc_ok=no - QTINC="" - AC_CHECK_FILE(${QTDIR}/include/qt4/QtCore/qglobal.h,QTINC="/qt4",QTINC="") - if test "x$QTINC" = "x" + AC_MSG_CHECKING(whether Qt version >= 4.0) + if test "x$QT_USING_PKGCONFIG" != "xyes" then - AC_CHECK_FILE(${QTDIR}/include${QTINC}/QtCore/qglobal.h,qt_inc_ok=yes,qt_inc_ok=no) - else - qt_inc_ok=yes + qt_inc_ok=no + QTINC="" + AC_CHECK_FILE(${QTDIR}/include/qt4/QtCore/qglobal.h,QTINC="/qt4",QTINC="") + if test "x$QTINC" = "x" + then + AC_CHECK_FILE(${QTDIR}/include${QTINC}/QtCore/qglobal.h,qt_inc_ok=yes,qt_inc_ok=no) + else + qt_inc_ok=yes + fi + + if test "x$qt_inc_ok" = "xyes" + then + QT_VERSION=`grep "QT_VERSION_STR" ${QTDIR}/include${QTINC}/QtCore/qglobal.h | sed -e 's%^#define QT_VERSION_STR[[:space:]]*\"\([[:digit:]\.]*\)\"%\1%g'` + fi fi - if test "x$qt_inc_ok" = "xyes" - then - AC_MSG_CHECKING(whether Qt version >= 4.0) - QT_VERSION=`grep "QT_VERSION_STR" ${QTDIR}/include${QTINC}/QtCore/qglobal.h | sed -e 's%^#define QT_VERSION_STR[[:space:]]*\"\([[:digit:]\.]*\)\"%\1%g'` + + + if test "x$qt_inc_ok" = "xyes" -o "x$QT_USING_PKGCONFIG" = "xyes" + then QT_VERSION_ID=`echo $QT_VERSION | awk -F. '{v=$[1]*10000+$[2]*100+$[3];print v}'` if test $QT_VERSION_ID -ge 40000 then @@ -142,14 +202,20 @@ fi # # check moc presence (meta-object compiler) # +qt_add=no + if test "x$qt_ok" = "xyes" then - if test -f ${QTDIR}/bin/moc + if test "x$QT_USING_PKGCONFIG" != "xyes" then - MOC=${QTDIR}/bin/moc - else - AC_PATH_PROG(MOC, moc) + if test -f ${QTDIR}/bin/moc + then + MOC=${QTDIR}/bin/moc + else + AC_PATH_PROG(MOC, moc) + fi fi + if test "x$MOC" = "x" then qt_ok=no @@ -162,30 +228,61 @@ then if test "x$qt_ok" = "xyes" then dnl check moc version - AC_MSG_CHECKING(cheching equality Qt and moc tool version) + AC_MSG_CHECKING( equality Qt and moc tool version) MOC_VERSION=`$MOC -v 2>&1 | awk 'BEGIN{FS="[[ ()]]"};{print $(NF-1)}'` if test "x$QT_VERSION" = "x$MOC_VERSION" then AC_MSG_RESULT(yes) qt_ok=yes else - AC_MSG_RESULT(moc tool and Qt product are inpompatible $MOC_VERSION) - qt_ok=no + AC_MSG_RESULT(moc tool and Qt product are incompatible $MOC_VERSION) + QT_VERSION_MAJ=`echo $QT_VERSION | awk -F. '{v=$[1];print v}'` + AC_MSG_CHECKING(for moc-qt$QT_VERSION_MAJ compatible version) + if test -f ${QTDIR}/bin/moc-qt$QT_VERSION_MAJ + then + MOC=${QTDIR}/bin/moc-qt$QT_VERSION_MAJ + qt_ok=yes + qt_add=$QT_VERSION_MAJ + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + qt_ok=no + fi fi fi fi +AC_MSG_CHECKING(moc tool and Qt product done) +AC_MSG_RESULT(yes) # # check uic presence (user interface compiler) # if test "x$qt_ok" = "xyes" then - if test -f ${QTDIR}/bin/uic + if test "x$QT_USING_PKGCONFIG" != "xyes" then - UIC=${QTDIR}/bin/uic - else - AC_PATH_PROG(UIC, uic) + if test "x$qt_add" = "xno" + then + AC_MSG_CHECKING(uic) + if test -f ${QTDIR}/bin/uic + then + UIC=${QTDIR}/bin/uic + else + AC_PATH_PROG(UIC, uic) + fi + AC_MSG_RESULT(yes) + else + AC_MSG_CHECKING(uic-qt$qt_add) + if test -f ${QTDIR}/bin/uic-qt$qt_add + then + UIC=${QTDIR}/bin/uic-qt$qt_add + else + AC_PATH_PROG(UIC, uic) + fi + AC_MSG_RESULT(yes) + fi fi + if test "x$UIC" = "x" then qt_ok=no @@ -194,6 +291,21 @@ then qt_ok=yes AC_MSG_RESULT(uic (Qt user interface compiler) is found) fi + + if test "x$qt_ok" = "xyes" + then + dnl check uic version + AC_MSG_CHECKING(cheching equality Qt and uic tool version) + UIC_VERSION=`$UIC -version 2>&1 | awk '{print $NF}'` + if test "x$QT_VERSION" = "x$UIC_VERSION" + then + AC_MSG_RESULT(yes) + qt_ok=yes + else + AC_MSG_RESULT(uic tool and Qt product are incompatible) + qt_ok=no + fi + fi fi # @@ -201,12 +313,26 @@ fi # if test "x$qt_ok" = "xyes" then - if test -f ${QTDIR}/bin/rcc + if test "x$QT_USING_PKGONFIG" != "xyes" then - QRCC=${QTDIR}/bin/rcc - else - AC_PATH_PROG(QRCC, rcc) + if test "x$qt_add" = "xno" + then + if test -f ${QTDIR}/bin/rcc + then + QRCC=${QTDIR}/bin/rcc + else + AC_PATH_PROG(QRCC, rcc) + fi + else + if test -f ${QTDIR}/bin/rcc-qt$qt_add + then + QRCC=${QTDIR}/bin/rcc-qt$qt_add + else + AC_PATH_PROG(QRCC, rcc) + fi + fi fi + if test "x$QRCC" = "x" then qt_ok=no @@ -226,7 +352,7 @@ then AC_MSG_RESULT(yes) qt_ok=yes else - AC_MSG_RESULT(rcc tool and Qt product are inpompatible) + AC_MSG_RESULT(rcc tool and Qt product are incompatible) qt_ok=no fi fi @@ -237,12 +363,26 @@ fi # if test "x$qt_ok" = "xyes" then - if test -f ${QTDIR}/bin/lrelease + if test "x$QT_USING_PKGCONFIG" != "xyes" then - LRELEASE=${QTDIR}/bin/lrelease - else - AC_PATH_PROG(LRELEASE, lrelease) + if test "x$qt_add" = "xno" + then + if test -f ${QTDIR}/bin/lrelease + then + LRELEASE=${QTDIR}/bin/lrelease + else + AC_PATH_PROG(LRELEASE, lrelease) + fi + else + if test -f ${QTDIR}/bin/lrelease-qt$qt_add + then + LRELEASE=${QTDIR}/bin/lrelease-qt$qt_add + else + AC_PATH_PROG(LRELEASE, lrelease) + fi + fi fi + if test "x$LRELEASE" = "x" then qt_ok=no @@ -262,7 +402,7 @@ then AC_MSG_RESULT(yes) qt_ok=yes else - AC_MSG_RESULT(lrelease tool and Qt product are inpompatible) + AC_MSG_RESULT(lrelease tool and Qt product are incompatible) qt_ok=no fi fi @@ -278,7 +418,12 @@ then AC_CHECKING(include Qt header files) CPPFLAGS_old=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I${QTDIR}/include${QTINC} -I${QTDIR}/include${QTINC}/QtCore" + if test "x$QT_USING_PKGCONFIG" != "xyes" + then + CPPFLAGS="$CPPFLAGS -I${QTDIR}/include${QTINC} -I${QTDIR}/include${QTINC}/QtCore" + else + CPPFLAGS="$CPPFLAGS $QTCORE_CPPFLAGS" + fi AC_CHECK_HEADER(QObject,qt_ok=yes,qt_ok=no) CPPFLAGS=$CPPFLAGS_old @@ -288,27 +433,24 @@ then AC_MSG_RESULT(QTDIR environment variable may be wrong (probably too old Qt version)) else AC_MSG_RESULT(qt header files seem to be OK) - QT_INCLUDES="-I${QTDIR}/include${QTINC}" - # user header files - QT_INCLUDES="${QT_INCLUDES} -I${QTDIR}/include${QTINC}/QtCore" - QT_INCLUDES="${QT_INCLUDES} -I${QTDIR}/include${QTINC}/QtGui" - QT_INCLUDES="${QT_INCLUDES} -I${QTDIR}/include${QTINC}/QtOpenGL" - QT_INCLUDES="${QT_INCLUDES} -I${QTDIR}/include${QTINC}/QtXml" - # not used currently header files (uncomment if required) - #QT_INCLUDES="${QT_INCLUDES} -I$(QTDIR)/include${QTINC}/QtAssistant" - #QT_INCLUDES="${QT_INCLUDES} -I$(QTDIR)/include${QTINC}/QtDBus" - #QT_INCLUDES="${QT_INCLUDES} -I$(QTDIR)/include${QTINC}/QtDesigner" - #QT_INCLUDES="${QT_INCLUDES} -I$(QTDIR)/include${QTINC}/QtNetwork" - #QT_INCLUDES="${QT_INCLUDES} -I$(QTDIR)/include${QTINC}/QtSql" - #QT_INCLUDES="${QT_INCLUDES} -I$(QTDIR)/include${QTINC}/QtSvg" - #QT_INCLUDES="${QT_INCLUDES} -I$(QTDIR)/include${QTINC}/QtTest" - #QT_INCLUDES="${QT_INCLUDES} -I$(QTDIR)/include${QTINC}/QtUiTools" - - QT_ASSISTANT_INCLUDES="${QT_ASSISTANT_INCLUDES} -I${QTDIR}/include${QTINC}/QtAssistant" - QT_ASSISTANT_INCLUDES="${QT_ASSISTANT_INCLUDES} -I${QTDIR}/include${QTINC}/QtNetwork" + if test "x$QT_USING_PKGCONFIG" != "xyes" + then + QT_BASE="-I${QTDIR}/include${QTINC}" + # user header files + QTCORE_CPPFLAGS="${QT_BASE}/QtCore" + QTGUI_CPPFLAGS="${QT_BASE}/QtGui" + QTOPENGL_CPPFLAGS="${QT_BASE}/QtOpenGL" + QTWEBKIT_CPPFLAGS="${QT_BASE}/QtWebKit" + QTXML_CPPFLAGS="${QT_BASE}/QtXml" + + QTASSISTANT_CPPFLAGS="${QT_BASE}/QtAssistant" + QTNETWORK_CPPFLAGS="${QT_BASE}/QtNetwork" + fi - # this flag is obsolete with Qt 4 - QT_MT_INCLUDES="$QT_INCLUDES" + QT_INCLUDES="$QT_BASE $QTCORE_CPPFLAGS $QTGUI_CPPFLAGS $QTOPENGL_CPPFLAGS $QTXML_CPPFLAGS $QTWEBKIT_CPPFLAGS" + + QT_ASSISTANT_INCLUDES="$QTASSISTANT_CPPFLAGS $QTNETWORK_CPPFLAGS" + QT_MT_INCLUDES="${QT_INCLUDES}" fi fi @@ -323,18 +465,24 @@ then CXXFLAGS="$CXXFLAGS $QT_INCLUDES" LIBS_old=$LIBS - if test "x$QTDIR" = "x/usr" + if test "x$QT_USING_PKGCONFIG" = "xyes" then - QT_LIB_DIR="" - elif test -d ${QTDIR}/lib; then - QT_LIB_DIR="-L$QTDIR/lib" - elif test -d ${QTDIR}/lib64; then - QT_LIB_DIR="-L$QTDIR/lib64" + LIBS="$LIBS $QTCORE_LDFLAGS" else - AC_MSG_ERROR(Can't detect of Qt library directory ) - qt_ok=no + if test "x$QTDIR" = "x/usr" ; then + QT_LIB_DIR="" + elif test -d ${QTDIR}/lib; then + QT_LIB_DIR="-L$QTDIR/lib" + elif test -d ${QTDIR}/lib64; then + QT_LIB_DIR="-L$QTDIR/lib64" + elif test "x$QTDIR" = "x/usr/lib/qt4" ; then + QT_LIB_DIR="" + else + AC_MSG_ERROR(Can't detect Qt library directory ) #' + qt_ok=no + fi + LIBS="$LIBS $QT_LIB_DIR -lQtCore" fi - LIBS="$LIBS $QT_LIB_DIR -lQtCore" AC_CACHE_VAL(salome_cv_lib_qt,[ AC_TRY_LINK( @@ -374,14 +522,21 @@ then else AC_MSG_RESULT(yes) # core libs - QT_CORE_LIBS="$QT_LIB_DIR -lQtCore -lQtXml" - # gui libs - QT_GUI_LIBS="$QT_LIB_DIR -lQtGui -lQtOpenGL" - # other libs (currently not used) - QT_OTHER_LIBS="$QT_LIB_DIR" - # other libs (can be used if necessary) - #QT_OTHER_LIBS="$QT_LIB_DIR -lQt3Support -lQtAssistantClient -lQtDesigner -lQtNetwork -lQtSql -lQtSvg -lQtTest -ltQtUiTools" - QT_ASSISTANT_LIBS="$QT_LIB_DIR -lQtAssistantClient -lQtNetwork" + if test "x$QT_USING_PKGCONFIG" = "xyes" + then + QT_CORE_LIBS="$QTCORE_LDFLAGS $QTXML_LDFLAGS" + QT_GUI_LIBS="$QTGUI_LDFLAGS $QTOPENGL_LDFLAGS $QTWEBKIT_LDFLAGS" + QT_ASSISTANT_LIBS="$QTASSISTANT_LDFLAGS $QTNETWORK_LDFLAGS" + else + QT_CORE_LIBS="$QT_LIB_DIR -lQtCore -lQtXml" + # gui libs + QT_GUI_LIBS="$QT_LIB_DIR -lQtGui -lQtOpenGL -lQtWebKit" + # other libs (currently not used) + QT_OTHER_LIBS="$QT_LIB_DIR" + # other libs (can be used if necessary) + #QT_OTHER_LIBS="$QT_LIB_DIR -lQt3Support -lQtAssistantClient -lQtDesigner -lQtNetwork -lQtSql -lQtSvg -lQtTest -ltQtUiTools" + QT_ASSISTANT_LIBS="$QT_LIB_DIR -lQtAssistantClient -lQtNetwork" + fi # all libs QT_LIBS="$QT_CORE_LIBS $QT_GUI_LIBS $QT_OTHER_LIBS" # this flag is obsolete with Qt 4 diff --git a/adm_local/unix/config_files/check_qwt.m4 b/adm_local/unix/config_files/check_qwt.m4 index c62506993..65180571f 100644 --- a/adm_local/unix/config_files/check_qwt.m4 +++ b/adm_local/unix/config_files/check_qwt.m4 @@ -1,24 +1,25 @@ -dnl Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE dnl -dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License. +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License. dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl -dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com dnl + AC_DEFUN([CHECK_QWT],[ AC_REQUIRE([CHECK_QT])dnl AC_REQUIRE([AC_LINKER_OPTIONS])dnl @@ -44,18 +45,47 @@ AC_ARG_WITH(qwt_inc, AC_MSG_RESULT("select $withval as path to QWT includes") ]) +libqwt_name=qwt if test -z $QWTHOME; then AC_MSG_RESULT(QWTHOME not defined) + AC_MSG_NOTICE(Trying native Qwt...) exist_ok=no if test "x$exist_ok" = "xno"; then - for d in /usr/local /usr ; do - AC_CHECK_FILE(${d}/lib${LIB_LOCATION_SUFFIX}/libqwt.so,exist_ok=yes,exist_ok=no) + for d in /usr /usr/local ; do + for extension in qwt-qt4 qwt; do + AC_CHECK_FILE(${d}/lib${LIB_LOCATION_SUFFIX}/lib${extension}.so,exist_ok=yes,exist_ok=no) + if test "x$exist_ok" = "xyes"; then + QWTHOME=$d + AC_MSG_RESULT(lib${extension}.so detected in $d/lib) + libqwt_name=${extension} + dnl break, libqwt-qt4.so is choosen before libqwt.so since it is surely the Qt4 version. + break + fi + done if test "x$exist_ok" = "xyes"; then - QWTHOME=$d - AC_MSG_RESULT(libqwt.so detected in $d/lib) + break fi done fi + if test "x$exist_ok" = "xno"; then + if test "${build_cpu::6}" = "x86_64" ; then + for d in /usr /usr/local ; do + for extension in qwt-qt4 qwt; do + AC_CHECK_FILE(${d}/lib64/lib${extension}.so,exist_ok=yes,exist_ok=no) + if test "x$exist_ok" = "xyes"; then + QWTHOME=$d + AC_MSG_RESULT(lib${extension}.so detected in $d/lib) + libqwt_name=${extension} + dnl break, libqwt-qt4.so is choosen before libqwt.so since it is surely the Qt4 version. + break + fi + done + if test "x$exist_ok" = "xyes"; then + break + fi + done + fi + fi if test "x$exist_ok" = "xno"; then for d in `echo $LD_LIBRARY_PATH | sed -e "s/:/ /g"` ; do if test -f $d/libqwt.so ; then @@ -69,7 +99,10 @@ if test -z $QWTHOME; then fi if test "x$exist_ok" = "xyes"; then if test -z $QWT_INCDIR; then - QWT_INCDIR=$QWTHOME"/include/qwt" + QWT_INCDIR=$QWTHOME"/include/qwt-qt4" + if test ! -f $QWT_INCDIR/qwt.h ; then + QWT_INCDIR=/usr/include/qwt + fi if test ! -f $QWT_INCDIR/qwt.h ; then QWT_INCDIR=$QWTHOME"/include" fi @@ -81,6 +114,7 @@ if test -z $QWTHOME; then qwt_ok=no fi else + AC_MSG_NOTICE(Trying Qwt from $QWTHOME ...) if test -z $QWT_INCDIR; then QWT_INCDIR="$QWTHOME/include" fi @@ -116,9 +150,9 @@ else LIBS_old=$LIBS LIBS="$LIBS $QT_LIBS" if test "x$QWTHOME" = "x/usr" ; then - LIBS="$LIBS -lqwt" + LIBS="$LIBS -l${libqwt_name}" else - LIBS="$LIBS -L$QWTHOME/lib -lqwt" + LIBS="$LIBS -L$QWTHOME/lib -l${libqwt_name}" fi CXXFLAGS_old=$CXXFLAGS @@ -145,9 +179,9 @@ else else AC_MSG_RESULT(yes) if test "x$QWTHOME" = "x/usr" ; then - QWT_LIBS=" -lqwt" + QWT_LIBS=" -l${libqwt_name}" else - QWT_LIBS="-L$QWTHOME/lib -lqwt" + QWT_LIBS="-L$QWTHOME/lib -l${libqwt_name}" fi fi diff --git a/adm_local/unix/config_files/check_sip.m4 b/adm_local/unix/config_files/check_sip.m4 index 464bdfd7e..f7c60477e 100644 --- a/adm_local/unix/config_files/check_sip.m4 +++ b/adm_local/unix/config_files/check_sip.m4 @@ -1,24 +1,25 @@ -dnl Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE dnl -dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License. +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License. dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl -dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com dnl + AC_DEFUN([CHECK_SIP],[ AC_REQUIRE([CHECK_PYTHON])dnl AC_REQUIRE([CHECK_QT])dnl @@ -71,7 +72,11 @@ if test "x$sip_ok" = "xyes" ; then fi TEST_INC_DIRS="${TEST_INC_DIRS} /usr/include /usr/include/python${PYTHON_VERSION}" TEST_LIB_DIRS="${TEST_LIB_DIRS} /usr/lib${LIB_LOCATION_SUFFIX} /usr/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages" - + TEST_LIB_DIRS="${TEST_LIB_DIRS} /usr/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/dist-packages/PyQt4" + TEST_LIB_DIRS="${TEST_LIB_DIRS} /usr/lib${LIB_LOCATION_SUFFIX}/pymodules/python${PYTHON_VERSION}" + if test "${build_cpu::6}" = "x86_64" ; then + TEST_LIB_DIRS="${TEST_LIB_DIRS} /usr/lib64/python${PYTHON_VERSION}/site-packages" + fi dnl Search sip.h file sip_ok=no for d in ${TEST_INC_DIRS} ; do diff --git a/adm_local/unix/config_files/check_vtk.m4 b/adm_local/unix/config_files/check_vtk.m4 deleted file mode 100644 index c70c5adda..000000000 --- a/adm_local/unix/config_files/check_vtk.m4 +++ /dev/null @@ -1,237 +0,0 @@ -dnl Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -dnl -dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -dnl -dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -dnl -dnl OPTIONS_VTK -dnl ------------------------------------------------------------------------ -dnl Adds the --with-vtk=path and --with-vtk-version configure options -dnl -AC_DEFUN([OPTIONS_VTK], [ - AC_ARG_WITH([vtk], - [AC_HELP_STRING([--with-vtk], [The prefix where VTK is installed (default "" means taking from environment variable)])], - [with_vtk=$withval], [with_vtk=""]) - - AC_ARG_WITH([vtk-version], - [AC_HELP_STRING([--with-vtk-version], [VTK include directory name is vtk-suffix, e.g. vtk-5.0/. What is the suffix? (Default "yes" means taking from environment variable)])], - [vtk_suffix=$withval], [vtk_suffix="yes"]) - - AC_ARG_WITH([paraview], - [AC_HELP_STRING([--with-paraview], [ParaView from the specified location is used instead of VTK (default "" means ParaView should not be used)])]) -]) - -dnl -dnl CHECK_VTK -dnl ------------------------------------------------------------------------ -dnl -AC_DEFUN([CHECK_VTK], [ -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_PROG_CXX])dnl -AC_REQUIRE([AC_PROG_CPP])dnl -AC_REQUIRE([AC_PROG_CXXCPP])dnl -AC_REQUIRE([AC_LINKER_OPTIONS])dnl - -AC_REQUIRE([OPTIONS_VTK])dnl - -AC_CHECKING(for VTK) - -AC_LANG_SAVE -AC_LANG_CPLUSPLUS - -AC_SUBST(VTK_INCLUDES) -AC_SUBST(VTK_LIBS) -AC_SUBST(VTKPY_MODULES) - -VTK_INCLUDES="" -VTK_LIBS="" -VTKPY_MODULES="" - -vtk_ok=no - -if test "x$OpenGL_ok" != "xyes" ; then - AC_MSG_WARN(VTK needs OpenGL correct configuration, check configure output) -fi - -AC_PATH_X -if test "x$x_libraries" != "x" -then - LXLIB="-L$x_libraries" -else - LXLIB="" -fi - -if test "x$x_libraries" = "x/usr/lib" -then - LXLIB="" -fi - -if test "x$x_libraries" = "x/usr/lib${LIB_LOCATION_SUFFIX}" -then - LXLIB="" -fi - -LOCAL_INCLUDES="$OGL_INCLUDES" -LOCAL_LIBS="-lvtkCommon -lvtkGraphics -lvtkImaging -lvtkFiltering -lvtkIO -lvtkRendering -lvtkHybrid -lvtkParallel -lvtkWidgets $LXLIB -lX11 -lXt" -TRY_LINK_LIBS="-lvtkCommon $LXLIB -lX11 -lXt" - -dnl VTK version suffix -if test -z $vtk_suffix ; then - vtk_suffix="yes" -fi -if test "x$vtk_suffix" == "xno" ; then - dnl in case user wrote --with-vtk-version=no, use empty suffix - vtk_suffix="" -fi -if test "x$vtk_suffix" != "xyes" ; then - VTKSUFFIX="$vtk_suffix" -else - dnl in case user wrote --with-vtk-version=yes, get the suffix from env - if test -z $VTKSUFFIX ; then - VTKSUFFIX="-5.0" - fi -fi - -dnl VTK install dir -if test -z $with_vtk ; then - with_vtk="" -fi -if test "x$with_vtk" = "xyes" ; then - dnl in case user wrote --with-vtk=yes - with_vtk="" -fi -if test "x$with_vtk" = "xno" ; then - dnl in case user wrote --with-vtk=no - with_vtk="" - AC_MSG_WARN(Value "no", specified for option --with-vtk, is not supported) -fi - -if test "x$with_vtk" != "x" ; then - VTKHOME="$with_vtk" -else - if test -z $VTKHOME ; then - AC_MSG_WARN(undefined VTKHOME variable which specify where vtk was compiled) - for d in /usr/local /usr ; do - if test -f ${d}/include/vtk${VTKSUFFIX}/vtkPlane.h ; then - AC_MSG_RESULT(trying ${d}) - VTKHOME="${d}" - break - else - if test -f ${d}/include/vtk-5.0/vtkPlane.h ; then - AC_MSG_RESULT(trying ${d}) - VTKHOME="${d}" - VTKSUFFIX="-5.0" - break - else - if test -f ${d}/include/vtk/vtkPlane.h ; then - AC_MSG_RESULT(trying ${d}) - VTKHOME="${d}" - VTKSUFFIX="" - break - fi - fi - fi - done - fi -fi - -# Using regular VTK installation -if test "x$with_paraview" = "x" ; then - LOCAL_INCLUDES="-I$VTKHOME/include/vtk${VTKSUFFIX} $LOCAL_INCLUDES" - LOCAL_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk${VTKSUFFIX} $LOCAL_LIBS" - TRY_LINK_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX} -L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk${VTKSUFFIX} $TRY_LINK_LIBS" - if test "x$VTKHOME" != "x/usr" ; then - LOCAL_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX} $LOCAL_LIBS" - fi -else -# VTK from ParaView overrides other VTK versions - if test "${with_paraview}" = "yes" ; then - if test -z $PVHOME ; then - PVHOME="/usr" - fi - else - PVHOME=${with_paraview} - fi - - if test -z $PVSRCHOME ; then - PVSRCHOME="$PVHOME/src" - fi - - if test -z $PVINSTALLHOME ; then - PVINSTALLHOME="$PVHOME/bin" - fi - - LOCAL_INCLUDES="-I$PVSRCHOME/VTK/Common -I$PVSRCHOME/VTK/Filtering -I$PVSRCHOME/VTK/GenericFiltering -I$PVSRCHOME/VTK/Graphics -I$PVSRCHOME/VTK/Hybrid -I$PVSRCHOME/VTK/Imaging -I$PVSRCHOME/VTK/Infovis -I$PVSRCHOME/VTK/IO -I$PVSRCHOME/VTK/Parallel -I$PVSRCHOME/VTK/Rendering -I$PVSRCHOME/VTK/Utilities -I$PVSRCHOME/VTK/Views -I$PVSRCHOME/VTK/VolumeRendering -I$PVSRCHOME/VTK/Widgets -I$PVINSTALLHOME/VTK -I$PVINSTALLHOME/VTK/Common -I$PVINSTALLHOME/VTK/Filtering -I$PVINSTALLHOME/VTK/GenericFiltering -I$PVINSTALLHOME/VTK/Graphics -I$PVINSTALLHOME/VTK/Hybrid -I$PVINSTALLHOME/VTK/Imaging -I$PVINSTALLHOME/VTK/Infovis -I$PVINSTALLHOME/VTK/IO -I$PVINSTALLHOME/VTK/Parallel -I$PVINSTALLHOME/VTK/Rendering -I$PVINSTALLHOME/VTK/Utilities -I$PVINSTALLHOME/VTK/Views -I$PVINSTALLHOME/VTK/VolumeRendering -I$PVINSTALLHOME/VTK/Widgets $LOCAL_INCLUDES" - LOCAL_LIBS="-L$PVINSTALLHOME/bin -lvtksys -lvtkzlib -lvtkpng -lvtkjpeg -lvtktiff -lvtkexpat -lvtksqlite -lvtkmetaio -lvtkverdict -lvtkNetCDF -lvtkDICOMParser -lvtkfreetype -lvtkftgl -lvtkexoIIc $LOCAL_LIBS" - TRY_LINK_LIBS="-L$PVINSTALLHOME/bin -lvtksys $TRY_LINK_LIBS" -fi - -dnl vtk headers -CPPFLAGS_old="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS $LOCAL_INCLUDES" - -AC_CHECK_HEADER(vtkPlane.h,vtk_ok="yes",vtk_ok="no") - -CPPFLAGS="$CPPFLAGS_old" - -if test "x$vtk_ok" = "xyes" -then - VTK_INCLUDES="$LOCAL_INCLUDES" - - dnl vtk libraries - - AC_MSG_CHECKING(linking VTK library) - - LIBS_old="$LIBS" - LIBS="$LIBS $TRY_LINK_LIBS" - #LIBS="$LIBS $LOCAL_LIBS" - CPPFLAGS_old="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $VTK_INCLUDES" - - dnl VTKPY_MODULES="$VTKHOME/python" - - AC_CACHE_VAL(salome_cv_lib_vtk,[ - AC_TRY_LINK([#include "vtkPlane.h" - ], - [vtkPlane::New()], - [salome_cv_lib_vtk=yes], - [salome_cv_lib_vtk=no]) - ]) - vtk_ok="$salome_cv_lib_vtk" - LIBS="$LIBS_old" - CPPFLAGS="$CPPFLAGS_old" -fi - -if test "x$vtk_ok" = "xno" -then - AC_MSG_RESULT(no) - AC_MSG_WARN(unable to link with vtk library) -else - AC_MSG_RESULT(yes) - VTK_LIBS="$LOCAL_LIBS" - VTK_MT_LIBS="$LOCAL_LIBS" -fi - -AC_MSG_RESULT(for VTK: $vtk_ok) - -AC_LANG_RESTORE - -# Save cache -AC_CACHE_SAVE - -])dnl diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am index f21fc7076..260923bdc 100644 --- a/adm_local/unix/make_common_starter.am +++ b/adm_local/unix/make_common_starter.am @@ -1,24 +1,33 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2003-2007 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 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. +# 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 +# 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + +# ============================================================ +# The following is to avoid PACKAGE_... env variable +# redefinition compilation warnings +# ============================================================ +# +AM_CXXFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h -I$(top_builddir) +AM_CPPFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h -I$(top_builddir) + # ============================================================ # This file defines the common definitions used in several # Makefile. This file must be included, if needed, by the file @@ -28,6 +37,7 @@ # salomeincludedir = $(includedir)/salome libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/salome +libparaviewdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/paraview bindir = $(prefix)/bin/salome salomescriptdir = $(bindir) salomepythondir = $(pythondir)/salome @@ -39,6 +49,9 @@ salomeidldir = $(prefix)/idl/salome # Directory for installing resource files salomeresdir = $(prefix)/share/salome/resources/@MODULE_NAME@ +# Directory for installing plugins files +salomepluginsdir = $(prefix)/share/salome/plugins/@MODULE_NAME@ + # Directories for installing admin files admlocaldir = $(prefix)/adm_local admlocalunixdir = $(admlocaldir)/unix diff --git a/adm_local/unix/make_conclude.in b/adm_local/unix/make_conclude.in deleted file mode 100644 index 69822e437..000000000 --- a/adm_local/unix/make_conclude.in +++ /dev/null @@ -1,445 +0,0 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -#======================================================================= -# This section of this makefile comes from the file -# 'adm/unix/make_conclude' which was generated with config.status -# from file adm/unix/make_conclude.in -#======================================================================= -# -* Makefile *- -# Authors : Patrick GOLDBRONN (CEA) - Marc Tajchman (CEA) -# Date : 6/07/2001 -# $Header$ -# -ifneq ($(GUI_DISABLE_CORBA),yes) -# ORB Specifics rules - -@CORBA@ - -# transform idl reference in appropriate obj file -LIB_CLIENT_SRC = $(LIB_CLIENT_IDL:%.idl=%$(IDL_CLN_CXX)) -LIB_SERVER_SRC = $(LIB_SERVER_IDL:%.idl=%$(IDL_SRV_CXX)) -LIB_SWIG_SRC = $(SWIG_DEF:%.i=%_wrap.cxx) -else -LIB_CLIENT_SRC = -LIB_SERVER_SRC = -LIB_SWIG_SRC = -endif - -LIB_MOC_SRC = $(LIB_MOC:%.h=%_moc.cxx) -LIB_SRC+=$(LIB_MOC_SRC) -LIB_DEP= $(LIB_SRC) $(LIB_CLIENT_SRC) $(LIB_SERVER_SRC) $(LIB_SWIG_SRC) - -ifneq ($(GUI_DISABLE_CORBA),yes) -LIB_CLIENT_OBJ = $(LIB_CLIENT_IDL:%.idl=%$(IDL_CLN_OBJ)) -LIB_SERVER_OBJ = $(LIB_SERVER_IDL:%.idl=%$(IDL_SRV_OBJ)) -LIB_SWIG_OBJ = $(LIB_SWIG_SRC:%.cxx=%.lo) -else -LIB_CLIENT_OBJ = -LIB_SERVER_OBJ = -LIB_SWIG_OBJ = -endif - -# transform c file in appropriate libtool obj file (.c, .cc and .cxx) -LIB_OBJ_C = $(patsubst %.c, %.lo, $(filter %.c, $(LIB_SRC))) -LIB_OBJ_CC = $(patsubst %.cc, %.lo, $(filter %.cc, $(LIB_SRC))) -LIB_OBJ_CXX = $(patsubst %.cxx, %.lo, $(filter %.cxx, $(LIB_SRC))) -LIB_OBJ_F = $(patsubst %.f, %.lo, $(filter %.f, $(LIB_SRC))) - -# all libtool obj file in library -LIB_OBJ = $(LIB_OBJ_CXX) $(LIB_OBJ_CC) $(LIB_OBJ_C) $(LIB_CLIENT_OBJ:%.o=%.lo) $(LIB_SERVER_OBJ:%.o=%.lo) $(LIB_SWIG_OBJ) $(LIB_OBJ_F) - -# LIB_BUILD = $(LIB:%.la=$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/%.la) -LIB_BUILD = $(patsubst %.la, $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/%.la, $(filter %.la, $(LIB))) -LIB_BUILD_A = $(patsubst %.a, $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/%.a, $(filter %.a, $(LIB))) -LIB_BUILD_SO = $(patsubst %.so, $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/%.so, $(filter %.so, $(LIB))) - -ifneq ($(findstring cmodule.la,$(filter %.la, $(LIB))),) -ifneq ($(GUI_DISABLE_CORBA),yes) -LIB_SWIG = $(patsubst %cmodule.la,%.so, $(filter %.la, $(LIB))) -else -LIB_SWIG = -endif -else -LIB_SWIG = -endif - -lib: $(LIB_BUILD) $(LIB_BUILD_SO) $(LIB_CLIENT_PY) -# we don't build static library ! - -$(LIB_BUILD): $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/%.la: %.la - -$(RM) $@ - -$(RM) $(patsubst %.la, %.so, $@) - -$(RM) $(patsubst %.la, %.a, $@) - ln -sf $(CURDIR)/$< $@ || true - ln -sf $(patsubst %.la, %.so, $(CURDIR)/.libs/$<) \ - $(patsubst %.la, %.so, $@) || true - ln -sf $(patsubst %.la, %.so, $(CURDIR)/.libs/$<).0 \ - $(patsubst %.la, %.so, $@).0 || true - - if ! test -z $(LIB_SWIG) ; then \ - ln -sf $(patsubst %.la,%.so, $(CURDIR)/.libs/$<) $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/_$(LIB_SWIG) || true;\ - fi; - -$(LIB_BUILD_A): $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/%.a: %.a - -$(RM) $@ - ln -sf $(CURDIR)/$< $@ || true - -$(LIB_BUILD_SO): $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/%.so: %.so - -$(RM) $@ - ln -sf $(CURDIR)/$< $@ || true - -$(LIB): $(LIB_OBJ) - @$(LT) --mode=link $(CXX) -shared -rpath $(libdir) -o $@ $(CXXFLAGS) $(LIB_OBJ) $(LDFLAGS) $(LIBS) - -# transform idl reference in appropriate obj file -ifneq ($(GUI_DISABLE_CORBA),yes) -BIN_CLIENT_SRC = $(BIN_CLIENT_IDL:%.idl=%$(IDL_CLN_CXX)) -BIN_SERVER_SRC = $(BIN_SERVER_IDL:%.idl=%$(IDL_SRV_CXX)) -else -BIN_CLIENT_SRC = -BIN_SERVER_SRC = -endif -BIN_MOC_SRC = $(BIN_MOC:%.h=%_moc.cxx) -BIN_SRC+=$(BIN_MOC_SRC) -BIN_DEP=$(BIN:%=%.cxx) $(BIN_SRC) $(BIN_CLIENT_SRC) $(BIN_SERVER_SRC) - -ifneq ($(GUI_DISABLE_CORBA),yes) -BIN_CLIENT_OBJ = $(BIN_CLIENT_IDL:%.idl=%$(IDL_CLN_OBJ)) -BIN_SERVER_OBJ = $(BIN_SERVER_IDL:%.idl=%$(IDL_SRV_OBJ)) -else -BIN_CLIENT_OBJ = -BIN_SERVER_OBJ = -endif -# transform c file in appropriate libtool obj file (.c) -BIN_OBJ_C = $(patsubst %.c, %.o, $(filter %.c, $(BIN_SRC))) -# transform c++ file in appropriate libtool obj file (.cc and .cxx) -BIN_OBJ_CC = $(patsubst %.cc, %.o, $(filter %.cc, $(BIN_SRC))) -BIN_OBJ_CXX = $(patsubst %.cxx, %.o, $(filter %.cxx, $(BIN_SRC))) -# all obj file in bin target -BIN_OBJ = $(BIN_OBJ_CC) $(BIN_OBJ_CXX) $(BIN_OBJ_C) $(BIN_CLIENT_OBJ) $(BIN_SERVER_OBJ) - -bin: $(BIN:%=$(top_builddir)/bin/salome/%) $(BIN) $(LIB) pyscripts sharedpyscripts - -BIN_LIB=$(LIB:lib%.la=-l%) - -$(BIN:%=$(top_builddir)/bin/salome/%) $(TEST_PROGS:%=$(top_builddir)/bin/salome/%): $(top_builddir)/bin/salome/%: % - -$(RM) $@ - ln -sf $(CURDIR)/$< $@ - -$(BIN) $(TEST_PROGS): %: %.lo $(BIN_OBJ) - $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(BIN_LIB) $(LDFLAGSFORBIN) $(LIBSFORBIN) - -# copy python scripts in $(top_builddir)/bin/salome -# - -UI_FILES = $(notdir $(wildcard $(srcdir)/*.ui)) -UI_PY_FILES_PY = $(patsubst %.ui, %.py, $(UI_FILES)) -UI_PY_FILES = $(filter-out $(EXPORT_PYSCRIPTS) ,$(UI_PY_FILES_PY)) - -DEST_PYSCRIPTS = $(EXPORT_PYSCRIPTS:%=$(top_builddir)/bin/salome/%) -DEST_UI_PY_FILES = $(UI_PY_FILES:%=$(top_builddir)/bin/salome/%) -pyscripts: $(DEST_PYSCRIPTS) $(UI_PY_FILES) $(DEST_UI_PY_FILES) -$(DEST_PYSCRIPTS): $(top_builddir)/bin/salome/%: % - cp -f $< $@ - -# generate generic python scripts from *.ui files -# -$(UI_PY_FILES): %.py: %.ui - $(PYUIC) $< -o $@ - -# copy ui-generated python scripts in $(top_builddir)/bin -# -$(DEST_UI_PY_FILES): $(top_builddir)/bin/salome/%: % - cp -f $< $@ - -# copy pyqt files in $(PYTHON_SHARED_SITE) -# -PYTHON_SHARED_SITE=$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules - -$(PYTHON_SHARED_SITE): - $(INSTALL) -d $@ - -DEST_SHAREDPYSCRIPTS = $(EXPORT_SHAREDPYSCRIPTS:%=$(PYTHON_SHARED_SITE)/%) -sharedpyscripts: $(PYTHON_SHARED_SITE) $(DEST_SHAREDPYSCRIPTS) -$(DEST_SHAREDPYSCRIPTS): $(PYTHON_SHARED_SITE)/%: % - cp -f $< $@ - -check: test - -tests: unittest - -test: $(LIB) $(TEST_PROGS:%=$(top_builddir)/bin/salome/%) - -unittest: - @if test "x$(UNIT_TEST_PROG)" != "x"; then \ - $(top_builddir)/bin/salome/$(UNIT_TEST_PROG); \ - fi; - -# copy header file in $(inc_builddir) -# -DEST_HEADERS = $(EXPORT_HEADERS:%=$(inc_builddir)/%) -inc: $(DEST_HEADERS) -$(DEST_HEADERS): $(inc_builddir)/%: % - cp -f $< $@ - -# build resources file (icons and messages) : .qm file from .po file -RESOURCES_FILES_ALL := $(notdir $(wildcard $(srcdir)/resources/*)) -RESOURCES_FILES_ALL := $(filter-out CVS, $(RESOURCES_FILES_ALL)) -RESOURCES_FILES_ALL := $(filter-out %.po, $(RESOURCES_FILES_ALL)) -RESOURCES_FILES_ALL := $(filter-out %.in, $(RESOURCES_FILES_ALL)) -RESOURCES_FILES ?= $(RESOURCES_FILES_ALL) - -resources: resources-po resources-cp - -resources-po: $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%.qm) - -resources-cp: $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%) - -$(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%): $(top_builddir)/share/salome/resources/$(MODULE_NAME)/% : % - cp -fr $< $@; - -# Make installation directories if they don't exist. -$(libdir) $(includedir) $(bindir) $(datadir) $(idldir) $(sharedpydir): - $(INSTALL) -d $@ && chmod 755 $@ - -# Install the library, the public header files, and programs. -install: $(LIB) $(BIN) $(TEST_PROGS) $(libdir) $(includedir) $(bindir) $(datadir) $(idldir) install-python install-sharedpyqt install-qm install-res - @for f in X $(LIB); do \ - if test $$f != X; then \ - ($(LT_INSTALL_LIB) $$f $(libdir)/. || exit 1); \ - fi; \ - done - @if ! test -z $(LIB_SWIG) ; then \ - (cd $(libdir); ln -sf $(patsubst %.so, %cmodule.so, $(LIB_SWIG)) _$(LIB_SWIG) || true); \ - fi; - @for f in X $(BIN); do \ - if test $$f != X; then \ - ($(LT_INSTALL_PROG) $$f $(bindir)/. || exit 1); \ - fi; \ - done -# Install tests programmes in bindir - @for f in X $(TEST_PROGS); do \ - if test $$f != X; then \ - ($(LT_INSTALL_PROG) $$f $(bindir)/. || exit 1); \ - fi; \ - done -# Install exported includes in includedir - @for f in X $(EXPORT_HEADERS:%=$(srcdir)/%); do \ - if test $$f != X; then \ - (cp -p -f $$f $(includedir) || exit 1); \ - fi; \ - done - -# Install python script in $(bindir) -install-python: $(bindir) $(EXPORT_PYSCRIPTS:%=install-%) $(UI_PY_FILES:%=install-%) - -$(UI_PY_FILES:%=install-%): install-%: % - $(INSTALL_PROGRAM) $< $(bindir)/. - -$(EXPORT_PYSCRIPTS:%=install-%): install-%: % - $(INSTALL_PROGRAM) $< $(bindir)/. - -#install-python: $(bindir) $(EXPORT_PYSCRIPTS) -# @for f in X $(EXPORT_PYSCRIPTS); do \ -# if test $$f != X; then \ -# ($(INSTALL_PROGRAM) $$f $(bindir)/. || exit 1); \ -# fi; \ -# done - -# Install pyqt script in $(install-sharedpyqt) -install-sharedpyqt: $(sharedpydir) $(EXPORT_SHAREDPYSCRIPTS:%=install-%) - -$(EXPORT_SHAREDPYSCRIPTS:%=install-%): install-%: % - $(INSTALL_PROGRAM) $< $(sharedpydir)/. - - -# generic rule to install .qm files : -install-qm: resources - $(INSTALL) -d $(datadir)/resources/$(MODULE_NAME) - @for f in X $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%.qm); do \ - if test $$f != X; then \ - ($(INSTALL_DATA) $$f $(datadir)/resources/$(MODULE_NAME)/. || exit 1); \ - fi; \ - done - -# generic rule to install resources files (png, ini ...): -install-res: resources - $(INSTALL) -d $(datadir)/resources/$(MODULE_NAME) - @for f in X $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%); do \ - if test $$f != X; then \ - ($(INSTALL_DATA) $$f $(datadir)/resources/$(MODULE_NAME)/. || exit 1); \ - fi; \ - done - -# Removes those things that `make install' (would have) installed. -uninstall: - @if test "X$(LIB)" != X; then \ - for f in $(LIB); do \ - $(LT_UNINSTALL) $(libdir)/$$f; \ - done; \ - fi - @if test "X$(BIN)" != X; then \ - for f in $(BIN); do \ - $(LT_UNINSTALL) $(bindir)/$$f; \ - done; \ - fi - @for f in X $(TEST_PROGS); do \ - if test $$f != X; then \ - $(LT_UNINSTALL) $(bindir)/$$f; \ - fi; \ - done -# Uninstall exported includes in includedir - @for f in X $(EXPORT_HEADERS); do \ - if test $$f != X; then \ - $(LT_UNINSTALL) $(includedir)/$$f; \ - fi; \ - done -# Uninstall python script in $(bindir) - @for f in X $(EXPORT_PYSCRIPTS); do \ - if test $$f != X; then \ - $(LT_UNINSTALL) $(bindir)/$$f ; \ - fi; \ - done - -# Uninstall python script in $(bindir) - @for f in X $(UI_PY_FILES); do \ - if test $$f != X; then \ - $(LT_UNINSTALL) $(bindir)/$$f ; \ - fi; \ - done - -# Uninstall pyqt script in $(sharedpydir) - @for f in X $(EXPORT_SHAREDPYSCRIPTS); do \ - if test $$f != X; then \ - $(LT_UNINSTALL) $(sharedpydir)/$$f ; \ - fi; \ - done - -# Uninstall qm files - @for f in X $(PO_FILES:%.po=%.qm); do \ - if test $$f != X; then \ - $(LT_UNINSTALL) $(datadir)/resources/$(MODULE_NAME)/$$f ; \ - fi; \ - done - -# remove all dependencies files -# -cleandep: - -$(RM) .dep* - -# Removes temporary files without removing the final target files. That is, -# remove things like object files but not libraries or executables. -# -mostlyclean: cleandep - -$(RM) $(LIB_OBJ) $(LIB_OBJ:.lo=.o) - -$(RM) $(BIN_OBJ) $(BIN:%=%.o) - -$(RM) $(TEST_OBJ) $(TEST_OBJ:.lo=.o) - -$(RM) $(PROG_OBJ) $(PROG_OBJ:.lo=.o) $(MOSTLYCLEAN) - -# Like `mostlyclean' except it also removes the final targets: things like -# libraries and executables. This target doesn't remove any file that -# is part of the SALOME distribution. -# -clean: mostlyclean - -$(RM) $(LIB) $(TEST_PROGS) $(BIN) $(CLEAN) - -$(RM) TAGS *~ *# core *.core - -$(RM) -r .libs - -$(RM) $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/$(LIB) - -$(RM) $(patsubst %,$(top_builddir)/bin/salome/%, $(BIN)) - -$(RM) $(patsubst %.la, %.so, $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/$(LIB)) - -$(RM) $(patsubst %.la, %.a, $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/$(LIB)) -# remove idl generated files (sources) - -$(RM) $(LIB_CLIENT_SRC) $(LIB_SERVER_SRC) $(BIN_CLIENT_SRC) $(BIN_SERVER_SRC) -# remove idl generated files (headers) - -$(RM) $(LIB_CLIENT_IDL:%.idl=%$(IDL_CLN_H)) $(LIB_SERVER_IDL:%.idl=%$(IDL_SRV_H)) - -$(RM) $(BIN_CLIENT_IDL:%.idl=%$(IDL_CLN_H)) $(BIN_SERVER_IDL:%.idl=%$(IDL_SRV_H)) - -$(RM) $(LIB_MOC_SRC) $(BIN_MOC_SRC) - -$(RM) $(LIB_SWIG_SRC) - -# Like `clean' except it also removes files that were created by running -# configure. If you've unpacked the source and built without creating -# any other files, then `make distclean' will leave only the files that were -# in the distribution. -# -distclean: clean - #remove qm file ! - -$(RM) $(PO_FILES:%.po=%.qm) $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%.qm) - #remove include files - -$(RM) $(DEST_HEADERS) - -$(RM) $(DISTCLEAN) *.bak *.old *.new .dep* - @if test -f $(srcdir)/Makefile.in; then \ - (@SETX@; $(RM) Makefile); \ - fi - - -#implicits rules -.cc.o: - $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< - -.cc.lo: - $(LT) --mode=compile $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< - -.cxx.o: - $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< - -.cxx.lo: - $(LT) --mode=compile $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< - -.c.o: - $(CC) $(CFLAGS) $(CPPFLAGS) -c $< - -.c.lo: - $(LT_COMPILE) $(CFLAGS) $(CPPFLAGS) -c $< - -.f.o: - $(FC) $(FFLAGS) -c $< -o $@ - -.f.lo: - $(LT) --mode=compile $(FC) $(FFLAGS) -c $< - -.ui.h: - $(UIC) -o $@ $< - -.ui.cxx: - $(UIC) -o $@ -i $*.h $< - -#pattern rules -%_moc.cxx : %.h - $(MOC) $< -o $@ - -%_wrap.cxx : %.i - $(SWIG) $(SWIG_FLAGS) -o $@ $< - -$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%.qm: %.po - $(MSG2QM) $< $@ ; \ - -#------------------------------------------------------------------------------ -# The following section of this makefile contains dependencies between the -# source files and the header files. If GNU make and GCC are being used then -# the dependencies are in the form of rules that cause the information to -# be kept updated automatically. Otherwise the dependencies are listed -# explicitly and come from the `.distdep' files in the various directories. -# These files are part of the distribution and are generated automatically on -# GNU/GCC systems. -#------------------------------------------------------------------------------ - -@DEPEND@ diff --git a/bin/Makefile.am b/bin/Makefile.am index 7d549a912..3d62fcb8a 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,24 +1,25 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2003-2007 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 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. +# 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 +# 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # -* Makefile *- # Author : Guillaume Boulant (CSSI) # Module : KERNEL @@ -33,3 +34,7 @@ nodist_salomescript_DATA = VERSION dist_salomescript_SCRIPTS = \ runLightSalome.csh \ runLightSalome.sh + +# python files +dist_salomescript_PYTHON = \ + gui_setenv.py diff --git a/bin/VERSION.in b/bin/VERSION.in index 1582d527a..68c192d24 100755 --- a/bin/VERSION.in +++ b/bin/VERSION.in @@ -1 +1,3 @@ -THIS IS SALOME - SALOMEGUI VERSION: @VERSION@ +[SALOME GUI] : @VERSION@ +[DEVELOPMENT] : @VERSION_DEV@ +[DESCRIPTION] : SALOME GUI module (SUIT) diff --git a/bin/runLightSalome.csh b/bin/runLightSalome.csh index 51b64d9f5..8101300c2 100755 --- a/bin/runLightSalome.csh +++ b/bin/runLightSalome.csh @@ -1,24 +1,24 @@ #!/bin/csh -f -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2003-2007 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 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. +# 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 +# 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # File : runLightSalome.csh # Author : Vadim SANDLER, Open CASCADE S.A.S, vadim.sandler@opencascade.com diff --git a/bin/runLightSalome.sh b/bin/runLightSalome.sh index 8caaaa916..7fb497840 100755 --- a/bin/runLightSalome.sh +++ b/bin/runLightSalome.sh @@ -1,149 +1,240 @@ #!/bin/bash -f -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE + +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2003-2007 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 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. +# 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 +# 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # File : runLightSalome.sh # Author : Vadim SANDLER, Open CASCADE S.A.S, vadim.sandler@opencascade.com + + ### -# set default value for the LightAppConfig variable, which -# is necessary for loading of .ini or .xml resources file +# function show_usage() : print help an exit ### -# -if [ -z "$LightAppConfig" ] ; then - export LightAppConfig=${GUI_ROOT_DIR}/share/salome/resources/gui -else - export LightAppConfig=${LightAppConfig}:${GUI_ROOT_DIR}/share/salome/resources/gui -fi -if [ -z "$LightAppResources" ] ; then - export LightAppResources=${GUI_ROOT_DIR}/share/salome/resources/gui -else - export LightAppResources=${LightAppResources}:${GUI_ROOT_DIR}/share/salome/resources/gui -fi + +show_usage() { + local RET=0 + if [ $# -gt 0 ] ; then RET=$1 ; fi + local MOVE1="echo -en \\033[35G" + local MOVE2="echo -en \\033[22G" + echo + echo "Run standalone SALOME desktop". + echo + echo "Usage: $(basename $0) [options]" + echo + echo "Options:" + echo " * all options have both short and long format;" + echo " * some options require additional parameter (below referenced as )" + echo " which should be separated by = symbol from the option itself." + echo + echo -en " --help" + ${MOVE2} ; echo -en "(-h)" + ${MOVE1} ; echo "Display this information and exit." + echo -en " --version" + ${MOVE2} ; echo -en "(-v)" + ${MOVE1} ; echo "Print SALOME version and exit." + echo -en " --modules=" + ${MOVE2} ; echo -en "(-m)" + ${MOVE1} ; echo "List of modules, separated by comma, to be used within SALOME session." + echo + echo "Example:" + echo " $(basename $0) --modules=LIGHT,PYLIGHT" + echo + exit ${RET} +} ### -# process --modules=... command line option (get list of modules) +# function show_version() : print SALOME version an exit ### -modules="" - -for arg in X $* ; do - if [ "$arg" != "X" ] ; then - case $arg in - --modules=* ) modules=`echo $arg | awk -F= '{ print $2 }' | sed -e "s%,% %g"` ;; - *) ;; - esac +show_version() { + local RET=0 + local DIR=$(dirname $0) + if [ -z "${DIR}" ] ; then DIR=. ; fi + if [ -f ${DIR}/VERSION ] ; then + cat ${DIR}/VERSION + else + echo + echo "Error: can't find VERSION file" > /dev/stderr + echo + RET=1 fi -done - -modules="KERNEL GUI $modules" + exit ${RET} +} ### -# exclude modules duplication +# function option_modules() : process --modules / -m command line option ### -mods="" - -for mod in $modules ; do - echo $mods | grep -E "\<$mod\>" >/dev/null 2>&1 - if [ "$?" == "1" ] ; then - mods="$mods $mod" +option_modules() { + local MODS=`echo $1 | awk -F "=" '{ if(NF>1) print $2 ; else print $1 }'` + if [ "X${MODS}" = "X" ] ; then + echo + echo "Error: Please, specify list of modules" > /dev/stderr + echo + exit 1 fi -done + MODULES=`echo ${MODS} | sed -e "s%,% %g"` + return +} + ### -# set additional environment +# function run_light_salome(): run SALOME ### -python_version=`python -c "import sys; print sys.version[:3]" 2>/dev/null` - -MY_PATH="" -MY_LD_LIBRARY_PATH="" -MY_PYTHONPATH="" - -for mod in $mods ; do - if [ "$arg" != "X" ] ; then - root_dir=`printenv ${mod}_ROOT_DIR` - if [ "$root_dir" != "" ] ; then - mod_lower=`echo $mod | tr "A-Z" "a-z"` - if [ -d ${root_dir}/bin/salome ] ; then - if [ "${MY_PATH}" == "" ] ; then - MY_PATH=${root_dir}/bin/salome - else - MY_PATH=${MY_PATH}:${root_dir}/bin/salome - fi - fi - if [ -d ${root_dir}/lib/salome ] ; then - if [ "${MY_LD_LIBRARY_PATH}" == "" ] ; then - MY_LD_LIBRARY_PATH=${root_dir}/lib/salome - else - MY_LD_LIBRARY_PATH=${MY_LD_LIBRARY_PATH}:${root_dir}/lib/salome - fi +run_light_salome(){ + + local MODULES + + ### + # process command line options + ### + + local OPTION + while getopts ":-:hvm:" OPTION "$@" ; do + if [ "${OPTION}" = "-" ] ; then + case ${OPTARG} in + help ) show_usage ;; + version ) show_version ;; + modules* ) option_modules "${OPTARG}" ;; + * ) echo "!!!Wrong option!!!" ; exit 1 ;; + esac + else + case ${OPTION} in + h ) show_usage ;; + v ) show_version ;; + m* ) option_modules "${OPTARG}" ;; + ? ) echo "!!!Wrong option!!!" ; exit 1 ;; + esac + fi + done + shift $((OPTIND - 1)) + + ### + # by default try to detect all available modules + ### + + if [ -z "${MODULES}" ] ; then + local ENVVAR + local ROOTDIR + for ENVVAR in `env | awk -F= '{print $1}' | grep _ROOT_DIR` ; do + local MOD=`echo $ENVVAR | awk -F_ '{print $1}'` + local LMOD=`echo ${MOD} | tr 'A-Z' 'a-z'` + ROOTDIR=`printenv ${ENVVAR}` + if [ -f ${ROOTDIR}/share/salome/resources/${LMOD}/LightApp.xml ] || [ -f ${ROOTDIR}/share/salome/resources/LightApp.xml ] ; then + MODULES="${MODULES} ${MOD}" fi - if [ "${python_version}" != "" ] ; then - if [ -d ${root_dir}/bin/salome ] ; then - if [ "${MY_PYTHONPATH}" == "" ] ; then - MY_PYTHONPATH=${root_dir}/bin/salome - else - MY_PYTHONPATH=${MY_PYTHONPATH}:${root_dir}/bin/salome - fi - fi - if [ -d ${root_dir}/lib/salome ] ; then - if [ "${MY_PYTHONPATH}" == "" ] ; then - MY_PYTHONPATH=${root_dir}/lib/salome - else - MY_PYTHONPATH=${MY_PYTHONPATH}:${root_dir}/lib/salome - fi - fi - if [ -d ${root_dir}/lib/python${python_version}/site-packages/salome ] ; then - if [ "${MY_PYTHONPATH}" == "" ] ; then - MY_PYTHONPATH=${root_dir}/lib/python${python_version}/site-packages/salome - else - MY_PYTHONPATH=${MY_PYTHONPATH}:${root_dir}/lib/python${python_version}/site-packages/salome - fi - fi + done + fi + + ### + # initial environment + ### + + if [ -z "${LightAppResources}" ] ; then + export LightAppResources=${GUI_ROOT_DIR}/share/salome/resources/gui + else + export LightAppResources=${LightAppResources}:${GUI_ROOT_DIR}/share/salome/resources/gui + fi + + MODULES="KERNEL GUI ${MODULES}" + + ### + # exclude modules duplication + ### + + local MODS="" + local MOD + for MOD in ${MODULES} ; do + echo ${MODS} | grep -E "\<${MOD}\>" >/dev/null 2>&1 + if [ "$?" == "1" ] ; then + MODS="${MODS} ${MOD}" + fi + done + MODULES=${MODS} + + ### + # set additional environment + ### + + local PVERSION=`python -c "import sys; print sys.version[:3]" 2>/dev/null` + + local MY_PATH="" + local MY_LD_LIBRARY_PATH="" + local MY_PYTHONPATH="" + + for MOD in ${MODULES} ; do + local ROOTDIR=`printenv ${MOD}_ROOT_DIR` + if [ -z "${ROOTDIR}" ] ; then continue ; fi + local LMOD=`echo ${MOD} | tr 'A-Z' 'a-z'` + if [ -d ${ROOTDIR}/bin/salome ] ; then + MY_PATH=${MY_PATH}:${ROOTDIR}/bin/salome + fi + if [ -d ${ROOTDIR}/lib/salome ] ; then + MY_LD_LIBRARY_PATH=${MY_LD_LIBRARY_PATH}:${ROOTDIR}/lib/salome + fi + if [ "${PVERSION}" != "" ] ; then + if [ -d ${ROOTDIR}/bin/salome ] ; then + MY_PYTHONPATH=${MY_PYTHONPATH}:${ROOTDIR}/bin/salome fi - if [ "$mod" != "KERNEL" ] && [ "$mod" != "GUI" ] ; then - export LightAppConfig=${LightAppConfig}:${root_dir}/share/salome/resources/${mod_lower} + if [ -d ${ROOTDIR}/lib/salome ] ; then + MY_PYTHONPATH=${MY_PYTHONPATH}:${ROOTDIR}/lib/salome fi - if [ "${SALOMEPATH}" == "" ] ; then - export SALOMEPATH=${root_dir} - else - export SALOMEPATH=${SALOMEPATH}:${root_dir} + if [ -d ${ROOTDIR}/lib/python${PVERSION}/site-packages/salome ] ; then + MY_PYTHONPATH=${MY_PYTHONPATH}:${ROOTDIR}/lib/python${PVERSION}/site-packages/salome fi fi - fi -done - -if [ "${MY_PATH}" != "" ] ; then - export PATH=${MY_PATH}:${PATH} -fi -if [ "${MY_LD_LIBRARY_PATH}" != "" ] ; then - export LD_LIBRARY_PATH=${MY_LD_LIBRARY_PATH}:${LD_LIBRARY_PATH} -fi -if [ "${PYTHONPATH}" != "" ] ; then - export PYTHONPATH=${MY_PYTHONPATH}:${PYTHONPATH} -fi + if [ -f ${ROOTDIR}/share/salome/resources/${LMOD}/LightApp.xml ] ; then + export LightAppConfig=${LightAppConfig}:${ROOTDIR}/share/salome/resources/${LMOD} + elif [ -f ${ROOTDIR}/share/salome/resources/LightApp.xml ] ; then + export LightAppConfig=${LightAppConfig}:${ROOTDIR}/share/salome/resources + fi + export SALOMEPATH=${SALOMEPATH}:${ROOTDIR} + done + + PATH=${MY_PATH}:${PATH} + PATH=`echo ${PATH} | sed -e "s,^:,,;s,:$,,;s,::\+,:,g"` + export PATH + LD_LIBRARY_PATH=${MY_LD_LIBRARY_PATH}:${LD_LIBRARY_PATH} + LD_LIBRARY_PATH=`echo ${LD_LIBRARY_PATH} | sed -e "s,^:,,;s,:$,,;s,::\+,:,g"` + export LD_LIBRARY_PATH + PYTHONPATH=${MY_PYTHONPATH}:${PYTHONPATH} + PYTHONPATH=`echo ${PYTHONPATH} | sed -e "s,^:,,;s,:$,,;s,::\+,:,g"` + export PYTHONPATH + LightAppConfig=`echo ${LightAppConfig} | sed -e "s,^:,,;s,:$,,;s,::\+,:,g"` + export LightAppConfig + SALOMEPATH=`echo ${SALOMEPATH} | sed -e "s,^:,,;s,:$,,;s,::\+,:,g"` + export SALOMEPATH + + ### + # start application + ### + + MODULES=`echo $MODULES | tr " " ","` + SUITApp LightApp --modules=${MODULES} "$*" & +} ### -# start application +# call wrapper function (entry point) ### -SUITApp LightApp $* & +run_light_salome "$@" \ No newline at end of file diff --git a/build_cmake b/build_cmake index 844a4f2c4..b8fe099ce 100755 --- a/build_cmake +++ b/build_cmake @@ -1,24 +1,21 @@ #!/bin/sh -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # -# Copyright (C) 2003-2007 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 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. # -# 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 # -# 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # CURRENT_DIR=`pwd` diff --git a/build_cmake.bat b/build_cmake.bat index 58a10b0a3..b5e1ffc53 100644 --- a/build_cmake.bat +++ b/build_cmake.bat @@ -1,2 +1,20 @@ - +@REM Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +@REM +@REM This library is free software; you can redistribute it and/or +@REM modify it under the terms of the GNU Lesser General Public +@REM License as published by the Free Software Foundation; either +@REM version 2.1 of the License. +@REM +@REM This library is distributed in the hope that it will be useful, +@REM but WITHOUT ANY WARRANTY; without even the implied warranty of +@REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +@REM Lesser General Public License for more details. +@REM +@REM You should have received a copy of the GNU Lesser General Public +@REM License along with this library; if not, write to the Free Software +@REM Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +@REM +@REM See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +@REM + %PYTHONBIN% %KERNEL_ROOT_DIR%\salome_adm\cmake_files\am2cmake.py --gui diff --git a/build_configure b/build_configure index 1fc78886f..dfdad322f 100755 --- a/build_configure +++ b/build_configure @@ -1,25 +1,26 @@ #!/bin/bash -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2003-2007 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 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. +# 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 +# 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # Tool for updating list of .in file for the SALOME project # and regenerating configure script # Author : Marc Tajchman - CEA @@ -41,34 +42,14 @@ fi cd ${CONF_DIR} ABS_CONF_DIR=`pwd` -mkdir -p salome_adm/unix/config_files -#cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files/* salome_adm/unix/config_files -#cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/pythonbe.py salome_adm/unix - -# remove KERNEL deprecated configure files -#for deprecated in ac_cc_warnings.m4 ac_cxx_partial_specialization.m4 \ -# check_mico.m4 config.guess ltmain.sh ac_cxx_bool.m4 ltconfig \ -# ac_cxx_typename.m4 check_pthreads.m4 config.sub libtool.m4 ac_cxx_mutable.m4 -#do -# rm salome_adm/unix/config_files/${deprecated} -#done - -# remove KERNEL CVS directories in subdirectory salome_adm -#for deprecated in CVS unix/CVS unix/config_files/CVS -#do -# rm -rf salome_adm/${deprecated} -#done - -cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/SALOMEconfig.h.in salome_adm/unix - # ____________________________________________________________________ # aclocal creates the aclocal.m4 file from the standard macro and the -# custom macro embedded in the directory salome_adm/unix/config_files -# and KERNEL config_files directory. +# custom macro embedded in the directory adm_local/unix/config_files +# and KERNEL salome_adm/unix/config_files directory. # output: # aclocal.m4 # autom4te.cache (directory) -echo "====================================================== aclocal" +echo "======================================================= aclocal" aclocal -I adm_local/unix/config_files \ -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files || exit 1 @@ -79,17 +60,13 @@ aclocal -I adm_local/unix/config_files \ # version. The files are created in the directory specified with the # AC_CONFIG_AUX_DIR() tag (see configure.ac). # output: -# salome_adm/unix/config_files/config.guess -# salome_adm/unix/config_files/config.sub -# salome_adm/unix/config_files/ltmain.sh -#echo "====================================================== libtoolize" +# adm_local/unix/config_files/config.guess +# adm_local/unix/config_files/config.sub +# adm_local/unix/config_files/ltmain.sh +echo "==================================================== libtoolize" libtoolize --force --copy --automake || exit 1 -# ____________________________________________________________________ -# make link to KERNEL configuration files to -#ln -sf ${KERNEL_ROOT_DIR}/salome_adm . - # ____________________________________________________________________ # autoconf creates the configure script from the file configure.ac (or # configure.in if configure.ac doesn't exist) @@ -106,11 +83,11 @@ autoconf # AC_CONFIG_AUX_DIR() tag (see configure.ac). This step also # creates the Makefile.in files from the Makefile.am files. # output: -# salome_adm/unix/config_files/compile -# salome_adm/unix/config_files/depcomp -# salome_adm/unix/config_files/install-sh -# salome_adm/unix/config_files/missing -# salome_adm/unix/config_files/py-compile +# adm_local/unix/config_files/compile +# adm_local/unix/config_files/depcomp +# adm_local/unix/config_files/install-sh +# adm_local/unix/config_files/missing +# adm_local/unix/config_files/py-compile # Makefile.in (from Makefile.am) echo "====================================================== automake" diff --git a/clean_configure b/clean_configure index f57f7b3bf..ec17918df 100755 --- a/clean_configure +++ b/clean_configure @@ -1,35 +1,31 @@ #!/bin/sh -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2003-2007 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 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. +# 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 +# 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + rm -rf autom4te.cache aclocal.m4 configure make_config find . -name "*~" -print -exec rm {} \; find . -name "*.pyc" -print -exec rm {} \; #exit # ==================== ON SORT AVANT -find bin -name Makefile.in | xargs rm -f -find doc -name Makefile.in | xargs rm -f -find idl -name Makefile.in | xargs rm -f -find resources -name Makefile.in | xargs rm -f -find salome_adm -name Makefile.in | xargs rm -f -find src -name Makefile.in | xargs rm -f -rm -f Makefile.in +find . -name Makefile.in | xargs rm -f +( cd adm_local/unix/config_files && rm -f config.* depcomp install-sh l*.m4 ltmain.sh missing py-compile ) diff --git a/configure.ac b/configure.ac index d8f8664f2..379f5bc81 100644 --- a/configure.ac +++ b/configure.ac @@ -1,38 +1,41 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2003-2007 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 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. +# 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 +# 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # Author : Marc Tajchman (CEA) # Date : 28/06/2001 # Modified by : Patrick GOLDBRONN (CEA) # Modified by : Marc Tajchman (CEA) # Modified by : Mikhail PONIKAROV (OCN) - autotools usage # -AC_INIT([Salome2 Project GUI module], [5.1.0], [webmaster.salome@opencascade.com], [SalomeGUI]) -AC_CONFIG_AUX_DIR(salome_adm/unix/config_files) +AC_INIT([Salome2 Project GUI module], [6.5.0], [webmaster.salome@opencascade.com], [SalomeGUI]) +AC_CONFIG_AUX_DIR(adm_local/unix/config_files) AC_CANONICAL_HOST AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([-Wno-portability]) XVERSION=`echo $VERSION | awk -F. '{printf("0x%02x%02x%02x",$1,$2,$3)}'` AC_SUBST(XVERSION) +VERSION_DEV=1 +AC_SUBST(VERSION_DEV) # set up MODULE_NAME variable for dynamic construction of directories (resources, etc.) MODULE_NAME=gui @@ -100,9 +103,6 @@ if test "x${enable_qxGraphViewer}" != "xno" ; then else DISABLE_QXGRAPHVIEWER="yes" fi -dnl THIS IS A TEMPORARY SOLUTION BECAUSE QXGRAPH NOT YET PORTING TO QT4 -dnl AFTER PORTING QXGARPH TO QT4 THE STRING BELOW HAVE TO BE REMOVED -DISABLE_QXGRAPHVIEWER="yes" dnl dnl Initialize source and build root directories @@ -140,6 +140,7 @@ echo AC_PROG_MAKE_SET AC_PROG_INSTALL +AC_LOCAL_INSTALL dnl dnl libtool macro check for CC, LD, NM, LN_S, RANLIB, STRIP + pour les librairies dynamiques ! @@ -166,7 +167,7 @@ dnl Fix up the INSTALL macro if it s a relative path. We want the dnl full-path to the binary instead. case "$INSTALL" in *install-sh*) - INSTALL='\${ROOT_BUILDDIR}'/salome_adm/unix/config_files/install-sh + INSTALL='\${ROOT_BUILDDIR}'/adm_local/unix/config_files/install-sh ;; esac @@ -199,13 +200,14 @@ dnl AC_CXX_HAVE_SSTREAM -dnl -dnl --------------------------------------------- -dnl testing MPICH -dnl --------------------------------------------- -dnl +echo +echo --------------------------------------------- +echo testing MPI +echo --------------------------------------------- +echo + +CHECK_MPI -CHECK_MPICH echo echo --------------------------------------------- @@ -226,6 +228,16 @@ echo CHECK_PYTHON +echo +echo --------------------------------------------- +echo testing swig +echo --------------------------------------------- +echo + +AM_PATH_PYTHON(2.3) +CHECK_SWIG + + dnl echo dnl echo --------------------------------------------- dnl echo testing java @@ -243,18 +255,6 @@ echo CHECK_DISABLE_CORBA echo "GUI_DISABLE_CORBA = "$GUI_DISABLE_CORBA -if test "x${GUI_DISABLE_CORBA}" != "xyes" ; then - -echo -echo --------------------------------------------- -echo testing swig -echo --------------------------------------------- -echo - -AM_PATH_PYTHON(2.3) -CHECK_SWIG -fi - echo echo --------------------------------------------- echo testing threads @@ -476,12 +476,10 @@ if test "x${GUI_DISABLE_CORBA}" != "xyes" ; then echo "failed : for full configuration of GUI module necessary enable SalomeObject !" exit fi - dnl THIS IS A TEMPORARY SOLUTION BECAUSE QXGRAPH NOT YET PORTING TO QT4 - dnl AFTER PORTING QXGARPH TO QT4 THE FOLLOWING CHECK HAVE TO BE UNCOMMENTED - dnl if test "x${DISABLE_QXGRAPHVIEWER}" == "xyes" ; then - dnl echo "failed : for full configuration of GUI module necessary enable QxGraphViewer !" - dnl exit - dnl fi + if test "x${DISABLE_QXGRAPHVIEWER}" == "xyes" ; then + echo "failed : for full configuration of GUI module necessary enable QxGraphViewer !" + exit + fi fi echo @@ -533,7 +531,7 @@ variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok omniORB_ok boost_ok occ_ok sip_ok pyqt_ok qwt_ok doxygen_ok graphviz_ok libxml_ok Kernel_ok" else variables="cc_ok lex_yacc_ok python_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok boost_ok -occ_ok sip_ok pyqt_ok qwt_ok doxygen_ok graphviz_ok Kernel_ok" +occ_ok sip_ok pyqt_ok qwt_ok doxygen_ok graphviz_ok Kernel_ok " fi for var in $variables @@ -579,6 +577,13 @@ AM_CONDITIONAL(ENABLE_SALOMEOBJECT, [test "$DISABLE_SALOMEOBJECT" = no]) AM_CONDITIONAL(ENABLE_QXGRAPHVIEWER, [test "$DISABLE_QXGRAPHVIEWER" = no]) AM_CONDITIONAL(ENABLE_TESTRECORDER, [test "$ENABLE_TESTRECORDER" = yes]) +if test "$DISABLE_PYCONSOLE" = "no" ; then + AC_DEFINE(SUIT_ENABLE_PYTHON) +fi + +dnl Build with GUI observers feature +AC_DEFINE(WITH_SALOMEDS_OBSERVER) + echo echo --------------------------------------------- echo generating Makefiles and configure files @@ -590,67 +595,90 @@ echo # chmod +x ./bin/salome/*; \ #]) +AC_HACK_LIBTOOL +AC_CONFIG_COMMANDS([hack_libtool],[ +sed -i "s%^CC=\"\(.*\)\"%hack_libtool (){ \n\ + $(pwd)/hack_libtool \1 \"\$[@]\" \n\ +}\n\ +CC=\"hack_libtool\"%g" libtool +sed -i "s%\(\s*\)for searchdir in \$newlib_search_path \$lib_search_path \$sys_lib_search_path \$shlib_search_path; do%\1searchdirs=\"\$newlib_search_path \$lib_search_path \$sys_lib_search_path \$shlib_search_path\"\n\1for searchdir in \$searchdirs; do%g" libtool +sed -i "s%\(\s*\)searchdirs=\"\$newlib_search_path \$lib_search_path \(.*\)\"%\1searchdirs=\"\$newlib_search_path \$lib_search_path\"\n\1sss_beg=\"\"\n\1sss_end=\"\2\"%g" libtool +sed -i "s%\(\s*\)\(for searchdir in \$searchdirs; do\)%\1for sss in \$searchdirs; do\n\1 if ! test -d \$sss; then continue; fi\n\1 ssss=\$(cd \$sss; pwd)\n\1 if test \"\$ssss\" != \"\" \&\& test -d \$ssss; then\n\1 case \$ssss in\n\1 /usr/lib | /usr/lib64 ) ;;\n\1 * ) sss_beg=\"\$sss_beg \$ssss\" ;;\n\1 esac\n\1 fi\n\1done\n\1searchdirs=\"\$sss_beg \$sss_end\"\n\1\2%g" libtool +],[]) + # This list is initiated using autoscan and must be updated manually # when adding a new file .in to manage. When you execute # autoscan, the Makefile list is generated in the output file configure.scan. # This could be helpfull to update de configuration. AC_OUTPUT([ \ - ./salome_adm/unix/SALOMEconfig.h \ - ./adm_local/Makefile \ - ./adm_local/cmake_files/Makefile \ - ./adm_local/unix/Makefile \ - ./adm_local/unix/config_files/Makefile \ - ./bin/VERSION \ - ./bin/Makefile \ - ./GUI_version.h \ - ./doc/Makefile \ - ./doc/salome/Makefile \ - ./doc/salome/gui/Makefile \ - ./doc/salome/gui/doxyfile \ - ./doc/salome/tui/Makefile \ - ./doc/salome/tui/doxyfile \ - ./src/Makefile \ - ./src/CASCatch/Makefile \ - ./src/Qtx/Makefile \ - ./src/Style/Makefile \ - ./src/DDS/Makefile \ - ./src/QDS/Makefile \ - ./src/SUIT/Makefile \ - ./src/STD/Makefile \ - ./src/CAF/Makefile \ - ./src/CAM/Makefile \ - ./src/SUITApp/Makefile \ - ./src/LogWindow/Makefile \ - ./src/ObjBrowser/Makefile \ - ./src/Prs/Makefile \ - ./src/OBJECT/Makefile \ - ./src/GLViewer/Makefile \ - ./src/VTKViewer/Makefile \ - ./src/SVTK/Makefile \ - ./src/OCCViewer/Makefile \ - ./src/SOCC/Makefile \ - ./src/PyInterp/Makefile \ - ./src/PyConsole/Makefile \ - ./src/Plot2d/Makefile \ - ./src/SPlot2d/Makefile \ - ./src/SUPERVGraph/Makefile \ - ./src/QxGraph/Makefile \ - ./src/QxScene/Makefile \ - ./src/LightApp/Makefile \ - ./src/ResExporter/Makefile \ - ./src/TOOLSGUI/Makefile \ - ./src/Event/Makefile \ - ./src/Session/Makefile \ - ./src/SalomeApp/Makefile \ - ./src/SalomeApp/Test/Makefile \ - ./src/SALOME_SWIG/Makefile \ - ./src/SALOME_SWIG/supervisionexample.py \ - ./src/SALOME_SWIG/supervisiongeomexample.py \ - ./src/SALOME_PY/Makefile \ - ./src/SALOME_PYQT/Makefile \ - ./src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile \ - ./src/SALOME_PYQT/SalomePyQt/Makefile \ - ./resources/Makefile \ - ./idl/Makefile \ + adm_local/Makefile \ + adm_local/cmake_files/Makefile \ + adm_local/unix/Makefile \ + adm_local/unix/config_files/Makefile \ + bin/VERSION \ + bin/Makefile \ + GUI_version.h \ + doc/Makefile \ + doc/salome/Makefile \ + doc/salome/gui/Makefile \ + doc/salome/gui/doxyfile \ + doc/salome/gui/static/header.html \ + doc/salome/tui/Makefile \ + doc/salome/tui/doxyfile \ + doc/salome/tui/static/header.html \ + src/Makefile \ + src/CASCatch/Makefile \ + src/Qtx/Makefile \ + src/Style/Makefile \ + src/DDS/Makefile \ + src/QDS/Makefile \ + src/SUIT/Makefile \ + src/STD/Makefile \ + src/CAF/Makefile \ + src/CAM/Makefile \ + src/SUITApp/Makefile \ + src/LogWindow/Makefile \ + src/ObjBrowser/Makefile \ + src/Prs/Makefile \ + src/OBJECT/Makefile \ + src/ViewerTools/Makefile \ + src/GLViewer/Makefile \ + src/VTKViewer/Makefile \ + src/SVTK/Makefile \ + src/OCCViewer/Makefile \ + src/SOCC/Makefile \ + src/PyInterp/Makefile \ + src/PyConsole/Makefile \ + src/Plot2d/Makefile \ + src/SPlot2d/Makefile \ + src/SUPERVGraph/Makefile \ + src/QxGraph/Makefile \ + src/QxScene/Makefile \ + src/LightApp/Makefile \ + src/ResExporter/Makefile \ + src/TOOLSGUI/Makefile \ + src/Event/Makefile \ + src/OpenGLUtils/Makefile \ + src/Session/Makefile \ + src/SalomeApp/Makefile \ + src/SalomeApp/Test/Makefile \ + src/SalomeApp/pluginsdemo/Makefile \ + src/GuiHelpers/Makefile \ + src/TreeData/Makefile \ + src/TreeData/Test/Makefile \ + src/SALOME_SWIG/Makefile \ + src/SALOME_SWIG/supervisionexample.py \ + src/SALOME_SWIG/supervisiongeomexample.py \ + src/SALOME_PY/Makefile \ + src/SALOME_PYQT/Makefile \ + src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile \ + src/SALOME_PYQT/SALOME_PYQT_GUILight/Makefile \ + src/SALOME_PYQT/SalomePyQt/Makefile \ + src/GUI_PY/Makefile \ + resources/Makefile \ + idl/Makefile \ + tools/Makefile \ + tools/dlgfactory/Makefile \ + tools/vtkEDFOverloads/Makefile \ Makefile ]) diff --git a/doc/Makefile.am b/doc/Makefile.am index 7ab931dd6..583c18bab 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,24 +1,25 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2003-2007 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 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. +# 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 +# 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # -* Makefile *- # Author : Patrick GOLDBRONN (CEA) # Date : 30/11/2001 diff --git a/doc/salome/Makefile.am b/doc/salome/Makefile.am index 7fce29287..705a2675b 100644 --- a/doc/salome/Makefile.am +++ b/doc/salome/Makefile.am @@ -1,24 +1,25 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2003-2007 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 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. +# 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 +# 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # -* Makefile *- # Author : Patrick GOLDBRONN (CEA) # Date : 30/11/2001 diff --git a/doc/salome/gui/Makefile.am b/doc/salome/gui/Makefile.am index 61de9ca86..974858410 100644 --- a/doc/salome/gui/Makefile.am +++ b/doc/salome/gui/Makefile.am @@ -1,31 +1,35 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2003-2007 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 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. +# 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 +# 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # File : Makefile.in # Author : Vasily Rusyaev (Open Cascade NN) # Module : doc # include $(top_srcdir)/adm_local/unix/make_common_starter.am -EXTRA_DIST += images input static +EXTRA_DIST += images input static/footer.html static/doxygen.css + +guidocdir = $(docdir)/gui/GUI +guidoc_DATA = images/head.png usr_docs: doxyfile echo "Running doxygen in directory: "`pwd`; \ @@ -37,8 +41,10 @@ clean-local: -rm -fr GUI doxygen.bak install-data-local: usr_docs - $(INSTALL) -d $(DESTDIR)$(docdir)/gui - cp -rp GUI $(DESTDIR)$(docdir)/gui + if test -d GUI; then \ + $(INSTALL) -d $(DESTDIR)$(docdir)/gui ; \ + cp -rp GUI $(DESTDIR)$(docdir)/gui ; \ + fi uninstall-local: rm -rf $(DESTDIR)$(docdir)/gui/GUI diff --git a/doc/salome/gui/doxyfile.in b/doc/salome/gui/doxyfile.in index dd9ea6528..16006e338 100755 --- a/doc/salome/gui/doxyfile.in +++ b/doc/salome/gui/doxyfile.in @@ -1,28 +1,29 @@ -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2003-2007 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 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. +# 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 +# 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- -PROJECT_NAME = "GUI Module Reference Manual v.@VERSION@" +PROJECT_NAME = "SALOME GUI User's Guide" OUTPUT_DIRECTORY = GUI CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English @@ -39,21 +40,31 @@ WARNINGS = YES #--------------------------------------------------------------------------- INPUT = @srcdir@/input FILE_PATTERNS = *.doc -IMAGE_PATH = @srcdir@/images +IMAGE_PATH = @srcdir@/images @top_srcdir@/src/OCCViewer/resources \ + @top_srcdir@/src/VTKViewer/resources \ + @top_srcdir@/src/SVTK/resources \ + @top_srcdir@/src/Plot2d/resources \ + @top_srcdir@/src/GLViewer/resources \ + @top_srcdir@/src/QxScene/resources \ #--------------------------------------------------------------------------- #HTML related options #--------------------------------------------------------------------------- GENERATE_HTML = YES HTML_OUTPUT = . -HTML_HEADER = @srcdir@/static/header.html +HTML_HEADER = @builddir@/static/header.html HTML_FOOTER = @srcdir@/static/footer.html -#HTML_STYLESHEET = @srcdir@/static/doxygen.css +HTML_STYLESHEET = @srcdir@/static/doxygen.css TOC_EXPAND = YES DISABLE_INDEX = NO GENERATE_TREEVIEW = YES TREEVIEW_WIDTH = 300 +#--------------------------------------------------------------------------- +#SORT related options +#--------------------------------------------------------------------------- +SORT_GROUP_NAMES = NO + #--------------------------------------------------------------------------- #LaTeX related option #--------------------------------------------------------------------------- @@ -62,4 +73,9 @@ GENERATE_LATEX = NO #--------------------------------------------------------------------------- #RTF related options #--------------------------------------------------------------------------- -GENERATE_RTF = NO \ No newline at end of file +GENERATE_RTF = NO + +#--------------------------------------------------------------------------- +#Search engine +#--------------------------------------------------------------------------- +SEARCHENGINE = NO diff --git a/doc/salome/gui/images/batchmode.png b/doc/salome/gui/images/batchmode.png deleted file mode 100644 index 34329463f..000000000 Binary files a/doc/salome/gui/images/batchmode.png and /dev/null differ diff --git a/doc/salome/gui/images/choicepage.png b/doc/salome/gui/images/choicepage.png deleted file mode 100644 index 7c997287e..000000000 Binary files a/doc/salome/gui/images/choicepage.png and /dev/null differ diff --git a/doc/salome/gui/images/directorypage.png b/doc/salome/gui/images/directorypage.png deleted file mode 100755 index fafc98936..000000000 Binary files a/doc/salome/gui/images/directorypage.png and /dev/null differ diff --git a/doc/salome/gui/images/featureedgesprops.png b/doc/salome/gui/images/featureedgesprops.png deleted file mode 100755 index 4a41a1aac..000000000 Binary files a/doc/salome/gui/images/featureedgesprops.png and /dev/null differ diff --git a/doc/salome/gui/images/geomview-alt.png b/doc/salome/gui/images/geomview-alt.png index e7e1ef677..b76055e50 100755 Binary files a/doc/salome/gui/images/geomview-alt.png and b/doc/salome/gui/images/geomview-alt.png differ diff --git a/doc/salome/gui/images/icon_about.png b/doc/salome/gui/images/icon_about.png index bbbc7a931..fd6640bda 100755 Binary files a/doc/salome/gui/images/icon_about.png and b/doc/salome/gui/images/icon_about.png differ diff --git a/doc/salome/gui/images/image100.gif b/doc/salome/gui/images/image100.gif deleted file mode 100644 index ec56cacc7..000000000 Binary files a/doc/salome/gui/images/image100.gif and /dev/null differ diff --git a/doc/salome/gui/images/image100.png b/doc/salome/gui/images/image100.png deleted file mode 100755 index ec56cacc7..000000000 Binary files a/doc/salome/gui/images/image100.png and /dev/null differ diff --git a/doc/salome/gui/images/image102.gif b/doc/salome/gui/images/image102.gif deleted file mode 100644 index 7880b7e46..000000000 Binary files a/doc/salome/gui/images/image102.gif and /dev/null differ diff --git a/doc/salome/gui/images/image103.gif b/doc/salome/gui/images/image103.gif deleted file mode 100644 index b02616f29..000000000 Binary files a/doc/salome/gui/images/image103.gif and /dev/null differ diff --git a/doc/salome/gui/images/image103.png b/doc/salome/gui/images/image103.png deleted file mode 100755 index b02616f29..000000000 Binary files a/doc/salome/gui/images/image103.png and /dev/null differ diff --git a/doc/salome/gui/images/image105.gif b/doc/salome/gui/images/image105.gif deleted file mode 100644 index 4f6173f82..000000000 Binary files a/doc/salome/gui/images/image105.gif and /dev/null differ diff --git a/doc/salome/gui/images/image106.gif b/doc/salome/gui/images/image106.gif deleted file mode 100644 index 0356a9a31..000000000 Binary files a/doc/salome/gui/images/image106.gif and /dev/null differ diff --git a/doc/salome/gui/images/image106.png b/doc/salome/gui/images/image106.png deleted file mode 100755 index 0356a9a31..000000000 Binary files a/doc/salome/gui/images/image106.png and /dev/null differ diff --git a/doc/salome/gui/images/image108.gif b/doc/salome/gui/images/image108.gif deleted file mode 100644 index fa8cbbc71..000000000 Binary files a/doc/salome/gui/images/image108.gif and /dev/null differ diff --git a/doc/salome/gui/images/image108.png b/doc/salome/gui/images/image108.png deleted file mode 100755 index fa8cbbc71..000000000 Binary files a/doc/salome/gui/images/image108.png and /dev/null differ diff --git a/doc/salome/gui/images/image109.gif b/doc/salome/gui/images/image109.gif deleted file mode 100644 index 5dbba4646..000000000 Binary files a/doc/salome/gui/images/image109.gif and /dev/null differ diff --git a/doc/salome/gui/images/image157.gif b/doc/salome/gui/images/image157.gif deleted file mode 100644 index 69fc55dbf..000000000 Binary files a/doc/salome/gui/images/image157.gif and /dev/null differ diff --git a/doc/salome/gui/images/image54.jpg b/doc/salome/gui/images/image54.jpg deleted file mode 100755 index a67ac4c7a..000000000 Binary files a/doc/salome/gui/images/image54.jpg and /dev/null differ diff --git a/doc/salome/gui/images/image65.gif b/doc/salome/gui/images/image65.gif deleted file mode 100755 index fbf6a81b9..000000000 Binary files a/doc/salome/gui/images/image65.gif and /dev/null differ diff --git a/doc/salome/gui/images/image67.gif b/doc/salome/gui/images/image67.gif deleted file mode 100755 index 4c5d4d67c..000000000 Binary files a/doc/salome/gui/images/image67.gif and /dev/null differ diff --git a/doc/salome/gui/images/image69.gif b/doc/salome/gui/images/image69.gif deleted file mode 100755 index f8ea563bb..000000000 Binary files a/doc/salome/gui/images/image69.gif and /dev/null differ diff --git a/doc/salome/gui/images/image70.gif b/doc/salome/gui/images/image70.gif deleted file mode 100755 index c88c53ed5..000000000 Binary files a/doc/salome/gui/images/image70.gif and /dev/null differ diff --git a/doc/salome/gui/images/image72.gif b/doc/salome/gui/images/image72.gif deleted file mode 100755 index 4364ce7fe..000000000 Binary files a/doc/salome/gui/images/image72.gif and /dev/null differ diff --git a/doc/salome/gui/images/image73.gif b/doc/salome/gui/images/image73.gif deleted file mode 100755 index 0ebcf97a2..000000000 Binary files a/doc/salome/gui/images/image73.gif and /dev/null differ diff --git a/doc/salome/gui/images/image75.gif b/doc/salome/gui/images/image75.gif deleted file mode 100755 index 9fdfbdc40..000000000 Binary files a/doc/salome/gui/images/image75.gif and /dev/null differ diff --git a/doc/salome/gui/images/image77.gif b/doc/salome/gui/images/image77.gif deleted file mode 100644 index b02616f29..000000000 Binary files a/doc/salome/gui/images/image77.gif and /dev/null differ diff --git a/doc/salome/gui/images/image86.gif b/doc/salome/gui/images/image86.gif deleted file mode 100644 index 441482d20..000000000 Binary files a/doc/salome/gui/images/image86.gif and /dev/null differ diff --git a/doc/salome/gui/images/image86.png b/doc/salome/gui/images/image86.png deleted file mode 100755 index 441482d20..000000000 Binary files a/doc/salome/gui/images/image86.png and /dev/null differ diff --git a/doc/salome/gui/images/image88.gif b/doc/salome/gui/images/image88.gif deleted file mode 100644 index 9466aa6ce..000000000 Binary files a/doc/salome/gui/images/image88.gif and /dev/null differ diff --git a/doc/salome/gui/images/image89.gif b/doc/salome/gui/images/image89.gif deleted file mode 100644 index 28ec89f03..000000000 Binary files a/doc/salome/gui/images/image89.gif and /dev/null differ diff --git a/doc/salome/gui/images/image89.png b/doc/salome/gui/images/image89.png deleted file mode 100755 index 28ec89f03..000000000 Binary files a/doc/salome/gui/images/image89.png and /dev/null differ diff --git a/doc/salome/gui/images/image91.gif b/doc/salome/gui/images/image91.gif deleted file mode 100644 index 66f81e604..000000000 Binary files a/doc/salome/gui/images/image91.gif and /dev/null differ diff --git a/doc/salome/gui/images/image91.png b/doc/salome/gui/images/image91.png deleted file mode 100755 index 66f81e604..000000000 Binary files a/doc/salome/gui/images/image91.png and /dev/null differ diff --git a/doc/salome/gui/images/image94.gif b/doc/salome/gui/images/image94.gif deleted file mode 100755 index 4364ce7fe..000000000 Binary files a/doc/salome/gui/images/image94.gif and /dev/null differ diff --git a/doc/salome/gui/images/image95.gif b/doc/salome/gui/images/image95.gif deleted file mode 100644 index 88941d0e8..000000000 Binary files a/doc/salome/gui/images/image95.gif and /dev/null differ diff --git a/doc/salome/gui/images/image96.gif b/doc/salome/gui/images/image96.gif deleted file mode 100644 index 87e001dd8..000000000 Binary files a/doc/salome/gui/images/image96.gif and /dev/null differ diff --git a/doc/salome/gui/images/image96.png b/doc/salome/gui/images/image96.png deleted file mode 100755 index 87e001dd8..000000000 Binary files a/doc/salome/gui/images/image96.png and /dev/null differ diff --git a/doc/salome/gui/images/image97.gif b/doc/salome/gui/images/image97.gif deleted file mode 100644 index 450dc56c6..000000000 Binary files a/doc/salome/gui/images/image97.gif and /dev/null differ diff --git a/doc/salome/gui/images/image97.png b/doc/salome/gui/images/image97.png deleted file mode 100755 index 450dc56c6..000000000 Binary files a/doc/salome/gui/images/image97.png and /dev/null differ diff --git a/doc/salome/gui/images/image98.gif b/doc/salome/gui/images/image98.gif deleted file mode 100644 index 87e001dd8..000000000 Binary files a/doc/salome/gui/images/image98.gif and /dev/null differ diff --git a/doc/salome/gui/images/image98.png b/doc/salome/gui/images/image98.png deleted file mode 100755 index 87e001dd8..000000000 Binary files a/doc/salome/gui/images/image98.png and /dev/null differ diff --git a/doc/salome/gui/images/image99.gif b/doc/salome/gui/images/image99.gif deleted file mode 100644 index ec56cacc7..000000000 Binary files a/doc/salome/gui/images/image99.gif and /dev/null differ diff --git a/doc/salome/gui/images/image99.png b/doc/salome/gui/images/image99.png deleted file mode 100755 index ec56cacc7..000000000 Binary files a/doc/salome/gui/images/image99.png and /dev/null differ diff --git a/doc/salome/gui/images/import.png b/doc/salome/gui/images/import.png index 093c667f2..100d433e0 100755 Binary files a/doc/salome/gui/images/import.png and b/doc/salome/gui/images/import.png differ diff --git a/doc/salome/gui/images/installtypepage.png b/doc/salome/gui/images/installtypepage.png deleted file mode 100755 index 8359d54c0..000000000 Binary files a/doc/salome/gui/images/installtypepage.png and /dev/null differ diff --git a/doc/salome/gui/images/intropage.png b/doc/salome/gui/images/intropage.png deleted file mode 100644 index de29d067a..000000000 Binary files a/doc/salome/gui/images/intropage.png and /dev/null differ diff --git a/doc/salome/gui/images/note1.gif b/doc/salome/gui/images/note1.gif deleted file mode 100755 index b53e21d0a..000000000 Binary files a/doc/salome/gui/images/note1.gif and /dev/null differ diff --git a/doc/salome/gui/images/occviewer_axialscale.png b/doc/salome/gui/images/occviewer_axialscale.png deleted file mode 100644 index fa8cbbc71..000000000 Binary files a/doc/salome/gui/images/occviewer_axialscale.png and /dev/null differ diff --git a/doc/salome/gui/images/occviewer_toolbar.png b/doc/salome/gui/images/occviewer_toolbar.png index 88941d0e8..3d8a91992 100644 Binary files a/doc/salome/gui/images/occviewer_toolbar.png and b/doc/salome/gui/images/occviewer_toolbar.png differ diff --git a/doc/salome/gui/images/platformpage.png b/doc/salome/gui/images/platformpage.png deleted file mode 100755 index cfbf60c3c..000000000 Binary files a/doc/salome/gui/images/platformpage.png and /dev/null differ diff --git a/doc/salome/gui/images/plot2d_clone.gif b/doc/salome/gui/images/plot2d_clone.gif deleted file mode 100644 index 441482d20..000000000 Binary files a/doc/salome/gui/images/plot2d_clone.gif and /dev/null differ diff --git a/doc/salome/gui/images/plot2d_clone.png b/doc/salome/gui/images/plot2d_clone.png deleted file mode 100755 index 441482d20..000000000 Binary files a/doc/salome/gui/images/plot2d_clone.png and /dev/null differ diff --git a/doc/salome/gui/images/plot2d_legend.gif b/doc/salome/gui/images/plot2d_legend.gif deleted file mode 100644 index 81c06277b..000000000 Binary files a/doc/salome/gui/images/plot2d_legend.gif and /dev/null differ diff --git a/doc/salome/gui/images/plot2d_legend.png b/doc/salome/gui/images/plot2d_legend.png deleted file mode 100755 index 81c06277b..000000000 Binary files a/doc/salome/gui/images/plot2d_legend.png and /dev/null differ diff --git a/doc/salome/gui/images/plot2d_lines.gif b/doc/salome/gui/images/plot2d_lines.gif deleted file mode 100644 index 978945284..000000000 Binary files a/doc/salome/gui/images/plot2d_lines.gif and /dev/null differ diff --git a/doc/salome/gui/images/plot2d_lines.png b/doc/salome/gui/images/plot2d_lines.png deleted file mode 100755 index 978945284..000000000 Binary files a/doc/salome/gui/images/plot2d_lines.png and /dev/null differ diff --git a/doc/salome/gui/images/plot2d_logarithmic_horizontal.gif b/doc/salome/gui/images/plot2d_logarithmic_horizontal.gif deleted file mode 100644 index fb62cd772..000000000 Binary files a/doc/salome/gui/images/plot2d_logarithmic_horizontal.gif and /dev/null differ diff --git a/doc/salome/gui/images/plot2d_logarithmic_horizontal.png b/doc/salome/gui/images/plot2d_logarithmic_horizontal.png deleted file mode 100755 index fb62cd772..000000000 Binary files a/doc/salome/gui/images/plot2d_logarithmic_horizontal.png and /dev/null differ diff --git a/doc/salome/gui/images/plot2d_logarithmic_vertical.gif b/doc/salome/gui/images/plot2d_logarithmic_vertical.gif deleted file mode 100644 index 825d59edb..000000000 Binary files a/doc/salome/gui/images/plot2d_logarithmic_vertical.gif and /dev/null differ diff --git a/doc/salome/gui/images/plot2d_logarithmic_vertical.png b/doc/salome/gui/images/plot2d_logarithmic_vertical.png deleted file mode 100755 index 825d59edb..000000000 Binary files a/doc/salome/gui/images/plot2d_logarithmic_vertical.png and /dev/null differ diff --git a/doc/salome/gui/images/plot2d_points.gif b/doc/salome/gui/images/plot2d_points.gif deleted file mode 100644 index 3cdea33dd..000000000 Binary files a/doc/salome/gui/images/plot2d_points.gif and /dev/null differ diff --git a/doc/salome/gui/images/plot2d_points.png b/doc/salome/gui/images/plot2d_points.png deleted file mode 100755 index 3cdea33dd..000000000 Binary files a/doc/salome/gui/images/plot2d_points.png and /dev/null differ diff --git a/doc/salome/gui/images/plot2d_settings.gif b/doc/salome/gui/images/plot2d_settings.gif deleted file mode 100644 index 64df2460b..000000000 Binary files a/doc/salome/gui/images/plot2d_settings.gif and /dev/null differ diff --git a/doc/salome/gui/images/plot2d_settings.png b/doc/salome/gui/images/plot2d_settings.png deleted file mode 100755 index 64df2460b..000000000 Binary files a/doc/salome/gui/images/plot2d_settings.png and /dev/null differ diff --git a/doc/salome/gui/images/plot2d_splines.gif b/doc/salome/gui/images/plot2d_splines.gif deleted file mode 100644 index 06a95572d..000000000 Binary files a/doc/salome/gui/images/plot2d_splines.gif and /dev/null differ diff --git a/doc/salome/gui/images/plot2d_splines.png b/doc/salome/gui/images/plot2d_splines.png deleted file mode 100755 index 06a95572d..000000000 Binary files a/doc/salome/gui/images/plot2d_splines.png and /dev/null differ diff --git a/doc/salome/gui/images/plot2d_view_settings.png b/doc/salome/gui/images/plot2d_view_settings.png index a9fab8866..2b7ddffc7 100644 Binary files a/doc/salome/gui/images/plot2d_view_settings.png and b/doc/salome/gui/images/plot2d_view_settings.png differ diff --git a/doc/salome/gui/images/ppref1.png b/doc/salome/gui/images/ppref1.png deleted file mode 100755 index c6783b509..000000000 Binary files a/doc/salome/gui/images/ppref1.png and /dev/null differ diff --git a/doc/salome/gui/images/ppref2.png b/doc/salome/gui/images/ppref2.png deleted file mode 100755 index 042a49a0f..000000000 Binary files a/doc/salome/gui/images/ppref2.png and /dev/null differ diff --git a/doc/salome/gui/images/ppref3.png b/doc/salome/gui/images/ppref3.png deleted file mode 100755 index 8c31ab8a1..000000000 Binary files a/doc/salome/gui/images/ppref3.png and /dev/null differ diff --git a/doc/salome/gui/images/pref11.png b/doc/salome/gui/images/pref11.png deleted file mode 100755 index 634da539e..000000000 Binary files a/doc/salome/gui/images/pref11.png and /dev/null differ diff --git a/doc/salome/gui/images/pref12.png b/doc/salome/gui/images/pref12.png deleted file mode 100755 index 6a711f34d..000000000 Binary files a/doc/salome/gui/images/pref12.png and /dev/null differ diff --git a/doc/salome/gui/images/pref13.png b/doc/salome/gui/images/pref13.png deleted file mode 100755 index 56dd24a41..000000000 Binary files a/doc/salome/gui/images/pref13.png and /dev/null differ diff --git a/doc/salome/gui/images/pref14.png b/doc/salome/gui/images/pref14.png deleted file mode 100755 index ec035a867..000000000 Binary files a/doc/salome/gui/images/pref14.png and /dev/null differ diff --git a/doc/salome/gui/images/pref15.png b/doc/salome/gui/images/pref15.png deleted file mode 100755 index 413a6cdbc..000000000 Binary files a/doc/salome/gui/images/pref15.png and /dev/null differ diff --git a/doc/salome/gui/images/pref21.png b/doc/salome/gui/images/pref21.png deleted file mode 100755 index 19e250375..000000000 Binary files a/doc/salome/gui/images/pref21.png and /dev/null differ diff --git a/doc/salome/gui/images/pref22.png b/doc/salome/gui/images/pref22.png deleted file mode 100755 index 154ad1b70..000000000 Binary files a/doc/salome/gui/images/pref22.png and /dev/null differ diff --git a/doc/salome/gui/images/pref23.png b/doc/salome/gui/images/pref23.png deleted file mode 100644 index 6910088a2..000000000 Binary files a/doc/salome/gui/images/pref23.png and /dev/null differ diff --git a/doc/salome/gui/images/pref24.png b/doc/salome/gui/images/pref24.png deleted file mode 100755 index a9b9a56be..000000000 Binary files a/doc/salome/gui/images/pref24.png and /dev/null differ diff --git a/doc/salome/gui/images/pref31.png b/doc/salome/gui/images/pref31.png deleted file mode 100755 index 48c055726..000000000 Binary files a/doc/salome/gui/images/pref31.png and /dev/null differ diff --git a/doc/salome/gui/images/pref33.png b/doc/salome/gui/images/pref33.png deleted file mode 100755 index 0c9255247..000000000 Binary files a/doc/salome/gui/images/pref33.png and /dev/null differ diff --git a/doc/salome/gui/images/pref34.png b/doc/salome/gui/images/pref34.png deleted file mode 100755 index 229ad9ccf..000000000 Binary files a/doc/salome/gui/images/pref34.png and /dev/null differ diff --git a/doc/salome/gui/images/pref37.png b/doc/salome/gui/images/pref37.png deleted file mode 100755 index 0d4dd68cf..000000000 Binary files a/doc/salome/gui/images/pref37.png and /dev/null differ diff --git a/doc/salome/gui/images/productpage1.png b/doc/salome/gui/images/productpage1.png deleted file mode 100644 index 1033c0c73..000000000 Binary files a/doc/salome/gui/images/productpage1.png and /dev/null differ diff --git a/doc/salome/gui/images/productpage2.png b/doc/salome/gui/images/productpage2.png deleted file mode 100644 index dc39f2ed4..000000000 Binary files a/doc/salome/gui/images/productpage2.png and /dev/null differ diff --git a/doc/salome/gui/images/productpage3.png b/doc/salome/gui/images/productpage3.png deleted file mode 100755 index 7c2db8b20..000000000 Binary files a/doc/salome/gui/images/productpage3.png and /dev/null differ diff --git a/doc/salome/gui/images/productpage4.png b/doc/salome/gui/images/productpage4.png deleted file mode 100755 index 9f0de3675..000000000 Binary files a/doc/salome/gui/images/productpage4.png and /dev/null differ diff --git a/doc/salome/gui/images/progresspage1.png b/doc/salome/gui/images/progresspage1.png deleted file mode 100644 index 20ac54bd9..000000000 Binary files a/doc/salome/gui/images/progresspage1.png and /dev/null differ diff --git a/doc/salome/gui/images/progresspage2.png b/doc/salome/gui/images/progresspage2.png deleted file mode 100755 index c2aad1f87..000000000 Binary files a/doc/salome/gui/images/progresspage2.png and /dev/null differ diff --git a/doc/salome/gui/images/readmepage.png b/doc/salome/gui/images/readmepage.png deleted file mode 100644 index 0ddd39aff..000000000 Binary files a/doc/salome/gui/images/readmepage.png and /dev/null differ diff --git a/doc/salome/gui/images/save.jpg b/doc/salome/gui/images/save.jpg deleted file mode 100755 index be10e0cf8..000000000 Binary files a/doc/salome/gui/images/save.jpg and /dev/null differ diff --git a/doc/salome/gui/images/studymanagement.png b/doc/salome/gui/images/studymanagement.png index f6b20973d..e50858a27 100755 Binary files a/doc/salome/gui/images/studymanagement.png and b/doc/salome/gui/images/studymanagement.png differ diff --git a/doc/salome/gui/images/studyproperties.png b/doc/salome/gui/images/studyproperties.png index e4f9f3d6e..c86d0bc04 100755 Binary files a/doc/salome/gui/images/studyproperties.png and b/doc/salome/gui/images/studyproperties.png differ diff --git a/doc/salome/gui/images/urbutton.png b/doc/salome/gui/images/urbutton.png deleted file mode 100755 index d7c0841e3..000000000 Binary files a/doc/salome/gui/images/urbutton.png and /dev/null differ diff --git a/doc/salome/gui/images/view_rotation_point.png b/doc/salome/gui/images/view_rotation_point.png deleted file mode 100644 index fc303e3ea..000000000 Binary files a/doc/salome/gui/images/view_rotation_point.png and /dev/null differ diff --git a/doc/salome/gui/input/geometry_preferences.doc b/doc/salome/gui/input/geometry_preferences.doc deleted file mode 100644 index 8000f2f7e..000000000 --- a/doc/salome/gui/input/geometry_preferences.doc +++ /dev/null @@ -1,47 +0,0 @@ -/*! - -\page geometry_preferences_page Geometry preferences - -In the \b Geometry module you can set preferences for visualisation of -geometrical figures which can be used in later sessions with this -module. - -\image html pref15.png - -\par -For all color definitions click on the respective line to access to -the \ref select_color_and_font_page "Select Color" dialog box. - -
    -
  • General
    • -
      -
    • Default Display Mode - allows to choose between wireframe -or shading.
      • -
    • Default Shading Color - allows to select default shading -color.
      • -
    • Default Wireframe Color - allows to select default -wireframe color (to be applied to any lines not being free boundaries -or isolated lines).
      • -
    • Color of free boundaries - allows to select default color for free boundaries.
      • -
    • Color of edges, vectors and wires - allows to select -default color for edges, vectors and wires (isolated lines).
      • -
    • Color of points - allows to select default color for -vertices.
      • -
    • Color of isolines - allows to select default color for -isolines.
      • -
    • Step Value for Spin Boxes - allows to define the increment -of values set in spin boxes.
      • -
    -
- -
    -
  • Marker of Points
    • -
      -
    • Type - allows to select the symbol for representation of -points (cross, asterisk, etc.).
      • -
    • Size - allows to define the size of the marker from 1 -(smallest) to 7 (largest).
      • -
    -
- -*/ \ No newline at end of file diff --git a/doc/salome/gui/input/index.doc b/doc/salome/gui/input/index.doc index be854bf19..f86d4028b 100644 --- a/doc/salome/gui/input/index.doc +++ b/doc/salome/gui/input/index.doc @@ -54,7 +54,7 @@ The SALOME platform is available in Open Source. integrated Python console -\image html image65.gif +\image html image65.png What can you do in SALOME? (Some of SALOME main functions)
    @@ -68,10 +68,8 @@ integrated Python console
From the point of view of the \subpage salome_architecture_page "Architecture", -Salome is composed of several modules, which provides a -great flexibility in its structure during -\subpage installing_salome_page "Installation" and -\subpage running_salome_page "Running". +Salome is composed of several modules. +To run salome (with different options) refer to \subpage running_salome_page page. This part of documentation on Salome also covers \subpage introduction_to_gui_page "general Salome functionalities", diff --git a/doc/salome/gui/input/installing_salome.doc b/doc/salome/gui/input/installing_salome.doc deleted file mode 100644 index 5a2f0bd19..000000000 --- a/doc/salome/gui/input/installing_salome.doc +++ /dev/null @@ -1,708 +0,0 @@ -/*! - -\page installing_salome_page SALOME Installation Wizard Help - -
-
    -
  • \ref installing_products "Installing products with the Installation Wizard" -
      -
    • \ref gui_mode_install "GUI mode" -
    • \ref batch_mode_install "Batch mode" -
    • \ref environment_files "Environment files" -
    -
  • \ref pick_up_env "Pick up the environment" -
  • \ref modifying_xml "Modifying XML configuration file" -
  • \ref installation_scripts "Implementing installation scripts for the new products" -
  • \ref finish_buttons "Customizing Readme page buttons" -
-
-\anchor installing_products -

Installing products with the Installation Wizard

- -The Installation Wizard can be launched in two modes: \b GUI and \b -batch. -
The root directory of the Installation Wizard contains Python -script \b runInstall. To run the Installation Wizard just type \b runInstall. -in the terminal window: -

[ python ] \b runInstall [options] - -Without options this script will launch the SALOME Installation -Wizard in the default mode (GUI). \n The default installation settings -can be overridden by using command line options. Each option has a -short and a long notation: - --g / --gui -\par -Runs the Installation Wizard in the GUI mode (this is the default -mode). - --b / --batch -\par -Runs the Installation Wizard in the terminal mode. - --f FILE / --file=FILE -\par -The XML configuration file to be used by the Installation Wizard. If -this option is not used then the installation script tries to define -the \e Linux version and use the corresponding XML file if it exists. For -examle, for Linux Mandrake 10.1 the config_Mandrake_10.1.xml file -will be used by default. If no appropriate file is found, the file -config.xml will be used. This file refers to the basic target platform -which is Linux Mandrake 10.1 for SALOME 3.0 and newer. If config.xml -file is not found either, a warning message box is shown (in GUI mode) -or printed to the console (in batch mode) and the Installation Wizard -quits. - --d DIR / --target=DIR -\par -The target directory SALOME platform is to be installed to. -If used, this option overrides the default target directory, given in -the configuration XML file (usually ${HOME}/salome_\, -see \ref modifying_xml "here" for more details). - --t DIR / --tmp=DIR -\par -The directory, which should be used for temporary files. If given, -this option overrides the default temporary directory, given in the -configuration xml file (usually \b /tmp, see \ref modifying_xml "here" -for more information). - --a / --all-from-sources -\par -Forces all the products to be installed from sources (including all -SALOME modules). If this option is used, all default installation -modes for all products are ignored. -\n This option is helpful when the user wants to install SALOME on the -platform which is not officially supported. In this case, the user can -try to run the SALOME Installation Wizard with the \b -a option in order -to build all the products from sources. -\nNote, that this is a time-consuming operation which can take -more than 24 hours depending on the computer. - --s / --single-directory -\par -Install all SALOME binaries packages to one directory.
-This option is ignored when --all-from-sources (-a) option is used. - --h / --help -\par -Prints help information on the Installation Wizard's use. - --v / --version -\par -Prints version information (\b Note: this is the Installation Wizard's -version number, not the number of SALOME platform version). - -The installation procedure supports different \em Linux platforms and -installs various installation 3d-party prerequisite products which are -required by SALOME platform. As it was mentioned above, the basic -target platform for SALOME 3.0 and newer is Linux Mandrake 10.1. -Use of configuration XML files gives a flexible way to modify the list -of products to be installed by the Installation Wizard without -changing the program source code. Just create your own XML -configuration file and implement installation scripts for the -prerequisite products you need and then use this XML file with the -Installation Wizard. This can be done, for example, for some Linux -platform which is not supported directly by the Installation -Wizard. See \ref modifying_xml "Modifying XML configuration file" and -\ref installation_scripts "Implementing installation scripts for the new products" -sections for more information. - -
-
-\anchor gui_mode_install -

GUI mode

- -The Installation Wizard GUI has been developed using -Trolltech's Qt 3.0.5 toolkit. After launching the Installation -Wizard in the GUI mode the wizard window is shown to the user. This -wizard guides the user through several subsequent pages. To navigate -between the pages use \em "Next" and \em "Back" buttons in the lower -part of the wizard window. The \em "Cancel" button closes the wizard -window and quits the installation procedure after the user's -confirmation. The \em "Help" button opens an additional window to show -help information. - -The first \em "Introduction" page is shown in \ref figure_1 "Figure 1". -Skip this page by clicking \em "Next": - -\anchor figure_1 -\image html intropage.png -\n
Figure 1: "Introduction" page
- -In the second page you are proposed to select the type of the SALOME installation.

-At this step three possible types of installation are available: - -1. "Install binaries" type: -\par - - all binaries and sources of the chosen modules are installed; - - all binaries of the chosen prerequisites are installed. - -2. "Install sources" type: -\par - - all sources of the chosen modules and prerequisites are installed without compilation. - -3. "Install sources and make compilation" type: -\par - - all sources of the chosen modules and prerequisites are installed;
- - all sources are compiled. - -In case you select "Install sources and make compilation" installation type, then you can also check "Remove sources and temporary files after compilation" option. - -\anchor figure_2 -\image html installtypepage.png -\n
Figure 1: "Type Of Installation" page
- -After the installation type has been selected you click "Next" button and the Installation Wizard tries to determine the Linux platform to load the corresponding configuration file. If the user system is not defined or the current SALOME package does not support this one, the warning will appear ("Install binaries" and "Install sources" installation types only): - -\anchor figure_3 -\image html platformpage.png -\n
Figure 3: "Installation platform" page
- -If "Install sources and make compilation" installation type has been selected, the warning message will be slightly different: "Your Linux platform is not supported by this SALOME package and compilation is not tested on this one".
-There is a list of all platforms supported by SALOME, but only those supported by the current package are available for selection. in this page you need to to select the reference platform, if you wish to proceed with the present installation procedure. - -\b Note: this page is not displayed if the installation platform has been defined automatically. - -In the next page you are proposed to enter the target directory -where the SALOME platform should be installed to. You can also click -"Browse..." and choose the destination folder using the standard -browse directory dialog box. -\n If the necessary directory does not exist you -are prompted to confirm directory creation. If you type a wrong -directory path, or if you do not have write permissions -for the directory you use, the corresponding message box is shown. - -\b Note: you are strongly recommended to avoid using directory names containing spaces. Otherwise you can experience some troubles with the installation. -\n -\anchor figure_4 -\image html directorypage.png -\n
Figure 4: "Installation directory" page
- -You can select the products to be installed in the "Choice of the products to be installed" page. -\n In the default mode it gives you the possibility to view and select SALOME modules only. There is a hidden list of 3d-party prerequisite products. To show it, just click "Show prerequisites..." button. - -\anchor figure_5 -\image html productpage1.png -\n
Figure 5: Choice of the SALOME modules
- -In the full mode you also have the possibility to select prerequisites. -\n The checkbox before each product indicates if this one will be installed or not (checked or unchecked). The second column shows the disk space occupied by the corresponding module. This value depends on the selected type of installation. -\n To hide the prerequisites list - click "Hide prerequisites" button. - -\anchor figure_6 -\image html productpage2.png -\n
Figure 6: Choice of the prerequisites
- -Some products may require some other prerequisite products to be installed. So the installation procedure has a special feature to automatically mark these products in the list view. For example, to install PyQt it is necessary to have gcc, Python, Qt and Sip installed, and these products will be also turned on when you check on PyQt. GEOM module requires KERNEL, GUI modules and such prerequisites as: OpenCascade, Python, Swig, Qt, etc. -\n -\n The dependencies between SALOME modules are managed in the following way: -\par -- If one module is unchecked, all modules which depend on this one are also unchecked automatically;\n -- If one module is checked, all modules required for this one are also checked automatically. - -Dependency between modules and prerequisites is realized in the following way: -\par -- The choices made by the user in the list of modules have a direct impact on the list of prerequisites; -- Whenever a module is checked, all the necessary prerequisites are checked automatically with no possibility for the user to uncheck them (see \ref figure_7 "Fig. 7" below); -- Whenever a module is unchecked, according to the remaining checked modules, the unnecessary prerequisites are unchecked automatically (see \ref figure_7 "Fig. 7" below). - -It is possible to check again the prerequisites, which have been automatically unchecked. In other words, it is possible to add more prerequisites than necessary. - -\anchor figure_7 -\image html productpage3.png -\n
Figure 7: Dependencies between modules and prerequisites
- -The "Installation with GUI" checkbox allows managing the installation of the graphical interface. Only modules for that 'woguimode' attribute is set to "true" value in the XML file (see \ref modifying_xml "here" for more information about customizing this installation mode) support without GUI mode and will be checked and installed with their necessary prerequisites in case of installation without GUI. And other modules are unchecked with no possibility to check them in this mode (see \ref figure_8 "Figure below"). -\n By default 'Installation with GUI' checkbox is switched on. - -\anchor figure_8 -\image html productpage4.png -\n
Figure 8: Installation without GUI mode
- -The box at the right side of the page displays the information about -currently selected product: name, version and short description, -required disk space, disk space required for temporary files and the list of -prerequisites (this information is provided in the XML file). - -The "Disk space required:" field displays how much disk space -on the hard drive is required for installation of selected products. -\n\b Note: Please, take into account that the displayed amount of -required disk space is approximate and may differ when you actually install -products on your hard drive. - -The installation procedure uses a special directory to store temporary -files. The "Space for temporary files:" field shows the information -about required disk space on the hard drive for extracting and -compiling the selected products. You can change the temporary directory (this information is provided in the XML file) to the folder you want. -\n\b Note: Actually, temporary files are not stored directly in the -directory entered by the user. The Installation Wizard creates in this directory an additional folder named like INSTALLWORKXXXXX where XXXXX is a unique number. This allows launching several Installation Wizards simultaneously. This temporary directory is removed automatically when the installation finishes. - -The installation procedure also checks the available disk space. If there is not enough disk space on your hard drive you will see the corresponding error message box. - -Also in the current version of Installation Wizard is possible to install all binaries of the selected SALOME modules into a \b single directory. It is "SALOME" directory. For this purpose there is a checkbox "Install modules to a single directory" checkbox exists (see \ref figure_8 "Fig. 8"). -\n This feature helps to get shorter PYTHONPATH and LD_LIBRARY_PATH environment variables. -\n\b Note: the installation into a single directory is available with the binaries installation type only. - -To proceed further click "Next". At this moment the program will make some tests to check the installation settings: if there is enough disk space on the hard drive, check for the dependencies for each product you have selected to be installed. If any test fails you will see the corresponding warning message box. Otherwise the wizard will proceed to the next page: - -\anchor figure_9 -\image html choicepage.png -\n
Figure 9: "Check your choice" page
- -This page summarizes the installation options you've selected in the previous pages. You can review again your choices and change them if necessary returning to the previous pages. -\n When you are sure that everything is OK, click "Next" to -follow to the \ref figure_10 "progress page". - -\anchor figure_10 -\image html progresspage1.png -\n
Figure 10: "Installation progress" page
- -To start the installation of the selected products click "Start" button. It launches the shell installation script and you will be able to see the output of the script in the topmost frame of the dialog box. If any errors occur during the installation progress, the corresponding messages will be printed to the log window in the bold red font. -\n It is possible to break the installation at any time by pressing "Stop" button. Then you can get back to the previous pages if you wish to change the installation settings or restart the installation by pressing "Start" button again. - -\b Note: in the current implementation it is not possible to resume the stopped installation process; the installation will restart from the very beginning. - -\anchor figure_11 -\image html progresspage2.png -\n
Figure 11: "Installation progress" page: installation in progress
- -The "Installation Status" frame window shows you the progress of -installation. \c "Waiting" status means that installation of this product -has not been started yet. The product currently being installed is -marked as \c "Processing" and is displayed in the status bar under "Installation Status" view. All installed products have \c "Completed" -status. - -You can abort installation and close the installation procedure using -\em "Cancel" button. - -\b Note: This button sends the signal "SIGTERM" to the shell -script. The script tries to clear all temporary files. The process of -removing temporary files can take some time, so the installation -wizard will wait 3 seconds before closing. - -At the end of the installation "Installation completed" message will appear in the status bar. You can return to the previous pages to start a new installation or click \em"Next" button to go to the readme page: - -\anchor figure_12 -\image html readmepage.png -\n
Figure 12: "Finish installation" page
- -In this page you can read important information about the Instalation -Wizard itself and some tips: how to run and test SALOME or how to -build SALOME from the sources. This is the contents of the README file -which you can find in the root directory of the Installation Wizard. - -You can also launch SALOME Desktop from this page or read the Release -Notes file by clicking on the corresponding buttons in the lower part -of the page (see \ref modifying_xml "here" and \ref finish_buttons -"here" for more information about customizing these buttons). - -
-
-\anchor batch_mode_install -

Batch mode

- -To launch the Installation Wizard in the batch mode use -\b b (--\b batch) -parameter. -\n In this mode the GUI wizard is not shown but all the installation -status is displayed directly in the console. In the batch mode the -user does not have a possibility to change installation settings which -are given in the configuration file, except target and temporary -directories which can be overridden by the corresponding command line -options. -\n The only exception is --\b all-from-sources (-\b a) option which enables -special installation mode in which all the products (including SALOME -modules) are installed from sources, ignoring the default mode defined -in the XML configuration file (see \ref installing_products "here" for details) and --single-directory (-s) option which defines that all SALOME modules have to be installed into the one directory (SALOME_, by default, where is SALOME version). - -\anchor figure_13 -\image html batchmode.png -\n
Figure 13: Batch mode
- -
-
-\anchor environment_files -

Environment files

- -During the process of installation the script creates some environment -files to simplify the procedure of launching SALOME. These shell -scripts set all necessary environment variables for all products you -have installed. To learn how installation scripts collects the -environment, see \ref pick_up_env "here". These files are: \b -salome.csh + \b salome.sh in the KERNEL module sources -and KERNEL module binaries root directories and -\b env_products.csh + \b env_products.sh and \b env_build.csh + -\b env_build.sh in the target installation directory. - -\b Note: there is some difference between these files: \b env_build.* -files are optimized to be used for building SALOME modules from -sources (see \b README file provided with the installation procedure -on the CD). The \b env_products.* (and \b salome.*) files are -optimized for SALOME launching. The behavior is defined by the -environment variable \b ENV_FOR_LAUNCH which is set to \b 0 in -env_build.* files and to \b 1 in env_products.* (salome.*) files. - -
-
-\anchor pick_up_env -

Pick up the environment

- -Please, read carefully the following information. This section -describes how the installation procedure generates the environment -scripts for the SALOME platform being installed. - -After installing each product shell the script creates a special -environment file for the product in its installation folder. The name -of the file is generated from the name of product by the following -scheme: \b env_.sh (for example \b env_Vtk.sh for the -Vtk). This file includes all necessary environment settings. At the -final step of the installation the script picks up all the settings -files and generates two common environment files from them: \b salome.sh -and \b salome.csh for \b bash and \b csh shells correspondingly. -Such approach helps to save time when reinstalling products and you may not bother about setting all environment variables manually to build/launch -SALOME. What you simply need is to source one of these environment -files. - -This also concerns those products which are not being installed. For -example, you install some SALOME binaries to the directory where you -have previously installed other products. The Installation procedure -tries to collect environment files from the target directory if it -finds necessary products installed there. If some product is not found -in the target directory the corresponding section of -\b salome.sh/salome.csh files will be skipped. -\n For native products (like \b gcc, \b tcl, etc...) the installation -procedure tries to find them first using \b PATH / \b LD_LIBRARY_PATH -variables and then in the system default directories (\b /usr/bin, -\b /usr/lib etc., depending on the product). -

-In any case you may edit \b salome.* files after the installation -procedure finishes, if you want. - -\n\b Note: As it was mentioned \ref environment_files "above" there are -other environment files which are generated by the installation -procedure: \b env_products.csh + \b env_products.sh and \b env_build.csh + -\b env_build.sh. These files can be found in the target installation root -directory. - -
-
-\anchor modifying_xml -

Modifying XML configuration file

- -You can create your own XML configuration file. The Installation -Wizard can then take it as a command line argument to provide a list -of products you want to install with it. The list of products and some -other settings for the Installation Wizard are provided in the XML -file. -\n This section describes the structure of the configuration file, optional sections/tags are in brackets. - -\code - - ] - [ caption= ] - [ copyright= ] - [ license= ] - platforms= - [ targetdir= ] - [ tempdir= ] - /> - [ - [