From: jfa Date: Thu, 12 Feb 2009 15:17:13 +0000 (+0000) Subject: Update from BR_V5_DEV 13Feb2009 X-Git-Tag: V5_1_1a1~8 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1c889394b028b786898a995d38c07c8f3d564837;p=modules%2Fgui.git Update from BR_V5_DEV 13Feb2009 --- diff --git a/GUI_version.h.in b/GUI_version.h.in index 9a5df78eb..9669a71af 100644 --- a/GUI_version.h.in +++ b/GUI_version.h.in @@ -1,26 +1,27 @@ -// Copyright (C) 2005 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. +// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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 +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // -// See http://www.salome-platform.org/ +// 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 // // File : GUI_version.h -// Author : Vadim SANDLER -// Module : SALOME - +// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) +// #if !defined(__GUI_VERSION_H__) #define __GUI_VERSION_H__ diff --git a/Makefile.am b/Makefile.am index 62e21b1b5..38c49561a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,7 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D +# 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 @@ -14,17 +17,18 @@ # 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 +ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \ + -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files + if GUI_ENABLE_CORBA IDLDIR = idl else !GUI_ENABLE_CORBA @@ -37,11 +41,11 @@ DIST_SUBDIRS = idl adm_local resources src doc bin DISTCLEANFILES = a.out aclocal.m4 configure -salomeinclude_DATA=GUI_version.h +salomeinclude_DATA = GUI_version.h -EXTRA_DIST+= \ - build_configure \ - clean_configure \ +EXTRA_DIST += \ + build_configure \ + clean_configure \ LICENCE dist-hook: @@ -50,7 +54,7 @@ dist-hook: usr_docs: (cd doc && $(MAKE) $(AM_MAKEFLAGS) usr_docs) -docs:usr_docs +docs: usr_docs dev_docs: (cd doc && $(MAKE) $(AM_MAKEFLAGS) dev_docs) diff --git a/SUIT.pro b/SUIT.pro new file mode 100644 index 000000000..307a12511 --- /dev/null +++ b/SUIT.pro @@ -0,0 +1,26 @@ +# 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 7ae83a6fc..c3877a440 100644 --- a/adm_local/Makefile.am +++ b/adm_local/Makefile.am @@ -1,19 +1,22 @@ -# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG -# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT -# 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 -# -SUBDIRS = unix +# 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 +# +SUBDIRS = unix cmake_files diff --git a/adm_local/cmake_files/FindCAS.cmake b/adm_local/cmake_files/FindCAS.cmake new file mode 100644 index 000000000..8490c7c66 --- /dev/null +++ b/adm_local/cmake_files/FindCAS.cmake @@ -0,0 +1,160 @@ +# 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 +# + +SET(CASROOT $ENV{CASROOT}) + +SET(OCC_VERSION_MAJOR 6) +SET(OCC_VERSION_MINOR 3) +SET(OCC_VERSION_MAINTENANCE 0) + +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} -DLIN -DLINTEL -DCSFDB) +SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DNo_exception) +SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DHAVE_CONFIG_H) +SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DHAVE_LIMITS_H) +SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -I${CASROOT}/inc) + +IF(WINDOWS) + SET(CASROOT_LIBDIR ${CASROOT}/win32/libd) +ELSE(WINDOWS) + SET(CASROOT_LIBDIR ${CASROOT}/lib) +ENDIF(WINDOWS) + +FIND_LIBRARY(BinLPlugin BinLPlugin PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(BinPlugin BinPlugin PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(BinTObjPlugin BinTObjPlugin PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(BinXCAFPlugin BinXCAFPlugin PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(FWOSPlugin FWOSPlugin PATHS ${CASROOT_LIBDIR}) +# FIND_LIBRARY(mscmd mscmd PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(PTKernel PTKernel PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(StdLPlugin StdLPlugin PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(StdPlugin StdPlugin PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKAdvTools TKAdvTools PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKBin TKBin PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKBinL TKBinL PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKBinTObj TKBinTObj PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKBinXCAF TKBinXCAF PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKBO TKBO PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKBool TKBool PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKBRep TKBRep PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKCAF TKCAF PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKCDF TKCDF PATHS ${CASROOT_LIBDIR}) +# FIND_LIBRARY(TKCDLFront TKCDLFront PATHS ${CASROOT_LIBDIR}) +# FIND_LIBRARY(TKCPPClient TKCPPClient PATHS ${CASROOT_LIBDIR}) +# FIND_LIBRARY(TKCPPExt TKCPPExt PATHS ${CASROOT_LIBDIR}) +# FIND_LIBRARY(TKCPPIntExt TKCPPIntExt PATHS ${CASROOT_LIBDIR}) +# FIND_LIBRARY(TKCPPJini TKCPPJini PATHS ${CASROOT_LIBDIR}) +# FIND_LIBRARY(TKCSFDBSchema TKCSFDBSchema PATHS ${CASROOT_LIBDIR}) +# FIND_LIBRARY(TKDCAF TKDCAF PATHS ${CASROOT_LIBDIR}) +# FIND_LIBRARY(TKDraw TKDraw PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKernel TKernel PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKFeat TKFeat PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKFillet TKFillet PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKG2d TKG2d PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKG3d TKG3d PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKGeomAlgo TKGeomAlgo PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKGeomBase TKGeomBase PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKHLR TKHLR PATHS ${CASROOT_LIBDIR}) +# FIND_LIBRARY(TKIDLFront TKIDLFront PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKIGES TKIGES PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKLCAF TKLCAF PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKMath TKMath PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKMesh TKMesh PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKMeshVS TKMeshVS PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKNIS TKNIS PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKOffset TKOffset PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKOpenGl TKOpenGl PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKPCAF TKPCAF PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKPLCAF TKPLCAF PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKPrim TKPrim PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKPShape TKPShape PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKService TKService PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKShapeSchema TKShapeSchema PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKShHealing TKShHealing PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKStdLSchema TKStdLSchema PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKStdSchema TKStdSchema PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKSTEP TKSTEP PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKSTEP209 TKSTEP209 PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKSTEPAttr TKSTEPAttr PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKSTEPBase TKSTEPBase PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKSTL TKSTL PATHS ${CASROOT_LIBDIR}) +# FIND_LIBRARY(TKTCPPExt TKTCPPExt PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKTObj TKTObj PATHS ${CASROOT_LIBDIR}) +# FIND_LIBRARY(TKTObjDRAW TKTObjDRAW PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKTopAlgo TKTopAlgo PATHS ${CASROOT_LIBDIR}) +# FIND_LIBRARY(TKTopTest TKTopTest PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKV2d TKV2d PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKV3d TKV3d PATHS ${CASROOT_LIBDIR}) +# FIND_LIBRARY(TKViewerTest TKViewerTest PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKVRML TKVRML PATHS ${CASROOT_LIBDIR}) +# FIND_LIBRARY(TKWOK TKWOK PATHS ${CASROOT_LIBDIR}) +# FIND_LIBRARY(TKWOKTcl TKWOKTcl PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKXCAF TKXCAF PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKXCAFSchema TKXCAFSchema PATHS ${CASROOT_LIBDIR}) +# FIND_LIBRARY(TKXDEDRAW TKXDEDRAW PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKXDEIGES TKXDEIGES PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKXDESTEP TKXDESTEP PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKXMesh TKXMesh PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKXml TKXml PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKXmlL TKXmlL PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKXmlTObj TKXmlTObj PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKXmlXCAF TKXmlXCAF PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKXSBase TKXSBase PATHS ${CASROOT_LIBDIR}) +# FIND_LIBRARY(TKXSDRAW TKXSDRAW PATHS ${CASROOT_LIBDIR}) +# FIND_LIBRARY(wokcmd wokcmd PATHS ${CASROOT_LIBDIR}) +# FIND_LIBRARY(wokdeliverysteps wokdeliverysteps PATHS ${CASROOT_LIBDIR}) +# FIND_LIBRARY(wokdfltsteps wokdfltsteps PATHS ${CASROOT_LIBDIR}) +# FIND_LIBRARY(wokobjssteps wokobjssteps PATHS ${CASROOT_LIBDIR}) +# FIND_LIBRARY(wokorbixsteps wokorbixsteps PATHS ${CASROOT_LIBDIR}) +# FIND_LIBRARY(woksteps woksteps PATHS ${CASROOT_LIBDIR}) +# FIND_LIBRARY(woktoolscmd woktoolscmd PATHS ${CASROOT_LIBDIR}) +# FIND_LIBRARY(wokutilscmd wokutilscmd PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(XCAFPlugin XCAFPlugin PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(XmlLPlugin XmlLPlugin PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(XmlPlugin XmlPlugin PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(XmlTObjPlugin XmlTObjPlugin PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(XmlXCAFPlugin XmlXCAFPlugin PATHS ${CASROOT_LIBDIR}) + +SET(CAS_KERNEL ${TKernel} ${TKMath}) +SET(CAS_OCAF ${TKernel} ${TKMath} ${TKCDF} ${TKLCAF}) +SET(CAS_VIEWER ${TKService} ${TKV3d} ${TKG3d} ${TKGeomBase} ${TKBRep}) +SET(CAS_OCAFVIS ${TKCAF} ${TKBRep} ${TKG2d}) +SET(CAS_MODELER ${TKG3d} ${TKGeomBase} ${TKGeomAlgo} ${TKBRep} ${TKTopAlgo} ${TKG2d}) + +SET(TKV3d_EA ${TKernel} ${TKMath} ${TKV3d}) +SET(TKBool_EA ${TKernel} ${TKMath} ${TKBRep} ${TKG2d} ${TKG3d} ${TKGeomBase} ${TKGeomAlgo} ${TKTopAlgo} ${TKBool}) +SET(TKBRep_EA ${TKernel} ${TKMath} ${TKBRep}) +SET(TKIGES_EA ${TKernel} ${TKMath} ${TKXSBase} ${TKBRep} ${TKIGES}) +SET(TKSTEP_EA ${TKernel} ${TKMath} ${TKXSBase} ${TKBRep} ${TKSTEP}) +SET(TKSTL_EA ${TKernel} ${TKMath} ${TKSTL}) +SET(TKCAF_EA ${TKPrim} ${TKCAF}) + +SET(TKV3d ${TKV3d_EA}) +SET(TKBool ${TKBool_EA}) +SET(TKBRep ${TKBRep_EA}) +SET(TKIGES ${TKIGES_EA}) +SET(TKSTEP ${TKSTEP_EA}) +SET(TKSTL ${TKSTL_EA}) +SET(TKCAF ${TKCAF_EA}) diff --git a/adm_local/cmake_files/FindGUI.cmake b/adm_local/cmake_files/FindGUI.cmake new file mode 100644 index 000000000..14ca37915 --- /dev/null +++ b/adm_local/cmake_files/FindGUI.cmake @@ -0,0 +1,55 @@ +# 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 +# + +SET(GUI_CXXFLAGS -I${GUI_ROOT_DIR}/include/salome) + +FIND_LIBRARY(caf caf ${GUI_ROOT_DIR}/lib/salome) +FIND_LIBRARY(CAM CAM ${GUI_ROOT_DIR}/lib/salome) +FIND_LIBRARY(CASCatch CASCatch ${GUI_ROOT_DIR}/lib/salome) +FIND_LIBRARY(DDS DDS ${GUI_ROOT_DIR}/lib/salome) +FIND_LIBRARY(Event Event ${GUI_ROOT_DIR}/lib/salome) +FIND_LIBRARY(GLViewer GLViewer ${GUI_ROOT_DIR}/lib/salome) +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(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) +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(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(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) +FIND_LIBRARY(SPlot2d SPlot2d ${GUI_ROOT_DIR}/lib/salome) +FIND_LIBRARY(std std ${GUI_ROOT_DIR}/lib/salome) +FIND_LIBRARY(SUITApp SUITApp ${GUI_ROOT_DIR}/lib/salome) +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(VTKViewer VTKViewer ${GUI_ROOT_DIR}/lib/salome) diff --git a/adm_local/cmake_files/FindOPENGL.cmake b/adm_local/cmake_files/FindOPENGL.cmake new file mode 100644 index 000000000..14584056e --- /dev/null +++ b/adm_local/cmake_files/FindOPENGL.cmake @@ -0,0 +1,27 @@ +# 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 +# + +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}) +ENDIF(${WINDOWS}) diff --git a/adm_local/cmake_files/FindQT4.cmake b/adm_local/cmake_files/FindQT4.cmake new file mode 100644 index 000000000..6b98c5f31 --- /dev/null +++ b/adm_local/cmake_files/FindQT4.cmake @@ -0,0 +1,33 @@ +# 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 +# + +INCLUDE(FindQt4) +INCLUDE(UseQt4) +SET(DIRS) +FOREACH(D ${QT_INCLUDES}) +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}) + +FIND_PROGRAM(QT_LRELEASE_EXECUTABLE lrelease) diff --git a/adm_local/cmake_files/FindQWT.cmake b/adm_local/cmake_files/FindQWT.cmake new file mode 100644 index 000000000..ea5f11dd8 --- /dev/null +++ b/adm_local/cmake_files/FindQWT.cmake @@ -0,0 +1,33 @@ +# 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 +# + +SET(QWTHOME $ENV{QWTHOME}) +FIND_PATH(QWT_INCLUDE_DIR qwt_plot.h ${QWTHOME}/include) +SET(QWT_INCLUDES -I${QWT_INCLUDE_DIR}) +IF(WINDOWS) +SET(QWT_INCLUDES ${QWT_INCLUDES} -DQWT_DLL) +ENDIF(WINDOWS) +IF(WINDOWS) +FIND_LIBRARY(QWT_LIBS qwt5 ${QWTHOME}/lib) +ELSE(WINDOWS) +FIND_LIBRARY(QWT_LIBS qwt ${QWTHOME}/lib) +ENDIF(WINDOWS) diff --git a/adm_local/cmake_files/FindSIPPYQT.cmake b/adm_local/cmake_files/FindSIPPYQT.cmake new file mode 100644 index 000000000..1f4ff9503 --- /dev/null +++ b/adm_local/cmake_files/FindSIPPYQT.cmake @@ -0,0 +1,55 @@ +# 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 +# + +FIND_PROGRAM(SIP_EXECUTABLE sip) + +SET(SIP_ROOT ${SIP_EXECUTABLE}) +IF(SIP_ROOT) +GET_FILENAME_COMPONENT(SIP_ROOT ${SIP_ROOT} PATH) +GET_FILENAME_COMPONENT(SIP_ROOT ${SIP_ROOT} PATH) +ENDIF(SIP_ROOT) + +SET(SIP_INCLUDES -I${SIP_ROOT}/include/python${PYTHON_VERSION}) + +FIND_PROGRAM(PYUIC_EXECUTABLE pyuic4) + +SET(PYUIC_ROOT ${PYUIC_EXECUTABLE}) +IF(PYUIC_ROOT) +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_INCLUDES -I${PYQT_SIPS}) +SET(PYQT_INCLUDES ${PYQT_INCLUDES} -I${PYQT_SIPS}/QtCore -I${PYQT_SIPS}/QtGui) +SET(PYQT_INCLUDES ${PYQT_INCLUDES} -I${PYQT_SIPS}/QtXml -I${PYQT_SIPS}/QtOpenGL) +SET(PYQT_INCLUDES ${PYQT_INCLUDES} -I${PYQT_SIPS}/QtAssistant -I${PYQT_SIPS}/QtDesigner) +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}) diff --git a/adm_local/cmake_files/FindVTK.cmake b/adm_local/cmake_files/FindVTK.cmake new file mode 100644 index 000000000..550256c72 --- /dev/null +++ b/adm_local/cmake_files/FindVTK.cmake @@ -0,0 +1,48 @@ +# 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 +# + +INCLUDE(FindVTK) + +SET(VTK_INCLUDES) +FOREACH(dir ${VTK_INCLUDE_DIRS}) + SET(VTK_INCLUDES ${VTK_INCLUDES} -I${dir}) +ENDFOREACH(dir ${VTK_INCLUDE_DIRS}) + +SET(VTK_LIBS) +FIND_LIBRARY(VTK_COMMON vtkCommon ${VTK_LIBRARY_DIRS}) +SET(VTK_LIBS ${VTK_LIBS} ${VTK_COMMON}) +FIND_LIBRARY(VTK_GRAPHICS vtkGraphics ${VTK_LIBRARY_DIRS}) +SET(VTK_LIBS ${VTK_LIBS} ${VTK_GRAPHICS}) +FIND_LIBRARY(VTK_IMAGING vtkImaging ${VTK_LIBRARY_DIRS}) +SET(VTK_LIBS ${VTK_LIBS} ${VTK_IMAGING}) +FIND_LIBRARY(VTK_FILTERING vtkFiltering ${VTK_LIBRARY_DIRS}) +SET(VTK_LIBS ${VTK_LIBS} ${VTK_FILTERING}) +FIND_LIBRARY(VTK_IO vtkIO ${VTK_LIBRARY_DIRS}) +SET(VTK_LIBS ${VTK_LIBS} ${VTK_IO}) +FIND_LIBRARY(VTK_RENDERING vtkRendering ${VTK_LIBRARY_DIRS}) +SET(VTK_LIBS ${VTK_LIBS} ${VTK_RENDERING}) +FIND_LIBRARY(VTK_HYBRID vtkHybrid ${VTK_LIBRARY_DIRS}) +SET(VTK_LIBS ${VTK_LIBS} ${VTK_HYBRID}) +FIND_LIBRARY(VTK_PARALLEL vtkParallel ${VTK_LIBRARY_DIRS}) +SET(VTK_LIBS ${VTK_LIBS} ${VTK_PARALLEL}) +FIND_LIBRARY(VTK_WIDGETS vtkWidgets ${VTK_LIBRARY_DIRS}) +SET(VTK_LIBS ${VTK_LIBS} ${VTK_WIDGETS}) diff --git a/adm_local/cmake_files/Makefile.am b/adm_local/cmake_files/Makefile.am new file mode 100644 index 000000000..d94ed4ebf --- /dev/null +++ b/adm_local/cmake_files/Makefile.am @@ -0,0 +1,32 @@ +# 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 +# +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +dist_admlocal_cmake_DATA = \ +FindCAS.cmake \ +FindOPENGL.cmake \ +FindQT4.cmake \ +FindQWT.cmake \ +FindSIPPYQT.cmake \ +FindVTK.cmake \ +FindGUI.cmake + diff --git a/adm_local/unix/Makefile.am b/adm_local/unix/Makefile.am index f9243d2f5..5f6d5f753 100644 --- a/adm_local/unix/Makefile.am +++ b/adm_local/unix/Makefile.am @@ -1,25 +1,24 @@ -# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG -# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT -# 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 -# - +# 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 +# include $(top_srcdir)/adm_local/unix/make_common_starter.am SUBDIRS = config_files - -# this is for LIGHT module compatibility -dist_admlocalunix_DATA=make_conclude.in \ No newline at end of file diff --git a/adm_local/unix/config_files/Makefile.am b/adm_local/unix/config_files/Makefile.am index de8790b70..c37053179 100644 --- a/adm_local/unix/config_files/Makefile.am +++ b/adm_local/unix/config_files/Makefile.am @@ -1,40 +1,43 @@ -# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG -# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT -# 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 -# +# 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 +# include $(top_srcdir)/adm_local/unix/make_common_starter.am -dist_admlocalm4_DATA=\ -check_disable_Corba.m4 \ -check_GLViewer.m4 \ -check_GUI.m4 \ -check_msg2qm.m4 \ -check_OCCViewer.m4 \ -check_opengl.m4 \ -check_Plot2dViewer.m4 \ -check_PyConsole.m4 \ -check_pyqt.m4 \ -check_qt.m4 \ -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 \ -README +dist_admlocalm4_DATA = \ +check_disable_Corba.m4 \ +check_GLViewer.m4 \ +check_GUI.m4 \ +check_msg2qm.m4 \ +check_OCCViewer.m4 \ +check_opengl.m4 \ +check_Plot2dViewer.m4 \ +check_PyConsole.m4 \ +check_pyqt.m4 \ +check_qt.m4 \ +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 diff --git a/adm_local/unix/config_files/README b/adm_local/unix/config_files/README deleted file mode 100644 index feb997b16..000000000 --- a/adm_local/unix/config_files/README +++ /dev/null @@ -1,3 +0,0 @@ -This file is only here for CVS: -CVS does not always create empty directory, and adm_local/unix/config_file -is needed by build_configure. diff --git a/adm_local/unix/config_files/check_GLViewer.m4 b/adm_local/unix/config_files/check_GLViewer.m4 index 90a304173..064a60ae0 100644 --- a/adm_local/unix/config_files/check_GLViewer.m4 +++ b/adm_local/unix/config_files/check_GLViewer.m4 @@ -1,3 +1,24 @@ +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 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 e0b0e24ae..ec07762f3 100755 --- a/adm_local/unix/config_files/check_GUI.m4 +++ b/adm_local/unix/config_files/check_GUI.m4 @@ -1,3 +1,24 @@ +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 Salome binary distribution # # Author : Marc Tajchman (CEA, 2002) diff --git a/adm_local/unix/config_files/check_OCCViewer.m4 b/adm_local/unix/config_files/check_OCCViewer.m4 index cae33b971..ee23fd53d 100644 --- a/adm_local/unix/config_files/check_OCCViewer.m4 +++ b/adm_local/unix/config_files/check_OCCViewer.m4 @@ -1,3 +1,24 @@ +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 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 a8fb1ad85..ebef27068 100644 --- a/adm_local/unix/config_files/check_Plot2dViewer.m4 +++ b/adm_local/unix/config_files/check_Plot2dViewer.m4 @@ -1,3 +1,24 @@ +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 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 503646f84..304867485 100644 --- a/adm_local/unix/config_files/check_PyConsole.m4 +++ b/adm_local/unix/config_files/check_PyConsole.m4 @@ -1,3 +1,24 @@ +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 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 1ef9f7314..ddd2a3c94 100644 --- a/adm_local/unix/config_files/check_QxGraphViewer.m4 +++ b/adm_local/unix/config_files/check_QxGraphViewer.m4 @@ -1,3 +1,24 @@ +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 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 453dbd7ab..76d83431f 100644 --- a/adm_local/unix/config_files/check_SalomeObject.m4 +++ b/adm_local/unix/config_files/check_SalomeObject.m4 @@ -1,3 +1,24 @@ +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 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 455f02136..2ba31b6fa 100644 --- a/adm_local/unix/config_files/check_SupervGraphViewer.m4 +++ b/adm_local/unix/config_files/check_SupervGraphViewer.m4 @@ -1,3 +1,24 @@ +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 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 new file mode 100644 index 000000000..0dbe0b6ae --- /dev/null +++ b/adm_local/unix/config_files/check_TestRecorder.m4 @@ -0,0 +1,122 @@ +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 existence of Test recorder sources and libraries. +# Set ENABLE_TESTRECORDER to yes|no +# +# Author : Margarita KARPUNINA (OCN, 2008) +# + +AC_DEFUN([CHECK_TESTRECORDER],[ + +AC_ARG_WITH(testrecorder, + [ --with-testrecorder=DIR root directory path of TestRecorder installation], + [], + [with_testrecorder=no]) + +AS_IF([test "x$with_testrecorder" != xno || test "$with_testrecorder" != "no"],[ + + echo + echo --------------------------------------------- + echo Testing TestRecorder + echo --------------------------------------------- + echo + + AC_REQUIRE([CHECK_QT])dnl + AC_REQUIRE([AC_PROG_CXX])dnl + AC_REQUIRE([AC_PROG_CXXCPP])dnl + + AC_CHECKING(for TestRecorder product) + + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + + TESTRECORDER_INCLUDES="" + TESTRECORDER_LIBS="" + ENABLE_TESTRECORDER="no" + + TestRecorder_ok=no + + if test "$with_testrecorder" == "yes" || test "$with_testrecorder" == "auto"; then + TESTRECORDER_HOME="" + else + TESTRECORDER_HOME="$with_testrecorder" + fi + + if test "$TESTRECORDER_HOME" == "" ; then + if test "x$TESTRECORDERHOME" != "x" ; then + TESTRECORDER_HOME=$TESTRECORDERHOME + fi + fi + + if test "x$TESTRECORDER_HOME" != "x"; then + TESTRECORDER_INCLUDES="-I$TESTRECORDER_HOME/include" + TESTRECORDER_LIBS="-L$TESTRECORDER_HOME/lib -lTestRecorder" + + CPPFLAGS_old="$CPPFLAGS" + CXXFLAGS_old="$CXXFLAGS" + CPPFLAGS="$TESTRECORDER_INCLUDES $QT_INLCUDES $CPPFLAGS" + CXXFLAGS="$TESTRECORDER_INCLUDES $QT_INCLUDES $CXXFLAGS" + + AC_MSG_CHECKING(for TestRecorder header file) + + AC_CHECK_HEADER(TestApplication.h,TestRecorder_ok=yes,TestRecorder_ok=no) + + if test "x$TestRecorder_ok" == "xyes"; then + + AC_MSG_CHECKING(for TestRecorder library) + + LDFLAGS_old="$LDFLAGS" + LDFLAGS="-L. -$TESTRECORDER_LIBS $QT_LIBS $LDFLAGS" + + AC_TRY_LINK( + #include "TestApplication.h", + TESTRECORDER_init();, + TestRecorder_ok=yes,TestRecorder_ok=no + ) + + LDFLAGS="$LDFLAGS_old" + + AC_MSG_RESULT($TestRecorder_ok) + fi + + CPPFLAGS="$CPPFLAGS_old" + CXXFLAGS="$CXXFLAGS_old" + + fi + + if test "x$TestRecorder_ok" == xno ; then + AC_MSG_RESULT(for TestRecorder: no) + AC_MSG_WARN(TestRecorder is not found or not properly installed) + else + AC_MSG_RESULT(for TestRecorder: yes) + ENABLE_TESTRECORDER="yes" + fi + + AC_SUBST(TESTRECORDER_INCLUDES) + AC_SUBST(TESTRECORDER_LIBS) + + AC_LANG_RESTORE + + ]) + +])dnl diff --git a/adm_local/unix/config_files/check_VTKViewer.m4 b/adm_local/unix/config_files/check_VTKViewer.m4 index c2adb23b9..774de209f 100644 --- a/adm_local/unix/config_files/check_VTKViewer.m4 +++ b/adm_local/unix/config_files/check_VTKViewer.m4 @@ -1,3 +1,24 @@ +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 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 index 381bf3b7d..cfa4a04d7 100755 --- a/adm_local/unix/config_files/check_corba_in_GUI.m4 +++ b/adm_local/unix/config_files/check_corba_in_GUI.m4 @@ -1,3 +1,24 @@ +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) diff --git a/adm_local/unix/config_files/check_disable_Corba.m4 b/adm_local/unix/config_files/check_disable_Corba.m4 index 5c777c3c1..94105766b 100644 --- a/adm_local/unix/config_files/check_disable_Corba.m4 +++ b/adm_local/unix/config_files/check_disable_Corba.m4 @@ -1,3 +1,24 @@ +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 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 8d0c5474f..afda71bea 100755 --- a/adm_local/unix/config_files/check_msg2qm.m4 +++ b/adm_local/unix/config_files/check_msg2qm.m4 @@ -1,3 +1,24 @@ +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 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 a1eb48ee2..dc94b1271 100644 --- a/adm_local/unix/config_files/check_opengl.m4 +++ b/adm_local/unix/config_files/check_opengl.m4 @@ -1,23 +1,23 @@ -dnl Copyright (C) 2003 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +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 AC_DEFUN([CHECK_OPENGL],[ AC_REQUIRE([AC_PROG_CC])dnl @@ -30,7 +30,7 @@ AC_LANG_CPLUSPLUS AC_ARG_WITH(opengl, [AC_HELP_STRING([--with-opengl=DIR],[root directory path of OpenGL installation])], [opengl_dir="$withval"], - [dirs="/usr/lib${LIB_LOCATION_SUFFIX} /usr/local/lib${LIB_LOCATION_SUFFIX} /opt/graphics/OpenGL/lib${LIB_LOCATION_SUFFIX} /usr/openwin/lib${LIB_LOCATION_SUFFIX} /usr/X11R6/lib${LIB_LOCATION_SUFFIX}"])dnl + [dirs="/usr/lib64 /usr/lib /usr/local/lib64 /usr/local/lib /opt/graphics/OpenGL/lib64 /opt/graphics/OpenGL/lib /usr/openwin/lib64 /usr/openwin/lib /usr/X11R6/lib64 /usr/X11R6/lib"])dnl AC_CHECKING(for OpenGL) AC_CHECKING(for OpenGL headers) @@ -107,7 +107,7 @@ if test "x${OpenGL_headers_ok}" = "xyes" ; then for idir in $dirs; do if test -r "${idir}/libGL.so"; then AC_MSG_RESULT(in ${idir}) - if test "x${idir}" = "x/usr/lib${LIB_LOCATION_SUFFIX}" ; then + if test "x${idir}" = "x/usr/lib64" -o "x${idir}" = "x/usr/lib" ; then GL_LIB_PATH="" else GL_LIB_PATH="-L${idir}" @@ -117,7 +117,7 @@ if test "x${OpenGL_headers_ok}" = "xyes" ; then # under IRIX ? if test -r "${idir}/libGL.sl"; then AC_MSG_RESULT(in ${idir}) - if test "x${idir}" = "x/usr/lib${LIB_LOCATION_SUFFIX}" ; then + if test "x${idir}" = "x/usr/lib64" -o "x${idir}" = "x/usr/lib" ; then GL_LIB_PATH="" else GL_LIB_PATH="-L${idir}" @@ -144,7 +144,7 @@ if test "x${OpenGL_libs_ok}" = "xyes" ; then for idir in $dirs; do if test -r "${idir}/libGLU.so"; then AC_MSG_RESULT(in ${idir}) - if test "x${idir}" = "x/usr/lib${LIB_LOCATION_SUFFIX}" ; then + if test "x${idir}" = "x/usr/lib64" -o "x${idir}" = "x/usr/lib" ; then GLU_LIB_PATH="" else GLU_LIB_PATH="-L${idir}" @@ -154,7 +154,7 @@ if test "x${OpenGL_libs_ok}" = "xyes" ; then # under IRIX ? if test -r "${idir}/libGLU.sl"; then AC_MSG_RESULT(in ${idir}) - if test "x${idir}" = "x/usr/lib${LIB_LOCATION_SUFFIX}" ; then + if test "x${idir}" = "x/usr/lib64" -o "x${idir}" = "x/usr/lib" ; then GLU_LIB_PATH="" else GLU_LIB_PATH="-L${idir}" diff --git a/adm_local/unix/config_files/check_pyqt.m4 b/adm_local/unix/config_files/check_pyqt.m4 index f63479879..9f201a915 100644 --- a/adm_local/unix/config_files/check_pyqt.m4 +++ b/adm_local/unix/config_files/check_pyqt.m4 @@ -1,329 +1,213 @@ -dnl Copyright (C) 2003 CEA/DEN, EDF R&D - +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 AC_DEFUN([CHECK_PYQT],[ AC_REQUIRE([CHECK_PYTHON])dnl AC_REQUIRE([CHECK_QT])dnl AC_REQUIRE([CHECK_SIP])dnl AC_REQUIRE([AC_LINKER_OPTIONS])dnl -AC_LANG_SAVE -AC_LANG_CPLUSPLUS +dnl AC_LANG_SAVE +dnl AC_LANG_CPLUSPLUS AC_ARG_WITH(pyqt, [ --with-pyqt=DIR root directory path to PyQt installation ], [PYQTDIR="$withval" - AC_MSG_RESULT("select $withval as path to PyQt") + AC_MSG_RESULT([Try $withval as path to the PyQt]) ]) AC_ARG_WITH(pyqt_sips, [ --with-pyqt_sips=DIR a directory path to PyQt sips installation ], [PYQT_SIPS="$withval" - AC_MSG_RESULT("select $withval as path to PyQt sips") + AC_MSG_RESULT([Try $withval as path to the PyQt sip files]) ]) - -AC_ARG_WITH(pyuic, - [ --with-pyuic=EXEC pyuic executable ], +AC_ARG_WITH(pyuic4, + [ --with-pyuic4=EXEC pyuic4 executable ], [PYUIC="$withval" - AC_MSG_RESULT("select $withval as pyqt executable") + AC_MSG_RESULT([Try $withval as pyuic4 executable]) ]) AC_CHECKING(for pyqt) -pyqt_ok=yes - -dnl look for pyuic -pyqt_uic_ok=no -if test "x$PYUIC" != x; then - dnl try withval value - AC_CHECK_FILE($PYUIC,pyqt_uic_ok=yes,pyqt_uic_ok=no) -fi -if test "x$pyqt_uic_ok" == "xno"; then - dnl try ${PYQTDIR} - if test "x${PYQTDIR}" != "x"; then - if test -d ${PYQTDIR} ; then - AC_CHECK_FILE(${PYQTDIR}/pyuic,pyqt_uic_ok=yes,pyqt_uic_ok=no) - if test "x$pyqt_uic_ok" == "xyes"; then - PYUIC="${PYQTDIR}/pyuic" - fi - fi - fi -fi -if test "x$pyqt_uic_ok" == "xno"; then - dnl try in $PATH - AC_PATH_PROG(PYUIC, pyuic) - if test "x$PYUIC" != x; then - PYQTDIR=$PYUIC - PYQTDIR=`dirname $PYQTDIR` - PYQTDIR=`dirname $PYQTDIR` - pyqt_uic_ok=yes - fi -fi -if test "x$pyqt_uic_ok" == "xno"; then - dnl try ${SIPDIR} - if test "x${SIPDIR}" != "x"; then - if test -d ${SIPDIR} ; then - AC_CHECK_FILE(${SIPDIR}/pyuic,pyqt_uic_ok=yes,pyqt_uic_ok=no) - if test "x$pyqt_uic_ok" == "xyes"; then - PYUIC="${SIPDIR}/pyuic" - fi - fi - fi -fi -if test "x$pyqt_uic_ok" == "xno"; then - dnl try ${PYTHONHOME}/bin - if test "x${PYTHONHOME}" != "x"; then - if test -d ${PYTHONHOME}/bin ; then - AC_CHECK_FILE(${PYTHONHOME}/bin/pyuic,pyqt_uic_ok=yes,pyqt_uic_ok=no) - if test "x$pyqt_uic_ok" == "xyes"; then - PYUIC="${PYTHONHOME}/bin/pyuic" - fi - fi - fi -fi -if test "x$pyqt_uic_ok" == "xno"; then - dnl try /usr/bin - AC_CHECK_FILE(/usr/bin/pyuic,pyqt_uic_ok=yes,pyqt_uic_ok=no) - if test "x$pyqt_uic_ok" == "xyes"; then - PYUIC="/usr/bin/pyuic" - fi -fi -if test "x$pyqt_uic_ok" == "xno"; then - pyqt_ok=no -fi +pyqt_ok=no -dnl look for PyQt libs -pyqt_lib_ok=no -if test "x${PYQTDIR}" != "x"; then - dnl try {PYQTDIR} - AC_CHECK_FILE(${PYQTDIR}/libqtcmodule.so,pyqt_lib_ok=yes,pyqt_lib_ok=no) - if test "x$pyqt_lib_ok" == "xyes"; then - if test "x${PYQTDIR}" = "x/usr/lib" - then - PYQT_LIBS="-lqtcmodule" - else - PYQT_LIBS="-L${PYQTDIR} -lqtcmodule" - fi - else - AC_CHECK_FILE(${PYQTDIR}/qt.so,pyqt_lib_ok=yes,pyqt_lib_ok=no) - if test "x$pyqt_lib_ok" == "xyes"; then - if test "x${PYQTDIR}" = "x/usr/lib" - then - PYQT_LIBS="" - else - PYQT_LIBS="-L${PYQTDIR}" - fi +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 - fi - if test "x$pyqt_lib_ok" == "xno"; then - dnl try ${PYQTDIR}/lib - if test -d ${PYQTDIR}/lib; then - AC_CHECK_FILE(${PYQTDIR}/lib/libqtcmodule.so,pyqt_lib_ok=yes,pyqt_lib_ok=no) - if test "x$pyqt_lib_ok" == "xyes"; then - PYQT_LIBS="-L${PYQTDIR}/lib -lqtcmodule" - else - AC_CHECK_FILE(${PYQTDIR}/lib/qt.so,pyqt_lib_ok=yes,pyqt_lib_ok=no) - if test "x$pyqt_lib_ok" == "xyes"; then - PYQT_LIBS="-L${PYQTDIR}/lib" - fi - 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 - fi - if test "x$pyqt_lib_ok" == "xno"; then - dnl try ${PYQTDIR}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages - if test -d ${PYQTDIR}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages; then - AC_CHECK_FILE(${PYQTDIR}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages/libqtcmodule.so,pyqt_lib_ok=yes,pyqt_lib_ok=no) - if test "x$pyqt_lib_ok" == "xyes"; then - PYQT_LIBS="-L${PYQTDIR}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages -lqtcmodule" - else - AC_CHECK_FILE(${PYQTDIR}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages/qt.so,pyqt_lib_ok=yes,pyqt_lib_ok=no) - if test "x$pyqt_lib_ok" == "xyes"; then - PYQT_LIBS="-L${PYQTDIR}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages" - fi - fi + if test "x${PYTHONHOME}" != "x" ; then + TEST_BIN_DIRS="${TEST_BIN_DIRS} ${PYTHONHOME}/bin" fi - fi -fi -if test "x$pyqt_lib_ok" == "xno"; then - dnl try ${SIPDIR} - if test "x${SIPDIR}" != "x"; then - if test -d ${SIPDIR} ; then - AC_CHECK_FILE(${SIPDIR}/libqtcmodule.so,pyqt_lib_ok=yes,pyqt_lib_ok=no) - if test "x$pyqt_lib_ok" == "xyes"; then - if test "x${SIPDIR}" = "x/usr/lib" - then - PYQT_LIBS="-lqtcmodule" + TEST_BIN_DIRS="${TEST_BIN_DIRS} /usr/bin" + + dnl search pyuic4 + pyqt_ok=no + for d in ${TEST_BIN_DIRS} ; do + if test "x${d}" = "x__CHECK__PATH__" ; then + AC_PATH_PROG(TEMP, pyuic4) + if test "x${TEMP}" != "x" ; then + PYUIC=${TEMP} + if test "x$PYQTDIR" = "x" ; then + PYQTDIR=`dirname ${PYUIC}` + PYQTDIR=`dirname ${PYQTDIR}` + fi + pyqt_ok=yes + break + fi else - PYQT_LIBS="-L${SIPDIR} -lqtcmodule" - fi - else - AC_CHECK_FILE(${SIPDIR}/qt.so,pyqt_lib_ok=yes,pyqt_lib_ok=no) - if test "x$pyqt_lib_ok" == "xyes"; then - if test "x${SIPDIR}" = "x/usr/lib" - then - PYQT_LIBS="" - else - PYQT_LIBS="-L${SIPDIR}" - fi + if test -d $d ; then + AC_CHECK_FILE(${d}/pyuic4,pyqt_ok=yes,pyqt_ok=no) + if test "x$pyqt_ok" == "xyes" ; then + PYUIC=${d}/pyuic4 + break + fi + fi fi - fi - fi - fi + done fi -if test "x$pyqt_lib_ok" == "xno"; then - dnl try ${PYTHONHOME}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages - if test "x${PYTHONHOME}" != "x"; then - if test -d ${PYTHONHOME}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages ; then - AC_CHECK_FILE(${PYTHONHOME}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages/libqtcmodule.so,pyqt_lib_ok=yes,pyqt_lib_ok=no) - if test "x$pyqt_lib_ok" == "xyes"; then - PYQT_LIBS="-L${PYTHONHOME}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages -lqtcmodule" - else - AC_CHECK_FILE(${PYTHONHOME}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages/qt.so,pyqt_lib_ok=yes,pyqt_lib_ok=no) - if test "x$pyqt_lib_ok" == "xyes"; then - PYQT_LIBS="-L${PYTHONHOME}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages" - fi - fi + +dnl check PyQt version +if test "x$pyqt_ok" == "xyes" ; then + AC_MSG_CHECKING(whether PyQt version >= 4.2) + PYQT_VERSION=`${PYUIC} --version 2>&1 | grep "Python User Interface Compiler"` + if test "$?" != "0" ; then + PYQT_VERSION=`${PYUIC} -version 2>&1 | grep "Python User Interface Compiler"` fi - fi -fi -if test "x$pyqt_lib_ok" == "xno"; then - dnl try /usr/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages - AC_CHECK_FILE(/usr/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages/libqtcmodule.so,pyqt_lib_ok=yes,pyqt_lib_ok=no) - if test "x$pyqt_lib_ok" == "xyes"; then - PYQT_LIBS="-L/usr/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages -lqtcmodule" - else - AC_CHECK_FILE(/usr/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages/qt.so,pyqt_lib_ok=yes,pyqt_lib_ok=no) - if test "x$pyqt_lib_ok" == "xyes"; then - PYQT_LIBS="-L/usr/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages" + if test "x${PYQT_VERSION}" != "x" ; then + PYQT_VERSION=`echo $PYQT_VERSION | sed -e 's%[[[:alpha:][:space:]]]*\([[[:digit:].]]*\).*%\1%g'` + PYQT_VERSION_ID=`echo $PYQT_VERSION | awk -F. '{v=$[1]*10000+$[2]*100+$[3];print v}'` + else + PYQT_VERSION="" + PYQT_VERSION_ID=0 fi - fi -fi -if test "x$pyqt_lib_ok" == "xno"; then - pyqt_ok=no + if test $PYQT_VERSION_ID -ge 40200 ; then + AC_MSG_RESULT(yes) + AC_MSG_RESULT(PyQt version is $PYQT_VERSION) + else + AC_MSG_RESULT(no) + AC_MSG_RESULT(WARNING! PyQt version $PYQT_VERSION is not supported (at least 4.2 is required)!) + pyqt_ok=no + fi +else + AC_MSG_RESULT(Warning! pyuic4 is not found!) fi -dnl look for PyQt sips -pyqt_sips_ok=no -dnl try ${PYQT_SIPS} or ${PYQT_SIPS}/qt -if test "x${PYQT_SIPS}" != "x"; then - AC_CHECK_FILE(${PYQT_SIPS}/qglobal.sip,pyqt_sips_ok=yes,pyqt_sips_ok=no) - if test "x$pyqt_sips_ok" == "xno"; then - AC_CHECK_FILE(${PYQT_SIPS}/qt/qglobal.sip,pyqt_sips_ok=yes,pyqt_sips_ok=no) - if test "x$pyqt_sips_ok" == "xyes"; then - PYQT_SIPS="${PYQT_SIPS}/qt" +if test "x$pyqt_ok" == "xyes" ; then + TESTLIBFILE=QtCore.so + TESTSIPFILE=QtCore/QtCoremod.sip + TEST_LIB_DIRS="" + TEST_SIPS_DIRS="" + if test "x${PYQT_SIPS}" != "x" ; then + TEST_SIPS_DIRS="${TEST_SIPS_DIRS} ${PYQT_SIPS}" fi - fi -fi -if test "x$pyqt_sips_ok" == "xno"; then - dnl try ${PYQTDIR}/sip - if test "x${PYQTDIR}" != "x"; then - if test -d ${PYQTDIR}/sip ; then - AC_CHECK_FILE(${PYQTDIR}/sip/qglobal.sip,pyqt_sips_ok=yes,pyqt_sips_ok=no) - if test "x$pyqt_sips_ok" == "xyes"; then - PYQT_SIPS="${PYQTDIR}/sip" - else - AC_CHECK_FILE(${PYQTDIR}/sip/qt/qglobal.sip,pyqt_sips_ok=yes,pyqt_sips_ok=no) - if test "x$pyqt_sips_ok" == "xyes"; then - PYQT_SIPS="${PYQTDIR}/sip/qt" - fi - fi + if test "x${PYQTDIR}" != "x" ; then + TEST_LIB_DIRS="${TEST_LIB_DIRS} ${PYQTDIR} ${PYQTDIR}/lib ${PYQTDIR}/PyQt4" + TEST_LIB_DIRS="${TEST_LIB_DIRS} ${PYQTDIR}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages" + TEST_LIB_DIRS="${TEST_LIB_DIRS} ${PYQTDIR}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages/PyQt4" + TEST_SIPS_DIRS="${TEST_SIPS_DIRS} ${PYQTDIR} ${PYQTDIR}/sip" + TEST_SIPS_DIRS="${TEST_SIPS_DIRS} ${PYQTDIR}/share ${PYQTDIR}/share/sip" fi - fi -fi -if test "x$pyqt_sips_ok" == "xno"; then - dnl try ${PYQTDIR}/share/sip/qt - if test "x${PYQTDIR}" != "x"; then - if test -d ${PYQTDIR}/share/sip/qt ; then - AC_CHECK_FILE(${PYQTDIR}/share/sip/qt/qglobal.sip,pyqt_sips_ok=yes,pyqt_sips_ok=no) - if test "x$pyqt_sips_ok" == "xyes"; then - PYQT_SIPS="${PYQTDIR}/share/sip/qt" - fi + if test "x${SIPDIR}" != "x" ; then + TEST_LIB_DIRS="${TEST_LIB_DIRS} ${SIPDIR} ${SIPDIR}/lib ${SIPDIR}/PyQt4" + TEST_LIB_DIRS="${TEST_LIB_DIRS} ${SIPDIR}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages" + TEST_LIB_DIRS="${TEST_LIB_DIRS} ${SIPDIR}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages/PyQt4" + TEST_SIPS_DIRS="${TEST_SIPS_DIRS} ${SIPDIR} ${SIPDIR}/sip" + TEST_SIPS_DIRS="${TEST_SIPS_DIRS} ${SIPDIR}/share ${SIPDIR}/share/sip ${SIPDIR}/share/sip/PyQt4" fi - fi -fi -if test "x$pyqt_sips_ok" == "xno"; then - dnl try ${SIPDIR}/sip - if test "x${SIPDIR}" != "x"; then - if test -d ${SIPDIR}/sip ; then - AC_CHECK_FILE(${SIPDIR}/sip/qglobal.sip,pyqt_sips_ok=yes,pyqt_sips_ok=no) - if test "x$pyqt_sips_ok" == "xyes"; then - PYQT_SIPS="${SIPDIR}/sip" - else - AC_CHECK_FILE(${SIPDIR}/sip/qt/qglobal.sip,pyqt_sips_ok=yes,pyqt_sips_ok=no) - if test "x$pyqt_sips_ok" == "xyes"; then - PYQT_SIPS="${SIPDIR}/sip/qt" - fi - fi + if test "x${PYTHONHOME}" != "x" ; then + TEST_LIB_DIRS="${TEST_LIB_DIRS} ${PYTHONHOME}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages" + TEST_LIB_DIRS="${TEST_LIB_DIRS} ${PYTHONHOME}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages/PyQt4" fi - fi -fi -if test "x$pyqt_sips_ok" == "xno"; then - dnl try /usr/share/sip - if test -d /usr/share/sip ; then - AC_CHECK_FILE(/usr/share/sip/qglobal.sip,pyqt_sips_ok=yes,pyqt_sips_ok=no) - if test "x$pyqt_sips_ok" == "xyes"; then - PYQT_SIPS="/usr/share/sip" - else - AC_CHECK_FILE(/usr/share/sip/qt/qglobal.sip,pyqt_sips_ok=yes,pyqt_sips_ok=no) - if test "x$pyqt_sips_ok" == "xyes"; then - PYQT_SIPS="/usr/share/sip/qt" - 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_SIPS_DIRS="${TEST_SIPS_DIRS} /usr/share/sip" + TEST_SIPS_DIRS="${TEST_SIPS_DIRS} /usr/share/sip/PyQt4" + + dnl check PyQt libs + pyqt_ok=no + for d in ${TEST_LIB_DIRS} ; do + if test -d $d ; then + AC_CHECK_FILE(${d}/${TESTLIBFILE},pyqt_ok=yes,pyqt_ok=no) + if test "x$pyqt_ok" == "xyes" ; then + if test "x${d}" = "x/usr/lib${LIB_LOCATION_SUFFIX}" ; then + PYQT_LIBS="" + else + PYQT_LIBS="-L${d}" + fi + break + fi + fi + done + + dnl check PyQt sips + if test "x$pyqt_ok" == "xyes" ; then + pyqt_ok=no + for d in ${TEST_SIPS_DIRS} ; do + if test -d $d ; then + AC_CHECK_FILE(${d}/${TESTSIPFILE},pyqt_ok=yes,pyqt_ok=no) + if test "x$pyqt_ok" == "xyes" ; then + PYQT_SIPS=${d} + PYQT_INCLUDES="-I ${d}" + PYQT_INCLUDES="${PYQT_INCLUDES} -I ${d}/QtCore -I ${d}/QtGui" + PYQT_INCLUDES="${PYQT_INCLUDES} -I ${d}/QtXml -I ${d}/QtOpenGL" + PYQT_INCLUDES="${PYQT_INCLUDES} -I ${d}/QtAssistant -I ${d}/QtDesigner" + PYQT_INCLUDES="${PYQT_INCLUDES} -I ${d}/QtNetwork -I ${d}/QtSql" + 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}" + break + fi + fi + done fi - fi -fi -if test "x$pyqt_sips_ok" == "xno"; then - pyqt_ok=no -else - PYQT_INCLUDES="-I$PYQT_SIPS" - - dnl Additional sip flags required for correct wrappers compilation - AC_MSG_CHECKING(which qt classes should be excluded) - - PYQT_SIPFLAGS="" - - CXXFLAGS_old=$CXXFLAGS - CXXFLAGS="$CXXFLAGS $QT_INCLUDES" - LIBS_old=$LIBS - LIBS="$LIBS $QT_LIBS" - - AC_TRY_COMPILE([#include ], - [new QCDEStyle();],,PYQT_SIPFLAGS="$PYQT_SIPFLAGS -x Qt_STYLE_CDE") - AC_TRY_COMPILE([#include ], - [new QInterlaceStyle();],,PYQT_SIPFLAGS="$PYQT_SIPFLAGS -x Qt_STYLE_INTERLACE") - AC_TRY_COMPILE([#include ], - [new QMotifStyle();],,PYQT_SIPFLAGS="$PYQT_SIPFLAGS -x Qt_STYLE_MOTIF") - AC_TRY_COMPILE([#include ], - [new QMotifPlusStyle();],,PYQT_SIPFLAGS="$PYQT_SIPFLAGS -x Qt_STYLE_MOTIFPLUS") - AC_TRY_COMPILE([#include ], - [new QPlatinumStyle();],,PYQT_SIPFLAGS="$PYQT_SIPFLAGS -x Qt_STYLE_PLATINUM") - AC_TRY_COMPILE([#include ], - [new QSGIStyle();],,PYQT_SIPFLAGS="$PYQT_SIPFLAGS -x Qt_STYLE_SGI") - AC_TRY_COMPILE([#include ], - [new QWindowsStyle();],,PYQT_SIPFLAGS="$PYQT_SIPFLAGS -x Qt_STYLE_WINDOWS") - AC_TRY_COMPILE([#include ], - [new QWindowsXPStyle();],,PYQT_SIPFLAGS="$PYQT_SIPFLAGS -x Qt_STYLE_WINDOWSXP") - - LIBS="$LIBS -lqassistantclient" - AC_TRY_LINK([#include ], - [new QAssistantClient("foo");],,PYQT_SIPFLAGS="$PYQT_SIPFLAGS -x Qt_ASSISTANTCLIENT") - - AC_MSG_RESULT(done) - - CXXFLAGS=$CXXFLAGS_old - LIBS=$LIBS_old fi -# get latest Qt version supported -QT_VERS=`grep -e "[[[:space:]]]*Qt_[[[:digit:]_]]\+}" ${PYQT_SIPS}/versions.sip | sed -e "s/\(.*\)[[[:space:]]]*\(Qt_[[[:digit:]_]]\+\)}/\2/g"` -AC_MSG_RESULT(Latest Qt version supported by PyQt is $QT_VERS) AC_SUBST(PYQT_INCLUDES) AC_SUBST(PYQT_LIBS) AC_SUBST(PYQT_SIPS) AC_SUBST(PYUIC) AC_SUBST(PYQT_SIPFLAGS) -AC_SUBST(QT_VERS) -AC_LANG_RESTORE +dnl AC_LANG_RESTORE AC_MSG_RESULT(for pyqt: $pyqt_ok) diff --git a/adm_local/unix/config_files/check_qt.m4 b/adm_local/unix/config_files/check_qt.m4 index 1aea9c3a2..5859b6afc 100644 --- a/adm_local/unix/config_files/check_qt.m4 +++ b/adm_local/unix/config_files/check_qt.m4 @@ -1,24 +1,37 @@ -dnl Copyright (C) 2003 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +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_QT +dnl ------------------------------------------------------------------------ +dnl Adds the --with-qt=path +dnl +AC_DEFUN([OPTIONS_QT], [ + AC_ARG_WITH([qt], + [AC_HELP_STRING([--with-qt], [Possible usage: + "Qt_Install_Path" - prefix to path where Qt was installd; + "" or "yes" or "auto" - means seaching installed Qt product in the system (checking $QTDIR and then - standard system paths ); + "no" - not use Qt product (is not supported) + By default "" option is used)])], + [with_qt=$withval], [with_qt=""]) +]) AC_DEFUN([CHECK_QT],[ AC_REQUIRE([AC_PROG_CC])dnl @@ -28,6 +41,8 @@ AC_REQUIRE([AC_PROG_CXXCPP])dnl AC_REQUIRE([CHECK_OPENGL])dnl AC_REQUIRE([AC_LINKER_OPTIONS])dnl +AC_REQUIRE([OPTIONS_QT])dnl + AC_CHECKING(for Qt) if test "x$OpenGL_ok" != "xyes" ; then @@ -39,19 +54,94 @@ qt_ok=yes AC_LANG_SAVE AC_LANG_CPLUSPLUS +dnl QT install dir +if test -z $with_qt ; then + with_qt="" +fi +if test "x$with_qt" = "xyes" ; then + dnl in case user wrote --with-qt=yes + with_qt="" +fi +if test "x$with_qt" = "xauto" ; then + dnl in case user wrote --with-qt=auto + with_qt="" +fi +if test "x$with_qt" = "xno" ; then + dnl in case user wrote --with-qt=no + with_qt="" + AC_MSG_WARN(Value no, specified for option --with-qt, is not supported) +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 + else + if test -f ${d}/include/qconfig.h ; then + AC_MSG_RESULT(trying ${d}) + QTDIR="${d}" + break + fi + fi + done + else + dnl Using QTDIR environment variable + AC_MSG_RESULT(QTDIR is $QTDIR) + fi +fi + +# +# check QTDIR environment variable +# if test "x$QTDIR" = "x" then - AC_MSG_RESULT(please define QTDIR variable) + AC_MSG_RESULT(Please define correct path in "--with-qt" option or use correct $QTDIR variable) qt_ok=no -else - AC_MSG_RESULT(QTDIR is $QTDIR) +fi + +# +# check Qt version +# +if test "x$qt_ok" = "xyes" +then qt_inc_ok=no QTINC="" - AC_CHECK_FILE(${QTDIR}/include/qt3/qglobal.h,QTINC="/qt3",QTINC="") - QT_VERSION=`grep "QT_VERSION_STR" ${QTDIR}/include${QTINC}/qglobal.h | sed -e 's%^#define QT_VERSION_STR\([[:space:]]*\)%%g' -e 's%\"%%g'` - AC_MSG_RESULT(Qt version is $QT_VERSION) + 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 + 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'` + QT_VERSION_ID=`echo $QT_VERSION | awk -F. '{v=$[1]*10000+$[2]*100+$[3];print v}'` + if test $QT_VERSION_ID -ge 40000 + then + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + qt_ok=no + fi + AC_MSG_CHECKING(Qt version) + AC_MSG_RESULT($QT_VERSION) + else + qt_ok=no + fi fi +# +# check moc presence (meta-object compiler) +# if test "x$qt_ok" = "xyes" then if test -f ${QTDIR}/bin/moc @@ -63,13 +153,31 @@ then if test "x$MOC" = "x" then qt_ok=no - AC_MSG_RESULT(moc qt-compiler not in PATH variable) + AC_MSG_RESULT(moc (Qt meta-object compiler) is not in the PATH variable) else qt_ok=yes - AC_MSG_RESULT(moc found) + AC_MSG_RESULT(moc (Qt meta-object compiler) is found) + fi + + if test "x$qt_ok" = "xyes" + then + dnl check moc version + AC_MSG_CHECKING(cheching 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 + fi fi fi +# +# check uic presence (user interface compiler) +# if test "x$qt_ok" = "xyes" then if test -f ${QTDIR}/bin/uic @@ -81,94 +189,227 @@ then if test "x$UIC" = "x" then qt_ok=no - AC_MSG_RESULT(uic qt-interface compiler not in PATH variable) + AC_MSG_RESULT(uic (Qt user interface compiler) is not in the PATH variable) else qt_ok=yes - AC_MSG_RESULT(uic found) + AC_MSG_RESULT(uic (Qt user interface compiler) is found) fi fi -AC_SUBST(QTDIR) -QT_ROOT=$QTDIR +# +# check rcc presence (resources compiler) +# +if test "x$qt_ok" = "xyes" +then + if test -f ${QTDIR}/bin/rcc + then + QRCC=${QTDIR}/bin/rcc + else + AC_PATH_PROG(QRCC, rcc) + fi + if test "x$QRCC" = "x" + then + qt_ok=no + AC_MSG_RESULT(rcc (Qt resources compiler) is not in the PATH variable) + else + qt_ok=yes + AC_MSG_RESULT(rcc (Qt resources compiler) is found) + fi + + if test "x$qt_ok" = "xyes" + then + dnl check rcc version + AC_MSG_CHECKING(cheching equality Qt and rcc tool version) + QRCC_VERSION=`$QRCC -v 2>&1 | awk '{print $NF}'` + if test "x$QT_VERSION" = "x$QRCC_VERSION" + then + AC_MSG_RESULT(yes) + qt_ok=yes + else + AC_MSG_RESULT(rcc tool and Qt product are inpompatible) + qt_ok=no + fi + fi +fi +# +# check lrelease presence (translation files compiler) +# if test "x$qt_ok" = "xyes" then - CPPFLAGS_old=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$QTDIR/include${QTINC}" + if test -f ${QTDIR}/bin/lrelease + then + LRELEASE=${QTDIR}/bin/lrelease + else + AC_PATH_PROG(LRELEASE, lrelease) + fi + if test "x$LRELEASE" = "x" + then + qt_ok=no + AC_MSG_RESULT(lrelease (Qt translation files compiler) is not in the PATH variable) + else + qt_ok=yes + AC_MSG_RESULT(lrelease (Qt translation files compiler) is found) + fi + + if test "x$qt_ok" = "xyes" + then + dnl check lrelease version + AC_MSG_CHECKING( equality of Qt and lrelease tool version) + LRELEASE_VERSION=`$LRELEASE -version 2>&1 | awk '{print $NF}'` + if test "x$QT_VERSION" = "x$LRELEASE_VERSION" + then + AC_MSG_RESULT(yes) + qt_ok=yes + else + AC_MSG_RESULT(lrelease tool and Qt product are inpompatible) + qt_ok=no + fi + fi +fi - AC_LANG_CPLUSPLUS - AC_CHECK_HEADER(qaction.h,qt_ok=yes ,qt_ok=no) +QT_ROOT=$QTDIR - CPPFLAGS=$CPPFLAGS_old +# +# check Qt header files +# +if test "x$qt_ok" = "xyes" +then + AC_CHECKING(include Qt header files) - AC_MSG_CHECKING(include of qt headers) + CPPFLAGS_old=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I${QTDIR}/include${QTINC} -I${QTDIR}/include${QTINC}/QtCore" + AC_CHECK_HEADER(QObject,qt_ok=yes,qt_ok=no) + CPPFLAGS=$CPPFLAGS_old if test "x$qt_ok" = "xno" then - AC_MSG_RESULT(qt headers not found, or too old qt version, in $QTDIR/include) - AC_MSG_RESULT(QTDIR environment variable may be wrong) + AC_MSG_RESULT(qt header files are not found in $QTDIR/include${QTINC}/QtCore) + AC_MSG_RESULT(QTDIR environment variable may be wrong (probably too old Qt version)) else - AC_MSG_RESULT(yes) - QT_INCLUDES="-I${QT_ROOT}/include${QTINC} -DQT_THREAD_SUPPORT -DQT_CLEAN_NAMESPACE" - QT_MT_INCLUDES="-I${QT_ROOT}/include${QTINC} -DQT_THREAD_SUPPORT -DQT_CLEAN_NAMESPACE" + 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" + + # this flag is obsolete with Qt 4 + QT_MT_INCLUDES="$QT_INCLUDES" fi fi +# +# test Qt libraries +# if test "x$qt_ok" = "xyes" then - AC_MSG_CHECKING(linking qt library) + AC_MSG_CHECKING(linking against Qt library) + + CXXFLAGS_old=$CXXFLAGS + CXXFLAGS="$CXXFLAGS $QT_INCLUDES" + LIBS_old=$LIBS if test "x$QTDIR" = "x/usr" then - LIBS="$LIBS -lqt-mt $OGL_LIBS" + 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" else - LIBS="$LIBS -L$QTDIR/lib${LIB_LOCATION_SUFFIX} -lqt-mt $OGL_LIBS" + AC_MSG_ERROR(Can't detect of Qt library directory ) + qt_ok=no fi - - CXXFLAGS_old=$CXXFLAGS - CXXFLAGS="$CXXFLAGS $QT_INCLUDES" + LIBS="$LIBS $QT_LIB_DIR -lQtCore" AC_CACHE_VAL(salome_cv_lib_qt,[ AC_TRY_LINK( -#include +#include , int n; char **s; - QApplication a(n, s); + QCoreApplication a(n, s); a.exec();, eval "salome_cv_lib_qt=yes",eval "salome_cv_lib_qt=no") ]) qt_ok="$salome_cv_lib_qt" + # BEGIN: for CCRT (installation of qt have only a "lib" directory) if test "x$qt_ok" = "xno" then + QT_LIB_DIR="-L$QTDIR/lib" + LIBS="$LIBS_old $QT_LIB_DIR -lQtCore" + + AC_CACHE_VAL(salome_cv_lib_qt,[ + AC_TRY_LINK( +#include +, int n; + char **s; + QCoreApplication a(n, s); + a.exec();, + eval "salome_cv_lib_qt=yes",eval "salome_cv_lib_qt=no") + ]) + qt_ok="$salome_cv_lib_qt" + fi + # END: for CCRT + + if test "x$qt_ok" = "xno" + then + AC_MSG_RESULT(no) AC_MSG_RESULT(unable to link with qt library) - AC_MSG_RESULT(QTDIR environment variable may be wrong) + AC_MSG_RESULT(QTDIR environment variable may be wrong (probably too old Qt version)) else AC_MSG_RESULT(yes) - if test "x$QTDIR" = "x/usr" - then - QT_LIBS=" -lqt-mt" - QT_MT_LIBS=" -lqt-mt" - else - QT_LIBS="-L$QTDIR/lib${LIB_LOCATION_SUFFIX} -lqt-mt" - QT_MT_LIBS="-L$QTDIR/lib${LIB_LOCATION_SUFFIX} -lqt-mt" - fi + # 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" + # all libs + QT_LIBS="$QT_CORE_LIBS $QT_GUI_LIBS $QT_OTHER_LIBS" + # this flag is obsolete with Qt 4 + QT_MT_LIBS="$QT_LIBS" fi - LIBS=$LIBS_old CXXFLAGS=$CXXFLAGS_old - fi +AC_SUBST(QTDIR) AC_SUBST(MOC) AC_SUBST(UIC) +AC_SUBST(QRCC) +AC_SUBST(LRELEASE) AC_SUBST(QT_ROOT) AC_SUBST(QT_INCLUDES) AC_SUBST(QT_MT_INCLUDES) +AC_SUBST(QT_ASSISTANT_INCLUDES) +AC_SUBST(QT_LIB_DIR) +AC_SUBST(QT_CORE_LIBS) +AC_SUBST(QT_GUI_LIBS) +AC_SUBST(QT_OTHER_LIBS) AC_SUBST(QT_LIBS) AC_SUBST(QT_MT_LIBS) +AC_SUBST(QT_ASSISTANT_LIBS) AC_SUBST(QT_VERSION) +AC_SUBST(QT_VERSION_ID) AC_LANG_RESTORE diff --git a/adm_local/unix/config_files/check_qwt.m4 b/adm_local/unix/config_files/check_qwt.m4 index d9bc23fbf..c62506993 100644 --- a/adm_local/unix/config_files/check_qwt.m4 +++ b/adm_local/unix/config_files/check_qwt.m4 @@ -1,14 +1,36 @@ -dnl Copyright (C) 2003 CEA/DEN, EDF R&D - +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 AC_DEFUN([CHECK_QWT],[ AC_REQUIRE([CHECK_QT])dnl AC_REQUIRE([AC_LINKER_OPTIONS])dnl AC_CHECKING(for qwt) +AC_LANG_SAVE +AC_LANG_CPLUSPLUS + qwt_ok=yes -dnl were is qwt ? +dnl where is qwt ? AC_ARG_WITH(qwt, [ --with-qwt=DIR directory path to QWT installation ], @@ -18,47 +40,49 @@ AC_ARG_WITH(qwt, AC_ARG_WITH(qwt_inc, [ --with-qwt_inc=DIR directory path to QWT includes ], - [QWT_INCLUDES="$withval" + [QWT_INCDIR="$withval" AC_MSG_RESULT("select $withval as path to QWT includes") ]) if test -z $QWTHOME; then AC_MSG_RESULT(QWTHOME not defined) - exits_ok=no - if test "x$exits_ok" = "xno"; then + 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,exits_ok=yes,exits_ok=no) - if test "x$exits_ok" = "xyes"; then + AC_CHECK_FILE(${d}/lib${LIB_LOCATION_SUFFIX}/libqwt.so,exist_ok=yes,exist_ok=no) + if test "x$exist_ok" = "xyes"; then QWTHOME=$d AC_MSG_RESULT(libqwt.so detected in $d/lib) fi done fi - if test "x$exits_ok" = "xno"; then + 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 AC_MSG_RESULT(libqwt.so detected in $d) QWTHOME=$d QWTHOME=`echo ${QWTHOME} | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"` - exits_ok=yes + exist_ok=yes break fi done fi - if test "x$exits_ok" = "xyes"; then - if test -z $QWT_INCLUDES; then - QWT_INCLUDES=$QWTHOME"/include/qwt" - if test ! -f $QWT_INCLUDES/qwt.h ; then - QWT_INCLUDES=$QWTHOME"/include" + if test "x$exist_ok" = "xyes"; then + if test -z $QWT_INCDIR; then + QWT_INCDIR=$QWTHOME"/include/qwt" + if test ! -f $QWT_INCDIR/qwt.h ; then + QWT_INCDIR=$QWTHOME"/include" fi - if test ! -f $QWT_INCLUDES/qwt.h ; then - QWT_INCLUDES=/usr/lib/qt3/include/qwt + if test ! -f $QWT_INCDIR/qwt.h ; then + QWT_INCDIR=/usr/lib/qt4/include/qwt fi fi + else + qwt_ok=no fi else - if test -z $QWT_INCLUDES; then - QWT_INCLUDES="$QWTHOME/include" + if test -z $QWT_INCDIR; then + QWT_INCDIR="$QWTHOME/include" fi fi @@ -67,86 +91,80 @@ if test "x$qwt_ok" = xno -o ! -d "$QWTHOME" ; then AC_MSG_WARN(qwt not found) qwt_ok=no else - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - CPPFLAGS_old=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$QWT_INCLUDES" - CPPFLAGS="$CPPFLAGS $QT_INCLUDES" - - AC_CHECK_HEADER(qwt.h,qwt_ok=yes,qwt_ok=no) + CPPFLAGS_old=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $QT_INCLUDES -I$QWT_INCDIR" - CPPFLAGS=$CPPFLAGS_old + AC_CHECK_HEADER(qwt.h,qwt_ok=yes,qwt_ok=no) + CPPFLAGS=$CPPFLAGS_old - if test "x$qwt_ok" = xno ; then - AC_MSG_RESULT(no) - AC_MSG_WARN(qwt not found) - else - qwt_ok=yes - fi + AC_MSG_CHECKING(include of qwt headers) -if test "x$qwt_ok" = "xyes" -then - AC_MSG_CHECKING(linking qwt library) - LIBS_old=$LIBS - if test "x$QTDIR" = "x/usr" - then - LIBS="$LIBS -lqt-mt" + if test "x$qwt_ok" = xno ; then + AC_MSG_RESULT(no) + AC_MSG_WARN(qwt not found) else - LIBS="$LIBS -L$QTDIR/lib${LIB_LOCATION_SUFFIX} -lqt-mt" - fi - if test "x$QWTHOME" = "x/usr" - then - LIBS="$LIBS -lqwt" - else - LIBS="$LIBS -L$QWTHOME/lib -lqwt" + AC_MSG_RESULT(yes) + QWT_INCLUDES=-I$QWT_INCDIR fi - CXXFLAGS_old=$CXXFLAGS - CXXFLAGS="$CXXFLAGS $QT_INCLUDES -I$QWT_INCLUDES" + # + # test Qwt libraries + # + if test "x$qwt_ok" = "xyes" ; then + AC_MSG_CHECKING(linking qwt library) - AC_CACHE_VAL(salome_cv_lib_qwt,[ - AC_TRY_LINK( -#include -#include -, int n; - char **s; - QApplication a(n, s); - QwtPlot* p; - a.setMainWidget(p); - a.exec();, - eval "salome_cv_lib_qwt=yes",eval "salome_cv_lib_qwt=no") - ]) - qwt_ok="$salome_cv_lib_qwt" - - if test "x$qwt_ok" = "xno" - then - AC_MSG_RESULT(unable to link with qwt library) - AC_MSG_RESULT(QWTHOME environment variable may be wrong) - else - QWT_INCLUDES="-I$QWT_INCLUDES" - if test "x$QWTHOME" = "x/usr" - then - QWT_LIBS=" -lqwt" + LIBS_old=$LIBS + LIBS="$LIBS $QT_LIBS" + if test "x$QWTHOME" = "x/usr" ; then + LIBS="$LIBS -lqwt" else - QWT_LIBS="-L$QWTHOME/lib -lqwt" + LIBS="$LIBS -L$QWTHOME/lib -lqwt" fi - AC_SUBST(QWT_INCLUDES) - AC_SUBST(QWT_LIBS) + CXXFLAGS_old=$CXXFLAGS + CXXFLAGS="$CXXFLAGS $QT_INCLUDES $QWT_INCLUDES" - AC_MSG_RESULT(yes) - fi + AC_CACHE_VAL(salome_cv_lib_qwt,[ + AC_TRY_LINK( +#include +#include +, int n; + char **s; + QApplication a(n, s); + QwtPlot p; + p.resize( 600, 400 ); + p.show(); + a.exec();, + eval "salome_cv_lib_qwt=yes",eval "salome_cv_lib_qwt=no") + ]) + qwt_ok="$salome_cv_lib_qwt" - LIBS=$LIBS_old - CXXFLAGS=$CXXFLAGS_old + if test "x$qwt_ok" = "xno" ; then + AC_MSG_RESULT(unable to link with qwt library) + AC_MSG_RESULT(QWTHOME environment variable may be wrong) + else + AC_MSG_RESULT(yes) + if test "x$QWTHOME" = "x/usr" ; then + QWT_LIBS=" -lqwt" + else + QWT_LIBS="-L$QWTHOME/lib -lqwt" + fi + fi + LIBS=$LIBS_old + CXXFLAGS=$CXXFLAGS_old + fi fi +AC_SUBST(QWT_INCLUDES) +AC_SUBST(QWT_LIBS) - AC_LANG_RESTORE +AC_LANG_RESTORE -fi +AC_MSG_RESULT(for qwt: $qwt_ok) +# Save cache +AC_CACHE_SAVE ])dnl dnl diff --git a/adm_local/unix/config_files/check_sip.m4 b/adm_local/unix/config_files/check_sip.m4 index 88cbe5951..464bdfd7e 100644 --- a/adm_local/unix/config_files/check_sip.m4 +++ b/adm_local/unix/config_files/check_sip.m4 @@ -1,5 +1,24 @@ -dnl Copyright (C) 2003 CEA/DEN, EDF R&D - +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 AC_DEFUN([CHECK_SIP],[ AC_REQUIRE([CHECK_PYTHON])dnl AC_REQUIRE([CHECK_QT])dnl @@ -10,176 +29,85 @@ sip_ok=yes AC_ARG_WITH(sip, [ --with-sip=EXEC sip executable ], [SIP="$withval" - AC_MSG_RESULT("select $withval as sip executable") + AC_MSG_RESULT([Try $withval as sip executable]) ], [ AC_PATH_PROG(SIP, sip) ]) if test "x$SIP" = "x" ; then sip_ok=no - AC_MSG_RESULT(sip not in PATH variable) + AC_MSG_RESULT(sip is not in the PATH variable) else - version=`$SIP -V` - AC_MSG_RESULT(sip version is $version) - case "$version" in - 3.2*) - SIP_VERS=v3_old ;; - 3.3*) - SIP_VERS=v3_old ;; - 3.4*) - SIP_VERS=v3_old ;; - 3.5*) - SIP_VERS=v3_old ;; - 3.6*) - SIP_VERS=v3_old ;; - 3.7*) - SIP_VERS=v3_old ;; - 3.8*) - SIP_VERS=v3_old ;; - 3.9*) - SIP_VERS=v3_old ;; - 3.10*) - SIP_VERS=v3_new ;; - 4.1*) - SIP_VERS=v4_old ;; - 4.2*) - SIP_VERS=v4_new ;; - 4.3*) - SIP_VERS=v4_new ;; - 4.4*) - SIP_VERS=v4_new ;; - 4.5*) - SIP_VERS=v4_new ;; - 4.6*) - SIP_VERS=v4_new ;; - 4.7*) - SIP_VERS=v4_new ;; - *) - AC_MSG_RESULT(sip version $version not supported) - SIP_VERS=unsupported ;; - esac + AC_MSG_CHECKING(whether sip version >= 4.6) + SIP_VERSION=`$SIP -V | awk '{print $[1]}'` + SIP_VERSION_ID=`echo $SIP_VERSION | awk -F. '{v=$[1]*10000+$[2]*100+$[3];print v}'` + if test $SIP_VERSION_ID -ge 40600 ; then + AC_MSG_RESULT(yes) + AC_MSG_RESULT(sip version is $SIP_VERSION) + else + AC_MSG_RESULT(no) + AC_MSG_RESULT(WARNING! sip version $SIP_VERSION is not supported (at least 4.6 is required)!) + sip_ok=no + fi +fi +if test "x$sip_ok" = "xyes" ; then if test "x$SIPDIR" = "x" ; then SIPDIR=`dirname $SIP` SIPDIR=`dirname $SIPDIR` fi - sip_ok=no - dnl Search sip.h file - if test "x$SIPDIR" != "x" ; then - dnl look for sip.h in ${SIPDIR} - AC_CHECK_FILE(${SIPDIR}/sip.h,sip_ok=yes,sip_ok=no) - if test "x$sip_ok" == "xyes" ; then - SIP_INCLUDES="-I${SIPDIR}" - fi - if test "x$sip_ok" == "xno" ; then - dnl look for sip.h in ${SIPDIR}/include/python${PYTHON_VERSION} - if test -d ${SIPDIR}/include/python${PYTHON_VERSION} ; then - AC_CHECK_FILE(${SIPDIR}/include/python${PYTHON_VERSION}/sip.h,sip_ok=yes,sip_ok=no) - if test "x$sip_ok" == "xyes" ; then - SIP_INCLUDES="-I${SIPDIR}/include/python${PYTHON_VERSION}" - fi - fi - fi + TEST_INC_DIRS="" + TEST_LIB_DIRS="" + if test "x${SIPDIR}" != "x" ; then + TEST_INC_DIRS="${TEST_INC_DIRS} ${SIPDIR} ${SIPDIR}/include" + TEST_INC_DIRS="${TEST_INC_DIRS} ${SIPDIR}/include/python${PYTHON_VERSION}" + TEST_LIB_DIRS="${TEST_LIB_DIRS} ${SIPDIR} ${SIPDIR}/lib" + TEST_LIB_DIRS="${TEST_LIB_DIRS} ${SIPDIR}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages" fi - if test "x$sip_ok" == "xno" ; then - dnl look for sip.h in ${PYTHON_PREFIX}/include/python${PYTHON_VERSION} - if test -d ${PYTHON_PREFIX}/include/python${PYTHON_VERSION} ; then - AC_CHECK_FILE(${PYTHON_PREFIX}/include/python${PYTHON_VERSION}/sip.h,sip_ok=yes,sip_ok=no) - if test "x$sip_ok" == "xyes" ; then - SIP_INCLUDES="${PYTHON_INCLUDES}" - fi - fi - fi - if test "x$sip_ok" == "xno" ; then - dnl look for sip.h in /usr/include/python${PYTHON_VERSION} - if test -d /usr/include/python${PYTHON_VERSION} ; then - AC_CHECK_FILE(/usr/include/python${PYTHON_VERSION}/sip.h,sip_ok=yes,sip_ok=no) - if test "x$sip_ok" == "xyes" ; then - SIP_INCLUDES="/usr/include/python${PYTHON_VERSION}" - fi - fi + if test "x${PYTHONHOME}" != "x" ; then + TEST_INC_DIRS="${TEST_INC_DIRS} ${PYTHONHOME}/include/python${PYTHON_VERSION}" + TEST_LIB_DIRS="${TEST_LIB_DIRS} ${PYTHONHOME}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages" fi - - dnl Search (lib)sip.so file - sip_lib_ok=no - if test "x$SIPDIR" != "x" ; then - dnl look for (lib)sip.so in ${SIPDIR} - AC_CHECK_FILE(${SIPDIR}/libsip.so,sip_lib_ok=yes,sip_lib_ok=no) - if test "x$sip_lib_ok" == "xyes" ; then - if test "x${SIPDIR}" = "x/usr/lib" - then - SIP_LIBS="-lsip" - else - SIP_LIBS="-L${SIPDIR} -lsip" + 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" + + dnl Search sip.h file + sip_ok=no + for d in ${TEST_INC_DIRS} ; do + if test -d $d ; then + AC_CHECK_FILE(${d}/sip.h,sip_ok=yes,sip_ok=no) + if test "x$sip_ok" == "xyes" ; then + SIP_INCLUDES="-I${d}" + break fi - else - AC_CHECK_FILE(${SIPDIR}/sip.so,sip_lib_ok=yes,sip_lib_ok=no) - if test "x$sip_lib_ok" == "xyes" ; then - if test "x${SIPDIR}" = "x/usr/lib" - then - SIP_LIBS="" - else - SIP_LIBS="-L${SIPDIR}" - fi - fi - fi + fi + done - if test "x$sip_lib_ok" == "xno" ; then - dnl look for (lib)sip.so in ${SIPDIR}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages - if test -d ${SIPDIR}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages ; then - AC_CHECK_FILE(${SIPDIR}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages/libsip.so,sip_lib_ok=yes,sip_lib_ok=no) - if test "x$sip_lib_ok" == "xyes" ; then - SIP_LIBS="-L${SIPDIR}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages -lsip" - else - AC_CHECK_FILE(${SIPDIR}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages/sip.so,sip_lib_ok=yes,sip_lib_ok=no) - if test "x$sip_lib_ok" == "xyes" ; then - SIP_LIBS="-L${SIPDIR}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages" - fi - fi - fi - fi - fi - if test "x$sip_lib_ok" == "xno" ; then - dnl look for (lib)sip.so in ${PYTHON_PREFIX}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages - if test -d ${PYTHON_PREFIX}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages ; then - AC_CHECK_FILE(${PYTHON_PREFIX}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages/libsip.so,sip_lib_ok=yes,sip_lib_ok=no) - if test "x$sip_lib_ok" == "xyes" ; then - SIP_LIBS="-L${PYTHON_PREFIX}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages -lsip" - else - AC_CHECK_FILE(${PYTHON_PREFIX}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages/sip.so,sip_lib_ok=yes,sip_lib_ok=no) - if test "x$sip_lib_ok" == "xyes" ; then - SIP_LIBS="-L${PYTHON_PREFIX}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages" + if test "x$sip_ok" == "xyes" ; then + dnl Search sip.so file + sip_ok=no + for d in ${TEST_LIB_DIRS} ; do + if test -d $d ; then + AC_CHECK_FILE(${d}/sip.so,sip_ok=yes,sip_ok=no) + if test "x$sip_ok" == "xyes" ; then + if test "x${d}" = "x/usr/lib${LIB_LOCATION_SUFFIX}" ; then + SIP_LIBS="" + else + SIP_LIBS="-L${d}" + fi + break fi - fi - fi - fi - if test "x$sip_lib_ok" == "xno" ; then - dnl look for (lib)sip.so in /usr/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages - if test -d /usr/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages ; then - AC_CHECK_FILE(/usr/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages/libsip.so,sip_lib_ok=yes,sip_lib_ok=no) - if test "x$sip_lib_ok" == "xyes" ; then - SIP_LIBS="-L$/usr/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages -lsip" - else - AC_CHECK_FILE(/usr/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages/sip.so,sip_lib_ok=yes,sip_lib_ok=no) - if test "x$sip_lib_ok" == "xyes" ; then - SIP_LIBS="-L/usr/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages" - fi fi - fi - fi - if test "x$sip_lib_ok" == "xno" ; then - sip_ok=no + done fi fi AC_SUBST(SIP) AC_SUBST(SIP_INCLUDES) AC_SUBST(SIP_LIBS) -AC_SUBST(SIP_VERS) - -AM_CONDITIONAL(IS_SIP_V4, [test $SIP_VERS == v4_old || test $SIP_VERS == v4_new]) -AM_CONDITIONAL(IS_SIP_NEW, [test $SIP_VERS == v3_new || test $SIP_VERS == v4_new]) +AC_SUBST(SIP_VERSION) +AC_SUBST(SIP_VERSION_ID) AC_MSG_RESULT(for sip: $sip_ok) diff --git a/adm_local/unix/config_files/check_vtk.m4 b/adm_local/unix/config_files/check_vtk.m4 index 5e4fc444e..c70c5adda 100644 --- a/adm_local/unix/config_files/check_vtk.m4 +++ b/adm_local/unix/config_files/check_vtk.m4 @@ -1,25 +1,23 @@ -dnl Copyright (C) 2003 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +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 ------------------------------------------------------------------------ @@ -33,6 +31,9 @@ AC_DEFUN([OPTIONS_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 @@ -86,8 +87,8 @@ then fi LOCAL_INCLUDES="$OGL_INCLUDES" -LOCAL_LIBS="-lvtkCommon -lvtkGraphics -lvtkImaging -lvtkFiltering -lvtkIO -lvtkRendering -lvtkHybrid -lvtkParallel -lvtkWidgets $OGL_LIBS $LXLIB -lX11 -lXt" -TRY_LINK_LIBS="-lvtkCommon $OGL_LIBS $LXLIB -lX11 -lXt" +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 @@ -149,11 +150,35 @@ else fi fi -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" +# 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 diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am index 16a5054e5..f21fc7076 100644 --- a/adm_local/unix/make_common_starter.am +++ b/adm_local/unix/make_common_starter.am @@ -1,49 +1,86 @@ +# 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 file defines the common definitions used in several # Makefile. This file must be included, if needed, by the file # Makefile.am. # ============================================================ -# - # Standard directory for installation -salomeincludedir = $(includedir)/@PACKAGE@ -libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/@PACKAGE@ -bindir = $(prefix)/bin/@PACKAGE@ +# +salomeincludedir = $(includedir)/salome +libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/salome +bindir = $(prefix)/bin/salome salomescriptdir = $(bindir) +salomepythondir = $(pythondir)/salome +salomepyexecdir = $(pyexecdir)/salome # Directory for installing idl files -salomeidldir = $(prefix)/idl/@PACKAGE@ +salomeidldir = $(prefix)/idl/salome # Directory for installing resource files -salomeresdir = $(prefix)/share/@PACKAGE@/resources/@MODULE_NAME@ +salomeresdir = $(prefix)/share/salome/resources/@MODULE_NAME@ # Directories for installing admin files -admlocaldir = $(prefix)/adm_local -admlocalunixdir = $(admlocaldir)/unix -admlocalm4dir = $(admlocaldir)/unix/config_files +admlocaldir = $(prefix)/adm_local +admlocalunixdir = $(admlocaldir)/unix +admlocalm4dir = $(admlocaldir)/unix/config_files + +# Directory for install cmake files +admlocal_cmakedir = $(admlocaldir)/cmake_files # Shared modules installation directory -sharedpkgpythondir =$(pkgpythondir)/shared_modules +sharedpkgpythondir = $(salomepythondir)/shared_modules # Documentation directory -docdir = $(datadir)/doc/@PACKAGE@ +docdir = $(datadir)/doc/salome # common rules -# moc-files generation +# meta object implementation files generation (moc) %_moc.cxx: %.h - $(MOC) $< -o $@ + $(MOC) $(MOC_FLAGS) $< -o $@ + +# translation (*.qm) files generation (lrelease) +%.qm: resources/%.ts + $(LRELEASE) $< -qm $@ + +# resource files generation (qrcc) +qrc_%.cxx: %.qrc + $(QRCC) $< -o $@ -name $(*F) -# qm-files generation -%.qm: resources/%.po - $(MSG2QM) $< $@ +# qt forms files generation (uic) +ui_%.h: %.ui + $(UIC) -o $@ $< -EXTRA_DIST=$(MOC_FILES:%_moc.cxx=%.h) $(nodist_salomeres_DATA:%.qm=resources/%.po) +# extra distributed files +EXTRA_DIST = $(MOC_FILES:%_moc.cxx=%.h) $(QRC_FILES:qrc_%.cxx=%.qrc) \ + $(UIC_FILES:ui_%.h=%.ui) $(nodist_salomeres_DATA:%.qm=resources/%.ts) +# customize clean operation mostlyclean-local: rm -f @builddir@/*_moc.cxx rm -f @builddir@/*.qm + rm -f @builddir@/qrc_*.cxx + rm -f @builddir@/ui_*.h # tests tests: unittest diff --git a/adm_local/unix/make_conclude.in b/adm_local/unix/make_conclude.in index da7a678e1..69822e437 100644 --- a/adm_local/unix/make_conclude.in +++ b/adm_local/unix/make_conclude.in @@ -1,15 +1,34 @@ +# 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 diff --git a/bin/Makefile.am b/bin/Makefile.am index a0f5c8488..7d549a912 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,41 +1,35 @@ -# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG -# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT -# 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 -# -* Makefile *- +# 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 # +# -* Makefile *- # Author : Guillaume Boulant (CSSI) # Module : KERNEL # $Header$ # - include $(top_srcdir)/adm_local/unix/make_common_starter.am -# -# =============================================================== -# Files to be installed -# =============================================================== -# - -# These files are data, module or lib files -nodist_salomescript_DATA= VERSION - -EXTRA_DIST+= VERSION.in +# non-distributed files +nodist_salomescript_DATA = VERSION -# These files are executable scripts -dist_salomescript_SCRIPTS=\ - runLightSalome.csh \ +# distributed files +dist_salomescript_SCRIPTS = \ + runLightSalome.csh \ runLightSalome.sh diff --git a/bin/runLightSalome.csh b/bin/runLightSalome.csh index 3a751e993..51b64d9f5 100755 --- a/bin/runLightSalome.csh +++ b/bin/runLightSalome.csh @@ -1,7 +1,157 @@ #!/bin/csh -f +# 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 +# +# File : runLightSalome.csh +# Author : Vadim SANDLER, Open CASCADE S.A.S, vadim.sandler@opencascade.com +# -# this variable necessary for loading .ini or .xml file -if ( ! $?LightAppConfig ) setenv LightAppConfig ${GUI_ROOT_DIR}/share/salome/resources/gui -if ( ! $?LightAppResources ) setenv LightAppResources ${GUI_ROOT_DIR}/share/salome/resources/gui +### +# set default value for the LightAppConfig variable, which +# is necessary for loading of .ini or .xml resources file +### -SUITApp LightApp -style salome $* & +if ( ! ($?LightAppConfig) ) then + setenv LightAppConfig ${GUI_ROOT_DIR}/share/salome/resources/gui +else + setenv LightAppConfig ${LightAppConfig}:${GUI_ROOT_DIR}/share/salome/resources/gui +endif +if ( ! ($?LightAppResources) ) then + setenv LightAppResources ${GUI_ROOT_DIR}/share/salome/resources/gui +else + setenv LightAppResources ${LightAppResources}:${GUI_ROOT_DIR}/share/salome/resources/gui +endif + +### +# default settings +### + +if (! ($?PATH) ) setenv PATH +if (! ($?LD_LIBRARY_PATH) ) setenv LD_LIBRARY_PATH +if (! ($?PYTHONPATH) ) setenv PYTHONPATH +if (! ($?SALOMEPATH) ) setenv SALOMEPATH + +### +# process --modules=... command line option (get list of modules) +### + +set modules="" + +foreach arg ( X $* ) + if ( "$arg" != "X" ) then + switch ( $arg ) + case --modules=*: + set modules=`echo $arg | awk -F= '{ print $2 }' | sed -e "s%,% %g"` + breaksw + default: + breaksw + endsw + endif +end + +set modules="KERNEL GUI $modules" + +### +# exclude modules duplication +### + +set mods="" + +foreach mod ( $modules ) + echo $mods | grep -E "\<$mod\>" >/dev/null + if ( "$?" == "1" ) then + set mods="$mods $mod" + endif +end + +### +# set additional environment +### + +set python_version=`python -c "import sys; print sys.version[:3]"` + +set MY_PATH="" +set MY_LD_LIBRARY_PATH="" +set MY_PYTHONPATH="" + +foreach mod ( $mods ) + if ( "$arg" != "X" ) then + set root_dir=`printenv ${mod}_ROOT_DIR` + if ( "$root_dir" != "" ) then + set mod_lower=`echo $mod | tr "A-Z" "a-z"` + if ( -d ${root_dir}/bin/salome ) then + if ( "${MY_PATH}" == "" ) then + set MY_PATH=${root_dir}/bin/salome + else + set MY_PATH=${MY_PATH}:${root_dir}/bin/salome + endif + endif + if ( -d ${root_dir}/lib/salome ) then + if ( "${MY_LD_LIBRARY_PATH}" == "" ) then + set MY_LD_LIBRARY_PATH=${root_dir}/lib/salome + else + set MY_LD_LIBRARY_PATH=${MY_LD_LIBRARY_PATH}:${root_dir}/lib/salome + endif + endif + if ( "${python_version}" != "" ) then + if ( -d ${root_dir}/bin/salome ) then + if ( "${MY_PYTHONPATH}" == "" ) then + set MY_PYTHONPATH=${root_dir}/bin/salome + else + set MY_PYTHONPATH=${MY_PYTHONPATH}:${root_dir}/bin/salome + endif + endif + if ( -d ${root_dir}/lib/salome ) then + if ( "${MY_PYTHONPATH}" == "" ) then + set MY_PYTHONPATH=${root_dir}/lib/salome + else + set MY_PYTHONPATH=${MY_PYTHONPATH}:${root_dir}/lib/salome + endif + endif + if ( -d ${root_dir}/lib/python${python_version}/site-packages/salome ) then + if ( "${MY_PYTHONPATH}" == "" ) then + set MY_PYTHONPATH=${root_dir}/lib/python${python_version}/site-packages/salome + else + set MY_PYTHONPATH=${MY_PYTHONPATH}:${root_dir}/lib/python${python_version}/site-packages/salome + endif + endif + endif + if ( "$mod" != "KERNEL" && "$mod" != "GUI" ) then + setenv LightAppConfig ${LightAppConfig}:${root_dir}/share/salome/resources/${mod_lower} + endif + if ( "${SALOMEPATH}" == "" ) then + setenv SALOMEPATH ${root_dir} + else + setenv SALOMEPATH ${SALOMEPATH}:${root_dir} + endif + endif + endif +end + +if ( "${MY_PATH}" != "" ) setenv PATH ${MY_PATH}:${PATH} +if ( "${MY_LD_LIBRARY_PATH}" != "" ) setenv LD_LIBRARY_PATH ${MY_LD_LIBRARY_PATH}:${LD_LIBRARY_PATH} +if ( "${PYTHONPATH}" != "" ) setenv PYTHONPATH ${MY_PYTHONPATH}:${PYTHONPATH} + +### +# start application +### + +SUITApp LightApp $* & diff --git a/bin/runLightSalome.sh b/bin/runLightSalome.sh index df19ca7ba..8caaaa916 100755 --- a/bin/runLightSalome.sh +++ b/bin/runLightSalome.sh @@ -1,4 +1,8 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D +#!/bin/bash -f +# 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 @@ -14,16 +18,132 @@ # 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 +### # -#!/bin/bash -f - -# this variable necessary for loading .ini or .xml file 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 -SUITApp LightApp -style salome $* & +### +# process --modules=... command line option (get list of modules) +### + +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 + fi +done + +modules="KERNEL GUI $modules" + +### +# exclude modules duplication +### + +mods="" + +for mod in $modules ; do + echo $mods | grep -E "\<$mod\>" >/dev/null 2>&1 + if [ "$?" == "1" ] ; then + mods="$mods $mod" + fi +done + +### +# set additional environment +### + +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 + 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 + fi + if [ "$mod" != "KERNEL" ] && [ "$mod" != "GUI" ] ; then + export LightAppConfig=${LightAppConfig}:${root_dir}/share/salome/resources/${mod_lower} + fi + if [ "${SALOMEPATH}" == "" ] ; then + export SALOMEPATH=${root_dir} + else + export SALOMEPATH=${SALOMEPATH}:${root_dir} + 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 + +### +# start application +### + +SUITApp LightApp $* & diff --git a/build_cmake b/build_cmake new file mode 100755 index 000000000..844a4f2c4 --- /dev/null +++ b/build_cmake @@ -0,0 +1,30 @@ +#!/bin/sh +# 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 +# + +CURRENT_DIR=`pwd` +CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"` +cd ${CONF_DIR} +python $KERNEL_ROOT_DIR/salome_adm/cmake_files/am2cmake.py --gui +status=$? +cd ${CURRENT_DIR} +exit $status diff --git a/build_cmake.bat b/build_cmake.bat new file mode 100644 index 000000000..58a10b0a3 --- /dev/null +++ b/build_cmake.bat @@ -0,0 +1,2 @@ + +%PYTHONBIN% %KERNEL_ROOT_DIR%\salome_adm\cmake_files\am2cmake.py --gui diff --git a/build_configure b/build_configure index 733a8cea6..1fc78886f 100755 --- a/build_configure +++ b/build_configure @@ -1,16 +1,33 @@ #!/bin/bash - +# 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 # # Tool for updating list of .in file for the SALOME project # and regenerating configure script -# # Author : Marc Tajchman - CEA # Date : 10/10/2002 # $Header$ -# # 26/10/2006: Mikhail PONIKAROV - OCN # Reorganization for uage of autotools - +# ORIG_DIR=`pwd` CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"` @@ -53,8 +70,8 @@ cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/SALOMEconfig.h.in salome_adm/unix # autom4te.cache (directory) echo "====================================================== aclocal" -aclocal -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \ - -I adm_local/unix/config_files || exit 1 +aclocal -I adm_local/unix/config_files \ + -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files || exit 1 # ____________________________________________________________________ # libtoolize creates some configuration files (ltmain.sh, diff --git a/clean_configure b/clean_configure index be0b5427f..f57f7b3bf 100755 --- a/clean_configure +++ b/clean_configure @@ -1,5 +1,25 @@ #!/bin/sh - +# 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 +# rm -rf autom4te.cache aclocal.m4 configure make_config find . -name "*~" -print -exec rm {} \; find . -name "*.pyc" -print -exec rm {} \; diff --git a/configure.ac b/configure.ac index a1ec14bbf..d8f8664f2 100644 --- a/configure.ac +++ b/configure.ac @@ -1,3 +1,23 @@ +# 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 # # Author : Marc Tajchman (CEA) # Date : 28/06/2001 @@ -5,9 +25,7 @@ # Modified by : Marc Tajchman (CEA) # Modified by : Mikhail PONIKAROV (OCN) - autotools usage # -# Created from configure.in.base -# -AC_INIT([Salome2 Project GUI module], [4.1.1], [webmaster.salome@opencascade.com], [salome]) +AC_INIT([Salome2 Project GUI module], [5.1.0], [webmaster.salome@opencascade.com], [SalomeGUI]) AC_CONFIG_AUX_DIR(salome_adm/unix/config_files) AC_CANONICAL_HOST AC_CANONICAL_TARGET @@ -82,7 +100,9 @@ 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 @@ -297,14 +317,6 @@ echo CHECK_QT -echo -echo --------------------------------------------- -echo testing msg2qm -echo --------------------------------------------- -echo - -CHECK_MSG2QM - echo echo --------------------------------------------- echo testing VTK @@ -361,6 +373,8 @@ echo CHECK_QWT +CHECK_TESTRECORDER + echo echo --------------------------------------------- echo Testing PyConsole @@ -462,10 +476,12 @@ if test "x${GUI_DISABLE_CORBA}" != "xyes" ; then echo "failed : for full configuration of GUI module necessary enable SalomeObject !" exit fi - if test "x${DISABLE_QXGRAPHVIEWER}" == "xyes" ; then - echo "failed : for full configuration of GUI module necessary enable QxGraphViewer !" - 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 fi echo @@ -513,10 +529,10 @@ fi if test "$GUI_DISABLE_CORBA" != "yes"; then -variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok msg2qm_ok vtk_ok hdf5_ok -omniORB_ok boost_ok occ_ok sip_ok pyqt_ok qwt_ok doxygen_ok graphviz_ok Kernel_ok" +variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_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 msg2qm_ok vtk_ok hdf5_ok boost_ok +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" fi @@ -527,7 +543,7 @@ do done echo "---Optional:" -variables="cppunit_ok" +variables="cppunit_ok TestRecorder_ok" for var in $variables do @@ -561,32 +577,7 @@ AM_CONDITIONAL(ENABLE_OCCVIEWER, [test "$DISABLE_OCCVIEWER" = no]) AM_CONDITIONAL(ENABLE_VTKVIEWER, [test "$DISABLE_VTKVIEWER" = no]) AM_CONDITIONAL(ENABLE_SALOMEOBJECT, [test "$DISABLE_SALOMEOBJECT" = no]) AM_CONDITIONAL(ENABLE_QXGRAPHVIEWER, [test "$DISABLE_QXGRAPHVIEWER" = no]) - -echo -echo --------------------------------------------- -echo copying resource files, shell scripts, and -echo xml files -echo --------------------------------------------- -echo - - -dnl copy shells and utilities contained in the bin directory -dnl excluding .in files (treated in AC-OUTPUT below) and CVS -dnl directory - -mkdir -p bin/salome -cd bin/salome - -for i in $ROOT_SRCDIR/bin/* -do - local_bin=`echo $i | sed -e "s,$ROOT_SRCDIR,.,"` - case "$local_bin" in - *.in | *~) ;; - ./bin/CVS | ./bin/salome) ;; - *) $INSTALL $i . ; echo $local_bin ;; - esac -done -cd $ROOT_BUILDDIR +AM_CONDITIONAL(ENABLE_TESTRECORDER, [test "$ENABLE_TESTRECORDER" = yes]) echo echo --------------------------------------------- @@ -594,10 +585,10 @@ echo generating Makefiles and configure files echo --------------------------------------------- echo -AC_OUTPUT_COMMANDS([ \ - chmod +x ./bin/*; \ - chmod +x ./bin/salome/*; \ -]) +#AC_OUTPUT_COMMANDS([ \ +# chmod +x ./bin/*; \ +# chmod +x ./bin/salome/*; \ +#]) # This list is initiated using autoscan and must be updated manually # when adding a new file .in to manage. When you execute @@ -606,6 +597,7 @@ AC_OUTPUT_COMMANDS([ \ 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 \ @@ -614,9 +606,9 @@ AC_OUTPUT([ \ ./doc/Makefile \ ./doc/salome/Makefile \ ./doc/salome/gui/Makefile \ - ./doc/salome/gui/GUI/doxyfile \ + ./doc/salome/gui/doxyfile \ ./doc/salome/tui/Makefile \ - ./doc/salome/tui/GUI/doxyfile \ + ./doc/salome/tui/doxyfile \ ./src/Makefile \ ./src/CASCatch/Makefile \ ./src/Qtx/Makefile \ @@ -638,14 +630,14 @@ AC_OUTPUT([ \ ./src/OCCViewer/Makefile \ ./src/SOCC/Makefile \ ./src/PyInterp/Makefile \ - ./src/PythonConsole/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/RegistryDisplay/Makefile \ ./src/TOOLSGUI/Makefile \ ./src/Event/Makefile \ ./src/Session/Makefile \ @@ -657,7 +649,6 @@ AC_OUTPUT([ \ ./src/SALOME_PY/Makefile \ ./src/SALOME_PYQT/Makefile \ ./src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile \ - ./src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_SipDefs.h \ ./src/SALOME_PYQT/SalomePyQt/Makefile \ ./resources/Makefile \ ./idl/Makefile \ diff --git a/doc/Makefile.am b/doc/Makefile.am index 6a2c2428b..7ab931dd6 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,7 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D +# 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 @@ -14,14 +17,19 @@ # 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 # $Header$ # +SUBDIRS = salome + +usr_docs: + (cd salome && $(MAKE) $(AM_MAKEFLAGS) usr_docs) + +docs: usr_docs -SUBDIRS= salome +dev_docs: + (cd salome && $(MAKE) $(AM_MAKEFLAGS) dev_docs) diff --git a/doc/salome/Makefile.am b/doc/salome/Makefile.am index 29f7e1854..7fce29287 100644 --- a/doc/salome/Makefile.am +++ b/doc/salome/Makefile.am @@ -1,4 +1,7 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D +# 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 @@ -14,19 +17,16 @@ # 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 # $Header$ # - -SUBDIRS= tui gui -SUBDIRSTUI= tui -SUBDIRSGUI= gui +SUBDIRS = tui gui +SUBDIRSTUI = tui +SUBDIRSGUI = gui usr_docs: @@SETX@; for d in $(SUBDIRSGUI); do \ diff --git a/doc/salome/gui/GUI/doxyfile.in b/doc/salome/gui/GUI/doxyfile.in deleted file mode 100755 index dfb7f3614..000000000 --- a/doc/salome/gui/GUI/doxyfile.in +++ /dev/null @@ -1,44 +0,0 @@ -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- -PROJECT_NAME = "GUI Module Reference Manual v.@VERSION@" -OUTPUT_DIRECTORY = ./ -CREATE_SUBDIRS = NO -OUTPUT_LANGUAGE = English -TAB_SIZE = 5 - -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- -QUIET = NO -WARNINGS = YES - -#--------------------------------------------------------------------------- -#Input related options -#--------------------------------------------------------------------------- -INPUT = @srcdir@/input -FILE_PATTERNS = *.doc -IMAGE_PATH = @srcdir@/images - -#--------------------------------------------------------------------------- -#HTML related options -#--------------------------------------------------------------------------- -GENERATE_HTML = YES -HTML_OUTPUT = ./ -HTML_HEADER = @srcdir@/static/header.html -HTML_FOOTER = @srcdir@/static/footer.html -#HTML_STYLESHEET = @srcdir@/static/doxygen.css -TOC_EXPAND = YES -DISABLE_INDEX = NO -GENERATE_TREEVIEW = YES -TREEVIEW_WIDTH = 300 - -#--------------------------------------------------------------------------- -#LaTeX related option -#--------------------------------------------------------------------------- -GENERATE_LATEX = NO - -#--------------------------------------------------------------------------- -#RTF related options -#--------------------------------------------------------------------------- -GENERATE_RTF = NO \ No newline at end of file diff --git a/doc/salome/gui/GUI/images/batchmode.png b/doc/salome/gui/GUI/images/batchmode.png deleted file mode 100644 index c439d7ebb..000000000 Binary files a/doc/salome/gui/GUI/images/batchmode.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/cataloggenerator.png b/doc/salome/gui/GUI/images/cataloggenerator.png deleted file mode 100755 index 51a0f2786..000000000 Binary files a/doc/salome/gui/GUI/images/cataloggenerator.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/choicepage.png b/doc/salome/gui/GUI/images/choicepage.png deleted file mode 100644 index e3afcc588..000000000 Binary files a/doc/salome/gui/GUI/images/choicepage.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/clipping.png b/doc/salome/gui/GUI/images/clipping.png deleted file mode 100644 index 6d738558e..000000000 Binary files a/doc/salome/gui/GUI/images/clipping.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/closestudy.png b/doc/salome/gui/GUI/images/closestudy.png deleted file mode 100755 index fb7abe1dc..000000000 Binary files a/doc/salome/gui/GUI/images/closestudy.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/copy-paste.jpg b/doc/salome/gui/GUI/images/copy-paste.jpg deleted file mode 100755 index e243122b3..000000000 Binary files a/doc/salome/gui/GUI/images/copy-paste.jpg and /dev/null differ diff --git a/doc/salome/gui/GUI/images/dumpstudy.png b/doc/salome/gui/GUI/images/dumpstudy.png deleted file mode 100755 index f899e778c..000000000 Binary files a/doc/salome/gui/GUI/images/dumpstudy.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/geomview-alt.png b/doc/salome/gui/GUI/images/geomview-alt.png deleted file mode 100755 index e797b085d..000000000 Binary files a/doc/salome/gui/GUI/images/geomview-alt.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/graduatedaxes1.png b/doc/salome/gui/GUI/images/graduatedaxes1.png deleted file mode 100644 index cf021ba42..000000000 Binary files a/doc/salome/gui/GUI/images/graduatedaxes1.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/icon_about.png b/doc/salome/gui/GUI/images/icon_about.png deleted file mode 100755 index 0cfa37ae0..000000000 Binary files a/doc/salome/gui/GUI/images/icon_about.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image100.gif b/doc/salome/gui/GUI/images/image100.gif deleted file mode 100644 index c44d68ffc..000000000 Binary files a/doc/salome/gui/GUI/images/image100.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image102.gif b/doc/salome/gui/GUI/images/image102.gif deleted file mode 100644 index 3507814ba..000000000 Binary files a/doc/salome/gui/GUI/images/image102.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image103.gif b/doc/salome/gui/GUI/images/image103.gif deleted file mode 100644 index be534c39e..000000000 Binary files a/doc/salome/gui/GUI/images/image103.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image105.gif b/doc/salome/gui/GUI/images/image105.gif deleted file mode 100644 index 4f6173f82..000000000 Binary files a/doc/salome/gui/GUI/images/image105.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image106.gif b/doc/salome/gui/GUI/images/image106.gif deleted file mode 100644 index 2bbcb4d94..000000000 Binary files a/doc/salome/gui/GUI/images/image106.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image108.gif b/doc/salome/gui/GUI/images/image108.gif deleted file mode 100644 index bec69e662..000000000 Binary files a/doc/salome/gui/GUI/images/image108.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image109.gif b/doc/salome/gui/GUI/images/image109.gif deleted file mode 100644 index 5dbba4646..000000000 Binary files a/doc/salome/gui/GUI/images/image109.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image157.gif b/doc/salome/gui/GUI/images/image157.gif deleted file mode 100644 index 2f66e05e7..000000000 Binary files a/doc/salome/gui/GUI/images/image157.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image54.jpg b/doc/salome/gui/GUI/images/image54.jpg deleted file mode 100755 index a67ac4c7a..000000000 Binary files a/doc/salome/gui/GUI/images/image54.jpg and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image65.gif b/doc/salome/gui/GUI/images/image65.gif deleted file mode 100755 index fbf6a81b9..000000000 Binary files a/doc/salome/gui/GUI/images/image65.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image67.gif b/doc/salome/gui/GUI/images/image67.gif deleted file mode 100755 index 4c5d4d67c..000000000 Binary files a/doc/salome/gui/GUI/images/image67.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image69.gif b/doc/salome/gui/GUI/images/image69.gif deleted file mode 100755 index f8ea563bb..000000000 Binary files a/doc/salome/gui/GUI/images/image69.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image70.gif b/doc/salome/gui/GUI/images/image70.gif deleted file mode 100755 index c88c53ed5..000000000 Binary files a/doc/salome/gui/GUI/images/image70.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image72.gif b/doc/salome/gui/GUI/images/image72.gif deleted file mode 100755 index 77c21bdeb..000000000 Binary files a/doc/salome/gui/GUI/images/image72.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image73.gif b/doc/salome/gui/GUI/images/image73.gif deleted file mode 100755 index 0ebcf97a2..000000000 Binary files a/doc/salome/gui/GUI/images/image73.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image75.gif b/doc/salome/gui/GUI/images/image75.gif deleted file mode 100755 index 9fdfbdc40..000000000 Binary files a/doc/salome/gui/GUI/images/image75.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image77.gif b/doc/salome/gui/GUI/images/image77.gif deleted file mode 100644 index ef7a62f32..000000000 Binary files a/doc/salome/gui/GUI/images/image77.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image86.gif b/doc/salome/gui/GUI/images/image86.gif deleted file mode 100644 index 339733193..000000000 Binary files a/doc/salome/gui/GUI/images/image86.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image88.gif b/doc/salome/gui/GUI/images/image88.gif deleted file mode 100644 index 9466aa6ce..000000000 Binary files a/doc/salome/gui/GUI/images/image88.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image89.gif b/doc/salome/gui/GUI/images/image89.gif deleted file mode 100644 index 373a6c026..000000000 Binary files a/doc/salome/gui/GUI/images/image89.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image91.gif b/doc/salome/gui/GUI/images/image91.gif deleted file mode 100644 index 9e93c1c72..000000000 Binary files a/doc/salome/gui/GUI/images/image91.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image94.gif b/doc/salome/gui/GUI/images/image94.gif deleted file mode 100755 index e2d310c5e..000000000 Binary files a/doc/salome/gui/GUI/images/image94.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image95.gif b/doc/salome/gui/GUI/images/image95.gif deleted file mode 100644 index fb293e234..000000000 Binary files a/doc/salome/gui/GUI/images/image95.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image96.gif b/doc/salome/gui/GUI/images/image96.gif deleted file mode 100644 index 4580d5b5c..000000000 Binary files a/doc/salome/gui/GUI/images/image96.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image97.gif b/doc/salome/gui/GUI/images/image97.gif deleted file mode 100644 index 1d78de1bc..000000000 Binary files a/doc/salome/gui/GUI/images/image97.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image98.gif b/doc/salome/gui/GUI/images/image98.gif deleted file mode 100644 index 6519dbb67..000000000 Binary files a/doc/salome/gui/GUI/images/image98.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/image99.gif b/doc/salome/gui/GUI/images/image99.gif deleted file mode 100644 index 3711be813..000000000 Binary files a/doc/salome/gui/GUI/images/image99.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/import.png b/doc/salome/gui/GUI/images/import.png deleted file mode 100755 index 093c667f2..000000000 Binary files a/doc/salome/gui/GUI/images/import.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/intropage.png b/doc/salome/gui/GUI/images/intropage.png deleted file mode 100644 index 226793ca5..000000000 Binary files a/doc/salome/gui/GUI/images/intropage.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/loadscript.png b/doc/salome/gui/GUI/images/loadscript.png deleted file mode 100755 index e681fc745..000000000 Binary files a/doc/salome/gui/GUI/images/loadscript.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/loadstudy2.png b/doc/salome/gui/GUI/images/loadstudy2.png deleted file mode 100755 index 595ea0528..000000000 Binary files a/doc/salome/gui/GUI/images/loadstudy2.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/lockedstudy.png b/doc/salome/gui/GUI/images/lockedstudy.png deleted file mode 100755 index 9ec7e744b..000000000 Binary files a/doc/salome/gui/GUI/images/lockedstudy.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/neo-view2.png b/doc/salome/gui/GUI/images/neo-view2.png deleted file mode 100755 index df1c7fe0f..000000000 Binary files a/doc/salome/gui/GUI/images/neo-view2.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/newsticn.jpg b/doc/salome/gui/GUI/images/newsticn.jpg deleted file mode 100755 index 94c8ee971..000000000 Binary files a/doc/salome/gui/GUI/images/newsticn.jpg and /dev/null differ diff --git a/doc/salome/gui/GUI/images/note1.gif b/doc/salome/gui/GUI/images/note1.gif deleted file mode 100755 index b53e21d0a..000000000 Binary files a/doc/salome/gui/GUI/images/note1.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/objectbrowser1.png b/doc/salome/gui/GUI/images/objectbrowser1.png deleted file mode 100755 index 16ab896a2..000000000 Binary files a/doc/salome/gui/GUI/images/objectbrowser1.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/objectbrowser2.png b/doc/salome/gui/GUI/images/objectbrowser2.png deleted file mode 100755 index e010ef2b0..000000000 Binary files a/doc/salome/gui/GUI/images/objectbrowser2.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/open.jpg b/doc/salome/gui/GUI/images/open.jpg deleted file mode 100755 index 5829aef52..000000000 Binary files a/doc/salome/gui/GUI/images/open.jpg and /dev/null differ diff --git a/doc/salome/gui/GUI/images/plot2d_clone.gif b/doc/salome/gui/GUI/images/plot2d_clone.gif deleted file mode 100644 index f980a5dd2..000000000 Binary files a/doc/salome/gui/GUI/images/plot2d_clone.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/plot2d_legend.gif b/doc/salome/gui/GUI/images/plot2d_legend.gif deleted file mode 100644 index a40211e8a..000000000 Binary files a/doc/salome/gui/GUI/images/plot2d_legend.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/plot2d_lines.gif b/doc/salome/gui/GUI/images/plot2d_lines.gif deleted file mode 100644 index 8d1dc2313..000000000 Binary files a/doc/salome/gui/GUI/images/plot2d_lines.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/plot2d_logarithmic_horizontal.gif b/doc/salome/gui/GUI/images/plot2d_logarithmic_horizontal.gif deleted file mode 100644 index 3473ad94a..000000000 Binary files a/doc/salome/gui/GUI/images/plot2d_logarithmic_horizontal.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/plot2d_logarithmic_vertical.gif b/doc/salome/gui/GUI/images/plot2d_logarithmic_vertical.gif deleted file mode 100644 index 0d3b25ef4..000000000 Binary files a/doc/salome/gui/GUI/images/plot2d_logarithmic_vertical.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/plot2d_points.gif b/doc/salome/gui/GUI/images/plot2d_points.gif deleted file mode 100644 index 6700f0078..000000000 Binary files a/doc/salome/gui/GUI/images/plot2d_points.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/plot2d_settings.gif b/doc/salome/gui/GUI/images/plot2d_settings.gif deleted file mode 100644 index 87e1105c6..000000000 Binary files a/doc/salome/gui/GUI/images/plot2d_settings.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/plot2d_splines.gif b/doc/salome/gui/GUI/images/plot2d_splines.gif deleted file mode 100644 index 1d50b2097..000000000 Binary files a/doc/salome/gui/GUI/images/plot2d_splines.gif and /dev/null differ diff --git a/doc/salome/gui/GUI/images/plot2d_view_settings.png b/doc/salome/gui/GUI/images/plot2d_view_settings.png deleted file mode 100644 index d4b4d29c2..000000000 Binary files a/doc/salome/gui/GUI/images/plot2d_view_settings.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/ppref1.png b/doc/salome/gui/GUI/images/ppref1.png deleted file mode 100755 index dd91013ce..000000000 Binary files a/doc/salome/gui/GUI/images/ppref1.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/ppref2.png b/doc/salome/gui/GUI/images/ppref2.png deleted file mode 100755 index 5a15f0e93..000000000 Binary files a/doc/salome/gui/GUI/images/ppref2.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/ppref3.png b/doc/salome/gui/GUI/images/ppref3.png deleted file mode 100755 index 1ecffe395..000000000 Binary files a/doc/salome/gui/GUI/images/ppref3.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/pref11.png b/doc/salome/gui/GUI/images/pref11.png deleted file mode 100755 index 26ddbe9b9..000000000 Binary files a/doc/salome/gui/GUI/images/pref11.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/pref12.png b/doc/salome/gui/GUI/images/pref12.png deleted file mode 100755 index 8cafab810..000000000 Binary files a/doc/salome/gui/GUI/images/pref12.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/pref13.png b/doc/salome/gui/GUI/images/pref13.png deleted file mode 100755 index 4cfe950cf..000000000 Binary files a/doc/salome/gui/GUI/images/pref13.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/pref14.png b/doc/salome/gui/GUI/images/pref14.png deleted file mode 100755 index 2f8bcfb3c..000000000 Binary files a/doc/salome/gui/GUI/images/pref14.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/pref15.png b/doc/salome/gui/GUI/images/pref15.png deleted file mode 100755 index 10053fb11..000000000 Binary files a/doc/salome/gui/GUI/images/pref15.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/pref21.png b/doc/salome/gui/GUI/images/pref21.png deleted file mode 100755 index 8f7ad1d34..000000000 Binary files a/doc/salome/gui/GUI/images/pref21.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/pref22.png b/doc/salome/gui/GUI/images/pref22.png deleted file mode 100755 index 26921dc5a..000000000 Binary files a/doc/salome/gui/GUI/images/pref22.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/pref23.png b/doc/salome/gui/GUI/images/pref23.png deleted file mode 100644 index e1a082a14..000000000 Binary files a/doc/salome/gui/GUI/images/pref23.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/pref24.png b/doc/salome/gui/GUI/images/pref24.png deleted file mode 100755 index c539e9b8b..000000000 Binary files a/doc/salome/gui/GUI/images/pref24.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/pref31.png b/doc/salome/gui/GUI/images/pref31.png deleted file mode 100755 index e5606d133..000000000 Binary files a/doc/salome/gui/GUI/images/pref31.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/pref33.png b/doc/salome/gui/GUI/images/pref33.png deleted file mode 100755 index bdc9b7643..000000000 Binary files a/doc/salome/gui/GUI/images/pref33.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/pref34.png b/doc/salome/gui/GUI/images/pref34.png deleted file mode 100755 index 5072c62b6..000000000 Binary files a/doc/salome/gui/GUI/images/pref34.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/pref37.png b/doc/salome/gui/GUI/images/pref37.png deleted file mode 100755 index 1d4d082fe..000000000 Binary files a/doc/salome/gui/GUI/images/pref37.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/pref38.png b/doc/salome/gui/GUI/images/pref38.png deleted file mode 100755 index 5c8d31ce3..000000000 Binary files a/doc/salome/gui/GUI/images/pref38.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/pref39.png b/doc/salome/gui/GUI/images/pref39.png deleted file mode 100755 index 878a52607..000000000 Binary files a/doc/salome/gui/GUI/images/pref39.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/pref40.png b/doc/salome/gui/GUI/images/pref40.png deleted file mode 100755 index e86c1e250..000000000 Binary files a/doc/salome/gui/GUI/images/pref40.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/productpage.png b/doc/salome/gui/GUI/images/productpage.png deleted file mode 100644 index bc05c8bfa..000000000 Binary files a/doc/salome/gui/GUI/images/productpage.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/productpage1.png b/doc/salome/gui/GUI/images/productpage1.png deleted file mode 100644 index b66616681..000000000 Binary files a/doc/salome/gui/GUI/images/productpage1.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/productpage2.png b/doc/salome/gui/GUI/images/productpage2.png deleted file mode 100644 index 998d286e3..000000000 Binary files a/doc/salome/gui/GUI/images/productpage2.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/progresspage.png b/doc/salome/gui/GUI/images/progresspage.png deleted file mode 100644 index 0779fccaf..000000000 Binary files a/doc/salome/gui/GUI/images/progresspage.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/progresspage1.png b/doc/salome/gui/GUI/images/progresspage1.png deleted file mode 100644 index efaa4d1ea..000000000 Binary files a/doc/salome/gui/GUI/images/progresspage1.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/readmepage.png b/doc/salome/gui/GUI/images/readmepage.png deleted file mode 100644 index b6aee2989..000000000 Binary files a/doc/salome/gui/GUI/images/readmepage.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/registry1.png b/doc/salome/gui/GUI/images/registry1.png deleted file mode 100755 index b8912c6ba..000000000 Binary files a/doc/salome/gui/GUI/images/registry1.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/registry3.png b/doc/salome/gui/GUI/images/registry3.png deleted file mode 100755 index f44e2ec3a..000000000 Binary files a/doc/salome/gui/GUI/images/registry3.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/registry4.png b/doc/salome/gui/GUI/images/registry4.png deleted file mode 100755 index 98a3772b5..000000000 Binary files a/doc/salome/gui/GUI/images/registry4.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/save.jpg b/doc/salome/gui/GUI/images/save.jpg deleted file mode 100755 index 90001afb9..000000000 Binary files a/doc/salome/gui/GUI/images/save.jpg and /dev/null differ diff --git a/doc/salome/gui/GUI/images/selectcolor.png b/doc/salome/gui/GUI/images/selectcolor.png deleted file mode 100755 index 70800b28a..000000000 Binary files a/doc/salome/gui/GUI/images/selectcolor.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/selectfont.png b/doc/salome/gui/GUI/images/selectfont.png deleted file mode 100755 index 04eff08fd..000000000 Binary files a/doc/salome/gui/GUI/images/selectfont.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/set_rotation_point_dialog1.png b/doc/salome/gui/GUI/images/set_rotation_point_dialog1.png deleted file mode 100644 index bdab73b7d..000000000 Binary files a/doc/salome/gui/GUI/images/set_rotation_point_dialog1.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/set_rotation_point_dialog2.png b/doc/salome/gui/GUI/images/set_rotation_point_dialog2.png deleted file mode 100644 index 7f3696a56..000000000 Binary files a/doc/salome/gui/GUI/images/set_rotation_point_dialog2.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/studyproperties.png b/doc/salome/gui/GUI/images/studyproperties.png deleted file mode 100755 index af88317f1..000000000 Binary files a/doc/salome/gui/GUI/images/studyproperties.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/updaterate.png b/doc/salome/gui/GUI/images/updaterate.png deleted file mode 100755 index 4a6c29981..000000000 Binary files a/doc/salome/gui/GUI/images/updaterate.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/urbutton.png b/doc/salome/gui/GUI/images/urbutton.png deleted file mode 100755 index d7c0841e3..000000000 Binary files a/doc/salome/gui/GUI/images/urbutton.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/view2.png b/doc/salome/gui/GUI/images/view2.png deleted file mode 100755 index 9d48a09bb..000000000 Binary files a/doc/salome/gui/GUI/images/view2.png and /dev/null differ diff --git a/doc/salome/gui/GUI/images/view_rotation_point.png b/doc/salome/gui/GUI/images/view_rotation_point.png deleted file mode 100644 index 7fe8f8389..000000000 Binary files a/doc/salome/gui/GUI/images/view_rotation_point.png and /dev/null differ diff --git a/doc/salome/gui/GUI/input/about_salome.doc b/doc/salome/gui/GUI/input/about_salome.doc deleted file mode 100644 index 4f132abae..000000000 --- a/doc/salome/gui/GUI/input/about_salome.doc +++ /dev/null @@ -1,12 +0,0 @@ -/*! - -\page about_salome_page About SALOME - -
    -
  • \subpage intro_to_salome_page
    • -
  • \subpage salome_architecture_page
    • -
  • \subpage installing_salome_page "Installing SALOME"
    • -
  • \subpage running_salome_page
    • -
- -*/ \ No newline at end of file diff --git a/doc/salome/gui/GUI/input/creating_new_study.doc b/doc/salome/gui/GUI/input/creating_new_study.doc deleted file mode 100644 index 3c4d0e3cc..000000000 --- a/doc/salome/gui/GUI/input/creating_new_study.doc +++ /dev/null @@ -1,36 +0,0 @@ -/*! - -\page creating_new_study_page Creating a new study - -Study is a document within GUI, an abstraction layer between actual -document data (probably, remote data available through CORBA) and data -presentation (in the Object Browser). It contains a tree of Data -Object instances. - -To create a new study: - -\par -From the main menu select File > New or in the standard toolbar -click "New document" button. - -\image html newsticn.jpg ""New document" button" - -Your study will be created with default name \b Study1. In SALOME you -can create several studies. - -In addition to it, you can create several windows with different -activated viewers (VTK, OCC, Plot2d) for each study. - -To create a new window for a definite study: -
    -
  1. Make your study \b active: maximize it (if it minimized) or click on -the top control zone of the study window. -
    2. -
  2. \n From the main menu select Window > New Window and from the submenu -choose the viewer, which will be activated in a new window. -
    3. -
- -The window for your study will be created with a default name \b Study1. - -*/ \ No newline at end of file diff --git a/doc/salome/gui/GUI/input/displaying_studies.doc b/doc/salome/gui/GUI/input/displaying_studies.doc deleted file mode 100644 index b45a8ed50..000000000 --- a/doc/salome/gui/GUI/input/displaying_studies.doc +++ /dev/null @@ -1,30 +0,0 @@ -/*! - -\page displaying_studies_page Displaying studies - -Starting from SALOME version 3.0.0. you are able to work in a -multi-desktop environment, which means that you can open as many -studies as you need, place them wherever you wish on the desktop, in -brief, work with Salome Platform like with a normal Windows -application. -\n Such windows as Object Browser and Python Console are dockable and -also can be placed at any part of the desktop. -\n Only one study window in representation area can be active. You can -change their size and move any windows between representation -areas. When an area becomes empty, it is not displayed. -\n All windows are placed inside tabs where you can switch between -them. If there are several windows (viewers) in your current study and -you want to display more then one at the same time, you can split -representation area into two parts, in horizontal or vertical -direction, to create two representation areas with windows be placed -in them. To do this, right-click on the tab and select Split -Vertically or Split Horizontally. - -For example, on this screen-shot the active zone has been split -horizontally to be able to work with OCC and VTK viewers -simultaneously, the one of the windows was split again, at this time -vertically to see Plot 2d graphs. - -\image html neo-view2.png - -*/ \ No newline at end of file diff --git a/doc/salome/gui/GUI/input/editing_studies.doc b/doc/salome/gui/GUI/input/editing_studies.doc deleted file mode 100644 index cafc03eed..000000000 --- a/doc/salome/gui/GUI/input/editing_studies.doc +++ /dev/null @@ -1,19 +0,0 @@ -/*! - -\page editing_studies_page Editing studies - -\b SALOME has \b Copy/Paste functionality allowing to edit your study -within a definite component: - -To copy/paste a definite object: -\par -In the main toolbar click "Copy"/"Paste" button or from the main menu -choose Edit > Copy/Paste option. - -\image html copy-paste.jpg ""Copy" and "Paste" buttons" - -\n The availability of \b Copy/Paste operations depends on the module and -the nature of an operation or an object, so if the module does not -provide this functionality, it won't be available. - -*/ \ No newline at end of file diff --git a/doc/salome/gui/GUI/input/geometry_preferences.doc b/doc/salome/gui/GUI/input/geometry_preferences.doc deleted file mode 100644 index 651ef2e7e..000000000 --- a/doc/salome/gui/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/GUI/input/getting_started.doc b/doc/salome/gui/GUI/input/getting_started.doc deleted file mode 100644 index a06873543..000000000 --- a/doc/salome/gui/GUI/input/getting_started.doc +++ /dev/null @@ -1,20 +0,0 @@ -/*! - -\page getting_started_page Getting started - -When you start the SALOME Platform, the following initial desktop window appears: - -\image html view2.png - -    In general, the SALOME platform is destined -for performance of different numerical calculations and visualization -of the resulting data. For that purpose, in the SALOME environment the -following notion is used - \b Study. -
Study represents a working document in which you can realize all -operations connected with the SALOME functionality. -
SALOME is a multi-study platform. It means that simultaneously you can -work with several studies. - -\note To proceed working in SALOME you should create or open a new study. - -*/ \ No newline at end of file diff --git a/doc/salome/gui/GUI/input/gui_module_chapter.doc b/doc/salome/gui/GUI/input/gui_module_chapter.doc deleted file mode 100644 index 3d4f43ce0..000000000 --- a/doc/salome/gui/GUI/input/gui_module_chapter.doc +++ /dev/null @@ -1,39 +0,0 @@ -/*! - -\page gui_module_page GUI module - -
    -
  • \subpage introduction_to_gui_page
    • -
  • \subpage getting_started_page
    • -
  • \subpage salome_desktop_page
    • -
  • \subpage study_management_page
    • -
      -
    • \ref creating_new_study_page
      • -
    • \ref opening_studies_page
      • -
    • \ref saving_and_closing_studies_page
      • -
    • \ref editing_studies_page
      • -
    • \ref displaying_studies_page
      • -
    • \ref working_with_python_scripts_page
      • -
    • \ref setting_study_properties_page
      • -
    -
  • \subpage using_object_browser_page
    • -
  • \subpage using_registry_tool_page
    • -
  • \subpage using_catalog_generator_page "Using Catalog Generator"
    • -
  • \subpage viewers_page
    • -
      -
    • \ref occ_3d_viewer_page
      • -
    • \ref vtk_3d_viewer_page
      • -
    • \ref plot2d_viewer_page
      • -
    -
  • \subpage setting_preferences_page
    • -
      -
    • \ref setting_preferences_subpage
      • -
    • \ref select_color_and_font_page
      • -
    • \ref salome_preferences_page
      • -
    • \ref geometry_preferences_page
      • -
    • \ref mesh_preferences_page
      • -
    • \ref postpro_preferences_page
      • -
    -
- -*/ diff --git a/doc/salome/gui/GUI/input/index.doc b/doc/salome/gui/GUI/input/index.doc deleted file mode 100644 index 1f340a405..000000000 --- a/doc/salome/gui/GUI/input/index.doc +++ /dev/null @@ -1,51 +0,0 @@ -/*! - -\mainpage GUI Module Reference Documentation - -
    -
  • \subpage introduction_page
    • -
  • \subpage about_salome_page
    • -
      -
    • \ref intro_to_salome_page
      • -
    • \ref salome_architecture_page
      • -
    • \ref installing_salome_page
      • -
    • \ref running_salome_page
      • -
    -
  • \subpage gui_module_page "GUI module"
    • -
      -
    • \ref introduction_to_gui_page
      • -
    • \ref getting_started_page
      • -
    • \ref salome_desktop_page
      • -
    • \ref study_management_page
      • -
        -
      • \ref creating_new_study_page
        • -
      • \ref opening_studies_page
        • -
      • \ref saving_and_closing_studies_page
        • -
      • \ref editing_studies_page
        • -
      • \ref displaying_studies_page
        • -
      • \ref working_with_python_scripts_page
        • -
      • \ref setting_study_properties_page
        • -
      -
    -
  • \ref using_object_browser_page
    • -
  • \ref using_registry_tool_page
    • -
  • \ref using_catalog_generator_page "Using Catalog Generator"
    • -
  • \ref viewers_page
    • -
      -
    • \ref occ_3d_viewer_page
      • -
    • \ref vtk_3d_viewer_page
      • -
    • \ref plot2d_viewer_page
      • -
    -
  • \ref setting_preferences_page
    • -
      -
    • \ref setting_preferences_subpage
      • -
    • \ref select_color_and_font_page
      • -
    • \ref salome_preferences_page
      • -
    • \ref geometry_preferences_page
      • -
    • \ref mesh_preferences_page
      • -
    • \ref postpro_preferences_page
      • -
    -
- - -*/ diff --git a/doc/salome/gui/GUI/input/installing_salome.doc b/doc/salome/gui/GUI/input/installing_salome.doc deleted file mode 100644 index e0f26afe6..000000000 --- a/doc/salome/gui/GUI/input/installing_salome.doc +++ /dev/null @@ -1,961 +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 notes_on_check "Notes on check products version procedure" -
  • \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. -\n Note, that this is a time-consuming operation which can take -more than 24 hours depending on the computer. - --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 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 directory you want to install products to 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. - -You can also change the temporary directory (which is used to store -temporary files required for the installation). -\n In the bottom part of the window the total disk space required for -the installation and for the temporary files is displayed (see below -for more details). - -In the GUI mode the Installation Wizard provides two different options -to install the SALOME platform: \b basic (default option) and -\b advanced. In the \b basic mode the user should enter the target -installation directory and temporary folder. All other installation -options are taken from the XML configuration file (see \ref figure_2 "Figure 2"): - -\anchor figure_2 -\image html productpage1.png -\n
Figure 2: "Installation settings"
- -In addition, you have a choice to use "Install all products from -sources" check box. If this option is turned on, all the products will -be installed from the sources (using their own build procedures). This -check box corresponds to the --all-from-sources (-a) option of -the \b runInstall script (see \ref installing_products "here"). - -\Note Installation of all products from sources is a long-time -operation. - -To switch to the \b advanced option, click "More..." (see -\ref figure_3 "Figure 3" ). - -In the advanced mode you have a possibility to select products to be -installed. Each product can have several options of installation: you -have a possibility to use the native product (provided with Linux -distribution and installed in the system folders), install already -precompiled binaries, build the product from sources or not install it -at all. Available options and default option are taken from the XML -configuration file. You can mark the products you want to install by -clicking the corresponding radio-buttons in the list view in the left -part of the page. -\n Note, that some products may require some other pre-requisite -products to be installed (or these prerequisite products should be -already available on your computer). The installation procedure has a -special feature to automatically mark these products in the list -view. For example, in order to install \b PyQt it is necessary to have -gcc, Python, Qt and \b Sip installed. Therefore all these -products will also be turned on when you check on \b PyQt. This -feature can be switched off by clicking the "Automatic -dependencies" checkbox. Turn on this checkbox if you want all -prerequisite products to be automatically checked when you select some -product to be installed. Turn off this checkbox if you want to disable -this feature. - -\anchor figure_3 -\image html productpage.png -\n
Figure 3: "Installation settings" page in the 'advanced' mode
- -If you want to use native products (like \b gcc, \b tcl, etc.), select "use -native" option. -\n Special button in the right part of the page - "Unselect All" - -allows to reset quickly all products to the "not install" state. -

-There are also two checkboxes on this page: "SALOME sources" -and "SALOME binaries". These three-state checkboxes allow -quick selecting/unselecting sources/binaries packages of SALOME -modules for installation. -

-In addition, when some SALOME sources are selected, one more check box -becomes available: "Build SALOME sources". If this option is -turned on, the selected SALOME modules will be built and installed -from sources. - -\note If this check box is turned on, the corresponding SALOME -module binaries package installation is disabled, because of SALOME -module sources and binaries packages conflict (see \ref figure_4 "Figure 4" below). - -\anchor figure_4 -\image html productpage2.png -\n
Figure 4: "Build SALOME sources" check box -usage
- -The box at the right side of the page displays the information about -currently highlighted product: name, version and short description, -required disk space, disk space required for temporary files, list of -prerequisites (this information is provided in the XML file) and -current user choice. -

-The "Disk space required:" field displays how much disk space -on the hard drive is required for installation of selected products. - -\note Please, take into account that the displayed amount of -required disk space is approximate and may differ when you 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 - just type a path to the folder you want to use or click on -the corresponding "Browse..." button. - -\note Actually, temporary files are not stored directly in the -directory entered by the user. The Installation Wizard creates an -additional folder in this directory named something like -INSTALLWORKXXXXX where XXXXX is a unique number. This allows to launch -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 a -corresponding error message box. - -\note You are strongly recommended not to use directory names -containing spaces. Otherwise you can experience -some troubles with the installation. - -To proceed further click "Next". At this moment the program will make -some tests to check installation settings: if there is enough disk -space on the hard drive, check for native products installation, -dependencies (prerequisites) 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_5 -\image html choicepage.png -\n
Figure 5: "Check your choice" page
- -This page summarizes the installation options you've made on the -previous pages. You can check again your choice and change it if -necessary by getting back to the previous page. -\n When you are sure that everything is OK, click "Next" to -follow to the \ref figure_6 "next page". - -\anchor figure_6 -\image html progresspage1.png -\n
Figure 6: "Installation progress" page
- -To start installation of the selected products click "Start". It -launches the shell installation script and you will be able to see the -output of the script in the dialog topmost frame. If any errors occur -during the installation progress the corresponding messages will be -printed to the log window in bold red font. - -It is possible to break the installation at any time by clicking -"Stop". Then you can get back to the previous pages if you wish to -change installation settings or restart installation by pressing again -"Start" button. - -\note In the current implementation it is not possible to resume -the stopped installation process; it will be re-started from the very -beginning. - -\anchor figure_7 -\image html progresspage.png -\n
Figure 7: "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". All installed products have \c "Completed" -status. - -You can abort installation and close the installation procedure using -\em "Cancel" button. - -\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 installation (all selected products have been installed -successfully) you can go back to the previous pages to start a new -installation or click \em "Next" to go the Readme page: - -\anchor figure_8 -\image html readmepage.png -\n
Figure 8: "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). - -\anchor figure_9 -\image html batchmode.png -\n
Figure 9: 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. - -\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 notes_on_check -

Notes on check products version procedure

- -Unfortunately there is no exact algorithm to identify the product -version under Linux platform. The information in this section gives an -idea how the version is checked for the native/preinstalled products -(this information refers to the base platform Linux Mandrake -10.1; and the same algorithms are used for other platforms). - -The general rule for all products is that the path to the binaries -should be set via the \b PATH environment variable, path to the libraries -should be set via the \b LD_LIBRARY_PATH variable and the python modules -should be available via the \b PYTHONPATH variable. - -\note the information given in this section refers to the prerequisite -products for SALOME version 3.2.4. - -
    -
  • gcc 3.4.1 -\n\n Version number is checked by gcc -dumpversion command. The \b gcc -executable should be in the \b PATH environment variable. Version should -be equal to "3.4.1". It is recommended to use native gcc on Mandrake -10.1.

    -
    • -
  • tcl/tk 8.4.5 -\n\n Version number for \b tcl/tk can be found in tclConfig.sh and -tkConfig.sh files (\b TCL_VERSION and \b TK_VERSION variables -correspondingly). Version number should be equal to "8.4" (release -number is not checked). Set the \b TCLHOME environment variable to the -root directory of tcl/tk installation. It is recommended to use native -tcl/tk on Mandrake 10.1.

    -
    • -
  • boost 1.31.0 -\n\n Version number is defined by \b version.hpp file which is part of -the boost distribution. This file defines the \b BOOST_VERSION macro -which should be equal to "103100". In addition the existence of boost -libraries is checked. Set the \b BOOSTDIR environment variable if you -have a preinstalled version of boost.

    -
    • -
  • Python 2.3.4 -\n\n Version number is checked by \b python -\b V command. The \b python -executable should be in the \b PATH environment variable. Version -number should be equal to "2.3.4". It is recommended to use native -Python on Mandrake 10.1. Set the \b PYTHONHOME environment variable if -you have a preinstalled version of Python.

    -
    • -
  • Swig 1.3.24 -\n\n Version number is checked by \b swig -\b version command. The \b swig -executable should be in the \b PATH environment variable. Version number -should be equal to "1.3.24". -

    -
    • -
  • Qt 3.3.3 -\n\n Version number is defined by \b qglobal.h file which is part of the -Qt distribution. This file defines \b QT_VERSION_STR macro which should be equal to "3.3.3". It is recommended to use native Qt on Mandrake 10.1. -\n Set the \b QTDIR environment variable if you have a preinstalled version of qt.

    -
    • -
  • msg2qm -\n\n \b msg2qm is a Qt tool which is used to convert text *.po files -to *.qm resource files. Unfortunately this tool is not included to the -Linux distribution and provided only in Qt sources package. This is -the reason why this tool is supplied with the SALOME Installation -Wizard. There is no way to check the version number of msg2qm tool. Just set -\b MSG2QM_ROOT environment variable if you have a preinstalled version -of msg2qm tool.

    -
    • -
  • Open CASCADE 6.1.2a2 -\n\n Version number is defined by \b Standard_Version.hxx file which -is part of the Open CASCADE distribution. This file defines \b -OCC_VERSION_MAJOR, \b OCC_VERSION_MINOR and \b OCC_VERSION_MAINTENANCE -macros which should refer to version 6.1.2. \n Set the CASROOT -environment variable if you have a preinstalled version of Open -CASCADE.

    -
    • -
  • qwt 4.2.0/0.4.2 -\n\n Version number is defined by \b qwt_global.h file which is part of -the qwt distribution. This file defines \b QWT_VERSION_STR macro which should be equal to "4.2.0". -\n Set the \b QWTHOME environment variable if you have a preinstalled version of qwt.

    -
    • -
  • hdf 5-1.6.4 -\n\n Version number is defined by \b libhdf5.settings file which is -part of the \b hdf5 distribution. Version should be equal to 1.6.4. -\n Set the \b HDF5HOME environment variable if you have a preinstalled -version of hdf5.

    -
    • -
  • med 2.2.3 -\n\n Unfortunately there is no formal way to check med version -number. We check existence of libmed.so.1.0.2 library on the -computer. If you have any problem with a preinstalled version of med, -please, reinstall it. -\n Set the \b MED2HOME environment variable if you have a preinstalled -version of med.

    -
    • -
  • Vtk 4.2.6 -\n\n Unfortunately there is no formal way to check VTK version -number. We just check the existence of \b libvtkCommon.so library on -the computer and hope that it is of version we need. If you have any -problem with a preinstalled version of Vtk, please, reinstall it. -\n Set the \b VTKHOME environment variable if you have a preinstalled -version of Vtk.

    -
    • -
  • OmniORB 4.0.5, OmniORBpy 2.5, OmniNotify 2.1 -\n\n We just check existence of some omniORB libraries and executable -on the computer, like \b libomniORB4.so.0.5, \b _omnipymodule.so.2.4, -\b libCOSNotify4.so.0.1 and \b notifd. \n Set the \b OMNIORBDIR -environment variable if you have a preinstalled version of omniORB -products.

    -
    • -
  • sip 4.1 -\n\n Version number is checked by \b sip -\b V command. The \b sip -executable should be in the \b PATH environment variable. Version number should be equal to "4.1". -\n Set the \b SIPDIR environment variable to the directory where you -have sip executable preinstalled.

    -
    • -
  • PyQt 3.13 -\n\n Version number is defined by \b pyqtconfig.py Python module file -which is part of the \b PyQt distribution. Version should be equal to "3.13". -\n Set the \b PYQTDIR environment variable if you have a preinstalled -version of PyQt.

    -
    • -
  • netgen 4.5 -\n\n Unfortunarely we can't find anything about netgen version. We -just check if \b NETGENROOT environment variable is set. \n Set the\b -NETGENROOT environment variable if you have a preinstalled version of -netgen mesher.
    -\note netgen 4.5 provided with the SALOME installation Wizard has been patched to improve its performance. -
    • -
  • Numeric 23.7 -\n\n Version number is checked by python -c 'import Numeric; print -Numeric.__version__' command. The \b python executable should be -in the \b PATH environment variable and \b Numeric module should be -available for the Python (for example it should be in the \b PYTHONPATH environment variable). Version number should be equal to "23.7". If you have any problem with a preinstalled version of Numeric 23.7, please, reinstall it. -\n Add the directory where you have a preinstalled version of Numeric -package to the the \b PYTHONHOME environment variable.

    -
    • -
  • graphviz 2.2.1 -\n\n Version number is checked by \b dot -\b V command. The dot -executable should be in the \b PATH environment variable. Version -number should be equal to "2.2.1". \n Add \b graphviz bin directory to -the the \b PATH environment variable.

    -
    • -
  • doxygen 1.4.6 -\n\n Version number is checked by \b doxygen --\b version command. The -\b doxygen executable should be in the \b PATH environment -variable. Version number should be equal to "1.4.6".

    -
    • -
  • \b SALOME module \b sources (3.2.4). -\n\n For each SALOME module sources package (KERNEL, GUI, GEOM, -etc...) the root directory contains file configure.in (configure.ac) -which defines version information.\n Set the \b \_SRC_DIR environment variable for each SALOME \b -MODULE sources package installed (where \b MODULE is KERNEL, GUI, -GEOM, ...).

    -
    • -
  • \b SALOME module \b binaries (3.2.4) -\n\n For each SALOME module binaries package (KERNEL, GUI, GEOM, -etc...) the \b bin/salome directory contains file \b VERSION which -defines version information.\n Set \_ROOT_DIR environment -variable for each SALOME \b MODULE binaries package installed (where -\b MODULE is KERNEL, GUI, GEOM, ...).

    -
    • -
- -If you have native products installed to directories different from -default ones (not \b /usr/bin, \b /usr/lib...), it is recommended to follow -the above mentioned instructions. Or you should properly set \b PATH and -\b LD_LIBRARY_PATH variables \em before starting the Installation -Wizard. Otherwise the installation script will fail to find -preinstalled/native products. - -\note for some native products (e.g. gcc, Python) the rules of version -checking are not so strict as described above. Only major and minor -version numbers should coincide with the prerequisite. Newer version -of the product can also be used. If some native product has version -number larger than that required by the installation procedure, the -user will be prompted by the warning message like this: "You have -newer version of gcc installed on your computer than that is required -(3.4.1). Continue?". You can click "\em Yes" to proceed with the -installation but in this case you should be aware of what you are -doing. SALOME binaries (including other products) are compiled with -the predefined prerequisites and most likely can not be run -successfully if these products are not found. This can be helpful only -if you plan to build all products from sources. - -
-
-\anchor pick_up_env -

Pick up the environment

- -Please, read the following information carefully . 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. - -\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. The default file which Installation Wizard looks for if no -command line arguments are given, is \b config.xml. -\n This section describes the structure of the configuration file. -\n Optional sections/tags are in brackets. - -\code - - [ ] - [ caption= ] - [ copyright= ] - [ license= ] - [ os= ] - /> - ] - [ ] - [ tempdir= ] - /> - ] - [