aboutsummaryrefslogtreecommitdiff
path: root/cad
diff options
context:
space:
mode:
authorThierry Thomas <thierry@FreeBSD.org>2011-01-04 21:13:44 +0000
committerThierry Thomas <thierry@FreeBSD.org>2011-01-04 21:13:44 +0000
commite52f5a3c8fb70fc269c72e59868d7579c757ea6e (patch)
treeef07515df71c5fdcdbe7ae4dd5503a2771720ed4 /cad
parent9d6ddb763654cac927081b3729bbb773495b3757 (diff)
downloadports-e52f5a3c8fb70fc269c72e59868d7579c757ea6e.tar.gz
ports-e52f5a3c8fb70fc269c72e59868d7579c757ea6e.zip
Notes
Diffstat (limited to 'cad')
-rw-r--r--cad/salome-geom/Makefile1
-rw-r--r--cad/salome-geom/files/patch-admlocal_unix_config_files_Makefile.am9
-rw-r--r--cad/salome-geom/files/patch-admlocal_unix_configfiles_Makefile.am12
-rw-r--r--cad/salome-geom/files/patch-build_configure12
-rw-r--r--cad/salome-geom/files/patch-check_qt.m438
-rw-r--r--cad/salome-geom/files/patch-check_vtk.m471
-rw-r--r--cad/salome-geom/pkg-plist458
-rw-r--r--cad/salome-gui/Makefile1
-rw-r--r--cad/salome-gui/files/patch-GUI_DDS_DDS_DicGroup.cxx10
-rw-r--r--cad/salome-gui/files/patch-GUI_DDS_DDS_DicItem.cxx11
-rw-r--r--cad/salome-gui/files/patch-GUI_QDS_QDS_Datum.cxx10
-rw-r--r--cad/salome-gui/files/patch-GUI_check_GUI.m411
-rw-r--r--cad/salome-gui/pkg-plist329
-rw-r--r--cad/salome-kernel/Makefile1
-rw-r--r--cad/salome-kernel/files/patch-KERNEL-Container_i.cxx10
-rw-r--r--cad/salome-kernel/files/patch-KERNEL-MPIObject_i.hxx6
-rw-r--r--cad/salome-kernel/files/patch-KERNEL-ReceiverFactory.cxx10
-rw-r--r--cad/salome-kernel/files/patch-KERNEL-Receivers.cxx4
-rw-r--r--cad/salome-kernel/files/patch-KERNEL-SALOMEDSImpl_StudyBuilder.cxx10
-rw-r--r--cad/salome-kernel/files/patch-KERNEL-SALOME_Comm_i.cxx26
-rw-r--r--cad/salome-kernel/files/patch-KERNEL-SALOME_LifeCycleCORBA.hxx11
-rw-r--r--cad/salome-kernel/files/patch-KERNEL-TestContainerManager.cxx10
-rw-r--r--cad/salome-kernel/files/patch-SALOME_Comm_i.cxx13
-rw-r--r--cad/salome-kernel/files/patch-salome_adm__unix__config_files__check_mpich.m422
-rw-r--r--cad/salome-kernel/pkg-plist137
-rw-r--r--cad/salome-light/Makefile1
-rw-r--r--cad/salome-light/pkg-plist18
-rw-r--r--cad/salome-med/Makefile1
-rw-r--r--cad/salome-med/files/patch-MEDMEM_MEDMEM_GibiMeshDriver.cxx10
-rw-r--r--cad/salome-med/files/patch-MED_configure.ac8
-rw-r--r--cad/salome-med/files/patch-ParaMEDMED_ParaMEDMEMTest.cxx10
-rw-r--r--cad/salome-med/files/patch-ParaMEDMED_test_AlltoAllvTimeDEC.cxx10
-rw-r--r--cad/salome-med/files/patch-ParaMEDMED_test_AlltoAllvTimeDoubleDEC.cxx10
-rw-r--r--cad/salome-med/files/patch-ParaMEDMEM_MxN_Mapping.hxx13
-rw-r--r--cad/salome-med/files/patch-adm_local_unix_configfiles_Makefile.am20
-rw-r--r--cad/salome-med/files/patch-check_qt.m438
-rw-r--r--cad/salome-med/pkg-plist645
-rw-r--r--cad/salome-multipr/Makefile1
-rw-r--r--cad/salome-randomizer/Makefile1
-rw-r--r--cad/salome-sierpinsky/Makefile1
-rw-r--r--cad/salome-smesh/Makefile1
-rw-r--r--cad/salome-smesh/files/patch-admlocal_unix_config_Makefile.am10
-rw-r--r--cad/salome-smesh/pkg-plist1027
-rw-r--r--cad/salome-visu/Makefile1
-rw-r--r--cad/salome-visu/pkg-plist584
-rw-r--r--cad/salome-yacs/Makefile1
-rw-r--r--cad/salome-yacs/files/patch-runtime_DistributedPythonNode.cxx18
-rw-r--r--cad/salome-yacs/files/patch-src_engine_swig_Makefile.am19
-rw-r--r--cad/salome-yacs/files/patch-src_runtime_SalomeOptimizerLoop.cxx14
-rw-r--r--cad/salome-yacs/files/patch-src_runtime_swig_Makefile.am22
-rw-r--r--cad/salome-yacs/files/patch-src_salomegui_swig_Makefile.am24
-rw-r--r--cad/salome-yacs/files/patch-src_yacsloader_swig_Makefile.am24
-rw-r--r--cad/salome-yacs/pkg-plist441
-rw-r--r--cad/salome/Makefile21
-rw-r--r--cad/salome/Makefile.ext69
-rw-r--r--cad/salome/distinfo5
56 files changed, 2099 insertions, 2202 deletions
diff --git a/cad/salome-geom/Makefile b/cad/salome-geom/Makefile
index 6b87fb36ebd2..0cf53f13a6e7 100644
--- a/cad/salome-geom/Makefile
+++ b/cad/salome-geom/Makefile
@@ -8,6 +8,7 @@ CATEGORIES= cad science
MASTERDIR= ${.CURDIR}/../salome
+PORTNAME= salome
PKGNAMESUFFIX= -geom
SAL_MODULE_UPPER= GEOM
diff --git a/cad/salome-geom/files/patch-admlocal_unix_config_files_Makefile.am b/cad/salome-geom/files/patch-admlocal_unix_config_files_Makefile.am
new file mode 100644
index 000000000000..b938e7cb1f2d
--- /dev/null
+++ b/cad/salome-geom/files/patch-admlocal_unix_config_files_Makefile.am
@@ -0,0 +1,9 @@
+--- adm_local/unix/config_files/Makefile.am.orig 2010-11-06 23:29:41.000000000 +0600
++++ adm_local/unix/config_files/Makefile.am 2010-11-06 23:29:55.000000000 +0600
+@@ -20,5 +20,4 @@
+ include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+ dist_admlocalm4_DATA = \
+-check_GEOM.m4 \
+-check_GUI.m4
++check_GEOM.m4
diff --git a/cad/salome-geom/files/patch-admlocal_unix_configfiles_Makefile.am b/cad/salome-geom/files/patch-admlocal_unix_configfiles_Makefile.am
deleted file mode 100644
index c6804a347762..000000000000
--- a/cad/salome-geom/files/patch-admlocal_unix_configfiles_Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
---- adm_local/unix/config_files/Makefile.am.orig 2009-12-26 22:32:01.000000000 +0600
-+++ adm_local/unix/config_files/Makefile.am 2009-12-26 22:32:16.000000000 +0600
-@@ -22,8 +22,4 @@
- include $(top_srcdir)/adm_local/unix/make_common_starter.am
-
- dist_admlocalm4_DATA = \
--check_GEOM.m4 \
--check_GUI.m4 \
--check_qt.m4 \
--check_opengl.m4 \
--check_vtk.m4
-+check_GEOM.m4
diff --git a/cad/salome-geom/files/patch-build_configure b/cad/salome-geom/files/patch-build_configure
deleted file mode 100644
index d439d9b9976b..000000000000
--- a/cad/salome-geom/files/patch-build_configure
+++ /dev/null
@@ -1,12 +0,0 @@
---- build_configure.orig 2010-01-05 19:08:31.000000000 +0600
-+++ build_configure 2010-01-05 19:09:32.000000000 +0600
-@@ -63,7 +63,8 @@
- echo "======================================================= aclocal"
-
- aclocal -I adm_local/unix/config_files \
-- -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files || exit 1
-+ -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
-+ -I ${GUI_ROOT_DIR}/adm_local/unix/config_files || exit 1
-
- # ____________________________________________________________________
- # libtoolize creates some configuration files (ltmain.sh,
diff --git a/cad/salome-geom/files/patch-check_qt.m4 b/cad/salome-geom/files/patch-check_qt.m4
deleted file mode 100644
index 7b8c2a7a65f6..000000000000
--- a/cad/salome-geom/files/patch-check_qt.m4
+++ /dev/null
@@ -1,38 +0,0 @@
---- adm_local/unix/config_files/check_qt.m4.orig 2009-10-19 12:42:16.000000000 +0700
-+++ adm_local/unix/config_files/check_qt.m4 2009-10-19 12:43:05.000000000 +0700
-@@ -153,9 +153,9 @@
- #
- if test "x$qt_ok" = "xyes"
- then
-- if test -f ${QTDIR}/bin/moc
-+ if test -f ${QTDIR}/bin/moc-qt4
- then
-- MOC=${QTDIR}/bin/moc
-+ MOC=${QTDIR}/bin/moc-qt4
- else
- AC_PATH_PROG(MOC, moc)
- fi
-@@ -189,9 +189,9 @@
- #
- if test "x$qt_ok" = "xyes"
- then
-- if test -f ${QTDIR}/bin/uic
-+ if test -f ${QTDIR}/bin/uic-qt4
- then
-- UIC=${QTDIR}/bin/uic
-+ UIC=${QTDIR}/bin/uic-qt4
- else
- AC_PATH_PROG(UIC, uic)
- fi
-@@ -246,9 +246,9 @@
- #
- if test "x$qt_ok" = "xyes"
- then
-- if test -f ${QTDIR}/bin/lrelease
-+ if test -f ${QTDIR}/bin/lrelease-qt4
- then
-- LRELEASE=${QTDIR}/bin/lrelease
-+ LRELEASE=${QTDIR}/bin/lrelease-qt4
- else
- AC_PATH_PROG(LRELEASE, lrelease)
- fi
diff --git a/cad/salome-geom/files/patch-check_vtk.m4 b/cad/salome-geom/files/patch-check_vtk.m4
deleted file mode 100644
index bd3ebeaa48e4..000000000000
--- a/cad/salome-geom/files/patch-check_vtk.m4
+++ /dev/null
@@ -1,71 +0,0 @@
---- adm_local/unix/config_files/check_vtk.m4.orig 2009-12-01 20:59:03.000000000 +0600
-+++ adm_local/unix/config_files/check_vtk.m4 2010-06-18 14:18:42.000000000 +0700
-@@ -94,18 +94,18 @@
- if test -z $vtk_suffix ; then
- vtk_suffix="yes"
- fi
--if test "x$vtk_suffix" == "xno" ; then
-+if test "x$vtk_suffix" = "xno" ; then
- dnl in case user wrote --with-vtk-version=no, use empty suffix
- vtk_suffix=""
- fi
--if test "x$vtk_suffix" != "xyes" ; then
-- VTKSUFFIX="$vtk_suffix"
--else
-- dnl in case user wrote --with-vtk-version=yes, get the suffix from env
-- if test -z $VTKSUFFIX ; then
-- VTKSUFFIX="-5.0"
-- fi
--fi
-+#if test "x$vtk_suffix" != "xyes" ; then
-+# VTKSUFFIX="$vtk_suffix"
-+#else
-+# dnl in case user wrote --with-vtk-version=yes, get the suffix from env
-+# if test -z $VTKSUFFIX ; then
-+# VTKSUFFIX="-5.0"
-+# fi
-+#fi
-
- dnl VTK install dir
- if test -z $with_vtk ; then
-@@ -121,9 +121,9 @@
- AC_MSG_WARN(Value "no", specified for option --with-vtk, is not supported)
- fi
-
--if test "x$with_vtk" != "x" ; then
-- VTKHOME="$with_vtk"
--else
-+#if test "x$with_vtk" != "x" ; then
-+# VTKHOME="$with_vtk"
-+#else
- if test -z $VTKHOME ; then
- AC_MSG_WARN(undefined VTKHOME variable which specify where vtk was compiled)
- for d in /usr/local /usr ; do
-@@ -144,6 +144,18 @@
- VTKSUFFIX="-5.2"
- break
- fi
-+ if test -f ${d}/include/vtk-5.4/vtkPlane.h ; then
-+ AC_MSG_RESULT(trying ${d})
-+ VTKHOME="${d}"
-+ VTKSUFFIX="-5.4"
-+ break
-+ fi
-+ if test -f ${d}/include/vtk-5.6/vtkPlane.h ; then
-+ AC_MSG_RESULT(trying ${d})
-+ VTKHOME="${d}"
-+ VTKSUFFIX="-5.6"
-+ break
-+ fi
- if test -f ${d}/include/vtk/vtkPlane.h ; then
- AC_MSG_RESULT(trying ${d})
- VTKHOME="${d}"
-@@ -152,7 +164,7 @@
- fi
- done
- fi
--fi
-+#fi
-
- # Using regular VTK installation
- if test "x$with_paraview" = "x" ; then
diff --git a/cad/salome-geom/pkg-plist b/cad/salome-geom/pkg-plist
index 96431b9d4c76..78c20fc067b7 100644
--- a/cad/salome-geom/pkg-plist
+++ b/cad/salome-geom/pkg-plist
@@ -41,6 +41,8 @@ bin/salome/geompyDC.py
bin/salome/libGEOM_Swig.py
idl/salome/GEOM_Gen.idl
idl/salome/GEOM_Superv.idl
+include/salome/AdvancedGUI.h
+include/salome/AdvancedGUI_PipeTShapeDlg.h
include/salome/Archimede_VolumeSection.hxx
include/salome/BasicGUI.h
include/salome/BasicGUI_ArcDlg.h
@@ -52,7 +54,6 @@ include/salome/BasicGUI_MarkerDlg.h
include/salome/BasicGUI_PlaneDlg.h
include/salome/BasicGUI_PointDlg.h
include/salome/BasicGUI_VectorDlg.h
-include/salome/BasicGUI_WorkingPlaneDlg.h
include/salome/BlockFix.hxx
include/salome/BlockFix.ixx
include/salome/BlockFix.jxx
@@ -288,6 +289,7 @@ include/salome/GEOMImpl_GlueDriver.hxx
include/salome/GEOMImpl_HealingDriver.hxx
include/salome/GEOMImpl_I3DPrimOperations.hxx
include/salome/GEOMImpl_I3DSketcher.hxx
+include/salome/GEOMImpl_IAdvancedOperations.hxx
include/salome/GEOMImpl_IArc.hxx
include/salome/GEOMImpl_IArchimede.hxx
include/salome/GEOMImpl_IBasicOperations.hxx
@@ -328,6 +330,7 @@ include/salome/GEOMImpl_IPipe.hxx
include/salome/GEOMImpl_IPipeBiNormal.hxx
include/salome/GEOMImpl_IPipeDiffSect.hxx
include/salome/GEOMImpl_IPipeShellSect.hxx
+include/salome/GEOMImpl_IPipeTShape.hxx
include/salome/GEOMImpl_IPlane.hxx
include/salome/GEOMImpl_IPoint.hxx
include/salome/GEOMImpl_IPolyline.hxx
@@ -354,6 +357,7 @@ include/salome/GEOMImpl_MirrorDriver.hxx
include/salome/GEOMImpl_OffsetDriver.hxx
include/salome/GEOMImpl_PartitionDriver.hxx
include/salome/GEOMImpl_PipeDriver.hxx
+include/salome/GEOMImpl_PipeTShapeDriver.hxx
include/salome/GEOMImpl_PlaneDriver.hxx
include/salome/GEOMImpl_PointDriver.hxx
include/salome/GEOMImpl_PolylineDriver.hxx
@@ -372,6 +376,7 @@ include/salome/GEOMImpl_TranslateDriver.hxx
include/salome/GEOMImpl_Types.hxx
include/salome/GEOMImpl_VectorDriver.hxx
include/salome/GEOMToolsGUI.h
+include/salome/GEOMToolsGUI_DeflectionDlg.h
include/salome/GEOMToolsGUI_DeleteDlg.h
include/salome/GEOMToolsGUI_MarkerDlg.h
include/salome/GEOMToolsGUI_NbIsosDlg.h
@@ -406,6 +411,7 @@ include/salome/GEOM_GEOM_I.hxx
include/salome/GEOM_Gen.hh
include/salome/GEOM_Gen_i.hh
include/salome/GEOM_I3DPrimOperations_i.hh
+include/salome/GEOM_IAdvancedOperations_i.hh
include/salome/GEOM_IBasicOperations_i.hh
include/salome/GEOM_IBlocksOperations_i.hh
include/salome/GEOM_IBooleanOperations_i.hh
@@ -452,6 +458,7 @@ include/salome/GenerationGUI_PipeDlg.h
include/salome/GenerationGUI_PrismDlg.h
include/salome/GenerationGUI_RevolDlg.h
include/salome/GeometryGUI.h
+include/salome/GeometryGUI_Operations.h
include/salome/GeometryGUI_Swig.hxx
include/salome/GeometryGUI_Swig.i
include/salome/GroupGUI.h
@@ -484,6 +491,7 @@ include/salome/Handle_GEOM_InteractiveObject.hxx
include/salome/Handle_NMTDS_DataMapNodeOfDataMapOfIntegerMapOfInteger.hxx
include/salome/Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx
include/salome/Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx
+include/salome/Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere.hxx
include/salome/Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx
include/salome/Handle_NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
include/salome/Handle_NMTDS_ListNodeOfListOfPassKey.hxx
@@ -512,6 +520,11 @@ include/salome/MeasureGUI_PropertiesDlg.h
include/salome/MeasureGUI_Skeleton.h
include/salome/MeasureGUI_WhatisDlg.h
include/salome/MeasureGUI_Widgets.h
+include/salome/NMTDS_BndSphere.hxx
+include/salome/NMTDS_BndSphere.ixx
+include/salome/NMTDS_BndSphere.jxx
+include/salome/NMTDS_BndSphere.lxx
+include/salome/NMTDS_BndSphereTree.hxx
include/salome/NMTDS_BoxBndTree.hxx
include/salome/NMTDS_CArray1OfIndexRange.hxx
include/salome/NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger.hxx
@@ -522,9 +535,11 @@ include/salome/NMTDS_IndexRange.ixx
include/salome/NMTDS_IndexRange.jxx
include/salome/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx
include/salome/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx
+include/salome/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere.hxx
include/salome/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx
include/salome/NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx
include/salome/NMTDS_IndexedDataMapOfIntegerShape.hxx
+include/salome/NMTDS_IndexedDataMapOfShapeBndSphere.hxx
include/salome/NMTDS_IndexedDataMapOfShapeBox.hxx
include/salome/NMTDS_InterfPool.hxx
include/salome/NMTDS_InterfPool.ixx
@@ -679,6 +694,9 @@ include/salome/libGEOM_Swig.i
lib/salome/_libGEOM_Swig.la
lib/salome/_libGEOM_Swig.so
lib/salome/_libGEOM_Swig.so.0
+lib/salome/libAdvancedGUI.la
+lib/salome/libAdvancedGUI.so
+lib/salome/libAdvancedGUI.so.0
lib/salome/libBREPExport.la
lib/salome/libBREPExport.so
lib/salome/libBREPExport.so.0
@@ -793,210 +811,238 @@ lib/salome/libShHealOper.so.0
lib/salome/libTransformationGUI.la
lib/salome/libTransformationGUI.so
lib/salome/libTransformationGUI.so.0
-share/salome/resources/geom/3dsketch.png
-share/salome/resources/geom/GEOM.config
-share/salome/resources/geom/GEOMCatalog.xml
-share/salome/resources/geom/GEOMDS_Resources
-share/salome/resources/geom/GEOM_en.xml
-share/salome/resources/geom/GEOM_fr.xml
-share/salome/resources/geom/GEOM_images.qm
-share/salome/resources/geom/GEOM_msg_en.qm
-share/salome/resources/geom/GEOM_msg_fr.qm
-share/salome/resources/geom/ImportExport
-share/salome/resources/geom/ModuleGeom.png
-share/salome/resources/geom/Plugin
-share/salome/resources/geom/SalomeApp.xml
-share/salome/resources/geom/ShHealing
-share/salome/resources/geom/angle.png
-share/salome/resources/geom/arc.png
-share/salome/resources/geom/arccenter.png
-share/salome/resources/geom/archimede.png
-share/salome/resources/geom/arcofellipse.png
-share/salome/resources/geom/axisinertia.png
-share/salome/resources/geom/basicproperties.png
-share/salome/resources/geom/bezier.png
-share/salome/resources/geom/block_2f.png
-share/salome/resources/geom/block_6f.png
-share/salome/resources/geom/block_face_2e.png
-share/salome/resources/geom/block_face_4e.png
-share/salome/resources/geom/block_face_4v.png
-share/salome/resources/geom/block_multitrsf_double.png
-share/salome/resources/geom/block_multitrsf_simple.png
-share/salome/resources/geom/bounding.png
-share/salome/resources/geom/box.png
-share/salome/resources/geom/box2points.png
-share/salome/resources/geom/boxdxyz.png
-share/salome/resources/geom/build_compound.png
-share/salome/resources/geom/build_edge.png
-share/salome/resources/geom/build_face.png
-share/salome/resources/geom/build_shell.png
-share/salome/resources/geom/build_solid.png
-share/salome/resources/geom/build_wire.png
-share/salome/resources/geom/centergravity.png
-share/salome/resources/geom/chamfer.png
-share/salome/resources/geom/chamferall.png
-share/salome/resources/geom/chamferedge.png
-share/salome/resources/geom/chamferedgefromface.png
-share/salome/resources/geom/chamferface.png
-share/salome/resources/geom/change_orientation.png
-share/salome/resources/geom/check.png
-share/salome/resources/geom/check_blocks_compound.png
-share/salome/resources/geom/circle.png
-share/salome/resources/geom/circle3points.png
-share/salome/resources/geom/circlecenter2pnts.png
-share/salome/resources/geom/circlepointvector.png
-share/salome/resources/geom/closecontour.png
-share/salome/resources/geom/common.png
-share/salome/resources/geom/cone.png
-share/salome/resources/geom/conedxyz.png
-share/salome/resources/geom/conepointvector.png
-share/salome/resources/geom/coordsys.png
-share/salome/resources/geom/cut.png
-share/salome/resources/geom/cylinder.png
-share/salome/resources/geom/cylinderdxyz.png
-share/salome/resources/geom/cylinderpointvector.png
-share/salome/resources/geom/delete.png
-share/salome/resources/geom/disk.png
-share/salome/resources/geom/disk3points.png
-share/salome/resources/geom/disk_pntvecr.png
-share/salome/resources/geom/disk_r.png
-share/salome/resources/geom/display.png
-share/salome/resources/geom/displayall.png
-share/salome/resources/geom/displayonly.png
-share/salome/resources/geom/ellipse.png
-share/salome/resources/geom/ellipsepointvector.png
-share/salome/resources/geom/erase.png
-share/salome/resources/geom/eraseall.png
-share/salome/resources/geom/face_hw.png
-share/salome/resources/geom/face_vechw.png
-share/salome/resources/geom/fillet.png
-share/salome/resources/geom/fillet1d.png
-share/salome/resources/geom/fillet2d.png
-share/salome/resources/geom/filletall.png
-share/salome/resources/geom/filletedge.png
-share/salome/resources/geom/filletface.png
-share/salome/resources/geom/filletwire.png
-share/salome/resources/geom/filling.png
-share/salome/resources/geom/free_bound.png
-share/salome/resources/geom/free_faces.png
-share/salome/resources/geom/fuse.png
-share/salome/resources/geom/geometry.png
-share/salome/resources/geom/glue.png
-share/salome/resources/geom/glue2.png
-share/salome/resources/geom/group_edit.png
-share/salome/resources/geom/group_new.png
-share/salome/resources/geom/interpol.png
-share/salome/resources/geom/line.png
-share/salome/resources/geom/line2faces.png
-share/salome/resources/geom/line2points.png
-share/salome/resources/geom/marker.png
-share/salome/resources/geom/marker2.png
-share/salome/resources/geom/marker3.png
-share/salome/resources/geom/marker_1.png
-share/salome/resources/geom/marker_10.png
-share/salome/resources/geom/marker_11.png
-share/salome/resources/geom/marker_12.png
-share/salome/resources/geom/marker_13.png
-share/salome/resources/geom/marker_2.png
-share/salome/resources/geom/marker_3.png
-share/salome/resources/geom/marker_4.png
-share/salome/resources/geom/marker_5.png
-share/salome/resources/geom/marker_6.png
-share/salome/resources/geom/marker_7.png
-share/salome/resources/geom/marker_8.png
-share/salome/resources/geom/marker_9.png
-share/salome/resources/geom/mindist.png
-share/salome/resources/geom/mirrorAxe.png
-share/salome/resources/geom/mirrorPlane.png
-share/salome/resources/geom/mirrorPoint.png
-share/salome/resources/geom/multirotation.png
-share/salome/resources/geom/multirotationdouble.png
-share/salome/resources/geom/multirotationsimple.png
-share/salome/resources/geom/multitranslation.png
-share/salome/resources/geom/multitranslationdouble.png
-share/salome/resources/geom/multitranslationsimple.png
-share/salome/resources/geom/normale.png
-share/salome/resources/geom/offset.png
-share/salome/resources/geom/partition.png
-share/salome/resources/geom/partitionkeep.png
-share/salome/resources/geom/partitionplane.png
-share/salome/resources/geom/pipe.png
-share/salome/resources/geom/pipebinormal.png
-share/salome/resources/geom/plane.png
-share/salome/resources/geom/plane3points.png
-share/salome/resources/geom/planeWorking.png
-share/salome/resources/geom/planeface.png
-share/salome/resources/geom/planepointvector.png
-share/salome/resources/geom/planeworkingface.png
-share/salome/resources/geom/planeworkingorigin.png
-share/salome/resources/geom/planeworkingvector.png
-share/salome/resources/geom/point2.png
-share/salome/resources/geom/point3.png
-share/salome/resources/geom/point_coord.png
-share/salome/resources/geom/point_line_intersection.png
-share/salome/resources/geom/pointonedge.png
-share/salome/resources/geom/pointonface.png
-share/salome/resources/geom/polyline.png
-share/salome/resources/geom/position.png
-share/salome/resources/geom/position2.png
-share/salome/resources/geom/position3.png
-share/salome/resources/geom/prism.png
-share/salome/resources/geom/prism2.png
-share/salome/resources/geom/prism3.png
-share/salome/resources/geom/propagate.png
-share/salome/resources/geom/redo.png
-share/salome/resources/geom/remove_extra_edges.png
-share/salome/resources/geom/revol.png
-share/salome/resources/geom/rotate.png
-share/salome/resources/geom/rotatepnt.png
-share/salome/resources/geom/scale.png
-share/salome/resources/geom/scale_along_axes.png
-share/salome/resources/geom/section.png
-share/salome/resources/geom/select1.png
-share/salome/resources/geom/sewing.png
-share/salome/resources/geom/shading.png
-share/salome/resources/geom/shapeprocess.png
-share/salome/resources/geom/shapesonshape.png
-share/salome/resources/geom/sketch.png
-share/salome/resources/geom/sphere.png
-share/salome/resources/geom/spheredxyz.png
-share/salome/resources/geom/spherepoint.png
-share/salome/resources/geom/spline.png
-share/salome/resources/geom/subblock.png
-share/salome/resources/geom/subshape.png
-share/salome/resources/geom/suppressintwires.png
-share/salome/resources/geom/supressHolesOnFaceShell.png
-share/salome/resources/geom/supressface.png
-share/salome/resources/geom/supresshole.png
-share/salome/resources/geom/tolerance.png
-share/salome/resources/geom/torus.png
-share/salome/resources/geom/torusdxyz.png
-share/salome/resources/geom/toruspointvector.png
-share/salome/resources/geom/translation.png
-share/salome/resources/geom/translationDxyz.png
-share/salome/resources/geom/translationPoints.png
-share/salome/resources/geom/translationVector.png
-share/salome/resources/geom/tree_block.png
-share/salome/resources/geom/tree_compound.png
-share/salome/resources/geom/tree_compsolid.png
-share/salome/resources/geom/tree_edge.png
-share/salome/resources/geom/tree_face.png
-share/salome/resources/geom/tree_group_edge.png
-share/salome/resources/geom/tree_group_face.png
-share/salome/resources/geom/tree_group_solid.png
-share/salome/resources/geom/tree_group_vertex.png
-share/salome/resources/geom/tree_lcs.png
-share/salome/resources/geom/tree_shape.png
-share/salome/resources/geom/tree_shell.png
-share/salome/resources/geom/tree_solid.png
-share/salome/resources/geom/tree_vertex.png
-share/salome/resources/geom/tree_wire.png
-share/salome/resources/geom/undo.png
-share/salome/resources/geom/vector.png
-share/salome/resources/geom/vector2points.png
-share/salome/resources/geom/vector_mode.png
-share/salome/resources/geom/vectordxyz.png
-share/salome/resources/geom/whatis.png
-@dirrm share/salome/resources/geom
+%%DATADIR%%/resources/geom/3dsketch.png
+%%DATADIR%%/resources/geom/GEOM.config
+%%DATADIR%%/resources/geom/GEOMCatalog.xml
+%%DATADIR%%/resources/geom/GEOMDS_Resources
+%%DATADIR%%/resources/geom/GEOM_en.xml
+%%DATADIR%%/resources/geom/GEOM_fr.xml
+%%DATADIR%%/resources/geom/GEOM_images.qm
+%%DATADIR%%/resources/geom/GEOM_msg_en.qm
+%%DATADIR%%/resources/geom/GEOM_msg_fr.qm
+%%DATADIR%%/resources/geom/ImportExport
+%%DATADIR%%/resources/geom/ModuleGeom.png
+%%DATADIR%%/resources/geom/Plugin
+%%DATADIR%%/resources/geom/SalomeApp.xml
+%%DATADIR%%/resources/geom/ShHealing
+%%DATADIR%%/resources/geom/angle.png
+%%DATADIR%%/resources/geom/arc.png
+%%DATADIR%%/resources/geom/arccenter.png
+%%DATADIR%%/resources/geom/archimede.png
+%%DATADIR%%/resources/geom/arcofellipse.png
+%%DATADIR%%/resources/geom/axisinertia.png
+%%DATADIR%%/resources/geom/basicproperties.png
+%%DATADIR%%/resources/geom/bezier.png
+%%DATADIR%%/resources/geom/block_2f.png
+%%DATADIR%%/resources/geom/block_6f.png
+%%DATADIR%%/resources/geom/block_face_2e.png
+%%DATADIR%%/resources/geom/block_face_4e.png
+%%DATADIR%%/resources/geom/block_face_4v.png
+%%DATADIR%%/resources/geom/block_multitrsf_double.png
+%%DATADIR%%/resources/geom/block_multitrsf_simple.png
+%%DATADIR%%/resources/geom/bounding.png
+%%DATADIR%%/resources/geom/box.png
+%%DATADIR%%/resources/geom/box2points.png
+%%DATADIR%%/resources/geom/boxdxyz.png
+%%DATADIR%%/resources/geom/build_compound.png
+%%DATADIR%%/resources/geom/build_edge.png
+%%DATADIR%%/resources/geom/build_face.png
+%%DATADIR%%/resources/geom/build_shell.png
+%%DATADIR%%/resources/geom/build_solid.png
+%%DATADIR%%/resources/geom/build_wire.png
+%%DATADIR%%/resources/geom/centergravity.png
+%%DATADIR%%/resources/geom/chamfer.png
+%%DATADIR%%/resources/geom/chamferall.png
+%%DATADIR%%/resources/geom/chamferedge.png
+%%DATADIR%%/resources/geom/chamferedgefromface.png
+%%DATADIR%%/resources/geom/chamferface.png
+%%DATADIR%%/resources/geom/change_orientation.png
+%%DATADIR%%/resources/geom/check.png
+%%DATADIR%%/resources/geom/check_blocks_compound.png
+%%DATADIR%%/resources/geom/circle.png
+%%DATADIR%%/resources/geom/circle3points.png
+%%DATADIR%%/resources/geom/circlecenter2pnts.png
+%%DATADIR%%/resources/geom/circlepointvector.png
+%%DATADIR%%/resources/geom/closecontour.png
+%%DATADIR%%/resources/geom/common.png
+%%DATADIR%%/resources/geom/cone.png
+%%DATADIR%%/resources/geom/conedxyz.png
+%%DATADIR%%/resources/geom/conepointvector.png
+%%DATADIR%%/resources/geom/coordsys.png
+%%DATADIR%%/resources/geom/cut.png
+%%DATADIR%%/resources/geom/cylinder.png
+%%DATADIR%%/resources/geom/cylinderdxyz.png
+%%DATADIR%%/resources/geom/cylinderpointvector.png
+%%DATADIR%%/resources/geom/delete.png
+%%DATADIR%%/resources/geom/disk.png
+%%DATADIR%%/resources/geom/disk3points.png
+%%DATADIR%%/resources/geom/disk_pntvecr.png
+%%DATADIR%%/resources/geom/disk_r.png
+%%DATADIR%%/resources/geom/display.png
+%%DATADIR%%/resources/geom/displayall.png
+%%DATADIR%%/resources/geom/displayonly.png
+%%DATADIR%%/resources/geom/dlg_pipetshape.png
+%%DATADIR%%/resources/geom/dlg_pipetshapechamfer.png
+%%DATADIR%%/resources/geom/dlg_pipetshapechamferh.png
+%%DATADIR%%/resources/geom/dlg_pipetshapechamferl1.png
+%%DATADIR%%/resources/geom/dlg_pipetshapechamferl2.png
+%%DATADIR%%/resources/geom/dlg_pipetshapechamferr1.png
+%%DATADIR%%/resources/geom/dlg_pipetshapechamferr2.png
+%%DATADIR%%/resources/geom/dlg_pipetshapechamferw.png
+%%DATADIR%%/resources/geom/dlg_pipetshapechamferw1.png
+%%DATADIR%%/resources/geom/dlg_pipetshapechamferw2.png
+%%DATADIR%%/resources/geom/dlg_pipetshapefillet.png
+%%DATADIR%%/resources/geom/dlg_pipetshapefilletl1.png
+%%DATADIR%%/resources/geom/dlg_pipetshapefilletl2.png
+%%DATADIR%%/resources/geom/dlg_pipetshapefilletr1.png
+%%DATADIR%%/resources/geom/dlg_pipetshapefilletr2.png
+%%DATADIR%%/resources/geom/dlg_pipetshapefilletrf.png
+%%DATADIR%%/resources/geom/dlg_pipetshapefilletw1.png
+%%DATADIR%%/resources/geom/dlg_pipetshapefilletw2.png
+%%DATADIR%%/resources/geom/dlg_pipetshapel1.png
+%%DATADIR%%/resources/geom/dlg_pipetshapel2.png
+%%DATADIR%%/resources/geom/dlg_pipetshaper1.png
+%%DATADIR%%/resources/geom/dlg_pipetshaper2.png
+%%DATADIR%%/resources/geom/dlg_pipetshapew1.png
+%%DATADIR%%/resources/geom/dlg_pipetshapew2.png
+%%DATADIR%%/resources/geom/ellipse.png
+%%DATADIR%%/resources/geom/ellipsepointvector.png
+%%DATADIR%%/resources/geom/erase.png
+%%DATADIR%%/resources/geom/eraseall.png
+%%DATADIR%%/resources/geom/face_hw.png
+%%DATADIR%%/resources/geom/face_vechw.png
+%%DATADIR%%/resources/geom/fillet.png
+%%DATADIR%%/resources/geom/fillet1d.png
+%%DATADIR%%/resources/geom/fillet2d.png
+%%DATADIR%%/resources/geom/filletall.png
+%%DATADIR%%/resources/geom/filletedge.png
+%%DATADIR%%/resources/geom/filletface.png
+%%DATADIR%%/resources/geom/filletwire.png
+%%DATADIR%%/resources/geom/filling.png
+%%DATADIR%%/resources/geom/free_bound.png
+%%DATADIR%%/resources/geom/free_faces.png
+%%DATADIR%%/resources/geom/fuse.png
+%%DATADIR%%/resources/geom/geometry.png
+%%DATADIR%%/resources/geom/glue.png
+%%DATADIR%%/resources/geom/glue2.png
+%%DATADIR%%/resources/geom/group_edit.png
+%%DATADIR%%/resources/geom/group_new.png
+%%DATADIR%%/resources/geom/interpol.png
+%%DATADIR%%/resources/geom/line.png
+%%DATADIR%%/resources/geom/line2faces.png
+%%DATADIR%%/resources/geom/line2points.png
+%%DATADIR%%/resources/geom/marker.png
+%%DATADIR%%/resources/geom/marker2.png
+%%DATADIR%%/resources/geom/marker3.png
+%%DATADIR%%/resources/geom/marker_1.png
+%%DATADIR%%/resources/geom/marker_10.png
+%%DATADIR%%/resources/geom/marker_11.png
+%%DATADIR%%/resources/geom/marker_12.png
+%%DATADIR%%/resources/geom/marker_13.png
+%%DATADIR%%/resources/geom/marker_2.png
+%%DATADIR%%/resources/geom/marker_3.png
+%%DATADIR%%/resources/geom/marker_4.png
+%%DATADIR%%/resources/geom/marker_5.png
+%%DATADIR%%/resources/geom/marker_6.png
+%%DATADIR%%/resources/geom/marker_7.png
+%%DATADIR%%/resources/geom/marker_8.png
+%%DATADIR%%/resources/geom/marker_9.png
+%%DATADIR%%/resources/geom/mindist.png
+%%DATADIR%%/resources/geom/mirrorAxe.png
+%%DATADIR%%/resources/geom/mirrorPlane.png
+%%DATADIR%%/resources/geom/mirrorPoint.png
+%%DATADIR%%/resources/geom/multirotation.png
+%%DATADIR%%/resources/geom/multirotationdouble.png
+%%DATADIR%%/resources/geom/multirotationsimple.png
+%%DATADIR%%/resources/geom/multitranslation.png
+%%DATADIR%%/resources/geom/multitranslationdouble.png
+%%DATADIR%%/resources/geom/multitranslationsimple.png
+%%DATADIR%%/resources/geom/normale.png
+%%DATADIR%%/resources/geom/offset.png
+%%DATADIR%%/resources/geom/partition.png
+%%DATADIR%%/resources/geom/partitionkeep.png
+%%DATADIR%%/resources/geom/partitionplane.png
+%%DATADIR%%/resources/geom/pipe.png
+%%DATADIR%%/resources/geom/pipebinormal.png
+%%DATADIR%%/resources/geom/pipetshape.png
+%%DATADIR%%/resources/geom/pipetshape_import_icon.png
+%%DATADIR%%/resources/geom/plane.png
+%%DATADIR%%/resources/geom/plane3points.png
+%%DATADIR%%/resources/geom/planeWorking.png
+%%DATADIR%%/resources/geom/planeface.png
+%%DATADIR%%/resources/geom/planepointvector.png
+%%DATADIR%%/resources/geom/planeworkingface.png
+%%DATADIR%%/resources/geom/planeworkingorigin.png
+%%DATADIR%%/resources/geom/planeworkingvector.png
+%%DATADIR%%/resources/geom/point2.png
+%%DATADIR%%/resources/geom/point3.png
+%%DATADIR%%/resources/geom/point_coord.png
+%%DATADIR%%/resources/geom/point_line_intersection.png
+%%DATADIR%%/resources/geom/pointonedge.png
+%%DATADIR%%/resources/geom/pointonface.png
+%%DATADIR%%/resources/geom/polyline.png
+%%DATADIR%%/resources/geom/position.png
+%%DATADIR%%/resources/geom/position2.png
+%%DATADIR%%/resources/geom/position3.png
+%%DATADIR%%/resources/geom/prism.png
+%%DATADIR%%/resources/geom/prism2.png
+%%DATADIR%%/resources/geom/prism3.png
+%%DATADIR%%/resources/geom/propagate.png
+%%DATADIR%%/resources/geom/redo.png
+%%DATADIR%%/resources/geom/remove_extra_edges.png
+%%DATADIR%%/resources/geom/revol.png
+%%DATADIR%%/resources/geom/rotate.png
+%%DATADIR%%/resources/geom/rotatepnt.png
+%%DATADIR%%/resources/geom/scale.png
+%%DATADIR%%/resources/geom/scale_along_axes.png
+%%DATADIR%%/resources/geom/section.png
+%%DATADIR%%/resources/geom/select1.png
+%%DATADIR%%/resources/geom/sewing.png
+%%DATADIR%%/resources/geom/shading.png
+%%DATADIR%%/resources/geom/shapeprocess.png
+%%DATADIR%%/resources/geom/shapesonshape.png
+%%DATADIR%%/resources/geom/sketch.png
+%%DATADIR%%/resources/geom/sphere.png
+%%DATADIR%%/resources/geom/spheredxyz.png
+%%DATADIR%%/resources/geom/spherepoint.png
+%%DATADIR%%/resources/geom/spline.png
+%%DATADIR%%/resources/geom/subblock.png
+%%DATADIR%%/resources/geom/subshape.png
+%%DATADIR%%/resources/geom/suppressintwires.png
+%%DATADIR%%/resources/geom/supressHolesOnFaceShell.png
+%%DATADIR%%/resources/geom/supressface.png
+%%DATADIR%%/resources/geom/supresshole.png
+%%DATADIR%%/resources/geom/tolerance.png
+%%DATADIR%%/resources/geom/torus.png
+%%DATADIR%%/resources/geom/torusdxyz.png
+%%DATADIR%%/resources/geom/toruspointvector.png
+%%DATADIR%%/resources/geom/translation.png
+%%DATADIR%%/resources/geom/translationDxyz.png
+%%DATADIR%%/resources/geom/translationPoints.png
+%%DATADIR%%/resources/geom/translationVector.png
+%%DATADIR%%/resources/geom/tree_block.png
+%%DATADIR%%/resources/geom/tree_compound.png
+%%DATADIR%%/resources/geom/tree_compsolid.png
+%%DATADIR%%/resources/geom/tree_edge.png
+%%DATADIR%%/resources/geom/tree_face.png
+%%DATADIR%%/resources/geom/tree_group_edge.png
+%%DATADIR%%/resources/geom/tree_group_face.png
+%%DATADIR%%/resources/geom/tree_group_solid.png
+%%DATADIR%%/resources/geom/tree_group_vertex.png
+%%DATADIR%%/resources/geom/tree_lcs.png
+%%DATADIR%%/resources/geom/tree_pipetshape.png
+%%DATADIR%%/resources/geom/tree_shape.png
+%%DATADIR%%/resources/geom/tree_shell.png
+%%DATADIR%%/resources/geom/tree_solid.png
+%%DATADIR%%/resources/geom/tree_vertex.png
+%%DATADIR%%/resources/geom/tree_wire.png
+%%DATADIR%%/resources/geom/undo.png
+%%DATADIR%%/resources/geom/vector.png
+%%DATADIR%%/resources/geom/vector2points.png
+%%DATADIR%%/resources/geom/vector_mode.png
+%%DATADIR%%/resources/geom/vectordxyz.png
+%%DATADIR%%/resources/geom/whatis.png
+@dirrm %%DATADIR%%/resources/geom
+@dirrm %%PYTHON_SITELIBDIR%%/salome/shared_modules
@dirrm %%PYTHON_SITELIBDIR%%/salome/GEOM__POA
@dirrm %%PYTHON_SITELIBDIR%%/salome/GEOM
diff --git a/cad/salome-gui/Makefile b/cad/salome-gui/Makefile
index f887dfcaa9cf..6eb5279e5d8e 100644
--- a/cad/salome-gui/Makefile
+++ b/cad/salome-gui/Makefile
@@ -8,6 +8,7 @@ CATEGORIES= cad science
MASTERDIR= ${.CURDIR}/../salome
+PORTNAME= salome
PKGNAMESUFFIX= -gui
SAL_MODULE_UPPER= GUI
diff --git a/cad/salome-gui/files/patch-GUI_DDS_DDS_DicGroup.cxx b/cad/salome-gui/files/patch-GUI_DDS_DDS_DicGroup.cxx
new file mode 100644
index 000000000000..21d5f49ff8f8
--- /dev/null
+++ b/cad/salome-gui/files/patch-GUI_DDS_DDS_DicGroup.cxx
@@ -0,0 +1,10 @@
+--- src/DDS/DDS_DicGroup.cxx.orig 2010-06-06 21:31:11.000000000 +0700
++++ src/DDS/DDS_DicGroup.cxx 2010-06-06 21:31:56.000000000 +0700
+@@ -20,6 +20,7 @@
+ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+ //
+
++#include <cstdio>
+ #include "DDS_DicGroup.h"
+
+ #include "DDS_Dictionary.h"
diff --git a/cad/salome-gui/files/patch-GUI_DDS_DDS_DicItem.cxx b/cad/salome-gui/files/patch-GUI_DDS_DDS_DicItem.cxx
new file mode 100644
index 000000000000..146dcd46b67c
--- /dev/null
+++ b/cad/salome-gui/files/patch-GUI_DDS_DDS_DicItem.cxx
@@ -0,0 +1,11 @@
+--- src/DDS/DDS_DicItem.cxx.orig 2010-06-06 21:37:52.000000000 +0700
++++ src/DDS/DDS_DicItem.cxx 2010-06-06 21:38:04.000000000 +0700
+@@ -19,7 +19,7 @@
+ //
+ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+ //
+-
++#include <cstdio>
+ #include "DDS_DicItem.h"
+ #include "DDS_Dictionary.h"
+
diff --git a/cad/salome-gui/files/patch-GUI_QDS_QDS_Datum.cxx b/cad/salome-gui/files/patch-GUI_QDS_QDS_Datum.cxx
new file mode 100644
index 000000000000..d901b26a2ea4
--- /dev/null
+++ b/cad/salome-gui/files/patch-GUI_QDS_QDS_Datum.cxx
@@ -0,0 +1,10 @@
+--- src/QDS/QDS_Datum.cxx.orig 2010-06-06 21:40:20.000000000 +0700
++++ src/QDS/QDS_Datum.cxx 2010-06-06 21:40:29.000000000 +0700
+@@ -20,6 +20,7 @@
+ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+ //
+
++#include <cstdio>
+ #include "QDS_Datum.h"
+
+ #include <QLayout>
diff --git a/cad/salome-gui/files/patch-GUI_check_GUI.m4 b/cad/salome-gui/files/patch-GUI_check_GUI.m4
deleted file mode 100644
index 7a0eea1416ca..000000000000
--- a/cad/salome-gui/files/patch-GUI_check_GUI.m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- adm_local/unix/config_files/check_GUI.m4.orig 2009-08-15 21:44:17.000000000 +0700
-+++ adm_local/unix/config_files/check_GUI.m4 2009-08-15 21:44:37.000000000 +0700
-@@ -59,7 +59,7 @@
- SalomeGUI_ok=yes
- AC_MSG_RESULT(Using SALOME GUI distribution in ${SALOME_GUI_DIR})
-
-- if test "x${GUI_ROOT_DIR}" == "x" ; then
-+ if test "x${GUI_ROOT_DIR}" = "x" ; then
- GUI_ROOT_DIR=${SALOME_GUI_DIR}
- fi
-
diff --git a/cad/salome-gui/pkg-plist b/cad/salome-gui/pkg-plist
index 2a9a9f86647c..fbafde9732e0 100644
--- a/cad/salome-gui/pkg-plist
+++ b/cad/salome-gui/pkg-plist
@@ -15,7 +15,6 @@ adm_local/unix/config_files/check_SalomeObject.m4
adm_local/unix/config_files/check_SupervGraphViewer.m4
adm_local/unix/config_files/check_TestRecorder.m4
adm_local/unix/config_files/check_VTKViewer.m4
-adm_local/unix/config_files/check_corba_in_GUI.m4
adm_local/unix/config_files/check_disable_Corba.m4
adm_local/unix/config_files/check_msg2qm.m4
adm_local/unix/config_files/check_opengl.m4
@@ -39,10 +38,6 @@ bin/salome/test_big_table.py
bin/salome/test_many_objects.py
bin/salome/test_remove_ref.py
bin/salome/test_table.py
-%%CPPUNIT%%bin/salome/TestSalomeApp
-%%CPPUNIT%%bin/salome/TestSalomeApp.py
-%%CPPUNIT%%bin/salome/TestSalomeApp.pyc
-%%CPPUNIT%%bin/salome/TestSalomeApp.pyo
idl/salome/SalomeApp_Engine.idl
include/salome/CAF.h
include/salome/CAF_Application.h
@@ -139,6 +134,7 @@ include/salome/OCCViewer_AxialScaleDlg.h
include/salome/OCCViewer_ClippingDlg.h
include/salome/OCCViewer_CreateRestoreViewDlg.h
include/salome/OCCViewer_SetRotationPointDlg.h
+include/salome/OCCViewer_ToolTip.h
include/salome/OCCViewer_Trihedron.h
include/salome/OCCViewer_VService.h
include/salome/OCCViewer_ViewManager.h
@@ -147,6 +143,8 @@ include/salome/OCCViewer_ViewPort.h
include/salome/OCCViewer_ViewPort3d.h
include/salome/OCCViewer_ViewSketcher.h
include/salome/OCCViewer_ViewWindow.h
+include/salome/OpenGLUtils.h
+include/salome/OpenGLUtils_FrameBuffer.h
include/salome/Plot2d.h
include/salome/Plot2d_Curve.h
include/salome/Plot2d_FitDataDlg.h
@@ -373,12 +371,18 @@ include/salome/VTKViewer_AppendFilter.h
include/salome/VTKViewer_ArcBuilder.h
include/salome/VTKViewer_CellLocationsArray.h
include/salome/VTKViewer_ConvexTool.h
+include/salome/VTKViewer_DataSetMapper.h
include/salome/VTKViewer_ExtractUnstructuredGrid.h
include/salome/VTKViewer_Filter.h
include/salome/VTKViewer_FramedTextActor.h
include/salome/VTKViewer_Functor.h
include/salome/VTKViewer_GeometryFilter.h
include/salome/VTKViewer_InteractorStyle.h
+include/salome/VTKViewer_MarkerDef.h
+include/salome/VTKViewer_MarkerDlg.h
+include/salome/VTKViewer_MarkerUtils.h
+include/salome/VTKViewer_MarkerWidget.h
+include/salome/VTKViewer_PolyDataMapper.h
include/salome/VTKViewer_RenderWindow.h
include/salome/VTKViewer_RenderWindowInteractor.h
include/salome/VTKViewer_ShrinkFilter.h
@@ -390,10 +394,12 @@ include/salome/VTKViewer_ViewManager.h
include/salome/VTKViewer_ViewModel.h
include/salome/VTKViewer_ViewWindow.h
include/salome/libSALOME_Swig.i
-%%CPPUNIT%%include/salome/SalomeAppTest.hxx
%%PYTHON_SITELIBDIR%%/salome/SalomeApp/__init__.py
%%PYTHON_SITELIBDIR%%/salome/SalomeApp_Engine_idl.py
%%PYTHON_SITELIBDIR%%/salome/SalomeApp__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/salome/salome_pluginsmanager.py
+%%PYTHON_SITELIBDIR%%/salome/salome_pluginsmanager.pyc
+%%PYTHON_SITELIBDIR%%/salome/salome_pluginsmanager.pyo
%%PYTHON_SITELIBDIR%%/salome/shared_modules/SALOMEGUI_shared_modules.py
%%PYTHON_SITELIBDIR%%/salome/shared_modules/SALOMEGUI_shared_modules.pyc
%%PYTHON_SITELIBDIR%%/salome/shared_modules/SALOMEGUI_shared_modules.pyo
@@ -428,6 +434,9 @@ lib/salome/libOCCViewer.so.0
lib/salome/libObjBrowser.la
lib/salome/libObjBrowser.so
lib/salome/libObjBrowser.so.0
+lib/salome/libOpenGLUtils.la
+lib/salome/libOpenGLUtils.so
+lib/salome/libOpenGLUtils.so.0
lib/salome/libPlot2d.la
lib/salome/libPlot2d.so
lib/salome/libPlot2d.so.0
@@ -506,161 +515,161 @@ lib/salome/libstd.so.0
lib/salome/libsuit.la
lib/salome/libsuit.so
lib/salome/libsuit.so.0
-%%CPPUNIT%%lib/salome/libSalomeAppTest.la
-%%CPPUNIT%%lib/salome/libSalomeAppTest.so
-%%CPPUNIT%%lib/salome/libSalomeAppTest.so.0
-share/salome/resources/gui/CAF_msg_en.qm
-share/salome/resources/gui/CAM_msg_en.qm
-share/salome/resources/gui/GLViewer_images.qm
-share/salome/resources/gui/GLViewer_msg_en.qm
-share/salome/resources/gui/LightApp.ini
-share/salome/resources/gui/LightApp.xml
-share/salome/resources/gui/LightApp_images.qm
-share/salome/resources/gui/LightApp_msg_en.qm
-share/salome/resources/gui/LogWindow_msg_en.qm
-share/salome/resources/gui/OB_msg_en.qm
-share/salome/resources/gui/OCCViewer_images.qm
-share/salome/resources/gui/OCCViewer_msg_en.qm
-share/salome/resources/gui/Plot2d_images.qm
-share/salome/resources/gui/Plot2d_msg_en.qm
-share/salome/resources/gui/PyConsole_msg_en.qm
-share/salome/resources/gui/QDS_msg_en.qm
-share/salome/resources/gui/QxSceneViewer_images.qm
-share/salome/resources/gui/QxSceneViewer_msg_en.qm
-share/salome/resources/gui/STD_images.qm
-share/salome/resources/gui/STD_msg_en.qm
-share/salome/resources/gui/SUITApp_msg_en.qm
-share/salome/resources/gui/SUIT_msg_en.qm
-share/salome/resources/gui/SUPERVGraph_images.qm
-share/salome/resources/gui/SUPERVGraph_msg_en.qm
-share/salome/resources/gui/SVTK_images.qm
-share/salome/resources/gui/SVTK_msg_en.qm
-share/salome/resources/gui/SalomeApp.ini
-share/salome/resources/gui/SalomeApp.xml
-share/salome/resources/gui/SalomeApp_images.qm
-share/salome/resources/gui/SalomeApp_msg_en.qm
-share/salome/resources/gui/SalomeStyle.xml
-share/salome/resources/gui/ToolsGUI_msg_en.qm
-share/salome/resources/gui/VTKViewer_images.qm
-share/salome/resources/gui/VTKViewer_msg_en.qm
-share/salome/resources/gui/cascade.png
-share/salome/resources/gui/close.png
-share/salome/resources/gui/copy.png
-share/salome/resources/gui/cut.png
-share/salome/resources/gui/delete.png
-share/salome/resources/gui/gl_cursor_rotate.png
-share/salome/resources/gui/gl_cursor_sketch.png
-share/salome/resources/gui/gl_cursor_zoom.png
-share/salome/resources/gui/gl_view_dump.png
-share/salome/resources/gui/gl_view_fitall.png
-share/salome/resources/gui/gl_view_fitarea.png
-share/salome/resources/gui/gl_view_fitselect.png
-share/salome/resources/gui/gl_view_glpan.png
-share/salome/resources/gui/gl_view_pan.png
-share/salome/resources/gui/gl_view_reset.png
-share/salome/resources/gui/gl_view_zoom.png
-share/salome/resources/gui/help.png
-share/salome/resources/gui/htile.png
-share/salome/resources/gui/icon_about.png
-share/salome/resources/gui/icon_applogo.png
-share/salome/resources/gui/icon_default.png
-share/salome/resources/gui/icon_module.png
-share/salome/resources/gui/icon_module_big.png
-share/salome/resources/gui/icon_select.png
-share/salome/resources/gui/new.png
-share/salome/resources/gui/occ_view_ambient.png
-share/salome/resources/gui/occ_view_back.png
-share/salome/resources/gui/occ_view_bottom.png
-share/salome/resources/gui/occ_view_camera_dump.png
-share/salome/resources/gui/occ_view_clipping.png
-share/salome/resources/gui/occ_view_clipping_pressed.png
-share/salome/resources/gui/occ_view_clone.png
-share/salome/resources/gui/occ_view_fitall.png
-share/salome/resources/gui/occ_view_fitarea.png
-share/salome/resources/gui/occ_view_front.png
-share/salome/resources/gui/occ_view_glpan.png
-share/salome/resources/gui/occ_view_left.png
-share/salome/resources/gui/occ_view_pan.png
-share/salome/resources/gui/occ_view_presets.png
-share/salome/resources/gui/occ_view_reset.png
-share/salome/resources/gui/occ_view_right.png
-share/salome/resources/gui/occ_view_rotate.png
-share/salome/resources/gui/occ_view_rotation_point.png
-share/salome/resources/gui/occ_view_scaling.png
-share/salome/resources/gui/occ_view_shoot.png
-share/salome/resources/gui/occ_view_top.png
-share/salome/resources/gui/occ_view_triedre.png
-share/salome/resources/gui/occ_view_zoom.png
-share/salome/resources/gui/open.png
-share/salome/resources/gui/paste.png
-share/salome/resources/gui/plot2d_camera_dump.png
-share/salome/resources/gui/plot2d_clone.png
-share/salome/resources/gui/plot2d_fitall.png
-share/salome/resources/gui/plot2d_fitarea.png
-share/salome/resources/gui/plot2d_glpan.png
-share/salome/resources/gui/plot2d_legend.png
-share/salome/resources/gui/plot2d_linear.png
-share/salome/resources/gui/plot2d_linear_y.png
-share/salome/resources/gui/plot2d_lines.png
-share/salome/resources/gui/plot2d_log.png
-share/salome/resources/gui/plot2d_log_y.png
-share/salome/resources/gui/plot2d_pan.png
-share/salome/resources/gui/plot2d_points.png
-share/salome/resources/gui/plot2d_settings.png
-share/salome/resources/gui/plot2d_splines.png
-share/salome/resources/gui/plot2d_zoom.png
-share/salome/resources/gui/print.png
-share/salome/resources/gui/qx_view_fitall.png
-share/salome/resources/gui/qx_view_fitarea.png
-share/salome/resources/gui/qx_view_glpan.png
-share/salome/resources/gui/qx_view_pan.png
-share/salome/resources/gui/qx_view_reset.png
-share/salome/resources/gui/qx_view_zoom.png
-share/salome/resources/gui/redo.png
-share/salome/resources/gui/reset.png
-share/salome/resources/gui/save.png
-share/salome/resources/gui/std.ini
-share/salome/resources/gui/superv_view_pan.png
-share/salome/resources/gui/superv_view_reset.png
-share/salome/resources/gui/undo.png
-share/salome/resources/gui/vtile.png
-share/salome/resources/gui/vtk_view_back.png
-share/salome/resources/gui/vtk_view_bottom.png
-share/salome/resources/gui/vtk_view_camera_dump.png
-share/salome/resources/gui/vtk_view_fitall.png
-share/salome/resources/gui/vtk_view_fitarea.png
-share/salome/resources/gui/vtk_view_front.png
-share/salome/resources/gui/vtk_view_glpan.png
-share/salome/resources/gui/vtk_view_graduated_axes.png
-share/salome/resources/gui/vtk_view_left.png
-share/salome/resources/gui/vtk_view_pan.png
-share/salome/resources/gui/vtk_view_parallel.png
-share/salome/resources/gui/vtk_view_parameters.png
-share/salome/resources/gui/vtk_view_perspective.png
-share/salome/resources/gui/vtk_view_recording_pause.png
-share/salome/resources/gui/vtk_view_recording_play.png
-share/salome/resources/gui/vtk_view_recording_start.png
-share/salome/resources/gui/vtk_view_recording_stop.png
-share/salome/resources/gui/vtk_view_reset.png
-share/salome/resources/gui/vtk_view_right.png
-share/salome/resources/gui/vtk_view_rotate.png
-share/salome/resources/gui/vtk_view_rotation_point.png
-share/salome/resources/gui/vtk_view_scaling.png
-share/salome/resources/gui/vtk_view_style_switch.png
-share/salome/resources/gui/vtk_view_top.png
-share/salome/resources/gui/vtk_view_triedre.png
-share/salome/resources/gui/vtk_view_update_rate.png
-share/salome/resources/gui/vtk_view_zoom.png
-@dirrm share/salome/resources/gui
-@dirrmtry share/salome/resources
-@dirrmtry share/salome
-@dirrmtry lib/salome
+%%DATADIR%%/resources/gui/CAF_msg_en.qm
+%%DATADIR%%/resources/gui/CAM_msg_en.qm
+%%DATADIR%%/resources/gui/GLViewer_images.qm
+%%DATADIR%%/resources/gui/GLViewer_msg_en.qm
+%%DATADIR%%/resources/gui/LightApp.ini
+%%DATADIR%%/resources/gui/LightApp.xml
+%%DATADIR%%/resources/gui/LightApp_images.qm
+%%DATADIR%%/resources/gui/LightApp_msg_en.qm
+%%DATADIR%%/resources/gui/LogWindow_msg_en.qm
+%%DATADIR%%/resources/gui/OB_msg_en.qm
+%%DATADIR%%/resources/gui/OCCViewer_images.qm
+%%DATADIR%%/resources/gui/OCCViewer_msg_en.qm
+%%DATADIR%%/resources/gui/Plot2d_images.qm
+%%DATADIR%%/resources/gui/Plot2d_msg_en.qm
+%%DATADIR%%/resources/gui/PyConsole_msg_en.qm
+%%DATADIR%%/resources/gui/QDS_msg_en.qm
+%%DATADIR%%/resources/gui/QxSceneViewer_images.qm
+%%DATADIR%%/resources/gui/QxSceneViewer_msg_en.qm
+%%DATADIR%%/resources/gui/STD_images.qm
+%%DATADIR%%/resources/gui/STD_msg_en.qm
+%%DATADIR%%/resources/gui/SUITApp_msg_en.qm
+%%DATADIR%%/resources/gui/SUIT_msg_en.qm
+%%DATADIR%%/resources/gui/SUPERVGraph_images.qm
+%%DATADIR%%/resources/gui/SUPERVGraph_msg_en.qm
+%%DATADIR%%/resources/gui/SVTK_images.qm
+%%DATADIR%%/resources/gui/SVTK_msg_en.qm
+%%DATADIR%%/resources/gui/SalomeApp.ini
+%%DATADIR%%/resources/gui/SalomeApp.xml
+%%DATADIR%%/resources/gui/SalomeApp_images.qm
+%%DATADIR%%/resources/gui/SalomeApp_msg_en.qm
+%%DATADIR%%/resources/gui/SalomeStyle.xml
+%%DATADIR%%/resources/gui/ToolsGUI_msg_en.qm
+%%DATADIR%%/resources/gui/VTKViewer_images.qm
+%%DATADIR%%/resources/gui/VTKViewer_msg_en.qm
+%%DATADIR%%/resources/gui/cascade.png
+%%DATADIR%%/resources/gui/close.png
+%%DATADIR%%/resources/gui/copy.png
+%%DATADIR%%/resources/gui/cut.png
+%%DATADIR%%/resources/gui/delete.png
+%%DATADIR%%/resources/gui/gl_cursor_rotate.png
+%%DATADIR%%/resources/gui/gl_cursor_sketch.png
+%%DATADIR%%/resources/gui/gl_cursor_zoom.png
+%%DATADIR%%/resources/gui/gl_view_dump.png
+%%DATADIR%%/resources/gui/gl_view_fitall.png
+%%DATADIR%%/resources/gui/gl_view_fitarea.png
+%%DATADIR%%/resources/gui/gl_view_fitselect.png
+%%DATADIR%%/resources/gui/gl_view_glpan.png
+%%DATADIR%%/resources/gui/gl_view_pan.png
+%%DATADIR%%/resources/gui/gl_view_reset.png
+%%DATADIR%%/resources/gui/gl_view_zoom.png
+%%DATADIR%%/resources/gui/help.png
+%%DATADIR%%/resources/gui/htile.png
+%%DATADIR%%/resources/gui/icon_about.png
+%%DATADIR%%/resources/gui/icon_applogo.png
+%%DATADIR%%/resources/gui/icon_default.png
+%%DATADIR%%/resources/gui/icon_module.png
+%%DATADIR%%/resources/gui/icon_module_big.png
+%%DATADIR%%/resources/gui/icon_select.png
+%%DATADIR%%/resources/gui/marker_1.png
+%%DATADIR%%/resources/gui/marker_2.png
+%%DATADIR%%/resources/gui/marker_3.png
+%%DATADIR%%/resources/gui/marker_4.png
+%%DATADIR%%/resources/gui/marker_5.png
+%%DATADIR%%/resources/gui/marker_6.png
+%%DATADIR%%/resources/gui/marker_7.png
+%%DATADIR%%/resources/gui/marker_8.png
+%%DATADIR%%/resources/gui/marker_9.png
+%%DATADIR%%/resources/gui/new.png
+%%DATADIR%%/resources/gui/occ_view_ambient.png
+%%DATADIR%%/resources/gui/occ_view_back.png
+%%DATADIR%%/resources/gui/occ_view_bottom.png
+%%DATADIR%%/resources/gui/occ_view_camera_dump.png
+%%DATADIR%%/resources/gui/occ_view_clipping.png
+%%DATADIR%%/resources/gui/occ_view_clipping_pressed.png
+%%DATADIR%%/resources/gui/occ_view_clone.png
+%%DATADIR%%/resources/gui/occ_view_fitall.png
+%%DATADIR%%/resources/gui/occ_view_fitarea.png
+%%DATADIR%%/resources/gui/occ_view_front.png
+%%DATADIR%%/resources/gui/occ_view_glpan.png
+%%DATADIR%%/resources/gui/occ_view_left.png
+%%DATADIR%%/resources/gui/occ_view_pan.png
+%%DATADIR%%/resources/gui/occ_view_presets.png
+%%DATADIR%%/resources/gui/occ_view_reset.png
+%%DATADIR%%/resources/gui/occ_view_right.png
+%%DATADIR%%/resources/gui/occ_view_rotate.png
+%%DATADIR%%/resources/gui/occ_view_rotation_point.png
+%%DATADIR%%/resources/gui/occ_view_scaling.png
+%%DATADIR%%/resources/gui/occ_view_shoot.png
+%%DATADIR%%/resources/gui/occ_view_top.png
+%%DATADIR%%/resources/gui/occ_view_triedre.png
+%%DATADIR%%/resources/gui/occ_view_zoom.png
+%%DATADIR%%/resources/gui/open.png
+%%DATADIR%%/resources/gui/paste.png
+%%DATADIR%%/resources/gui/plot2d_camera_dump.png
+%%DATADIR%%/resources/gui/plot2d_clone.png
+%%DATADIR%%/resources/gui/plot2d_fitall.png
+%%DATADIR%%/resources/gui/plot2d_fitarea.png
+%%DATADIR%%/resources/gui/plot2d_glpan.png
+%%DATADIR%%/resources/gui/plot2d_legend.png
+%%DATADIR%%/resources/gui/plot2d_linear.png
+%%DATADIR%%/resources/gui/plot2d_linear_y.png
+%%DATADIR%%/resources/gui/plot2d_lines.png
+%%DATADIR%%/resources/gui/plot2d_log.png
+%%DATADIR%%/resources/gui/plot2d_log_y.png
+%%DATADIR%%/resources/gui/plot2d_pan.png
+%%DATADIR%%/resources/gui/plot2d_points.png
+%%DATADIR%%/resources/gui/plot2d_settings.png
+%%DATADIR%%/resources/gui/plot2d_splines.png
+%%DATADIR%%/resources/gui/plot2d_zoom.png
+%%DATADIR%%/resources/gui/print.png
+%%DATADIR%%/resources/gui/qx_view_fitall.png
+%%DATADIR%%/resources/gui/qx_view_fitarea.png
+%%DATADIR%%/resources/gui/qx_view_glpan.png
+%%DATADIR%%/resources/gui/qx_view_pan.png
+%%DATADIR%%/resources/gui/qx_view_reset.png
+%%DATADIR%%/resources/gui/qx_view_zoom.png
+%%DATADIR%%/resources/gui/redo.png
+%%DATADIR%%/resources/gui/reset.png
+%%DATADIR%%/resources/gui/save.png
+%%DATADIR%%/resources/gui/std.ini
+%%DATADIR%%/resources/gui/superv_view_pan.png
+%%DATADIR%%/resources/gui/superv_view_reset.png
+%%DATADIR%%/resources/gui/undo.png
+%%DATADIR%%/resources/gui/vtile.png
+%%DATADIR%%/resources/gui/vtk_view_back.png
+%%DATADIR%%/resources/gui/vtk_view_bottom.png
+%%DATADIR%%/resources/gui/vtk_view_camera_dump.png
+%%DATADIR%%/resources/gui/vtk_view_fitall.png
+%%DATADIR%%/resources/gui/vtk_view_fitarea.png
+%%DATADIR%%/resources/gui/vtk_view_front.png
+%%DATADIR%%/resources/gui/vtk_view_glpan.png
+%%DATADIR%%/resources/gui/vtk_view_graduated_axes.png
+%%DATADIR%%/resources/gui/vtk_view_left.png
+%%DATADIR%%/resources/gui/vtk_view_pan.png
+%%DATADIR%%/resources/gui/vtk_view_parallel.png
+%%DATADIR%%/resources/gui/vtk_view_parameters.png
+%%DATADIR%%/resources/gui/vtk_view_perspective.png
+%%DATADIR%%/resources/gui/vtk_view_recording_pause.png
+%%DATADIR%%/resources/gui/vtk_view_recording_play.png
+%%DATADIR%%/resources/gui/vtk_view_recording_start.png
+%%DATADIR%%/resources/gui/vtk_view_recording_stop.png
+%%DATADIR%%/resources/gui/vtk_view_reset.png
+%%DATADIR%%/resources/gui/vtk_view_right.png
+%%DATADIR%%/resources/gui/vtk_view_rotate.png
+%%DATADIR%%/resources/gui/vtk_view_rotation_point.png
+%%DATADIR%%/resources/gui/vtk_view_scaling.png
+%%DATADIR%%/resources/gui/vtk_view_style_switch.png
+%%DATADIR%%/resources/gui/vtk_view_top.png
+%%DATADIR%%/resources/gui/vtk_view_triedre.png
+%%DATADIR%%/resources/gui/vtk_view_update_rate.png
+%%DATADIR%%/resources/gui/vtk_view_zoom.png
+@dirrm %%DATADIR%%/resources/gui
@dirrmtry %%PYTHON_SITELIBDIR%%/salome/shared_modules
-@dirrm %%PYTHON_SITELIBDIR%%/salome/SalomeApp__POA
-@dirrm %%PYTHON_SITELIBDIR%%/salome/SalomeApp
-@dirrmtry %%PYTHON_SITELIBDIR%%/salome
-@dirrmtry idl/salome
-@dirrmtry idl
+@dirrmtry %%PYTHON_SITELIBDIR%%/salome/SalomeApp__POA
+@dirrmtry %%PYTHON_SITELIBDIR%%/salome/SalomeApp
@dirrmtry adm_local/unix/config_files
@dirrmtry adm_local/unix
@dirrmtry adm_local/cmake_files
diff --git a/cad/salome-kernel/Makefile b/cad/salome-kernel/Makefile
index c304e992da0a..3c542bbbc963 100644
--- a/cad/salome-kernel/Makefile
+++ b/cad/salome-kernel/Makefile
@@ -8,6 +8,7 @@ CATEGORIES= cad science
MASTERDIR= ${.CURDIR}/../salome
+PORTNAME= salome
PKGNAMESUFFIX= -kernel
SAL_MODULE_UPPER= KERNEL
diff --git a/cad/salome-kernel/files/patch-KERNEL-Container_i.cxx b/cad/salome-kernel/files/patch-KERNEL-Container_i.cxx
deleted file mode 100644
index 293ae17d6cdb..000000000000
--- a/cad/salome-kernel/files/patch-KERNEL-Container_i.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Container/Container_i.cxx.orig 2009-03-18 20:52:29.000000000 +0600
-+++ src/Container/Container_i.cxx 2009-05-20 10:21:06.000000000 +0700
-@@ -29,6 +29,7 @@
- #include <string.h>
- #include <stdio.h>
- #include <time.h>
-+#include <sys/wait.h>
- #ifndef WIN32
- #include <sys/time.h>
- #include <dlfcn.h>
diff --git a/cad/salome-kernel/files/patch-KERNEL-MPIObject_i.hxx b/cad/salome-kernel/files/patch-KERNEL-MPIObject_i.hxx
index 3c7124b245ab..9a803a5a3d47 100644
--- a/cad/salome-kernel/files/patch-KERNEL-MPIObject_i.hxx
+++ b/cad/salome-kernel/files/patch-KERNEL-MPIObject_i.hxx
@@ -1,6 +1,6 @@
---- src/MPIContainer/MPIObject_i.hxx.orig 2009-10-16 15:06:13.000000000 +0700
-+++ src/MPIContainer/MPIObject_i.hxx 2009-10-16 15:06:22.000000000 +0700
-@@ -26,6 +26,7 @@
+--- src/MPIContainer/MPIObject_i.hxx.orig 2010-11-17 10:23:50.000000000 +0600
++++ src/MPIContainer/MPIObject_i.hxx 2010-11-17 10:24:06.000000000 +0600
+@@ -27,6 +27,7 @@
#ifndef _SALOME_POBJECT_I_H_
#define _SALOME_POBJECT_I_H_
diff --git a/cad/salome-kernel/files/patch-KERNEL-ReceiverFactory.cxx b/cad/salome-kernel/files/patch-KERNEL-ReceiverFactory.cxx
new file mode 100644
index 000000000000..efb0f6b30bdc
--- /dev/null
+++ b/cad/salome-kernel/files/patch-KERNEL-ReceiverFactory.cxx
@@ -0,0 +1,10 @@
+--- src/Communication/ReceiverFactory.cxx.orig 2010-06-03 14:59:15.000000000 +0700
++++ src/Communication/ReceiverFactory.cxx 2010-06-03 15:00:38.000000000 +0700
+@@ -43,6 +43,7 @@
+ #endif
+
+ #ifdef HAVE_SOCKET
++#include <rpc/types.h>
+ #include <rpc/xdr.h>
+ #endif
+
diff --git a/cad/salome-kernel/files/patch-KERNEL-Receivers.cxx b/cad/salome-kernel/files/patch-KERNEL-Receivers.cxx
index 6c0ba133dcf8..fbfb4f04f600 100644
--- a/cad/salome-kernel/files/patch-KERNEL-Receivers.cxx
+++ b/cad/salome-kernel/files/patch-KERNEL-Receivers.cxx
@@ -1,5 +1,5 @@
---- src/Communication/Receivers.cxx.orig 2009-03-18 20:52:29.000000000 +0600
-+++ src/Communication/Receivers.cxx 2009-05-20 10:21:06.000000000 +0700
+--- src/Communication/Receivers.cxx.orig 2010-06-03 14:59:24.000000000 +0700
++++ src/Communication/Receivers.cxx 2010-06-03 15:00:16.000000000 +0700
@@ -235,6 +235,7 @@
#include <arpa/inet.h>
#include <netdb.h>
diff --git a/cad/salome-kernel/files/patch-KERNEL-SALOMEDSImpl_StudyBuilder.cxx b/cad/salome-kernel/files/patch-KERNEL-SALOMEDSImpl_StudyBuilder.cxx
deleted file mode 100644
index 16482f18d8d4..000000000000
--- a/cad/salome-kernel/files/patch-KERNEL-SALOMEDSImpl_StudyBuilder.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/SALOMEDSImpl/SALOMEDSImpl_StudyBuilder.cxx.orig 2009-07-20 15:08:45.000000000 +0700
-+++ src/SALOMEDSImpl/SALOMEDSImpl_StudyBuilder.cxx 2009-07-20 15:10:26.000000000 +0700
-@@ -35,6 +35,7 @@
- #include "DF_Label.hxx"
-
- #include <HDFOI.hxx>
-+#include <cstring>
- #include <stdlib.h>
-
- using namespace std;
diff --git a/cad/salome-kernel/files/patch-KERNEL-SALOME_Comm_i.cxx b/cad/salome-kernel/files/patch-KERNEL-SALOME_Comm_i.cxx
deleted file mode 100644
index b45fe853dc7b..000000000000
--- a/cad/salome-kernel/files/patch-KERNEL-SALOME_Comm_i.cxx
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/Communication/SALOME_Comm_i.cxx.orig 2009-12-01 20:58:49.000000000 +0600
-+++ src/Communication/SALOME_Comm_i.cxx 2010-03-10 22:41:04.000000000 +0600
-@@ -19,10 +19,14 @@
- //
- // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
- //
--#include "SALOME_Comm_i.hxx"
- #ifndef WIN32
-+#include <rpc/types.h>
- #include <rpc/xdr.h>
- #endif
-+
-+#include <cstdio>
-+
-+#include "SALOME_Comm_i.hxx"
- #include "omniORB4/poa.h"
- #include "omnithread.h"
- #include "Utils_SINGLETON.hxx"
-@@ -32,6 +36,7 @@
- #include "SenderFactory.hxx"
- using namespace std;
-
-+
- #ifndef WIN32
- CORBA::ORB_var &getGlobalORB(){
- ORB_INIT &init = *SINGLETON_<ORB_INIT>::Instance();
diff --git a/cad/salome-kernel/files/patch-KERNEL-SALOME_LifeCycleCORBA.hxx b/cad/salome-kernel/files/patch-KERNEL-SALOME_LifeCycleCORBA.hxx
deleted file mode 100644
index 99794aa48ae5..000000000000
--- a/cad/salome-kernel/files/patch-KERNEL-SALOME_LifeCycleCORBA.hxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx.orig 2009-03-18 20:52:29.000000000 +0600
-+++ src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx 2009-05-20 10:21:06.000000000 +0700
-@@ -33,6 +33,8 @@
- #include <unistd.h>
- #endif
- #include <string>
-+#include <string.h>
-+#include <stdio.h>
-
- #include <SALOMEconfig.h>
- #include <Utils_SALOME_Exception.hxx>
diff --git a/cad/salome-kernel/files/patch-KERNEL-TestContainerManager.cxx b/cad/salome-kernel/files/patch-KERNEL-TestContainerManager.cxx
deleted file mode 100644
index 6c25968640b3..000000000000
--- a/cad/salome-kernel/files/patch-KERNEL-TestContainerManager.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/LifeCycleCORBA/TestContainerManager.cxx.orig 2009-05-28 22:07:55.000000000 +0700
-+++ src/LifeCycleCORBA/TestContainerManager.cxx 2009-07-10 12:47:50.000000000 +0700
-@@ -29,6 +29,7 @@
- #include <iostream>
- #ifndef WNT
- #include <unistd.h>
-+#include <libgen.h>
- #endif
- #include <SALOMEconfig.h>
- #include "SALOME_NamingService.hxx"
diff --git a/cad/salome-kernel/files/patch-SALOME_Comm_i.cxx b/cad/salome-kernel/files/patch-SALOME_Comm_i.cxx
new file mode 100644
index 000000000000..3652ad07a7ff
--- /dev/null
+++ b/cad/salome-kernel/files/patch-SALOME_Comm_i.cxx
@@ -0,0 +1,13 @@
+--- src/Communication/SALOME_Comm_i.cxx.orig 2010-06-17 21:08:32.000000000 +0700
++++ src/Communication/SALOME_Comm_i.cxx 2010-11-15 15:55:02.000000000 +0600
+@@ -22,8 +22,10 @@
+
+ #include "SALOME_Comm_i.hxx"
+ #ifndef WIN32
++#include <rpc/types.h>
+ #include <rpc/xdr.h>
+ #endif
++#include <cstdio>
+ #include "omniORB4/poa.h"
+ #include "omnithread.h"
+ #include "Utils_SINGLETON.hxx"
diff --git a/cad/salome-kernel/files/patch-salome_adm__unix__config_files__check_mpich.m4 b/cad/salome-kernel/files/patch-salome_adm__unix__config_files__check_mpich.m4
new file mode 100644
index 000000000000..82ced4a4b0b5
--- /dev/null
+++ b/cad/salome-kernel/files/patch-salome_adm__unix__config_files__check_mpich.m4
@@ -0,0 +1,22 @@
+--- ./salome_adm/unix/config_files/check_mpich.m4.orig 2010-06-17 16:08:33.000000000 +0200
++++ ./salome_adm/unix/config_files/check_mpich.m4 2011-01-01 16:53:27.000000000 +0100
+@@ -58,15 +58,18 @@
+ if test "$WITHMPICH" = "yes";then
+ LDFLAGS_old="$LDFLAGS"
+ LDFLAGS="$MPI_LIBS $LDFLAGS"
++ LIBS_old="$LIBS"
++ LIBS="$LIBS -lmpl"
+ AC_CHECK_LIB(mpich,MPI_Init,WITHMPICH="yes",WITHMPICH="no")
+ AC_CHECK_LIB(mpich,MPI_Publish_name,WITHMPI2="yes",WITHMPI2="no")
+ LDFLAGS="$LDFLAGS_old"
++ LIBS="$LIBS_old"
+ fi
+
+ if test "$WITHMPICH" = "yes";then
+ WITHMPI="yes"
+ mpi_ok=yes
+- MPI_LIBS="$MPI_LIBS -lmpich"
++ MPI_LIBS="$MPI_LIBS -lmpich -lmpl"
+ else
+ mpi_ok=no
+ fi
diff --git a/cad/salome-kernel/pkg-plist b/cad/salome-kernel/pkg-plist
index 7e9c5a98e6a4..030b9a82dc8a 100644
--- a/cad/salome-kernel/pkg-plist
+++ b/cad/salome-kernel/pkg-plist
@@ -23,7 +23,6 @@ bin/salome/SALOME_DriverPy.pyc
bin/salome/SALOME_DriverPy.pyo
bin/salome/SALOME_LauncherServer
bin/salome/SALOME_Logger_Server
-%%MPI%%bin/salome/SALOME_MPIContainer
bin/salome/SALOME_ModuleCatalog_Client
bin/salome/SALOME_ModuleCatalog_Server
bin/salome/SALOME_NamingServicePy.py
@@ -54,7 +53,6 @@ bin/salome/TestLogger
bin/salome/TestLogger.py
bin/salome/TestLogger.pyc
bin/salome/TestLogger.pyo
-%%MPI%%bin/salome/TestMPIContainer
bin/salome/TestModuleCatalog.py
bin/salome/TestModuleCatalog.pyc
bin/salome/TestModuleCatalog.pyo
@@ -156,50 +154,6 @@ bin/salome/waitNS.py
bin/salome/waitNS.pyc
bin/salome/waitNS.pyo
bin/salome/waitNS.sh
-%%CPPUNIT%%bin/salome/LifeCycleCORBA_SWIGTest.py
-%%CPPUNIT%%bin/salome/LifeCycleCORBA_SWIGTest.pyc
-%%CPPUNIT%%bin/salome/LifeCycleCORBA_SWIGTest.pyo
-%%CPPUNIT%%bin/salome/TestKiller.py
-%%CPPUNIT%%bin/salome/TestKiller.pyc
-%%CPPUNIT%%bin/salome/TestKiller.pyo
-%%CPPUNIT%%bin/salome/TestLifeCycleCORBA
-%%CPPUNIT%%bin/salome/TestLifeCycleCORBA_SWIG.py
-%%CPPUNIT%%bin/salome/TestLifeCycleCORBA_SWIG.pyc
-%%CPPUNIT%%bin/salome/TestLifeCycleCORBA_SWIG.pyo
-%%CPPUNIT%%bin/salome/TestNamingService
-%%CPPUNIT%%bin/salome/TestNamingService.py
-%%CPPUNIT%%bin/salome/TestNamingService.pyc
-%%CPPUNIT%%bin/salome/TestNamingService.pyo
-%%CPPUNIT%%bin/salome/TestSALOMEDS
-%%CPPUNIT%%bin/salome/TestSALOMEDS.py
-%%CPPUNIT%%bin/salome/TestSALOMEDS.pyc
-%%CPPUNIT%%bin/salome/TestSALOMEDS.pyo
-%%CPPUNIT%%bin/salome/TestSALOMEDSImpl
-%%CPPUNIT%%bin/salome/TestSALOMEDSImpl.py
-%%CPPUNIT%%bin/salome/TestSALOMEDSImpl.pyc
-%%CPPUNIT%%bin/salome/TestSALOMEDSImpl.pyo
-%%CPPUNIT%%bin/salome/TestSALOMELocalTrace
-%%CPPUNIT%%bin/salome/TestSALOMELocalTrace.py
-%%CPPUNIT%%bin/salome/TestSALOMELocalTrace.pyc
-%%CPPUNIT%%bin/salome/TestSALOMELocalTrace.pyo
-%%CPPUNIT%%bin/salome/TestSALOMETraceCollector
-%%CPPUNIT%%bin/salome/TestSALOMETraceCollector.py
-%%CPPUNIT%%bin/salome/TestSALOMETraceCollector.pyc
-%%CPPUNIT%%bin/salome/TestSALOMETraceCollector.pyo
-%%CPPUNIT%%bin/salome/TestUtils
-%%CPPUNIT%%bin/salome/TestUtils.py
-%%CPPUNIT%%bin/salome/TestUtils.pyc
-%%CPPUNIT%%bin/salome/TestUtils.pyo
-%%CPPUNIT%%bin/salome/UnitTests
-%%CPPUNIT%%bin/salome/UnitTests.py
-%%CPPUNIT%%bin/salome/UnitTests.pyc
-%%CPPUNIT%%bin/salome/UnitTests.pyo
-%%CPPUNIT%%bin/salome/testcontainermanager.py
-%%CPPUNIT%%bin/salome/testcontainermanager.pyc
-%%CPPUNIT%%bin/salome/testcontainermanager.pyo
-%%CPPUNIT%%bin/salome/testresourcemanager.py
-%%CPPUNIT%%bin/salome/testresourcemanager.pyc
-%%CPPUNIT%%bin/salome/testresourcemanager.pyo
idl/salome/Calcium_Ports.idl
idl/salome/DSC_Engines.idl
idl/salome/Logger.idl
@@ -211,8 +165,6 @@ idl/salome/SALOME_Component.idl
idl/salome/SALOME_ContainerManager.idl
idl/salome/SALOME_Exception.idl
idl/salome/SALOME_GenericObj.idl
-%%MPI%%idl/salome/SALOME_MPIContainer.idl
-%%MPI%%idl/salome/SALOME_MPIObject.idl
idl/salome/SALOME_ModuleCatalog.idl
idl/salome/SALOME_PACOExtension.idl
idl/salome/SALOME_ParamPorts.idl
@@ -222,7 +174,6 @@ idl/salome/SALOME_Registry.idl
idl/salome/SALOME_RessourcesCatalog.idl
idl/salome/SALOME_Session.idl
idl/salome/SALOME_TestComponent.idl
-%%MPI%%idl/salome/SALOME_TestMPIComponent.idl
idl/salome/SALOME_TestModuleCatalog.idl
idl/salome/nstest.idl
include/salome/AdjacentFunctor.hxx
@@ -291,10 +242,14 @@ include/salome/HDFtypes.h
include/salome/IteratorTraits.hxx
include/salome/KERNEL_version.h
include/salome/Launcher.hxx
+include/salome/Launcher_Job.hxx
+include/salome/Launcher_Job_Command.hxx
+include/salome/Launcher_Job_PythonSALOME.hxx
+include/salome/Launcher_Job_SALOME.hxx
+include/salome/Launcher_Job_YACSFile.hxx
+include/salome/Launcher_Utils.hxx
include/salome/LocalTraceBufferPool.hxx
include/salome/Logger.hh
-%%MPI%%include/salome/MPIContainer_i.hxx
-%%MPI%%include/salome/MPIObject_i.hxx
include/salome/MatrixClient.hxx
include/salome/MultiCommException.hxx
include/salome/NOTIFICATION.hxx
@@ -335,6 +290,7 @@ include/salome/SALOMEDSClient_AttributeSequenceOfInteger.hxx
include/salome/SALOMEDSClient_AttributeSequenceOfReal.hxx
include/salome/SALOMEDSClient_AttributeString.hxx
include/salome/SALOMEDSClient_AttributeStudyProperties.hxx
+include/salome/SALOMEDSClient_AttributeTable.hxx
include/salome/SALOMEDSClient_AttributeTableOfInteger.hxx
include/salome/SALOMEDSClient_AttributeTableOfReal.hxx
include/salome/SALOMEDSClient_AttributeTableOfString.hxx
@@ -379,6 +335,7 @@ include/salome/SALOMEDSImpl_AttributeSequenceOfInteger.hxx
include/salome/SALOMEDSImpl_AttributeSequenceOfReal.hxx
include/salome/SALOMEDSImpl_AttributeString.hxx
include/salome/SALOMEDSImpl_AttributeStudyProperties.hxx
+include/salome/SALOMEDSImpl_AttributeTable.hxx
include/salome/SALOMEDSImpl_AttributeTableOfInteger.hxx
include/salome/SALOMEDSImpl_AttributeTableOfReal.hxx
include/salome/SALOMEDSImpl_AttributeTableOfString.hxx
@@ -446,8 +403,6 @@ include/salome/SALOME_Launcher_defs.hxx
include/salome/SALOME_LifeCycleCORBA.hxx
include/salome/SALOME_LoadRateManager.hxx
include/salome/SALOME_LocalTrace.hxx
-%%MPI%%include/salome/SALOME_MPIContainer.hh
-%%MPI%%include/salome/SALOME_MPIObject.hh
include/salome/SALOME_Matrix_i.hxx
include/salome/SALOME_ModuleCatalog.hh
include/salome/SALOME_ModuleCatalog.hxx
@@ -471,7 +426,6 @@ include/salome/SALOME_ResourcesManager.hxx
include/salome/SALOME_RessourcesCatalog.hh
include/salome/SALOME_Session.hh
include/salome/SALOME_TestComponent.hh
-%%MPI%%include/salome/SALOME_TestMPIComponent.hh
include/salome/SALOME_TestModuleCatalog.hh
include/salome/SALOME_Trace.hxx
include/salome/SALOME_Utils.hxx
@@ -480,7 +434,6 @@ include/salome/Salome_file_i.hxx
include/salome/SenderFactory.hxx
include/salome/ServiceUnreachable.hxx
include/salome/Superv_Component_i.hxx
-%%MPI%%include/salome/TestMPIComponentEngine.hxx
include/salome/TraceCollector_WaitForServerReadiness.hxx
include/salome/Utils_CommException.hxx
include/salome/Utils_CorbaException.hxx
@@ -522,14 +475,6 @@ include/salome/provides_port.hxx
include/salome/uses_port.hxx
include/salome/utilities.h
include/salome/version.h
-%%CPPUNIT%%include/salome/BasicMainTest.hxx
-%%CPPUNIT%%include/salome/LifeCycleCORBATest.hxx
-%%CPPUNIT%%include/salome/NamingServiceTest.hxx
-%%CPPUNIT%%include/salome/SALOMEDSImplTest.hxx
-%%CPPUNIT%%include/salome/SALOMEDSTest.hxx
-%%CPPUNIT%%include/salome/SALOMELocalTraceTest.hxx
-%%CPPUNIT%%include/salome/SALOMETraceCollectorTest.hxx
-%%CPPUNIT%%include/salome/UtilsTest.hxx
%%PYTHON_SITELIBDIR%%/salome/Calcium_Ports_idl.py
%%PYTHON_SITELIBDIR%%/salome/DSC_Engines_idl.py
%%PYTHON_SITELIBDIR%%/salome/Engines/__init__.py
@@ -564,8 +509,6 @@ include/salome/version.h
%%PYTHON_SITELIBDIR%%/salome/SALOME_GenericObj_idl.py
%%PYTHON_SITELIBDIR%%/salome/SALOME_Logger/__init__.py
%%PYTHON_SITELIBDIR%%/salome/SALOME_Logger__POA/__init__.py
-%%MPI%%%%PYTHON_SITELIBDIR%%/salome/SALOME_MPIContainer_idl.py
-%%MPI%%%%PYTHON_SITELIBDIR%%/salome/SALOME_MPIObject_idl.py
%%PYTHON_SITELIBDIR%%/salome/SALOME_ModuleCatalog/__init__.py
%%PYTHON_SITELIBDIR%%/salome/SALOME_ModuleCatalog__POA/__init__.py
%%PYTHON_SITELIBDIR%%/salome/SALOME_ModuleCatalog_idl.py
@@ -579,7 +522,6 @@ include/salome/version.h
%%PYTHON_SITELIBDIR%%/salome/SALOME_RessourcesCatalog_idl.py
%%PYTHON_SITELIBDIR%%/salome/SALOME_Session_idl.py
%%PYTHON_SITELIBDIR%%/salome/SALOME_TestComponent_idl.py
-%%MPI%%%%PYTHON_SITELIBDIR%%/salome/SALOME_TestMPIComponent_idl.py
%%PYTHON_SITELIBDIR%%/salome/SALOME_TestModuleCatalog/__init__.py
%%PYTHON_SITELIBDIR%%/salome/SALOME_TestModuleCatalog__POA/__init__.py
%%PYTHON_SITELIBDIR%%/salome/SALOME_TestModuleCatalog_idl.py
@@ -732,9 +674,6 @@ lib/salome/libSalomeLifeCycleCORBA.so.0
lib/salome/libSalomeLoggerServer.la
lib/salome/libSalomeLoggerServer.so
lib/salome/libSalomeLoggerServer.so.0
-%%MPI%%lib/salome/libSalomeMPIContainer.la
-%%MPI%%lib/salome/libSalomeMPIContainer.so
-%%MPI%%lib/salome/libSalomeMPIContainer.so.0
lib/salome/libSalomeNS.la
lib/salome/libSalomeNS.so
lib/salome/libSalomeNS.so.0
@@ -747,36 +686,12 @@ lib/salome/libSalomeResourcesManager.so.0
lib/salome/libSalomeTestComponentEngine.la
lib/salome/libSalomeTestComponentEngine.so
lib/salome/libSalomeTestComponentEngine.so.0
-%%MPI%%lib/salome/libSalomeTestMPIComponentEngine.la
-%%MPI%%lib/salome/libSalomeTestMPIComponentEngine.so
-%%MPI%%lib/salome/libSalomeTestMPIComponentEngine.so.0
lib/salome/libTOOLSDS.la
lib/salome/libTOOLSDS.so
lib/salome/libTOOLSDS.so.0
lib/salome/libwith_loggerTraceCollector.la
lib/salome/libwith_loggerTraceCollector.so
lib/salome/libwith_loggerTraceCollector.so.0
-%%CPPUNIT%%lib/salome/libLifeCycleCORBATest.la
-%%CPPUNIT%%lib/salome/libLifeCycleCORBATest.so
-%%CPPUNIT%%lib/salome/libLifeCycleCORBATest.so.0
-%%CPPUNIT%%lib/salome/libNamingServiceTest.la
-%%CPPUNIT%%lib/salome/libNamingServiceTest.so
-%%CPPUNIT%%lib/salome/libNamingServiceTest.so.0
-%%CPPUNIT%%lib/salome/libSALOMEDSImplTest.la
-%%CPPUNIT%%lib/salome/libSALOMEDSImplTest.so
-%%CPPUNIT%%lib/salome/libSALOMEDSImplTest.so.0
-%%CPPUNIT%%lib/salome/libSALOMEDSTest.la
-%%CPPUNIT%%lib/salome/libSALOMEDSTest.so
-%%CPPUNIT%%lib/salome/libSALOMEDSTest.so.0
-%%CPPUNIT%%lib/salome/libSALOMELocalTraceTest.la
-%%CPPUNIT%%lib/salome/libSALOMELocalTraceTest.so
-%%CPPUNIT%%lib/salome/libSALOMELocalTraceTest.so.0
-%%CPPUNIT%%lib/salome/libSALOMETraceCollectorTest.la
-%%CPPUNIT%%lib/salome/libSALOMETraceCollectorTest.so
-%%CPPUNIT%%lib/salome/libSALOMETraceCollectorTest.so.0
-%%CPPUNIT%%lib/salome/libUtilsTest.la
-%%CPPUNIT%%lib/salome/libUtilsTest.so
-%%CPPUNIT%%lib/salome/libUtilsTest.so.0
salome_adm/cmake_files/FindBOOST.cmake
salome_adm/cmake_files/FindCPPUNIT.cmake
salome_adm/cmake_files/FindDOXYGEN.cmake
@@ -852,14 +767,34 @@ salome_adm/unix/make_conclude.in
salome_adm/unix/make_module.in
salome_adm/unix/make_omniorb.in
salome_adm/unix/sstream.in
-share/salome/resources/kernel/CatalogModulePersonnel.xml_skel
-share/salome/resources/kernel/CatalogResources.xml
-share/salome/resources/kernel/KERNELCatalog.xml
-share/salome/resources/kernel/SALOMEDS_Resources
-share/salome/resources/kernel/channel.cfg
-@dirrm share/salome/resources/kernel
-@dirrm share/salome/resources
-@dirrm share/salome
+%%DATADIR%%/resources/kernel/CatalogModulePersonnel.xml_skel
+%%DATADIR%%/resources/kernel/CatalogResources.xml
+%%DATADIR%%/resources/kernel/KERNELCatalog.xml
+%%DATADIR%%/resources/kernel/SALOMEDS_Resources
+%%DATADIR%%/resources/kernel/channel.cfg
+%%MPI%%bin/salome/SALOME_MPIContainer
+%%MPI%%bin/salome/TestMPIContainer
+%%MPI%%idl/salome/SALOME_MPIObject.idl
+%%MPI%%idl/salome/SALOME_MPIContainer.idl
+%%MPI%%idl/salome/SALOME_TestMPIComponent.idl
+%%MPI%%include/salome/SALOME_MPIObject.hh
+%%MPI%%include/salome/SALOME_MPIContainer.hh
+%%MPI%%include/salome/SALOME_TestMPIComponent.hh
+%%MPI%%include/salome/MPIObject_i.hxx
+%%MPI%%include/salome/MPIContainer_i.hxx
+%%MPI%%include/salome/TestMPIComponentEngine.hxx
+%%MPI%%%%PYTHON_SITELIBDIR%%/salome/SALOME_MPIContainer_idl.py
+%%MPI%%%%PYTHON_SITELIBDIR%%/salome/SALOME_MPIObject_idl.py
+%%MPI%%%%PYTHON_SITELIBDIR%%/salome/SALOME_TestMPIComponent_idl.py
+%%MPI%%lib/salome/libSalomeMPIContainer.so.0
+%%MPI%%lib/salome/libSalomeMPIContainer.so
+%%MPI%%lib/salome/libSalomeMPIContainer.la
+%%MPI%%lib/salome/libSalomeTestMPIComponentEngine.so.0
+%%MPI%%lib/salome/libSalomeTestMPIComponentEngine.so
+%%MPI%%lib/salome/libSalomeTestMPIComponentEngine.la
+@dirrm %%DATADIR%%/resources/kernel
+@dirrm %%DATADIR%%/resources
+@dirrm %%DATADIR%%
@dirrm salome_adm/unix/config_files/DEPRECATED
@dirrm salome_adm/unix/config_files
@dirrm salome_adm/unix
diff --git a/cad/salome-light/Makefile b/cad/salome-light/Makefile
index b95adc5e8f37..9fd1b7800b30 100644
--- a/cad/salome-light/Makefile
+++ b/cad/salome-light/Makefile
@@ -8,6 +8,7 @@ CATEGORIES= cad science
MASTERDIR= ${.CURDIR}/../salome
+PORTNAME= salome
PKGNAMESUFFIX= -light
SAL_MODULE_UPPER= LIGHT
diff --git a/cad/salome-light/pkg-plist b/cad/salome-light/pkg-plist
index e050935d8ff9..1ab7f5a902e1 100644
--- a/cad/salome-light/pkg-plist
+++ b/cad/salome-light/pkg-plist
@@ -3,12 +3,12 @@ include/salome/LIGHT_version.h
lib/salome/libLIGHT.la
lib/salome/libLIGHT.so
lib/salome/libLIGHT.so.0
-share/salome/resources/light/LIGHT.png
-share/salome/resources/light/LIGHT_images.qm
-share/salome/resources/light/LIGHT_msg_en.qm
-share/salome/resources/light/LightApp.xml
-share/salome/resources/light/SalomeApp.xml
-share/salome/resources/light/line_icon.png
-share/salome/resources/light/paragraph_icon.png
-share/salome/resources/light/queen.txt
-@dirrm share/salome/resources/light
+%%DATADIR%%/resources/light/LIGHT.png
+%%DATADIR%%/resources/light/LIGHT_images.qm
+%%DATADIR%%/resources/light/LIGHT_msg_en.qm
+%%DATADIR%%/resources/light/LightApp.xml
+%%DATADIR%%/resources/light/SalomeApp.xml
+%%DATADIR%%/resources/light/line_icon.png
+%%DATADIR%%/resources/light/paragraph_icon.png
+%%DATADIR%%/resources/light/queen.txt
+@dirrm %%DATADIR%%/resources/light
diff --git a/cad/salome-med/Makefile b/cad/salome-med/Makefile
index 5f5502f467fe..da0027e1d3f2 100644
--- a/cad/salome-med/Makefile
+++ b/cad/salome-med/Makefile
@@ -8,6 +8,7 @@ CATEGORIES= cad science
MASTERDIR= ${.CURDIR}/../salome
+PORTNAME= salome
PKGNAMESUFFIX= -med
SAL_MODULE_UPPER= MED
diff --git a/cad/salome-med/files/patch-MEDMEM_MEDMEM_GibiMeshDriver.cxx b/cad/salome-med/files/patch-MEDMEM_MEDMEM_GibiMeshDriver.cxx
new file mode 100644
index 000000000000..c062c6f57713
--- /dev/null
+++ b/cad/salome-med/files/patch-MEDMEM_MEDMEM_GibiMeshDriver.cxx
@@ -0,0 +1,10 @@
+--- src/MEDMEM/MEDMEM_GibiMeshDriver.cxx.orig 2010-11-07 16:46:10.000000000 +0600
++++ src/MEDMEM/MEDMEM_GibiMeshDriver.cxx 2010-11-07 16:46:22.000000000 +0600
+@@ -29,6 +29,7 @@
+ #ifdef HAS_XDR
+ // On windows, this file must be included first otherwise
+ // there is a conflict with the symbol GROUP when compiling the xdr support ...
++#include <rpc/types.h>
+ #include <rpc/xdr.h>
+ #endif
+
diff --git a/cad/salome-med/files/patch-MED_configure.ac b/cad/salome-med/files/patch-MED_configure.ac
deleted file mode 100644
index e0134069733b..000000000000
--- a/cad/salome-med/files/patch-MED_configure.ac
+++ /dev/null
@@ -1,8 +0,0 @@
---- configure.ac.orig 2009-06-03 15:58:43.000000000 +0700
-+++ configure.ac 2009-06-03 16:05:00.000000000 +0700
-@@ -665,4 +665,4 @@
- ])
-
- dnl To avoid recompiling half of the sources because of SALOMEconfig.h recreating
--touch -d 01Jan2007 ./salome_adm/unix/SALOMEconfig.h
-+touch -t 200701010000 ./salome_adm/unix/SALOMEconfig.h
diff --git a/cad/salome-med/files/patch-ParaMEDMED_ParaMEDMEMTest.cxx b/cad/salome-med/files/patch-ParaMEDMED_ParaMEDMEMTest.cxx
deleted file mode 100644
index 4ff7cd4ca617..000000000000
--- a/cad/salome-med/files/patch-ParaMEDMED_ParaMEDMEMTest.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/ParaMEDMEM/Test/ParaMEDMEMTest.cxx.orig 2010-02-12 13:31:18.000000000 +0000
-+++ src/ParaMEDMEM/Test//ParaMEDMEMTest.cxx 2010-02-12 13:32:06.000000000 +0000
-@@ -23,6 +23,7 @@
- #include <cmath>
- #include <list>
- #include <stdexcept>
-+#include <stdlib.h>
-
- //================================================================================
- /*!
diff --git a/cad/salome-med/files/patch-ParaMEDMED_test_AlltoAllvTimeDEC.cxx b/cad/salome-med/files/patch-ParaMEDMED_test_AlltoAllvTimeDEC.cxx
deleted file mode 100644
index 227b30f590b0..000000000000
--- a/cad/salome-med/files/patch-ParaMEDMED_test_AlltoAllvTimeDEC.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/ParaMEDMEM/Test/test_AllToAllvTimeDEC.cxx.orig 2010-02-12 13:47:22.000000000 +0000
-+++ src/ParaMEDMEM/Test//test_AllToAllvTimeDEC.cxx 2010-02-12 13:47:35.000000000 +0000
-@@ -21,6 +21,7 @@
- #include <map>
- #include <iostream>
- #include <mpi.h>
-+#include <ctime>
- #include <time.h>
-
- #include "MPIAccessDECTest.hxx"
diff --git a/cad/salome-med/files/patch-ParaMEDMED_test_AlltoAllvTimeDoubleDEC.cxx b/cad/salome-med/files/patch-ParaMEDMED_test_AlltoAllvTimeDoubleDEC.cxx
deleted file mode 100644
index ca4b7d8a1dcc..000000000000
--- a/cad/salome-med/files/patch-ParaMEDMED_test_AlltoAllvTimeDoubleDEC.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/ParaMEDMEM/Test/test_AllToAllvTimeDoubleDEC.cxx.orig 2010-02-12 13:48:18.000000000 +0000
-+++ src/ParaMEDMEM/Test//test_AllToAllvTimeDoubleDEC.cxx 2010-02-12 13:48:32.000000000 +0000
-@@ -23,6 +23,7 @@
- #include <iostream>
- #include <mpi.h>
- #include <time.h>
-+#include <ctime>
-
- #include "MPIAccessDECTest.hxx"
- #include <cppunit/TestAssert.h>
diff --git a/cad/salome-med/files/patch-ParaMEDMEM_MxN_Mapping.hxx b/cad/salome-med/files/patch-ParaMEDMEM_MxN_Mapping.hxx
deleted file mode 100644
index ef76cb864ec3..000000000000
--- a/cad/salome-med/files/patch-ParaMEDMEM_MxN_Mapping.hxx
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/ParaMEDMEM/MxN_Mapping.hxx.orig 2009-10-19 15:18:21.000000000 +0700
-+++ src/ParaMEDMEM/MxN_Mapping.hxx 2009-10-19 15:18:27.000000000 +0700
-@@ -39,8 +39,8 @@
- void addElementFromSource(int distant_proc, int distant_elem);
- void prepareSendRecv();
- void sendRecv(MEDCouplingFieldDouble& field);
-- void sendRecv(double* field, MEDCouplingFieldDouble& field) const ;
-- void reverseSendRecv(double* field, MEDCouplingFieldDouble& field) const ;
-+ void sendRecv(double* fieldd, MEDCouplingFieldDouble& field) const ;
-+ void reverseSendRecv(double* fieldd, MEDCouplingFieldDouble& field) const ;
-
- //
- const std::vector<std::pair<int,int> >& getSendingIds() const { return _sending_ids; }//tmp
diff --git a/cad/salome-med/files/patch-adm_local_unix_configfiles_Makefile.am b/cad/salome-med/files/patch-adm_local_unix_configfiles_Makefile.am
deleted file mode 100644
index 767006bdceff..000000000000
--- a/cad/salome-med/files/patch-adm_local_unix_configfiles_Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
---- adm_local/unix/config_files/Makefile.am.orig 2009-12-01 20:59:14.000000000 +0600
-+++ adm_local/unix/config_files/Makefile.am 2010-01-05 20:29:04.000000000 +0600
-@@ -23,17 +23,12 @@
-
- dist_admlocalm4_DATA = \
- ac_check_sizeof_fortran.m4 \
-- check_GUI.m4 \
- check_Med.m4 \
- check_Med2.m4 \
- check_bft.m4 \
- check_fvm.m4 \
- check_libxml.m4 \
-- check_metis.m4 \
-- check_opengl.m4 \
-- check_qt.m4 \
- check_scotch.m4 \
-- check_vtk.m4 \
- med_check_sizeof_medint.m4 \
- renumber.m4 \
- splitter.m4 \
diff --git a/cad/salome-med/files/patch-check_qt.m4 b/cad/salome-med/files/patch-check_qt.m4
deleted file mode 100644
index 4ffce697283f..000000000000
--- a/cad/salome-med/files/patch-check_qt.m4
+++ /dev/null
@@ -1,38 +0,0 @@
---- adm_local/unix/config_files/check_qt.m4.orig 2009-10-19 14:53:19.000000000 +0700
-+++ adm_local/unix/config_files/check_qt.m4 2009-10-19 14:53:50.000000000 +0700
-@@ -153,9 +153,9 @@
- #
- if test "x$qt_ok" = "xyes"
- then
-- if test -f ${QTDIR}/bin/moc
-+ if test -f ${QTDIR}/bin/moc-qt4
- then
-- MOC=${QTDIR}/bin/moc
-+ MOC=${QTDIR}/bin/moc-qt4
- else
- AC_PATH_PROG(MOC, moc)
- fi
-@@ -189,9 +189,9 @@
- #
- if test "x$qt_ok" = "xyes"
- then
-- if test -f ${QTDIR}/bin/uic
-+ if test -f ${QTDIR}/bin/uic-qt4
- then
-- UIC=${QTDIR}/bin/uic
-+ UIC=${QTDIR}/bin/uic-qt4
- else
- AC_PATH_PROG(UIC, uic)
- fi
-@@ -246,9 +246,9 @@
- #
- if test "x$qt_ok" = "xyes"
- then
-- if test -f ${QTDIR}/bin/lrelease
-+ if test -f ${QTDIR}/bin/lrelease-qt4
- then
-- LRELEASE=${QTDIR}/bin/lrelease
-+ LRELEASE=${QTDIR}/bin/lrelease-qt4
- else
- AC_PATH_PROG(LRELEASE, lrelease)
- fi
diff --git a/cad/salome-med/pkg-plist b/cad/salome-med/pkg-plist
index 7ca1eca6cd4f..36a7786de8a4 100644
--- a/cad/salome-med/pkg-plist
+++ b/cad/salome-med/pkg-plist
@@ -12,7 +12,7 @@ adm_local/unix/config_files/check_Med.m4
adm_local/unix/config_files/check_Med2.m4
adm_local/unix/config_files/check_bft.m4
adm_local/unix/config_files/check_fvm.m4
-adm_local/unix/config_files/check_libxml.m4
+adm_local/unix/config_files/check_metis.m4
adm_local/unix/config_files/check_scotch.m4
adm_local/unix/config_files/med_check_sizeof_medint.m4
adm_local/unix/config_files/renumber.m4
@@ -22,6 +22,7 @@ bin/runTestMedCorba
bin/salome/Compo1.py
bin/salome/Compo1Py.py
bin/salome/MEDCouplingBasicsTest.py
+bin/salome/MEDCouplingRemapperTest.py
bin/salome/MEDSPLITTER.py
bin/salome/MED_Test
bin/salome/MED_test1.py
@@ -54,6 +55,7 @@ bin/salome/create_mesh_c3h8q4
bin/salome/create_mesh_c3h8q4_wrong
bin/salome/create_mesh_interpolation
bin/salome/create_poly3D
+bin/salome/dumpInterpolation
bin/salome/dumpMEDMEM.py
bin/salome/duplicateMED
bin/salome/duplicateMEDMESH
@@ -61,7 +63,11 @@ bin/salome/ensight2med
bin/salome/ensightMedEnsight_test.py
bin/salome/libCompo2.py
bin/salome/libMEDClient.py
+bin/salome/libMEDCouplingClient_Swig.py
+bin/salome/libMEDCouplingCorba_Swig.py
+bin/salome/libMEDCouplingRemapper_Swig.py
bin/salome/libMEDCoupling_Swig.py
+bin/salome/libMEDLoader_Swig.py
bin/salome/libMEDMEM_Swig.py
bin/salome/libMEDSPLITTER_Swig.py
bin/salome/libMedCorba_Swig.py
@@ -154,50 +160,30 @@ bin/salome/test_profil_MedFieldDriver
bin/salome/test_profil_MedFieldDriver.py
bin/salome/test_profil_gauss_MedFieldDriver
bin/salome/test_write_groups_poly
-%%CPPUNIT%%bin/salome/MEDMEMTest_Array_fault
-%%CPPUNIT%%bin/salome/MEDMEMTest_Connectivity_fault
-%%CPPUNIT%%bin/salome/MEDMEMTest_Coordinate_fault
-%%CPPUNIT%%bin/salome/MEDMEMTest_Family_fault
-%%CPPUNIT%%bin/salome/MEDMEMTest_Field_fault
-%%CPPUNIT%%bin/salome/MEDMEMTest_Grid_fault
-%%CPPUNIT%%bin/salome/MEDMEMTest_MedFieldDriver21_fault
-%%CPPUNIT%%bin/salome/MEDMEMTest_MedMedDriver21_fault
-%%CPPUNIT%%bin/salome/MEDMEMTest_MedMedDriver22_fault
-%%CPPUNIT%%bin/salome/MEDMEMTest_MeshAndMeshing_fault
-%%CPPUNIT%%bin/salome/MEDMEMTest_Support_fault
-%%CPPUNIT%%bin/salome/MEDMEMTest_VtkFieldDriver_fault
-%%CPPUNIT%%bin/salome/MEDMEMTest_VtkMeshDriver_fault
-%%CPPUNIT%%bin/salome/PerfTest
-%%CPPUNIT%%bin/salome/TestINTERP_KERNEL
-%%CPPUNIT%%bin/salome/TestMEDCoupling
-%%CPPUNIT%%bin/salome/TestMEDCouplingCorbaClt
-%%CPPUNIT%%bin/salome/TestMEDCouplingCorbaServ
-%%CPPUNIT%%bin/salome/TestMEDMEM
-%%CPPUNIT%%bin/salome/TestMEDSPLITTER
-%%CPPUNIT%%bin/salome/testMEDMEM.py
-%%CPPUNIT%%bin/salome/testMEDSPLITTER.py
idl/salome/Compo1Py.idl
idl/salome/MED.idl
idl/salome/MEDCouplingCorbaServant.idl
idl/salome/MEDCouplingCorbaServantTest.idl
idl/salome/MED_Gen.idl
-include/salome/AbstractEdge.hxx
include/salome/BBTree.txx
include/salome/BoundingBox.hxx
-include/salome/Bounds.hxx
include/salome/CONNECTIVITYClient.hxx
include/salome/COORDINATEClient.hxx
include/salome/CellModel.hxx
include/salome/Compo1Py.hh
-include/salome/ComposedEdge.hxx
include/salome/ConvexIntersector.hxx
include/salome/ConvexIntersector.txx
-include/salome/Edge.hxx
-include/salome/Edge.txx
-include/salome/EdgeArcCircle.hxx
-include/salome/EdgeInfLin.hxx
-include/salome/EdgeLin.hxx
-include/salome/ElementaryEdge.hxx
+include/salome/CurveIntersector.hxx
+include/salome/CurveIntersector.txx
+include/salome/CurveIntersectorP0P0.hxx
+include/salome/CurveIntersectorP0P0.txx
+include/salome/CurveIntersectorP0P1.hxx
+include/salome/CurveIntersectorP0P1.txx
+include/salome/CurveIntersectorP1P0.hxx
+include/salome/CurveIntersectorP1P0.txx
+include/salome/CurveIntersectorP1P1.hxx
+include/salome/CurveIntersectorP1P1.txx
+include/salome/DirectedBoundingBox.hxx
include/salome/FAMILYClient.hxx
include/salome/FIELDClient.cxx
include/salome/FIELDClient.hxx
@@ -206,22 +192,50 @@ include/salome/Geometric2DIntersector.hxx
include/salome/Geometric2DIntersector.txx
include/salome/INTERPKERNELBASESDefines.hxx
include/salome/INTERPKERNELDefines.hxx
+include/salome/INTERPKERNELEXPREVALDefines.hxx
include/salome/INTERPKERNELGEOMETRIC2DDefines.hxx
include/salome/IntegralUniformIntersector.hxx
include/salome/IntegralUniformIntersector.txx
include/salome/InterpKernelException.hxx
+include/salome/InterpKernelExprParser.hxx
+include/salome/InterpKernelFunction.hxx
+include/salome/InterpKernelGeo2DAbstractEdge.hxx
+include/salome/InterpKernelGeo2DBounds.hxx
+include/salome/InterpKernelGeo2DComposedEdge.hxx
+include/salome/InterpKernelGeo2DEdge.hxx
+include/salome/InterpKernelGeo2DEdge.txx
+include/salome/InterpKernelGeo2DEdgeArcCircle.hxx
+include/salome/InterpKernelGeo2DEdgeInfLin.hxx
+include/salome/InterpKernelGeo2DEdgeLin.hxx
+include/salome/InterpKernelGeo2DElementaryEdge.hxx
+include/salome/InterpKernelGeo2DNode.hxx
include/salome/InterpKernelGeo2DPrecision.hxx
+include/salome/InterpKernelGeo2DQuadraticPolygon.hxx
+include/salome/InterpKernelHashFun.hxx
+include/salome/InterpKernelHashMap.hxx
+include/salome/InterpKernelHashTable.hxx
include/salome/InterpKernelMatrix.hxx
+include/salome/InterpKernelStlExt.hxx
+include/salome/InterpKernelUnit.hxx
+include/salome/InterpKernelValue.hxx
include/salome/Interpolation.hxx
include/salome/Interpolation.txx
+include/salome/Interpolation1D.hxx
+include/salome/Interpolation1D.txx
include/salome/Interpolation2D.hxx
include/salome/Interpolation2D.txx
+include/salome/Interpolation2DCurve.hxx
+include/salome/Interpolation2DCurve.txx
include/salome/Interpolation3D.hxx
include/salome/Interpolation3D.txx
include/salome/Interpolation3DSurf.hxx
include/salome/Interpolation3DSurf.txx
include/salome/InterpolationCC.hxx
include/salome/InterpolationCC.txx
+include/salome/InterpolationCU.hxx
+include/salome/InterpolationCU.txx
+include/salome/InterpolationCurve.hxx
+include/salome/InterpolationCurve.txx
include/salome/InterpolationOptions.hxx
include/salome/InterpolationPlanar.hxx
include/salome/InterpolationPlanar.txx
@@ -238,6 +252,14 @@ include/salome/Intersector3DP1P0Bary.hxx
include/salome/Intersector3DP1P0Bary.txx
include/salome/Intersector3DP1P1.hxx
include/salome/Intersector3DP1P1.txx
+include/salome/IntersectorCU.hxx
+include/salome/IntersectorCU.txx
+include/salome/IntersectorCU1D.hxx
+include/salome/IntersectorCU1D.txx
+include/salome/IntersectorCU2D.hxx
+include/salome/IntersectorCU2D.txx
+include/salome/IntersectorCU3D.hxx
+include/salome/IntersectorCU3D.txx
include/salome/Log.hxx
include/salome/MED.hh
include/salome/MEDClient.hxx
@@ -247,6 +269,7 @@ include/salome/MEDCouplingClient.hxx
include/salome/MEDCouplingCorba.hxx
include/salome/MEDCouplingCorbaServant.hh
include/salome/MEDCouplingCorbaServantTest.hh
+include/salome/MEDCouplingExtrudedMesh.hxx
include/salome/MEDCouplingField.hxx
include/salome/MEDCouplingFieldDiscretization.hxx
include/salome/MEDCouplingFieldDouble.hxx
@@ -264,9 +287,11 @@ include/salome/MEDCouplingNormalizedCartesianMesh.txx
include/salome/MEDCouplingNormalizedUnstructuredMesh.hxx
include/salome/MEDCouplingNormalizedUnstructuredMesh.txx
include/salome/MEDCouplingPointSet.hxx
+include/salome/MEDCouplingPointSet.txx
include/salome/MEDCouplingPointSetServant.hxx
include/salome/MEDCouplingRefCountObject.hxx
include/salome/MEDCouplingRefCountServant.hxx
+include/salome/MEDCouplingRemapper.hxx
include/salome/MEDCouplingTimeDiscretization.hxx
include/salome/MEDCouplingTimeLabel.hxx
include/salome/MEDCouplingTypemaps.i
@@ -274,6 +299,8 @@ include/salome/MEDCouplingUMesh.hxx
include/salome/MEDCouplingUMeshClient.hxx
include/salome/MEDCouplingUMeshDesc.hxx
include/salome/MEDCouplingUMeshServant.hxx
+include/salome/MEDLoader.hxx
+include/salome/MEDLoaderBase.hxx
include/salome/MEDMEM.hxx
include/salome/MEDMEM_Array.hxx
include/salome/MEDMEM_ArrayConvert.hxx
@@ -428,7 +455,6 @@ include/salome/MeshElement.txx
include/salome/MeshRegion.hxx
include/salome/MeshRegion.txx
include/salome/MeshUtils.hxx
-include/salome/MEDNode.hxx
include/salome/NormalizedUnstructuredMesh.hxx
include/salome/PlanarIntersector.hxx
include/salome/PlanarIntersector.txx
@@ -436,18 +462,34 @@ include/salome/PlanarIntersectorP0P0.hxx
include/salome/PlanarIntersectorP0P0.txx
include/salome/PlanarIntersectorP0P1.hxx
include/salome/PlanarIntersectorP0P1.txx
+include/salome/PlanarIntersectorP0P1PL.hxx
+include/salome/PlanarIntersectorP0P1PL.txx
include/salome/PlanarIntersectorP1P0.hxx
include/salome/PlanarIntersectorP1P0.txx
include/salome/PlanarIntersectorP1P0Bary.hxx
include/salome/PlanarIntersectorP1P0Bary.txx
+include/salome/PlanarIntersectorP1P0PL.hxx
+include/salome/PlanarIntersectorP1P0PL.txx
include/salome/PlanarIntersectorP1P1.hxx
include/salome/PlanarIntersectorP1P1.txx
+include/salome/PlanarIntersectorP1P1PL.hxx
+include/salome/PlanarIntersectorP1P1PL.txx
include/salome/PointLocator.hxx
+include/salome/PointLocator2DIntersector.hxx
+include/salome/PointLocator2DIntersector.txx
+include/salome/PointLocator3DIntersectorP0P0.hxx
+include/salome/PointLocator3DIntersectorP0P0.txx
+include/salome/PointLocator3DIntersectorP0P1.hxx
+include/salome/PointLocator3DIntersectorP0P1.txx
+include/salome/PointLocator3DIntersectorP1P0.hxx
+include/salome/PointLocator3DIntersectorP1P0.txx
+include/salome/PointLocator3DIntersectorP1P1.hxx
+include/salome/PointLocator3DIntersectorP1P1.txx
include/salome/PointLocatorAlgos.txx
include/salome/PolygonAlgorithms.hxx
include/salome/PolygonAlgorithms.txx
-include/salome/PolyhedronIntersector.hxx
-include/salome/PolyhedronIntersector.txx
+include/salome/PolyhedronIntersectorP0P0.hxx
+include/salome/PolyhedronIntersectorP0P0.txx
include/salome/PolyhedronIntersectorP0P1.hxx
include/salome/PolyhedronIntersectorP0P1.txx
include/salome/PolyhedronIntersectorP1P0.hxx
@@ -456,7 +498,6 @@ include/salome/PolyhedronIntersectorP1P0Bary.hxx
include/salome/PolyhedronIntersectorP1P0Bary.txx
include/salome/PolyhedronIntersectorP1P1.hxx
include/salome/PolyhedronIntersectorP1P1.txx
-include/salome/QuadraticPolygon.hxx
include/salome/RENUMBER_BOOSTRenumbering.hxx
include/salome/RENUMBER_METISRenumbering.hxx
include/salome/RENUMBER_Renumbering.hxx
@@ -482,16 +523,17 @@ include/salome/VolSurfUser.hxx
include/salome/VolSurfUser.txx
include/salome/hdf5_version2api.hxx
include/salome/libMEDClient.i
+include/salome/libMEDCouplingClient_Swig.i
+include/salome/libMEDCouplingCorba_Swig.i
+include/salome/libMEDCouplingRemapper_Swig.i
include/salome/libMEDCoupling_Swig.i
+include/salome/libMEDLoader_Swig.i
include/salome/libMEDMEM_Swig.i
include/salome/libMEDSPLITTER_Swig.i
include/salome/libMedCorba_Swig.i
include/salome/med.hxx
include/salome/med_proto.hxx
include/salome/my_typemap.i
-%%CPPUNIT%%include/salome/MEDMEMCppTestExport.hxx
-%%CPPUNIT%%include/salome/MEDMEMTest.hxx
-%%CPPUNIT%%include/salome/MEDSPLITTERTest.hxx
%%PYTHON_SITELIBDIR%%/salome/Compo1Py_ORB/__init__.py
%%PYTHON_SITELIBDIR%%/salome/Compo1Py_ORB__POA/__init__.py
%%PYTHON_SITELIBDIR%%/salome/Compo1Py_idl.py
@@ -511,9 +553,21 @@ lib/salome/_libCompo2.so.0
lib/salome/_libMEDClient.la
lib/salome/_libMEDClient.so
lib/salome/_libMEDClient.so.0
+lib/salome/_libMEDCouplingClient_Swig.la
+lib/salome/_libMEDCouplingClient_Swig.so
+lib/salome/_libMEDCouplingClient_Swig.so.0
+lib/salome/_libMEDCouplingCorba_Swig.la
+lib/salome/_libMEDCouplingCorba_Swig.so
+lib/salome/_libMEDCouplingCorba_Swig.so.0
+lib/salome/_libMEDCouplingRemapper_Swig.la
+lib/salome/_libMEDCouplingRemapper_Swig.so
+lib/salome/_libMEDCouplingRemapper_Swig.so.0
lib/salome/_libMEDCoupling_Swig.la
lib/salome/_libMEDCoupling_Swig.so
lib/salome/_libMEDCoupling_Swig.so.0
+lib/salome/_libMEDLoader_Swig.la
+lib/salome/_libMEDLoader_Swig.so
+lib/salome/_libMEDLoader_Swig.so.0
lib/salome/_libMEDMEM_Swig.la
lib/salome/_libMEDMEM_Swig.so
lib/salome/_libMEDMEM_Swig.so.0
@@ -556,9 +610,6 @@ lib/salome/libSalomeIDLMED.so.0
lib/salome/libinterpkernel.la
lib/salome/libinterpkernel.so
lib/salome/libinterpkernel.so.0
-lib/salome/libinterpkernelbases.la
-lib/salome/libinterpkernelbases.so
-lib/salome/libinterpkernelbases.so.0
lib/salome/libmed_V2_1.la
lib/salome/libmed_V2_1.so
lib/salome/libmed_V2_1.so.0
@@ -571,6 +622,12 @@ lib/salome/libmedcouplingclient.so.0
lib/salome/libmedcouplingcorba.la
lib/salome/libmedcouplingcorba.so
lib/salome/libmedcouplingcorba.so.0
+lib/salome/libmedcouplingremapper.la
+lib/salome/libmedcouplingremapper.so
+lib/salome/libmedcouplingremapper.so.0
+lib/salome/libmedloader.la
+lib/salome/libmedloader.so
+lib/salome/libmedloader.so.0
lib/salome/libmedmem.la
lib/salome/libmedmem.so
lib/salome/libmedmem.so.0
@@ -580,280 +637,270 @@ lib/salome/libmedsplitter.so.0
lib/salome/librenumber.la
lib/salome/librenumber.so
lib/salome/librenumber.so.0
-share/salome/resources/med/Box1.med
-share/salome/resources/med/Box1Moderate.med
-share/salome/resources/med/Box2.med
-share/salome/resources/med/Box2Moderate.med
-share/salome/resources/med/Box3.med
-share/salome/resources/med/BoxEvenSmaller1.med
-share/salome/resources/med/BoxHexa1.med
-share/salome/resources/med/BoxHexa2.med
-share/salome/resources/med/BoxModSmall1.med
-share/salome/resources/med/BoxModSmall2.med
-share/salome/resources/med/BoxTetra2.med
-share/salome/resources/med/Case1.cnc
-share/salome/resources/med/Case1.inp
-share/salome/resources/med/Case1.xyz
-share/salome/resources/med/CatalogModuleTest.xml
-share/salome/resources/med/ChampsDarcy.med
-share/salome/resources/med/ComplexIncludedTetra.med
-share/salome/resources/med/ComplexIncludingTetra.med
-share/salome/resources/med/Compo1PyCatalog.xml
-share/salome/resources/med/CornerTetra.med
-share/salome/resources/med/Darcy3_3D_H_10x10x10.sauve
-share/salome/resources/med/Darcy3_3D_H_10x10x10_2.med
-share/salome/resources/med/Data.png
-share/salome/resources/med/DegenEdgeXY.med
-share/salome/resources/med/DegenFaceXYZ.med
-share/salome/resources/med/DegenTranslatedInPlane.med
-share/salome/resources/med/DividedGenTetra1.med
-share/salome/resources/med/DividedGenTetra2.med
-share/salome/resources/med/DividedUnitTetra.med
-share/salome/resources/med/DividedUnitTetraSimpler.med
-share/salome/resources/med/GenTetra1.med
-share/salome/resources/med/GenTetra2.med
-share/salome/resources/med/GeneralTetra.med
-share/salome/resources/med/H_CastCast_EFMH_I129_COUPLEX1.med
-share/salome/resources/med/H_CastCast_VF_I129_COUPLEX1.med
-share/salome/resources/med/H_CastCast_VF_Se79_COUPLEX1.med
-share/salome/resources/med/H_CastPorf_I129_COUPLEX1.med
-share/salome/resources/med/H_CastPorf_Se79_COUPLEX1.med
-share/salome/resources/med/H_PorfCast_EFMH_I129_COUPLEX1.med
-share/salome/resources/med/H_PorfCast_EFMH_Se79_COUPLEX1.med
-share/salome/resources/med/H_PorfPorf_I129_COUPLEX1.med
-share/salome/resources/med/H_Traces_I129_COUPLEX1.med
-share/salome/resources/med/H_Traces_Se79_COUPLEX1.med
-share/salome/resources/med/HalfstripOnly.med
-share/salome/resources/med/HalfstripOnly2.med
-share/salome/resources/med/Infos.png
-share/salome/resources/med/LargeInconsistentTetra.med
-share/salome/resources/med/LargeUnitTetra.med
-share/salome/resources/med/MEDCatalog.xml
-share/salome/resources/med/MED_images.qm
-share/salome/resources/med/MED_msg_en.qm
-share/salome/resources/med/MED_msg_fr.qm
-share/salome/resources/med/Mesh3D_10_2d1.med
-share/salome/resources/med/Mesh3D_10_2d2.med
-share/salome/resources/med/Mesh3D_11.med
-share/salome/resources/med/Mistrat.med
-share/salome/resources/med/Mistrat_import22.med
-share/salome/resources/med/ModuleMed.png
-share/salome/resources/med/MovedHexaBox1.med
-share/salome/resources/med/MovedHexaBox2.med
-share/salome/resources/med/NudgedDividedUnitTetra.med
-share/salome/resources/med/NudgedDividedUnitTetraSimpler.med
-share/salome/resources/med/NudgedSimpler.med
-share/salome/resources/med/NudgedTetra.med
-share/salome/resources/med/Old_ChampsDarcy.med
-share/salome/resources/med/Old_H_CastCast_EFMH_I129_COUPLEX1.med
-share/salome/resources/med/Old_H_CastCast_VF_I129_COUPLEX1.med
-share/salome/resources/med/Old_H_CastCast_VF_Se79_COUPLEX1.med
-share/salome/resources/med/Old_H_CastPorf_I129_COUPLEX1.med
-share/salome/resources/med/Old_H_CastPorf_Se79_COUPLEX1.med
-share/salome/resources/med/Old_H_PorfCast_EFMH_I129_COUPLEX1.med
-share/salome/resources/med/Old_H_PorfCast_EFMH_Se79_COUPLEX1.med
-share/salome/resources/med/Old_H_PorfPorf_I129_COUPLEX1.med
-share/salome/resources/med/Old_H_PorfPorf_Se79_COUPLEX1.med
-share/salome/resources/med/Old_H_Traces_I129_COUPLEX1.med
-share/salome/resources/med/Old_H_Traces_Se79_COUPLEX1.med
-share/salome/resources/med/Old_darcy2_Castem_EFMH.med
-share/salome/resources/med/Old_darcy2_Castem_qua_EFMH.med
-share/salome/resources/med/Old_darcy2_Castem_qua_VF.med
-share/salome/resources/med/Old_darcy_1.1_res.med
-share/salome/resources/med/Old_darcy_1.3_resCASTEM.med
-share/salome/resources/med/Old_darcy_1.3_resPORFLOW.med
-share/salome/resources/med/Old_darcy_1.3_resTRACES.med
-share/salome/resources/med/Old_maillage_chemvalIV_cas1_40elts.med
-share/salome/resources/med/Pol1.fig
-share/salome/resources/med/Pol2.fig
-share/salome/resources/med/Pol3.fig
-share/salome/resources/med/Pol4.fig
-share/salome/resources/med/SalomeApp.xml
-share/salome/resources/med/SimpleHalfstripOnly.med
-share/salome/resources/med/SimpleIncludedTetra.med
-share/salome/resources/med/SimpleIncludingTetra.med
-share/salome/resources/med/Structure.png
-share/salome/resources/med/Test2D.med
-share/salome/resources/med/Test2Dpoly.med
-share/salome/resources/med/Test3D.med
-share/salome/resources/med/Test3Dpoly.med
-share/salome/resources/med/TimeStamps.med
-share/salome/resources/med/TimeStamps_import22.med
-share/salome/resources/med/TinyBox.med
-share/salome/resources/med/TrickyTetra1.med
-share/salome/resources/med/UnitTetra.med
-share/salome/resources/med/UnitTetraDegenT.med
-share/salome/resources/med/blow5_ascii.case
-share/salome/resources/med/blow5_ascii.geo
-share/salome/resources/med/blow5_ascii_cd_displacement
-share/salome/resources/med/blow5_ascii_cd_thickness
-share/salome/resources/med/blow5_ascii_pd_displacement
-share/salome/resources/med/blow5_ascii_pd_thickness
-share/salome/resources/med/boitenew.cnc
-share/salome/resources/med/boitenew.inp
-share/salome/resources/med/boitenew.xyz
-share/salome/resources/med/carre_en_quad4.med
-share/salome/resources/med/carre_en_quad4_import22.med
-share/salome/resources/med/carre_en_quad4_seg2.med
-share/salome/resources/med/carre_en_quad4_seg2_import22.med
-share/salome/resources/med/cas_defaut_domaine_fluide.med
-share/salome/resources/med/cube.cnc
-share/salome/resources/med/cube.inp
-share/salome/resources/med/cube.xyz
-share/salome/resources/med/cube_hexa8.med
-share/salome/resources/med/cube_hexa8_import22.med
-share/salome/resources/med/cube_hexa8_quad4.med
-share/salome/resources/med/cube_hexa8_quad4_import22.med
-share/salome/resources/med/darcy2_Castem_EFMH.med
-share/salome/resources/med/darcy2_Castem_qua_EFMH.med
-share/salome/resources/med/darcy2_Castem_qua_VF.med
-share/salome/resources/med/darcy_1.1_res.med
-share/salome/resources/med/darcy_1.3_resCASTEM.med
-share/salome/resources/med/darcy_1.3_resPORFLOW.med
-share/salome/resources/med/darcy_1.3_resTRACES.med
-share/salome/resources/med/dx200_dy1_avec_2couches.sauve
-share/salome/resources/med/elle_2D_QT_10x10.sauve
-share/salome/resources/med/elle_2D_QT_2x2.sauve
-share/salome/resources/med/elle_2D_QT_40x40.sauve
-share/salome/resources/med/elle_2D_QT_4x4.sauve
-share/salome/resources/med/elle_3D_HPr_10x10x10.sauve
-share/salome/resources/med/elle_3D_HPr_10x10x10_2.med
-share/salome/resources/med/elle_3D_HPr_2x2x2.sauve
-share/salome/resources/med/elle_3D_HPr_2x2x2_2.med
-share/salome/resources/med/elle_3D_HPr_4x4x4.sauve
-share/salome/resources/med/elle_3D_HPr_4x4x4_2.med
-share/salome/resources/med/explore_med_file.png
-share/salome/resources/med/extendedtransport53_triangles.med
-share/salome/resources/med/field_selection.png
-share/salome/resources/med/geomMesh21.med
-share/salome/resources/med/geomMesh22.med
-share/salome/resources/med/inclusion_2d.sauve
-share/salome/resources/med/inclusion_2d_raf.sauve
-share/salome/resources/med/mail-test1-4-1.sauve
-share/salome/resources/med/mail-test1-4-2.sauve
-share/salome/resources/med/mail_ktest1-3-hexa.sauve
-share/salome/resources/med/mail_ktest1-3-tetra.sauve
-share/salome/resources/med/mail_ktest3-1.sauve
-share/salome/resources/med/mail_ktest3-2.sauve
-share/salome/resources/med/mail_test1-1-qua.sauve
-share/salome/resources/med/mail_test1-1-tri.sauve
-share/salome/resources/med/mail_test1-2-qua.sauve
-share/salome/resources/med/mail_test1-2-tri.sauve
-share/salome/resources/med/maill.0.med
-share/salome/resources/med/maill.00.med
-share/salome/resources/med/maill.00_nofield.med
-share/salome/resources/med/maill.00_nomesh.med
-share/salome/resources/med/maill.00_without_seg2.med
-share/salome/resources/med/maillage_5_5_5.med
-share/salome/resources/med/maillage_CHEMVAL_100elts.sauve
-share/salome/resources/med/maillage_CHEMVAL_40elts.sauve
-share/salome/resources/med/maillage_UniSegFam.med
-share/salome/resources/med/maillage_UniSegFam_import22.med
-share/salome/resources/med/maillage_andra2_100elts.sauve
-share/salome/resources/med/maillage_cas2_2d.sauve
-share/salome/resources/med/maillage_cas4_234elts.sauve
-share/salome/resources/med/maillage_chemvalIV_cas1_100elts.sauve
-share/salome/resources/med/maillage_chemvalIV_cas1_40elts.med
-share/salome/resources/med/maillage_chemvalIV_cas1_40elts.sauve
-share/salome/resources/med/mesh.med
-share/salome/resources/med/mesh_import22.med
-share/salome/resources/med/mesh_selection.png
-share/salome/resources/med/pointe.med
-share/salome/resources/med/pointe_import22.med
-share/salome/resources/med/poly3D.med
-share/salome/resources/med/polyedres.med
-share/salome/resources/med/polygones.med
-share/salome/resources/med/recoll_bord.med
-share/salome/resources/med/square1.med
-share/salome/resources/med/square1_split
-share/salome/resources/med/square1_split1.med
-share/salome/resources/med/square1_split2.med
-share/salome/resources/med/square1_split3.med
-share/salome/resources/med/square2.med
-share/salome/resources/med/square2_split
-share/salome/resources/med/square2_split1.med
-share/salome/resources/med/square2_split2.med
-share/salome/resources/med/test19.med
-share/salome/resources/med/test3.cnc
-share/salome/resources/med/test3.inp
-share/salome/resources/med/test3.xyz
-share/salome/resources/med/test_2D.med
-share/salome/resources/med/test_hydro_darcy1a_out.med
-share/salome/resources/med/titi.cnc
-share/salome/resources/med/titi.inp
-share/salome/resources/med/titi.xyz
-share/salome/resources/med/trio_2D.med
-share/salome/resources/med/zzzz121b.med
-share/salome/resources/med/zzzz121b_without_tr6.med
-%%MPI%%bin/salome/ParaMEDMEM.py
-%%MPI%%bin/salome/libParaMEDMEM_Swig.py
+%%DATADIR%%/resources/med/Box1.med
+%%DATADIR%%/resources/med/Box1Moderate.med
+%%DATADIR%%/resources/med/Box2.med
+%%DATADIR%%/resources/med/Box2Moderate.med
+%%DATADIR%%/resources/med/Box3.med
+%%DATADIR%%/resources/med/BoxEvenSmaller1.med
+%%DATADIR%%/resources/med/BoxHexa1.med
+%%DATADIR%%/resources/med/BoxHexa2.med
+%%DATADIR%%/resources/med/BoxModSmall1.med
+%%DATADIR%%/resources/med/BoxModSmall2.med
+%%DATADIR%%/resources/med/BoxTetra2.med
+%%DATADIR%%/resources/med/Case1.cnc
+%%DATADIR%%/resources/med/Case1.inp
+%%DATADIR%%/resources/med/Case1.xyz
+%%DATADIR%%/resources/med/CatalogModuleTest.xml
+%%DATADIR%%/resources/med/ChampsDarcy.med
+%%DATADIR%%/resources/med/ComplexIncludedTetra.med
+%%DATADIR%%/resources/med/ComplexIncludingTetra.med
+%%DATADIR%%/resources/med/Compo1PyCatalog.xml
+%%DATADIR%%/resources/med/CornerTetra.med
+%%DATADIR%%/resources/med/Darcy3_3D_H_10x10x10.sauve
+%%DATADIR%%/resources/med/Darcy3_3D_H_10x10x10_2.med
+%%DATADIR%%/resources/med/Data.png
+%%DATADIR%%/resources/med/DegenEdgeXY.med
+%%DATADIR%%/resources/med/DegenFaceXYZ.med
+%%DATADIR%%/resources/med/DegenTranslatedInPlane.med
+%%DATADIR%%/resources/med/DividedGenTetra1.med
+%%DATADIR%%/resources/med/DividedGenTetra2.med
+%%DATADIR%%/resources/med/DividedUnitTetra.med
+%%DATADIR%%/resources/med/DividedUnitTetraSimpler.med
+%%DATADIR%%/resources/med/GenTetra1.med
+%%DATADIR%%/resources/med/GenTetra2.med
+%%DATADIR%%/resources/med/GeneralTetra.med
+%%DATADIR%%/resources/med/H_CastCast_EFMH_I129_COUPLEX1.med
+%%DATADIR%%/resources/med/H_CastCast_VF_I129_COUPLEX1.med
+%%DATADIR%%/resources/med/H_CastCast_VF_Se79_COUPLEX1.med
+%%DATADIR%%/resources/med/H_CastPorf_I129_COUPLEX1.med
+%%DATADIR%%/resources/med/H_CastPorf_Se79_COUPLEX1.med
+%%DATADIR%%/resources/med/H_PorfCast_EFMH_I129_COUPLEX1.med
+%%DATADIR%%/resources/med/H_PorfCast_EFMH_Se79_COUPLEX1.med
+%%DATADIR%%/resources/med/H_PorfPorf_I129_COUPLEX1.med
+%%DATADIR%%/resources/med/H_Traces_I129_COUPLEX1.med
+%%DATADIR%%/resources/med/H_Traces_Se79_COUPLEX1.med
+%%DATADIR%%/resources/med/HalfstripOnly.med
+%%DATADIR%%/resources/med/HalfstripOnly2.med
+%%DATADIR%%/resources/med/Infos.png
+%%DATADIR%%/resources/med/LargeInconsistentTetra.med
+%%DATADIR%%/resources/med/LargeUnitTetra.med
+%%DATADIR%%/resources/med/MEDCatalog.xml
+%%DATADIR%%/resources/med/MED_images.qm
+%%DATADIR%%/resources/med/MED_msg_en.qm
+%%DATADIR%%/resources/med/MED_msg_fr.qm
+%%DATADIR%%/resources/med/Mesh3D_10_2d1.med
+%%DATADIR%%/resources/med/Mesh3D_10_2d2.med
+%%DATADIR%%/resources/med/Mesh3D_11.med
+%%DATADIR%%/resources/med/Mistrat.med
+%%DATADIR%%/resources/med/Mistrat_import22.med
+%%DATADIR%%/resources/med/ModuleMed.png
+%%DATADIR%%/resources/med/MovedHexaBox1.med
+%%DATADIR%%/resources/med/MovedHexaBox2.med
+%%DATADIR%%/resources/med/NudgedDividedUnitTetra.med
+%%DATADIR%%/resources/med/NudgedDividedUnitTetraSimpler.med
+%%DATADIR%%/resources/med/NudgedSimpler.med
+%%DATADIR%%/resources/med/NudgedTetra.med
+%%DATADIR%%/resources/med/Old_ChampsDarcy.med
+%%DATADIR%%/resources/med/Old_H_CastCast_EFMH_I129_COUPLEX1.med
+%%DATADIR%%/resources/med/Old_H_CastCast_VF_I129_COUPLEX1.med
+%%DATADIR%%/resources/med/Old_H_CastCast_VF_Se79_COUPLEX1.med
+%%DATADIR%%/resources/med/Old_H_CastPorf_I129_COUPLEX1.med
+%%DATADIR%%/resources/med/Old_H_CastPorf_Se79_COUPLEX1.med
+%%DATADIR%%/resources/med/Old_H_PorfCast_EFMH_I129_COUPLEX1.med
+%%DATADIR%%/resources/med/Old_H_PorfCast_EFMH_Se79_COUPLEX1.med
+%%DATADIR%%/resources/med/Old_H_PorfPorf_I129_COUPLEX1.med
+%%DATADIR%%/resources/med/Old_H_PorfPorf_Se79_COUPLEX1.med
+%%DATADIR%%/resources/med/Old_H_Traces_I129_COUPLEX1.med
+%%DATADIR%%/resources/med/Old_H_Traces_Se79_COUPLEX1.med
+%%DATADIR%%/resources/med/Old_darcy2_Castem_EFMH.med
+%%DATADIR%%/resources/med/Old_darcy2_Castem_qua_EFMH.med
+%%DATADIR%%/resources/med/Old_darcy2_Castem_qua_VF.med
+%%DATADIR%%/resources/med/Old_darcy_1.1_res.med
+%%DATADIR%%/resources/med/Old_darcy_1.3_resCASTEM.med
+%%DATADIR%%/resources/med/Old_darcy_1.3_resPORFLOW.med
+%%DATADIR%%/resources/med/Old_darcy_1.3_resTRACES.med
+%%DATADIR%%/resources/med/Old_maillage_chemvalIV_cas1_40elts.med
+%%DATADIR%%/resources/med/Pol1.fig
+%%DATADIR%%/resources/med/Pol2.fig
+%%DATADIR%%/resources/med/Pol3.fig
+%%DATADIR%%/resources/med/Pol4.fig
+%%DATADIR%%/resources/med/SalomeApp.xml
+%%DATADIR%%/resources/med/SimpleHalfstripOnly.med
+%%DATADIR%%/resources/med/SimpleIncludedTetra.med
+%%DATADIR%%/resources/med/SimpleIncludingTetra.med
+%%DATADIR%%/resources/med/Structure.png
+%%DATADIR%%/resources/med/Test2D.med
+%%DATADIR%%/resources/med/Test2Dpoly.med
+%%DATADIR%%/resources/med/Test3D.med
+%%DATADIR%%/resources/med/Test3Dpoly.med
+%%DATADIR%%/resources/med/TimeStamps.med
+%%DATADIR%%/resources/med/TimeStamps_import22.med
+%%DATADIR%%/resources/med/TinyBox.med
+%%DATADIR%%/resources/med/TrickyTetra1.med
+%%DATADIR%%/resources/med/UnitTetra.med
+%%DATADIR%%/resources/med/UnitTetraDegenT.med
+%%DATADIR%%/resources/med/blow5_ascii.case
+%%DATADIR%%/resources/med/blow5_ascii.geo
+%%DATADIR%%/resources/med/blow5_ascii_cd_displacement
+%%DATADIR%%/resources/med/blow5_ascii_cd_thickness
+%%DATADIR%%/resources/med/blow5_ascii_pd_displacement
+%%DATADIR%%/resources/med/blow5_ascii_pd_thickness
+%%DATADIR%%/resources/med/boitenew.cnc
+%%DATADIR%%/resources/med/boitenew.inp
+%%DATADIR%%/resources/med/boitenew.xyz
+%%DATADIR%%/resources/med/carre_en_quad4.med
+%%DATADIR%%/resources/med/carre_en_quad4_import22.med
+%%DATADIR%%/resources/med/carre_en_quad4_seg2.med
+%%DATADIR%%/resources/med/carre_en_quad4_seg2_import22.med
+%%DATADIR%%/resources/med/cas_defaut_domaine_fluide.med
+%%DATADIR%%/resources/med/cube.cnc
+%%DATADIR%%/resources/med/cube.inp
+%%DATADIR%%/resources/med/cube.xyz
+%%DATADIR%%/resources/med/cube_hexa8.med
+%%DATADIR%%/resources/med/cube_hexa8_import22.med
+%%DATADIR%%/resources/med/cube_hexa8_quad4.med
+%%DATADIR%%/resources/med/cube_hexa8_quad4_import22.med
+%%DATADIR%%/resources/med/darcy2_Castem_EFMH.med
+%%DATADIR%%/resources/med/darcy2_Castem_qua_EFMH.med
+%%DATADIR%%/resources/med/darcy2_Castem_qua_VF.med
+%%DATADIR%%/resources/med/darcy_1.1_res.med
+%%DATADIR%%/resources/med/darcy_1.3_resCASTEM.med
+%%DATADIR%%/resources/med/darcy_1.3_resPORFLOW.med
+%%DATADIR%%/resources/med/darcy_1.3_resTRACES.med
+%%DATADIR%%/resources/med/dx200_dy1_avec_2couches.sauve
+%%DATADIR%%/resources/med/elle_2D_QT_10x10.sauve
+%%DATADIR%%/resources/med/elle_2D_QT_2x2.sauve
+%%DATADIR%%/resources/med/elle_2D_QT_40x40.sauve
+%%DATADIR%%/resources/med/elle_2D_QT_4x4.sauve
+%%DATADIR%%/resources/med/elle_3D_HPr_10x10x10.sauve
+%%DATADIR%%/resources/med/elle_3D_HPr_10x10x10_2.med
+%%DATADIR%%/resources/med/elle_3D_HPr_2x2x2.sauve
+%%DATADIR%%/resources/med/elle_3D_HPr_2x2x2_2.med
+%%DATADIR%%/resources/med/elle_3D_HPr_4x4x4.sauve
+%%DATADIR%%/resources/med/elle_3D_HPr_4x4x4_2.med
+%%DATADIR%%/resources/med/explore_med_file.png
+%%DATADIR%%/resources/med/extendedtransport53_triangles.med
+%%DATADIR%%/resources/med/field_selection.png
+%%DATADIR%%/resources/med/geomMesh21.med
+%%DATADIR%%/resources/med/geomMesh22.med
+%%DATADIR%%/resources/med/inclusion_2d.sauve
+%%DATADIR%%/resources/med/inclusion_2d_raf.sauve
+%%DATADIR%%/resources/med/mail-test1-4-1.sauve
+%%DATADIR%%/resources/med/mail-test1-4-2.sauve
+%%DATADIR%%/resources/med/mail_ktest1-3-hexa.sauve
+%%DATADIR%%/resources/med/mail_ktest1-3-tetra.sauve
+%%DATADIR%%/resources/med/mail_ktest3-1.sauve
+%%DATADIR%%/resources/med/mail_ktest3-2.sauve
+%%DATADIR%%/resources/med/mail_test1-1-qua.sauve
+%%DATADIR%%/resources/med/mail_test1-1-tri.sauve
+%%DATADIR%%/resources/med/mail_test1-2-qua.sauve
+%%DATADIR%%/resources/med/mail_test1-2-tri.sauve
+%%DATADIR%%/resources/med/maill.0.med
+%%DATADIR%%/resources/med/maill.00.med
+%%DATADIR%%/resources/med/maill.00_nofield.med
+%%DATADIR%%/resources/med/maill.00_nomesh.med
+%%DATADIR%%/resources/med/maill.00_without_seg2.med
+%%DATADIR%%/resources/med/maillage_5_5_5.med
+%%DATADIR%%/resources/med/maillage_CHEMVAL_100elts.sauve
+%%DATADIR%%/resources/med/maillage_CHEMVAL_40elts.sauve
+%%DATADIR%%/resources/med/maillage_UniSegFam.med
+%%DATADIR%%/resources/med/maillage_UniSegFam_import22.med
+%%DATADIR%%/resources/med/maillage_andra2_100elts.sauve
+%%DATADIR%%/resources/med/maillage_cas2_2d.sauve
+%%DATADIR%%/resources/med/maillage_cas4_234elts.sauve
+%%DATADIR%%/resources/med/maillage_chemvalIV_cas1_100elts.sauve
+%%DATADIR%%/resources/med/maillage_chemvalIV_cas1_40elts.med
+%%DATADIR%%/resources/med/maillage_chemvalIV_cas1_40elts.sauve
+%%DATADIR%%/resources/med/mesh.med
+%%DATADIR%%/resources/med/mesh_import22.med
+%%DATADIR%%/resources/med/mesh_selection.png
+%%DATADIR%%/resources/med/pointe.med
+%%DATADIR%%/resources/med/pointe_import22.med
+%%DATADIR%%/resources/med/poly3D.med
+%%DATADIR%%/resources/med/polyedres.med
+%%DATADIR%%/resources/med/polygones.med
+%%DATADIR%%/resources/med/recoll_bord.med
+%%DATADIR%%/resources/med/square1.med
+%%DATADIR%%/resources/med/square1_split
+%%DATADIR%%/resources/med/square1_split1.med
+%%DATADIR%%/resources/med/square1_split2.med
+%%DATADIR%%/resources/med/square1_split3.med
+%%DATADIR%%/resources/med/square2.med
+%%DATADIR%%/resources/med/square2_split
+%%DATADIR%%/resources/med/square2_split1.med
+%%DATADIR%%/resources/med/square2_split2.med
+%%DATADIR%%/resources/med/test19.med
+%%DATADIR%%/resources/med/test3.cnc
+%%DATADIR%%/resources/med/test3.inp
+%%DATADIR%%/resources/med/test3.xyz
+%%DATADIR%%/resources/med/test_2D.med
+%%DATADIR%%/resources/med/test_hydro_darcy1a_out.med
+%%DATADIR%%/resources/med/titi.cnc
+%%DATADIR%%/resources/med/titi.inp
+%%DATADIR%%/resources/med/titi.xyz
+%%DATADIR%%/resources/med/trio_2D.med
+%%DATADIR%%/resources/med/zzzz121b.med
+%%DATADIR%%/resources/med/zzzz121b_without_tr6.med
%%MPI%%bin/salome/test_InterpKernelDEC.py
%%MPI%%bin/salome/test_NonCoincidentDEC.py
%%MPI%%bin/salome/test_StructuredCoincodentDEC.py
+%%MPI%%bin/salome/ParaMEDMEM.py
+%%MPI%%bin/salome/libParaMEDMEM_Swig.py
+%%MPI%%idl/salome/ParaMEDCouplingCorbaServant.idl
%%MPI%%idl/salome/ParaMEDMEMComponent.idl
-%%MPI%%include/salome/BlockTopology.hxx
+%%MPI%%include/salome/ParaMEDCouplingCorbaServant.hh
+%%MPI%%include/salome/ParaMEDMEMComponent.hh
+%%MPI%%include/salome/DEC.hxx
+%%MPI%%include/salome/Topology.hxx
%%MPI%%include/salome/CommInterface.hxx
+%%MPI%%include/salome/MPIProcessorGroup.hxx
+%%MPI%%include/salome/ProcessorGroup.hxx
+%%MPI%%include/salome/BlockTopology.hxx
+%%MPI%%include/salome/ParaGRID.hxx
+%%MPI%%include/salome/ParaMESH.hxx
%%MPI%%include/salome/ComponentTopology.hxx
-%%MPI%%include/salome/DEC.hxx
+%%MPI%%include/salome/ExplicitTopology.hxx
+%%MPI%%include/salome/ParaFIELD.hxx
%%MPI%%include/salome/DECOptions.hxx
-%%MPI%%include/salome/ElementLocator.hxx
+%%MPI%%include/salome/MxN_Mapping.hxx
+%%MPI%%include/salome/StructuredCoincidentDEC.hxx
+%%MPI%%include/salome/InterpolationMatrix.hxx
+%%MPI%%include/salome/InterpKernelDEC.hxx
%%MPI%%include/salome/ExplicitCoincidentDEC.hxx
-%%MPI%%include/salome/ExplicitMapping.hxx
-%%MPI%%include/salome/ExplicitTopology.hxx
%%MPI%%include/salome/ICoCoField.hxx
+%%MPI%%include/salome/ElementLocator.hxx
+%%MPI%%include/salome/ExplicitMapping.hxx
%%MPI%%include/salome/ICoCoMEDField.hxx
%%MPI%%include/salome/ICoCoTrioField.hxx
-%%MPI%%include/salome/InterpKernelDEC.hxx
-%%MPI%%include/salome/InterpolationMatrix.hxx
-%%MPI%%include/salome/LinearTimeInterpolator.hxx
-%%MPI%%include/salome/MEDLoader.hxx
%%MPI%%include/salome/MPIAccess.hxx
%%MPI%%include/salome/MPIAccessDEC.hxx
-%%MPI%%include/salome/MPIProcessorGroup.hxx
-%%MPI%%include/salome/MxN_Mapping.hxx
-%%MPI%%include/salome/ParaFIELD.hxx
-%%MPI%%include/salome/ParaGRID.hxx
-%%MPI%%include/salome/ParaMEDMEMComponent.hh
-%%MPI%%include/salome/ParaMEDMEMComponent_i.hxx
-%%MPI%%include/salome/ParaMESH.hxx
-%%MPI%%include/salome/ProcessorGroup.hxx
-%%MPI%%include/salome/StructuredCoincidentDEC.hxx
%%MPI%%include/salome/TimeInterpolator.hxx
-%%MPI%%include/salome/Topology.hxx
+%%MPI%%include/salome/LinearTimeInterpolator.hxx
+%%MPI%%include/salome/ParaMEDLoader.hxx
%%MPI%%include/salome/libParaMEDMEM_Swig.i
-%%MPI%%lib/salome/_libParaMEDMEM_Swig.la
-%%MPI%%lib/salome/_libParaMEDMEM_Swig.so
-%%MPI%%lib/salome/_libParaMEDMEM_Swig.so.0
-%%MPI%%lib/salome/libparamedmem.la
-%%MPI%%lib/salome/libparamedmem.so
+%%MPI%%include/salome/ParaMEDCouplingFieldDoubleServant.hxx
+%%MPI%%include/salome/ParaMEDCouplingUMeshServant.hxx
+%%MPI%%include/salome/MPIMEDCouplingFieldDoubleServant.hxx
+%%MPI%%include/salome/ParaMEDMEMComponent_i.hxx
+%%MPI%%%%PYTHON_SITELIBDIR%%/salome/ParaMEDCouplingCorbaServant_idl.py
+%%MPI%%%%PYTHON_SITELIBDIR%%/salome/ParaMEDMEMComponent_idl.py
%%MPI%%lib/salome/libparamedmem.so.0
-%%MPI%%lib/salome/libparamedmemcompo.la
-%%MPI%%lib/salome/libparamedmemcompo.so
+%%MPI%%lib/salome/libparamedmem.so
+%%MPI%%lib/salome/libparamedmem.la
+%%MPI%%lib/salome/libparamedloader.so.0
+%%MPI%%lib/salome/libparamedloader.so
+%%MPI%%lib/salome/libparamedloader.la
+%%MPI%%lib/salome/_libParaMEDMEM_Swig.so.0
+%%MPI%%lib/salome/_libParaMEDMEM_Swig.so
+%%MPI%%lib/salome/_libParaMEDMEM_Swig.la
+%%MPI%%lib/salome/libparamedcouplingcorba.so.0
+%%MPI%%lib/salome/libparamedcouplingcorba.so
+%%MPI%%lib/salome/libparamedcouplingcorba.la
%%MPI%%lib/salome/libparamedmemcompo.so.0
-%%MPI%%lib/salome/libparamedmemmedloader.la
-%%MPI%%lib/salome/libparamedmemmedloader.so
-%%MPI%%lib/salome/libparamedmemmedloader.so.0
-%%CPPUNIT%%lib/salome/libInterpKernelTest.la
-%%CPPUNIT%%lib/salome/libInterpKernelTest.so
-%%CPPUNIT%%lib/salome/libInterpKernelTest.so.0
-%%CPPUNIT%%lib/salome/libMEDMEMCppTest.la
-%%CPPUNIT%%lib/salome/libMEDMEMCppTest.so
-%%CPPUNIT%%lib/salome/libMEDMEMCppTest.so.0
-%%CPPUNIT%%lib/salome/libMEDSPLITTERTest.la
-%%CPPUNIT%%lib/salome/libMEDSPLITTERTest.so
-%%CPPUNIT%%lib/salome/libMEDSPLITTERTest.so.0
-%%CPPUNIT%%%%MPI%%lib/salome/libParaMEDMEMTest.la
-%%CPPUNIT%%%%MPI%%lib/salome/libParaMEDMEMTest.so
-%%CPPUNIT%%%%MPI%%lib/salome/libParaMEDMEMTest.so.0
-%%CPPUNIT%%%%MPI%%include/salome/MPIAccessDECTest.hxx
-%%CPPUNIT%%%%MPI%%include/salome/MPIAccessTest.hxx
-%%CPPUNIT%%%%MPI%%include/salome/MPIMainTest.hxx
-%%CPPUNIT%%%%MPI%%include/salome/ParaMEDMEMTest.hxx
-%%CPPUNIT%%%%MPI%%bin/salome/TestMPIAccess
-%%CPPUNIT%%%%MPI%%bin/salome/TestMPIAccessDEC
-%%CPPUNIT%%%%MPI%%bin/salome/TestParaMEDMEM
-%%CPPUNIT%%%%MPI%%bin/salome/test_perf
-@dirrm share/salome/resources/med
+%%MPI%%lib/salome/libparamedmemcompo.so
+%%MPI%%lib/salome/libparamedmemcompo.la
+@dirrm %%DATADIR%%/resources/med
@dirrm %%PYTHON_SITELIBDIR%%/salome/SALOME_TEST__POA
@dirrm %%PYTHON_SITELIBDIR%%/salome/SALOME_TEST
@dirrm %%PYTHON_SITELIBDIR%%/salome/SALOME_MED__POA
diff --git a/cad/salome-multipr/Makefile b/cad/salome-multipr/Makefile
index e55c37544026..18d1652284a7 100644
--- a/cad/salome-multipr/Makefile
+++ b/cad/salome-multipr/Makefile
@@ -8,6 +8,7 @@ CATEGORIES= cad science
MASTERDIR= ${.CURDIR}/../salome
+PORTNAME= salome
PKGNAMESUFFIX= -multipr
SAL_MODULE_UPPER= MULTIPR
diff --git a/cad/salome-randomizer/Makefile b/cad/salome-randomizer/Makefile
index c63f574c1f27..13704a700e3c 100644
--- a/cad/salome-randomizer/Makefile
+++ b/cad/salome-randomizer/Makefile
@@ -8,6 +8,7 @@ CATEGORIES= cad science
MASTERDIR= ${.CURDIR}/../salome
+PORTNAME= salome
PKGNAMESUFFIX= -randomizer
SAL_MODULE_UPPER= RANDOMIZER
diff --git a/cad/salome-sierpinsky/Makefile b/cad/salome-sierpinsky/Makefile
index 8a9df9cc8691..b7a0448abcf9 100644
--- a/cad/salome-sierpinsky/Makefile
+++ b/cad/salome-sierpinsky/Makefile
@@ -8,6 +8,7 @@ CATEGORIES= cad science
MASTERDIR= ${.CURDIR}/../salome
+PORTNAME= salome
PKGNAMESUFFIX= -sierpinsky
SAL_MODULE_UPPER= SIERPINSKY
diff --git a/cad/salome-smesh/Makefile b/cad/salome-smesh/Makefile
index da131d675947..e5f8ae72bf90 100644
--- a/cad/salome-smesh/Makefile
+++ b/cad/salome-smesh/Makefile
@@ -8,6 +8,7 @@ CATEGORIES= cad science
MASTERDIR= ${.CURDIR}/../salome
+PORTNAME= salome
PKGNAMESUFFIX= -smesh
SAL_MODULE_UPPER= SMESH
diff --git a/cad/salome-smesh/files/patch-admlocal_unix_config_Makefile.am b/cad/salome-smesh/files/patch-admlocal_unix_config_Makefile.am
deleted file mode 100644
index 382ca7ecbdc5..000000000000
--- a/cad/salome-smesh/files/patch-admlocal_unix_config_Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- adm_local/unix/config_files/Makefile.am.orig 2009-12-26 23:17:33.000000000 +0600
-+++ adm_local/unix/config_files/Makefile.am 2009-12-26 23:17:44.000000000 +0600
-@@ -24,5 +24,4 @@
- dist_admlocalm4_DATA = \
- check_SMESH.m4 \
- check_f77.m4 \
-- check_Platform.m4 \
-- check_qwt.m4
-+ check_Platform.m4
-\ No newline at end of file
diff --git a/cad/salome-smesh/pkg-plist b/cad/salome-smesh/pkg-plist
index 2a12747f125f..b9676bf2b5df 100644
--- a/cad/salome-smesh/pkg-plist
+++ b/cad/salome-smesh/pkg-plist
@@ -1,19 +1,54 @@
adm_local/cmake_files/FindSMESH.cmake
-adm_local/unix/config_files/check_SMESH.m4
-adm_local/unix/config_files/check_f77.m4
adm_local/unix/config_files/check_Platform.m4
+adm_local/unix/config_files/check_SMESH.m4
+bin/salome/DAT_Test
+bin/salome/PAL_MESH_041_mesh.py
+bin/salome/PAL_MESH_043_2D.py
+bin/salome/PAL_MESH_043_3D.py
bin/salome/SMDS_MemoryLimit
+bin/salome/SMESHClientBin
bin/salome/SMESHControls
-bin/salome/DAT_Test
-bin/salome/UNV_Test
-bin/salome/STL_Test
bin/salome/SMESHEngine
-bin/salome/smeshpy.py
-bin/salome/SMESHClientBin
-bin/salome/smesh.py
-bin/salome/smeshDC.py
-bin/salome/batchmode_smesh.py
+bin/salome/SMESH_AdvancedEditor.py
+bin/salome/SMESH_BelongToGeom.py
+bin/salome/SMESH_BuildCompound.py
+bin/salome/SMESH_GroupFromGeom.py
+bin/salome/SMESH_GroupFromGeom2.py
+bin/salome/SMESH_GroupLyingOnGeom.py
+bin/salome/SMESH_Nut.py
+bin/salome/SMESH_Partition1_tetra.py
+bin/salome/SMESH_Sphere.py
+bin/salome/SMESH_blocks.py
+bin/salome/SMESH_box.py
+bin/salome/SMESH_box2_tetra.py
+bin/salome/SMESH_box3_tetra.py
+bin/salome/SMESH_box_tetra.py
+bin/salome/SMESH_controls.py
+bin/salome/SMESH_demo_hexa2_upd.py
+bin/salome/SMESH_fixation.py
+bin/salome/SMESH_fixation_hexa.py
+bin/salome/SMESH_fixation_netgen.py
+bin/salome/SMESH_fixation_tetra.py
+bin/salome/SMESH_flight_skin.py
+bin/salome/SMESH_freebord.py
+bin/salome/SMESH_hexaedre.py
+bin/salome/SMESH_mechanic.py
+bin/salome/SMESH_mechanic_editor.py
+bin/salome/SMESH_mechanic_netgen.py
+bin/salome/SMESH_mechanic_tetra.py
+bin/salome/SMESH_reg.py
+bin/salome/SMESH_test.py
+bin/salome/SMESH_test0.py
+bin/salome/SMESH_test1.py
+bin/salome/SMESH_test1_AndDisplay.py
+bin/salome/SMESH_test2.py
+bin/salome/SMESH_test3.py
+bin/salome/SMESH_test4.py
+bin/salome/SMESH_test5.py
+bin/salome/STL_Test
+bin/salome/UNV_Test
bin/salome/batchmode_mefisto.py
+bin/salome/batchmode_smesh.py
bin/salome/ex00_all.py
bin/salome/ex01_cube2build.py
bin/salome/ex02_cube2primitive.py
@@ -37,76 +72,59 @@ bin/salome/ex19_sphereINcube.py
bin/salome/ex21_lamp.py
bin/salome/ex24_cylinder.py
bin/salome/ex29_refine.py
-bin/salome/ex30_tepal.py
bin/salome/ex30_groupsOp.py
+bin/salome/ex30_tepal.py
bin/salome/ex31_dimGroup.py
-bin/salome/SMESH_test.py
-bin/salome/SMESH_test0.py
-bin/salome/SMESH_test1.py
-bin/salome/SMESH_test1_AndDisplay.py
-bin/salome/SMESH_test2.py
-bin/salome/SMESH_test3.py
-bin/salome/SMESH_test4.py
-bin/salome/SMESH_test5.py
-bin/salome/SMESH_mechanic.py
-bin/salome/SMESH_mechanic_tetra.py
-bin/salome/SMESH_mechanic_editor.py
-bin/salome/SMESH_mechanic_netgen.py
-bin/salome/SMESH_fixation.py
-bin/salome/SMESH_fixation_hexa.py
-bin/salome/SMESH_fixation_tetra.py
-bin/salome/SMESH_fixation_netgen.py
-bin/salome/SMESH_box_tetra.py
-bin/salome/SMESH_box2_tetra.py
-bin/salome/SMESH_box3_tetra.py
-bin/salome/SMESH_flight_skin.py
-bin/salome/SMESH_Partition1_tetra.py
-bin/salome/SMESH_controls.py
-bin/salome/SMESH_freebord.py
-bin/salome/SMESH_blocks.py
-bin/salome/SMESH_BelongToGeom.py
-bin/salome/SMESH_GroupFromGeom2.py
-bin/salome/SMESH_box.py
-bin/salome/SMESH_demo_hexa2_upd.py
-bin/salome/SMESH_hexaedre.py
-bin/salome/SMESH_Sphere.py
-bin/salome/SMESH_GroupFromGeom.py
-bin/salome/SMESH_Nut.py
-bin/salome/SMESH_GroupLyingOnGeom.py
-bin/salome/SMESH_AdvancedEditor.py
-bin/salome/SMESH_BuildCompound.py
-bin/salome/PAL_MESH_041_mesh.py
-bin/salome/PAL_MESH_043_2D.py
-bin/salome/PAL_MESH_043_3D.py
-bin/salome/SMESH_reg.py
bin/salome/libSMESH_Swig.py
+bin/salome/smesh.py
+bin/salome/smeshDC.py
bin/salome/smesh_setenv.py
bin/salome/smesh_setenv.pyc
bin/salome/smesh_setenv.pyo
-idl/salome/SMESH_Gen.idl
-idl/salome/SMESH_Mesh.idl
-idl/salome/SMESH_Hypothesis.idl
+bin/salome/smeshpy.py
idl/salome/SMESH_BasicHypothesis.idl
idl/salome/SMESH_Filter.idl
+idl/salome/SMESH_Gen.idl
idl/salome/SMESH_Group.idl
-idl/salome/SMESH_Pattern.idl
+idl/salome/SMESH_Hypothesis.idl
+idl/salome/SMESH_Mesh.idl
idl/salome/SMESH_MeshEditor.idl
+idl/salome/SMESH_Pattern.idl
+include/salome/DriverDAT_R_SMDS_Mesh.h
+include/salome/DriverDAT_R_SMESHDS_Document.h
+include/salome/DriverDAT_R_SMESHDS_Mesh.h
+include/salome/DriverDAT_W_SMDS_Mesh.h
+include/salome/DriverDAT_W_SMESHDS_Document.h
+include/salome/DriverDAT_W_SMESHDS_Mesh.h
+include/salome/DriverMED_Family.h
+include/salome/DriverMED_R_SMDS_Mesh.h
+include/salome/DriverMED_R_SMESHDS_Document.h
+include/salome/DriverMED_R_SMESHDS_Mesh.h
+include/salome/DriverMED_W_SMDS_Mesh.h
+include/salome/DriverMED_W_SMESHDS_Document.h
+include/salome/DriverMED_W_SMESHDS_Mesh.h
+include/salome/DriverSTL_R_SMDS_Mesh.h
+include/salome/DriverSTL_W_SMDS_Mesh.h
+include/salome/DriverUNV_R_SMDS_Mesh.h
+include/salome/DriverUNV_R_SMESHDS_Document.h
+include/salome/DriverUNV_R_SMESHDS_Mesh.h
+include/salome/DriverUNV_W_SMDS_Mesh.h
+include/salome/DriverUNV_W_SMESHDS_Document.h
+include/salome/DriverUNV_W_SMESHDS_Mesh.h
+include/salome/Driver_Document.h
+include/salome/Driver_Mesh.h
+include/salome/Driver_SMDS_Mesh.h
+include/salome/Driver_SMESHDS_Mesh.h
+include/salome/GeomSelectionTools.h
include/salome/Rn.h
-include/salome/SMESH.hxx
-include/salome/SMESH_Gen.hh
-include/salome/aptrte.h
-include/salome/SMESH_Mesh.hh
-include/salome/SMESH_Hypothesis.hh
-include/salome/SMESH_BasicHypothesis.hh
-include/salome/SMESH_Filter.hh
-include/salome/SMESH_Group.hh
-include/salome/SMESH_Pattern.hh
-include/salome/SMESH_MeshEditor.hh
-include/salome/SMDS_TypeOfPosition.hxx
include/salome/SMDSAbs_ElementType.hxx
include/salome/SMDS_EdgePosition.hxx
include/salome/SMDS_ElemIterator.hxx
+include/salome/SMDS_FaceOfEdges.hxx
+include/salome/SMDS_FaceOfNodes.hxx
include/salome/SMDS_FacePosition.hxx
+include/salome/SMDS_Iterator.hxx
+include/salome/SMDS_IteratorOfElements.hxx
include/salome/SMDS_Mesh.hxx
include/salome/SMDS_Mesh0DElement.hxx
include/salome/SMDS_MeshEdge.hxx
@@ -115,508 +133,509 @@ include/salome/SMDS_MeshElementIDFactory.hxx
include/salome/SMDS_MeshFace.hxx
include/salome/SMDS_MeshGroup.hxx
include/salome/SMDS_MeshIDFactory.hxx
+include/salome/SMDS_MeshInfo.hxx
include/salome/SMDS_MeshNode.hxx
include/salome/SMDS_MeshObject.hxx
include/salome/SMDS_MeshVolume.hxx
+include/salome/SMDS_PolygonalFaceOfNodes.hxx
+include/salome/SMDS_PolyhedralVolumeOfNodes.hxx
include/salome/SMDS_Position.hxx
+include/salome/SMDS_QuadraticEdge.hxx
+include/salome/SMDS_QuadraticFaceOfNodes.hxx
+include/salome/SMDS_QuadraticVolumeOfNodes.hxx
+include/salome/SMDS_SetIterator.hxx
include/salome/SMDS_SpacePosition.hxx
+include/salome/SMDS_StdIterator.hxx
+include/salome/SMDS_TypeOfPosition.hxx
include/salome/SMDS_VertexPosition.hxx
-include/salome/SMDS_Iterator.hxx
-include/salome/SMDS_IteratorOfElements.hxx
include/salome/SMDS_VolumeOfFaces.hxx
include/salome/SMDS_VolumeOfNodes.hxx
-include/salome/SMDS_PolyhedralVolumeOfNodes.hxx
-include/salome/SMDS_FaceOfEdges.hxx
-include/salome/SMDS_FaceOfNodes.hxx
-include/salome/SMDS_PolygonalFaceOfNodes.hxx
include/salome/SMDS_VolumeTool.hxx
-include/salome/SMDS_QuadraticEdge.hxx
-include/salome/SMDS_QuadraticFaceOfNodes.hxx
-include/salome/SMDS_QuadraticVolumeOfNodes.hxx
-include/salome/SMDS_SetIterator.hxx
-include/salome/SMESH_SMDS.hxx
-include/salome/SMDS_MeshInfo.hxx
+include/salome/SMESH.hxx
+include/salome/SMESHDS_Command.hxx
+include/salome/SMESHDS_CommandType.hxx
+include/salome/SMESHDS_DataMapOfShape.hxx
include/salome/SMESHDS_Document.hxx
+include/salome/SMESHDS_Group.hxx
+include/salome/SMESHDS_GroupBase.hxx
+include/salome/SMESHDS_GroupOnGeom.hxx
include/salome/SMESHDS_Hypothesis.hxx
include/salome/SMESHDS_Mesh.hxx
include/salome/SMESHDS_Script.hxx
-include/salome/SMESHDS_Command.hxx
-include/salome/SMESHDS_CommandType.hxx
include/salome/SMESHDS_SubMesh.hxx
-include/salome/SMESHDS_GroupBase.hxx
-include/salome/SMESHDS_Group.hxx
-include/salome/SMESHDS_GroupOnGeom.hxx
-include/salome/SMESH_SMESHDS.hxx
-include/salome/SMESHDS_DataMapOfShape.hxx
-include/salome/SMESH_Controls.hxx
-include/salome/SMESH_ControlsDef.hxx
-include/salome/Driver_Document.h
-include/salome/Driver_Mesh.h
-include/salome/Driver_SMDS_Mesh.h
-include/salome/Driver_SMESHDS_Mesh.h
-include/salome/DriverMED_R_SMDS_Mesh.h
-include/salome/DriverMED_R_SMESHDS_Mesh.h
-include/salome/DriverMED_R_SMESHDS_Document.h
-include/salome/DriverMED_W_SMDS_Mesh.h
-include/salome/DriverMED_W_SMESHDS_Mesh.h
-include/salome/DriverMED_W_SMESHDS_Document.h
-include/salome/DriverMED_Family.h
-include/salome/SMESH_DriverMED.hxx
-include/salome/DriverDAT_R_SMDS_Mesh.h
-include/salome/DriverDAT_R_SMESHDS_Mesh.h
-include/salome/DriverDAT_R_SMESHDS_Document.h
-include/salome/DriverDAT_W_SMDS_Mesh.h
-include/salome/DriverDAT_W_SMESHDS_Mesh.h
-include/salome/DriverDAT_W_SMESHDS_Document.h
-include/salome/SMESH_DriverDAT.hxx
-include/salome/DriverUNV_R_SMDS_Mesh.h
-include/salome/DriverUNV_R_SMESHDS_Mesh.h
-include/salome/DriverUNV_R_SMESHDS_Document.h
-include/salome/DriverUNV_W_SMDS_Mesh.h
-include/salome/DriverUNV_W_SMESHDS_Mesh.h
-include/salome/SMESH_DriverUNV.hxx
-include/salome/DriverUNV_W_SMESHDS_Document.h
-include/salome/DriverSTL_R_SMDS_Mesh.h
-include/salome/DriverSTL_W_SMDS_Mesh.h
-include/salome/SMESH_DriverSTL.hxx
-include/salome/SMESH_Gen.hxx
-include/salome/SMESH_Mesh.hxx
-include/salome/SMESH_subMesh.hxx
-include/salome/SMESH_subMeshEventListener.hxx
-include/salome/SMESH_Hypothesis.hxx
-include/salome/SMESH_HypoFilter.hxx
-include/salome/SMESH_Algo.hxx
+include/salome/SMESHGUI.h
+include/salome/SMESHGUI_AddMeshElementDlg.h
+include/salome/SMESHGUI_AddQuadraticElementDlg.h
+include/salome/SMESHGUI_BuildCompoundDlg.h
+include/salome/SMESHGUI_ClippingDlg.h
+include/salome/SMESHGUI_ComputeDlg.h
+include/salome/SMESHGUI_ConvToQuadDlg.h
+include/salome/SMESHGUI_ConvToQuadOp.h
+include/salome/SMESHGUI_CreatePatternDlg.h
+include/salome/SMESHGUI_CreatePolyhedralVolumeDlg.h
+include/salome/SMESHGUI_DeleteGroupDlg.h
+include/salome/SMESHGUI_Dialog.h
+include/salome/SMESHGUI_Displayer.h
+include/salome/SMESHGUI_EditMeshDlg.h
+include/salome/SMESHGUI_ExtrusionAlongPathDlg.h
+include/salome/SMESHGUI_ExtrusionDlg.h
+include/salome/SMESHGUI_FileValidator.h
+include/salome/SMESHGUI_Filter.h
+include/salome/SMESHGUI_FilterDlg.h
+include/salome/SMESHGUI_FilterLibraryDlg.h
+include/salome/SMESHGUI_FilterUtils.h
+include/salome/SMESHGUI_FindElemByPointDlg.h
+include/salome/SMESHGUI_GEOMGenUtils.h
+include/salome/SMESHGUI_GroupDlg.h
+include/salome/SMESHGUI_GroupOpDlg.h
+include/salome/SMESHGUI_GroupUtils.h
+include/salome/SMESHGUI_Hypotheses.h
+include/salome/SMESHGUI_HypothesesUtils.h
+include/salome/SMESHGUI_IdValidator.h
+include/salome/SMESHGUI_Make2DFrom3DOp.h
+include/salome/SMESHGUI_MakeNodeAtPointDlg.h
+include/salome/SMESHGUI_MeshDlg.h
+include/salome/SMESHGUI_MeshEditPreview.h
+include/salome/SMESHGUI_MeshInfosBox.h
+include/salome/SMESHGUI_MeshInfosDlg.h
+include/salome/SMESHGUI_MeshOp.h
+include/salome/SMESHGUI_MeshOrderDlg.h
+include/salome/SMESHGUI_MeshOrderOp.h
+include/salome/SMESHGUI_MeshPatternDlg.h
+include/salome/SMESHGUI_MeshUtils.h
+include/salome/SMESHGUI_MoveNodesDlg.h
+include/salome/SMESHGUI_MultiEditDlg.h
+include/salome/SMESHGUI_NodesDlg.h
+include/salome/SMESHGUI_Operation.h
+include/salome/SMESHGUI_PatternUtils.h
+include/salome/SMESHGUI_PatternWidget.h
+include/salome/SMESHGUI_Preferences_ColorDlg.h
+include/salome/SMESHGUI_Preferences_ScalarBarDlg.h
+include/salome/SMESHGUI_RemoveElementsDlg.h
+include/salome/SMESHGUI_RemoveNodesDlg.h
+include/salome/SMESHGUI_RenumberingDlg.h
+include/salome/SMESHGUI_RevolutionDlg.h
+include/salome/SMESHGUI_RotationDlg.h
+include/salome/SMESHGUI_ScaleDlg.h
+include/salome/SMESHGUI_Selection.h
+include/salome/SMESHGUI_SelectionOp.h
+include/salome/SMESHGUI_SewingDlg.h
+include/salome/SMESHGUI_ShapeByMeshDlg.h
+include/salome/SMESHGUI_SingleEditDlg.h
+include/salome/SMESHGUI_SmoothingDlg.h
+include/salome/SMESHGUI_SpinBox.h
+include/salome/SMESHGUI_StandardMeshInfosDlg.h
+include/salome/SMESHGUI_SymmetryDlg.h
+include/salome/SMESHGUI_TranslationDlg.h
+include/salome/SMESHGUI_TransparencyDlg.h
+include/salome/SMESHGUI_Utils.h
+include/salome/SMESHGUI_VTKUtils.h
+include/salome/SMESHGUI_WhatIsDlg.h
+include/salome/SMESHGUI_XmlHandler.h
include/salome/SMESH_0D_Algo.hxx
+include/salome/SMESH_0D_Algo_i.hxx
include/salome/SMESH_1D_Algo.hxx
+include/salome/SMESH_1D_Algo_i.hxx
include/salome/SMESH_2D_Algo.hxx
+include/salome/SMESH_2D_Algo_i.hxx
+include/salome/SMESH_2smeshpy.hxx
include/salome/SMESH_3D_Algo.hxx
-include/salome/SMESH_Group.hxx
-include/salome/SMESH_MeshEditor.hxx
+include/salome/SMESH_3D_Algo_i.hxx
+include/salome/SMESH_Actor.h
+include/salome/SMESH_ActorDef.h
+include/salome/SMESH_ActorUtils.h
+include/salome/SMESH_Algo.hxx
+include/salome/SMESH_Algo_i.hxx
+include/salome/SMESH_BasicHypothesis.hh
include/salome/SMESH_Block.hxx
-include/salome/SMESH_Pattern.hxx
-include/salome/SMESH_IndexedDataMapOfShapeIndexedMapOfShape.hxx
-include/salome/SMESH_DataMapOfElemPtrSequenceOfElemPtr.hxx
-include/salome/SMESH_SequenceOfElemPtr.hxx
-include/salome/SMESH_SequenceOfNode.hxx
-include/salome/SMESH_MesherHelper.hxx
-include/salome/SMESH_Octree.hxx
-include/salome/SMESH_OctreeNode.hxx
+include/salome/SMESH_Client.hxx
include/salome/SMESH_Comment.hxx
include/salome/SMESH_ComputeError.hxx
-include/salome/SMESH_SMESH.hxx
+include/salome/SMESH_Controls.hxx
+include/salome/SMESH_ControlsDef.hxx
+include/salome/SMESH_DataMapOfElemPtrSequenceOfElemPtr.hxx
+include/salome/SMESH_DeviceActor.h
+include/salome/SMESH_DriverDAT.hxx
+include/salome/SMESH_DriverMED.hxx
+include/salome/SMESH_DriverSTL.hxx
+include/salome/SMESH_DriverUNV.hxx
+include/salome/SMESH_ExtractGeometry.h
+include/salome/SMESH_FaceOrientationFilter.h
+include/salome/SMESH_File.hxx
+include/salome/SMESH_Filter.hh
+include/salome/SMESH_Filter_i.hxx
+include/salome/SMESH_Gen.hh
+include/salome/SMESH_Gen.hxx
include/salome/SMESH_Gen_i.hxx
-include/salome/SMESH_Algo_i.hxx
-include/salome/SMESH_0D_Algo_i.hxx
-include/salome/SMESHGUI.h
-include/salome/SMESH_1D_Algo_i.hxx
-include/salome/SMESH_2D_Algo_i.hxx
-include/salome/SMESH_3D_Algo_i.hxx
-include/salome/SMESH_subMesh_i.hxx
-include/salome/SMESH_Mesh_i.hxx
-include/salome/SMESH_Hypothesis_i.hxx
-include/salome/SMESH_PythonDump.hxx
+include/salome/SMESH_Group.hh
+include/salome/SMESH_Group.hxx
include/salome/SMESH_Group_i.hxx
-include/salome/SMESH_MEDMesh_i.hxx
-include/salome/SMESH_Filter_i.hxx
-include/salome/SMESH_MeshEditor_i.hxx
+include/salome/SMESH_HypoFilter.hxx
+include/salome/SMESH_Hypothesis.hh
+include/salome/SMESH_Hypothesis.hxx
+include/salome/SMESH_Hypothesis_i.hxx
+include/salome/SMESH_IndexedDataMapOfShapeIndexedMapOfShape.hxx
+include/salome/SMESH_LogicalFilter.hxx
include/salome/SMESH_MEDFamily_i.hxx
+include/salome/SMESH_MEDMesh_i.hxx
include/salome/SMESH_MEDSupport_i.hxx
-include/salome/SMESH_Pattern_i.hxx
-include/salome/SMESH_2smeshpy.hxx
+include/salome/SMESH_Mesh.hh
+include/salome/SMESH_Mesh.hxx
+include/salome/SMESH_MeshEditor.hh
+include/salome/SMESH_MeshEditor.hxx
+include/salome/SMESH_MeshEditor_i.hxx
+include/salome/SMESH_Mesh_i.hxx
+include/salome/SMESH_MesherHelper.hxx
include/salome/SMESH_NoteBook.hxx
-include/salome/SMESH_Client.hxx
-include/salome/StdMeshers_LocalLength.hxx
-include/salome/StdMeshers_StartEndLength.hxx
+include/salome/SMESH_NumberFilter.hxx
+include/salome/SMESH_Object.h
+include/salome/SMESH_ObjectDef.h
+include/salome/SMESH_Octree.hxx
+include/salome/SMESH_OctreeNode.hxx
+include/salome/SMESH_Pattern.hh
+include/salome/SMESH_Pattern.hxx
+include/salome/SMESH_Pattern_i.hxx
+include/salome/SMESH_PreviewActorsCollection.h
+include/salome/SMESH_PythonDump.hxx
+include/salome/SMESH_SMDS.hxx
+include/salome/SMESH_SMESH.hxx
+include/salome/SMESH_SMESHDS.hxx
+include/salome/SMESH_SMESHGUI.hxx
+include/salome/SMESH_SequenceOfElemPtr.hxx
+include/salome/SMESH_SequenceOfNode.hxx
+include/salome/SMESH_StdMeshers.hxx
+include/salome/SMESH_StdMeshersGUI.hxx
+include/salome/SMESH_StdMeshers_I.hxx
+include/salome/SMESH_Type.h
+include/salome/SMESH_TypeFilter.hxx
+include/salome/SMESH_subMesh.hxx
+include/salome/SMESH_subMeshEventListener.hxx
+include/salome/SMESH_subMesh_i.hxx
+include/salome/SMESH_version.h
+include/salome/StdMeshersGUI_DistrPreview.h
+include/salome/StdMeshersGUI_DistrTable.h
+include/salome/StdMeshersGUI_FixedPointsParamWdg.h
+include/salome/StdMeshersGUI_LayerDistributionParamWdg.h
+include/salome/StdMeshersGUI_NbSegmentsCreator.h
+include/salome/StdMeshersGUI_ObjectReferenceParamWdg.h
+include/salome/StdMeshersGUI_StdHypothesisCreator.h
+include/salome/StdMeshersGUI_SubShapeSelectorWdg.h
include/salome/StdMeshers_Arithmetic1D.hxx
-include/salome/StdMeshers_FixedPoints1D.hxx
-include/salome/StdMeshers_NumberOfSegments.hxx
+include/salome/StdMeshers_Arithmetic1D_i.hxx
+include/salome/StdMeshers_AutomaticLength.hxx
+include/salome/StdMeshers_AutomaticLength_i.hxx
+include/salome/StdMeshers_CompositeHexa_3D.hxx
+include/salome/StdMeshers_CompositeSegment_1D.hxx
+include/salome/StdMeshers_CompositeSegment_1D_i.hxx
include/salome/StdMeshers_Deflection1D.hxx
-include/salome/StdMeshers_Propagation.hxx
+include/salome/StdMeshers_Deflection1D_i.hxx
+include/salome/StdMeshers_Distribution.hxx
+include/salome/StdMeshers_FaceSide.hxx
+include/salome/StdMeshers_FixedPoints1D.hxx
+include/salome/StdMeshers_FixedPoints1D_i.hxx
+include/salome/StdMeshers_HexaFromSkin_3D.hxx
+include/salome/StdMeshers_Hexa_3D.hxx
+include/salome/StdMeshers_Hexa_3D_i.hxx
+include/salome/StdMeshers_LayerDistribution.hxx
+include/salome/StdMeshers_LayerDistribution2D.hxx
+include/salome/StdMeshers_LayerDistribution2D_i.hxx
+include/salome/StdMeshers_LayerDistribution_i.hxx
include/salome/StdMeshers_LengthFromEdges.hxx
+include/salome/StdMeshers_LengthFromEdges_i.hxx
+include/salome/StdMeshers_LocalLength.hxx
+include/salome/StdMeshers_LocalLength_i.hxx
+include/salome/StdMeshers_MEFISTO_2D.hxx
+include/salome/StdMeshers_MEFISTO_2D_i.hxx
include/salome/StdMeshers_MaxElementArea.hxx
+include/salome/StdMeshers_MaxElementArea_i.hxx
include/salome/StdMeshers_MaxElementVolume.hxx
+include/salome/StdMeshers_MaxElementVolume_i.hxx
+include/salome/StdMeshers_MaxLength.hxx
+include/salome/StdMeshers_MaxLength_i.hxx
include/salome/StdMeshers_NotConformAllowed.hxx
-include/salome/StdMeshers_Regular_1D.hxx
-include/salome/StdMeshers_Quadrangle_2D.hxx
-include/salome/StdMeshers_MEFISTO_2D.hxx
-include/salome/StdMeshers_Hexa_3D.hxx
-include/salome/StdMeshers_Penta_3D.hxx
-include/salome/StdMeshers_AutomaticLength.hxx
-include/salome/StdMeshers_Distribution.hxx
-include/salome/StdMeshers_QuadranglePreference.hxx
-include/salome/StdMeshers_QuadraticMesh.hxx
+include/salome/StdMeshers_NotConformAllowed_i.hxx
include/salome/StdMeshers_NumberOfLayers.hxx
include/salome/StdMeshers_NumberOfLayers2D.hxx
+include/salome/StdMeshers_NumberOfLayers2D_i.hxx
+include/salome/StdMeshers_NumberOfLayers_i.hxx
+include/salome/StdMeshers_NumberOfSegments.hxx
+include/salome/StdMeshers_NumberOfSegments_i.hxx
+include/salome/StdMeshers_ObjRefUlils.hxx
+include/salome/StdMeshers_Penta_3D.hxx
include/salome/StdMeshers_Prism_3D.hxx
+include/salome/StdMeshers_Prism_3D_i.hxx
include/salome/StdMeshers_ProjectionSource1D.hxx
+include/salome/StdMeshers_ProjectionSource1D_i.hxx
include/salome/StdMeshers_ProjectionSource2D.hxx
+include/salome/StdMeshers_ProjectionSource2D_i.hxx
include/salome/StdMeshers_ProjectionSource3D.hxx
+include/salome/StdMeshers_ProjectionSource3D_i.hxx
+include/salome/StdMeshers_ProjectionUtils.hxx
include/salome/StdMeshers_Projection_1D.hxx
+include/salome/StdMeshers_Projection_1D_2D_3D_i.hxx
include/salome/StdMeshers_Projection_2D.hxx
include/salome/StdMeshers_Projection_3D.hxx
-include/salome/StdMeshers_RadialPrism_3D.hxx
-include/salome/StdMeshers_ProjectionUtils.hxx
-include/salome/StdMeshers_LayerDistribution.hxx
-include/salome/StdMeshers_LayerDistribution2D.hxx
-include/salome/StdMeshers_SegmentAroundVertex_0D.hxx
-include/salome/StdMeshers_SegmentLengthAroundVertex.hxx
-include/salome/StdMeshers_FaceSide.hxx
-include/salome/StdMeshers_CompositeSegment_1D.hxx
-include/salome/StdMeshers_UseExisting_1D2D.hxx
+include/salome/StdMeshers_Propagation.hxx
+include/salome/StdMeshers_Propagation_i.hxx
include/salome/StdMeshers_QuadToTriaAdaptor.hxx
-include/salome/SMESH_StdMeshers.hxx
-include/salome/StdMeshers_TrianglePreference.hxx
-include/salome/StdMeshers_CompositeHexa_3D.hxx
-include/salome/StdMeshers_MaxLength.hxx
include/salome/StdMeshers_QuadrangleParams.hxx
-include/salome/StdMeshers_RadialQuadrangle_1D2D.hxx
-include/salome/StdMeshers_LocalLength_i.hxx
-include/salome/StdMeshers_StartEndLength_i.hxx
-include/salome/StdMeshers_Arithmetic1D_i.hxx
-include/salome/StdMeshers_FixedPoints1D_i.hxx
-include/salome/StdMeshers_NumberOfSegments_i.hxx
-include/salome/SMESH_Actor.h
-include/salome/StdMeshers_Deflection1D_i.hxx
-include/salome/StdMeshers_Propagation_i.hxx
-include/salome/StdMeshers_LengthFromEdges_i.hxx
-include/salome/StdMeshers_MaxElementArea_i.hxx
-include/salome/StdMeshers_MaxElementVolume_i.hxx
-include/salome/StdMeshers_NotConformAllowed_i.hxx
-include/salome/StdMeshers_Regular_1D_i.hxx
-include/salome/StdMeshers_Quadrangle_2D_i.hxx
-include/salome/StdMeshers_MEFISTO_2D_i.hxx
-include/salome/StdMeshers_Hexa_3D_i.hxx
-include/salome/StdMeshers_AutomaticLength_i.hxx
+include/salome/StdMeshers_QuadrangleParams_i.hxx
+include/salome/StdMeshers_QuadranglePreference.hxx
include/salome/StdMeshers_QuadranglePreference_i.hxx
+include/salome/StdMeshers_Quadrangle_2D.hxx
+include/salome/StdMeshers_Quadrangle_2D_i.hxx
+include/salome/StdMeshers_QuadraticMesh.hxx
include/salome/StdMeshers_QuadraticMesh_i.hxx
-include/salome/StdMeshers_NumberOfLayers_i.hxx
-include/salome/StdMeshers_NumberOfLayers2D_i.hxx
-include/salome/StdMeshers_Prism_3D_i.hxx
-include/salome/StdMeshers_ProjectionSource1D_i.hxx
-include/salome/StdMeshers_ProjectionSource2D_i.hxx
-include/salome/StdMeshers_ProjectionSource3D_i.hxx
-include/salome/StdMeshers_Projection_1D_2D_3D_i.hxx
-include/salome/StdMeshers_ObjRefUlils.hxx
-include/salome/StdMeshers_LayerDistribution_i.hxx
-include/salome/StdMeshers_LayerDistribution2D_i.hxx
-include/salome/StdMeshers_UseExisting_1D2D_i.hxx
-include/salome/StdMeshers_CompositeSegment_1D_i.hxx
+include/salome/StdMeshers_RadialPrism_3D.hxx
+include/salome/StdMeshers_RadialQuadrangle_1D2D.hxx
+include/salome/StdMeshers_RadialQuadrangle_1D2D_i.hxx
+include/salome/StdMeshers_Regular_1D.hxx
+include/salome/StdMeshers_Regular_1D_i.hxx
+include/salome/StdMeshers_SegmentAroundVertex_0D.hxx
include/salome/StdMeshers_SegmentAroundVertex_0D_i.hxx
+include/salome/StdMeshers_SegmentLengthAroundVertex.hxx
include/salome/StdMeshers_SegmentLengthAroundVertex_i.hxx
+include/salome/StdMeshers_StartEndLength.hxx
+include/salome/StdMeshers_StartEndLength_i.hxx
+include/salome/StdMeshers_TrianglePreference.hxx
include/salome/StdMeshers_TrianglePreference_i.hxx
-include/salome/StdMeshers_MaxLength_i.hxx
-include/salome/StdMeshers_QuadrangleParams_i.hxx
-include/salome/StdMeshers_RadialQuadrangle_1D2D_i.hxx
-include/salome/SMESH_StdMeshers_I.hxx
-include/salome/SMESH_Object.h
-include/salome/SMESH_ObjectDef.h
-include/salome/SMESH_ActorUtils.h
-include/salome/SMESH_ActorDef.h
-include/salome/SMESH_DeviceActor.h
-include/salome/SMESH_Type.h
-include/salome/SMESH_PreviewActorsCollection.h
-include/salome/SMESH_ExtractGeometry.h
-include/salome/SMESH_FaceOrientationFilter.h
-include/salome/SMESH_TypeFilter.hxx
-include/salome/SMESH_NumberFilter.hxx
-include/salome/SMESH_LogicalFilter.hxx
-include/salome/SMESHGUI_Utils.h
-include/salome/SMESHGUI_Hypotheses.h
-include/salome/SMESHGUI_HypothesesUtils.h
-include/salome/SMESHGUI_SpinBox.h
-include/salome/SMESHGUI_Selection.h
-include/salome/SMESHGUI_VTKUtils.h
-include/salome/SMESHGUI_Displayer.h
-include/salome/SMESHGUI_GEOMGenUtils.h
-include/salome/SMESHGUI_MeshUtils.h
-include/salome/libSMESH_Swig.i
-include/salome/SMESHGUI_FilterUtils.h
-include/salome/SMESHGUI_PatternUtils.h
-include/salome/SMESHGUI_GroupUtils.h
-include/salome/SMESHGUI_PatternWidget.h
-include/salome/SMESHGUI_CreatePatternDlg.h
-include/salome/SMESHGUI_MeshPatternDlg.h
-include/salome/SMESHGUI_NodesDlg.h
-include/salome/SMESHGUI_TransparencyDlg.h
-include/salome/SMESHGUI_ClippingDlg.h
-include/salome/SMESHGUI_GroupDlg.h
-include/salome/SMESHGUI_RemoveNodesDlg.h
-include/salome/SMESHGUI_RemoveElementsDlg.h
-include/salome/SMESHGUI_MeshInfosDlg.h
-include/salome/SMESHGUI_StandardMeshInfosDlg.h
-include/salome/SMESHGUI_WhatIsDlg.h
-include/salome/SMESHGUI_Preferences_ColorDlg.h
-include/salome/SMESHGUI_Preferences_ScalarBarDlg.h
-include/salome/SMESHGUI_MoveNodesDlg.h
-include/salome/SMESHGUI_AddMeshElementDlg.h
-include/salome/SMESHGUI_XmlHandler.h
-include/salome/SMESHGUI_Filter.h
-include/salome/SMESHGUI_FilterDlg.h
-include/salome/SMESHGUI_FilterLibraryDlg.h
-include/salome/SMESHGUI_SingleEditDlg.h
-include/salome/SMESHGUI_MultiEditDlg.h
-include/salome/SMESHGUI_DeleteGroupDlg.h
-include/salome/SMESHGUI_GroupOpDlg.h
-include/salome/SMESHGUI_SmoothingDlg.h
-include/salome/SMESHGUI_RenumberingDlg.h
+include/salome/StdMeshers_UseExisting_1D2D.hxx
+include/salome/StdMeshers_UseExisting_1D2D_i.hxx
+include/salome/aptrte.h
include/salome/libSMESH_Swig.h
-include/salome/SMESHGUI_ExtrusionDlg.h
-include/salome/SMESHGUI_ExtrusionAlongPathDlg.h
-include/salome/SMESHGUI_RevolutionDlg.h
-include/salome/SMESHGUI_RotationDlg.h
-include/salome/SMESHGUI_TranslationDlg.h
-include/salome/SMESHGUI_SymmetryDlg.h
-include/salome/SMESHGUI_SewingDlg.h
-include/salome/SMESHGUI_EditMeshDlg.h
-include/salome/SMESHGUI_CreatePolyhedralVolumeDlg.h
-include/salome/SMESHGUI_Operation.h
-include/salome/SMESHGUI_SelectionOp.h
-include/salome/SMESHGUI_Dialog.h
-include/salome/SMESHGUI_MeshDlg.h
-include/salome/SMESHGUI_MeshOp.h
-include/salome/SMESHGUI_ShapeByMeshDlg.h
-include/salome/SMESHGUI_AddQuadraticElementDlg.h
-include/salome/SMESHGUI_ConvToQuadDlg.h
-include/salome/SMESHGUI_ConvToQuadOp.h
-include/salome/SMESHGUI_BuildCompoundDlg.h
-include/salome/SMESHGUI_ComputeDlg.h
-include/salome/SMESHGUI_MakeNodeAtPointDlg.h
-include/salome/SMESHGUI_MeshEditPreview.h
-include/salome/SMESHGUI_IdValidator.h
-include/salome/SMESHGUI_MeshInfosBox.h
-include/salome/SMESHGUI_Make2DFrom3DOp.h
-include/salome/SMESH_SMESHGUI.hxx
-include/salome/StdMeshersGUI_StdHypothesisCreator.h
-include/salome/SMESH_StdMeshersGUI.hxx
-include/salome/StdMeshersGUI_DistrPreview.h
-include/salome/StdMeshersGUI_DistrTable.h
-include/salome/StdMeshersGUI_NbSegmentsCreator.h
-include/salome/StdMeshersGUI_ObjectReferenceParamWdg.h
-include/salome/StdMeshersGUI_LayerDistributionParamWdg.h
-include/salome/StdMeshersGUI_FixedPointsParamWdg.h
-include/salome/StdMeshersGUI_SubShapeSelectorWdg.h
-include/salome/SMESH_version.h
-%%PYTHON_SITELIBDIR%%/salome/shared_modules/SMESH_shared_modules.py
-%%PYTHON_SITELIBDIR%%/salome/shared_modules/SMESH_shared_modules.pyc
-%%PYTHON_SITELIBDIR%%/salome/shared_modules/SMESH_shared_modules.pyo
+include/salome/libSMESH_Swig.i
+%%PYTHON_SITELIBDIR%%/salome/SMESH/__init__.py
%%PYTHON_SITELIBDIR%%/salome/SMESH_BasicHypothesis_idl.py
-%%PYTHON_SITELIBDIR%%/salome/StdMeshers/__init__.py
-%%PYTHON_SITELIBDIR%%/salome/StdMeshers__POA/__init__.py
%%PYTHON_SITELIBDIR%%/salome/SMESH_Filter_idl.py
-%%PYTHON_SITELIBDIR%%/salome/SMESH/__init__.py
-%%PYTHON_SITELIBDIR%%/salome/SMESH__POA/__init__.py
%%PYTHON_SITELIBDIR%%/salome/SMESH_Gen_idl.py
%%PYTHON_SITELIBDIR%%/salome/SMESH_Group_idl.py
%%PYTHON_SITELIBDIR%%/salome/SMESH_Hypothesis_idl.py
-%%PYTHON_SITELIBDIR%%/salome/SMESH_Mesh_idl.py
%%PYTHON_SITELIBDIR%%/salome/SMESH_MeshEditor_idl.py
+%%PYTHON_SITELIBDIR%%/salome/SMESH_Mesh_idl.py
%%PYTHON_SITELIBDIR%%/salome/SMESH_Pattern_idl.py
-lib/salome/libSMDS.so
-lib/salome/libSalomeIDLSMESH.so.0
-lib/salome/libSalomeIDLSMESH.so
-lib/salome/libSalomeIDLSMESH.la
-lib/salome/libSMDS.so.0
-lib/salome/libSMDS.la
-lib/salome/libSMESHDS.so.0
-lib/salome/libSMESHDS.so
-lib/salome/libSMESHDS.la
-lib/salome/libSMESHControls.so.0
-lib/salome/libSMESHControls.so
-lib/salome/libSMESHControls.la
-lib/salome/libMeshDriver.so.0
-lib/salome/libMeshDriver.so
+%%PYTHON_SITELIBDIR%%/salome/SMESH__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/salome/StdMeshers/__init__.py
+%%PYTHON_SITELIBDIR%%/salome/StdMeshers__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/salome/shared_modules/SMESH_shared_modules.py
+%%PYTHON_SITELIBDIR%%/salome/shared_modules/SMESH_shared_modules.pyc
+%%PYTHON_SITELIBDIR%%/salome/shared_modules/SMESH_shared_modules.pyo
+lib/salome/_libSMESH_Swig.la
+lib/salome/_libSMESH_Swig.so
+lib/salome/_libSMESH_Swig.so.0
+lib/salome/libGeomSelectionTools.la
+lib/salome/libGeomSelectionTools.so
+lib/salome/libGeomSelectionTools.so.0
+lib/salome/libMEFISTO2D.la
+lib/salome/libMEFISTO2D.so
+lib/salome/libMEFISTO2D.so.0
lib/salome/libMeshDriver.la
-lib/salome/libMeshDriverMED.so.0
-lib/salome/libMeshDriverMED.so
-lib/salome/libMeshDriverMED.la
-lib/salome/libMeshDriverDAT.so.0
-lib/salome/libMeshDriverDAT.so
+lib/salome/libMeshDriver.so
+lib/salome/libMeshDriver.so.0
lib/salome/libMeshDriverDAT.la
-lib/salome/libMeshDriverUNV.so.0
-lib/salome/libMeshDriverUNV.so
-lib/salome/libMeshDriverUNV.la
-lib/salome/libMeshDriverSTL.so.0
-lib/salome/libMeshDriverSTL.so
+lib/salome/libMeshDriverDAT.so
+lib/salome/libMeshDriverDAT.so.0
+lib/salome/libMeshDriverMED.la
+lib/salome/libMeshDriverMED.so
+lib/salome/libMeshDriverMED.so.0
lib/salome/libMeshDriverSTL.la
-lib/salome/libSMESHimpl.so.0
-lib/salome/libSMESHimpl.so
-lib/salome/libSMESHimpl.la
-lib/salome/libSMESHEngine.so.0
-lib/salome/libSMESHEngine.so
-lib/salome/libSMESHEngine.la
-lib/salome/libSMESHClient.so.0
-lib/salome/libSMESHClient.so
-lib/salome/libSMESHClient.la
-lib/salome/libMEFISTO2D.so.0
-lib/salome/libMEFISTO2D.so
-lib/salome/libMEFISTO2D.la
-lib/salome/libStdMeshers.so.0
-lib/salome/libStdMeshers.so
+lib/salome/libMeshDriverSTL.so
+lib/salome/libMeshDriverSTL.so.0
+lib/salome/libMeshDriverUNV.la
+lib/salome/libMeshDriverUNV.so
+lib/salome/libMeshDriverUNV.so.0
+lib/salome/libSMDS.la
+lib/salome/libSMDS.so
+lib/salome/libSMDS.so.0
+lib/salome/libSMESH.la
lib/salome/libSMESH.so
+lib/salome/libSMESH.so.0
+lib/salome/libSMESHClient.la
+lib/salome/libSMESHClient.so
+lib/salome/libSMESHClient.so.0
+lib/salome/libSMESHControls.la
+lib/salome/libSMESHControls.so
+lib/salome/libSMESHControls.so.0
+lib/salome/libSMESHDS.la
+lib/salome/libSMESHDS.so
+lib/salome/libSMESHDS.so.0
+lib/salome/libSMESHEngine.la
+lib/salome/libSMESHEngine.so
+lib/salome/libSMESHEngine.so.0
+lib/salome/libSMESHFiltersSelection.la
+lib/salome/libSMESHFiltersSelection.so
+lib/salome/libSMESHFiltersSelection.so.0
+lib/salome/libSMESHObject.la
+lib/salome/libSMESHObject.so
+lib/salome/libSMESHObject.so.0
+lib/salome/libSMESHimpl.la
+lib/salome/libSMESHimpl.so
+lib/salome/libSMESHimpl.so.0
+lib/salome/libSalomeIDLSMESH.la
+lib/salome/libSalomeIDLSMESH.so
+lib/salome/libSalomeIDLSMESH.so.0
lib/salome/libStdMeshers.la
-lib/salome/libStdMeshersEngine.so.0
-lib/salome/libStdMeshersEngine.so
+lib/salome/libStdMeshers.so
+lib/salome/libStdMeshers.so.0
lib/salome/libStdMeshersEngine.la
-lib/salome/libSMESHObject.so.0
-lib/salome/libSMESHObject.so
-lib/salome/libSMESHObject.la
-lib/salome/libSMESHFiltersSelection.so.0
-lib/salome/libSMESHFiltersSelection.so
-lib/salome/libSMESHFiltersSelection.la
-lib/salome/libSMESH.so.0
-lib/salome/libSMESH.la
-lib/salome/_libSMESH_Swig.so.0
-lib/salome/_libSMESH_Swig.so
-lib/salome/_libSMESH_Swig.la
-lib/salome/libStdMeshersGUI.so.0
-lib/salome/libStdMeshersGUI.so
+lib/salome/libStdMeshersEngine.so
+lib/salome/libStdMeshersEngine.so.0
lib/salome/libStdMeshersGUI.la
-share/salome/resources/smesh/delete.png
-share/salome/resources/smesh/mesh_add_sub.png
-share/salome/resources/smesh/mesh_algo_hexa.png
-share/salome/resources/smesh/mesh_algo_mefisto.png
-share/salome/resources/smesh/mesh_algo_quad.png
-share/salome/resources/smesh/mesh_algo_regular.png
-share/salome/resources/smesh/mesh_algo_tetra.png
-share/salome/resources/smesh/mesh_angle.png
-share/salome/resources/smesh/mesh_area.png
-share/salome/resources/smesh/mesh_aspect.png
-share/salome/resources/smesh/mesh_aspect_3d.png
-share/salome/resources/smesh/mesh_clear.png
-share/salome/resources/smesh/mesh_compute.png
-share/salome/resources/smesh/mesh_diagonal.png
-share/salome/resources/smesh/mesh_edit.png
-share/salome/resources/smesh/mesh_hexa.png
-share/salome/resources/smesh/mesh_hypo_area.png
-share/salome/resources/smesh/mesh_hypo_length.png
-share/salome/resources/smesh/mesh_hypo_segment.png
-share/salome/resources/smesh/mesh_hypo_volume.png
-share/salome/resources/smesh/mesh_hypo_edit.png
-share/salome/resources/smesh/mesh_info.png
-share/salome/resources/smesh/advanced_mesh_info.png
-share/salome/resources/smesh/standard_mesh_info.png
-share/salome/resources/smesh/mesh_whatis.png
-share/salome/resources/smesh/mesh_init.png
-share/salome/resources/smesh/mesh_length.png
-share/salome/resources/smesh/mesh_length_2d.png
-share/salome/resources/smesh/mesh_free_edges.png
-share/salome/resources/smesh/mesh_free_edges_2d.png
-share/salome/resources/smesh/mesh_free_nodes.png
-share/salome/resources/smesh/mesh_multi_edges.png
-share/salome/resources/smesh/mesh_multi_edges_2d.png
-share/salome/resources/smesh/mesh_line_n.png
-share/salome/resources/smesh/mesh_line.png
-share/salome/resources/smesh/mesh_move_node.png
-share/salome/resources/smesh/mesh_orientation.png
-share/salome/resources/smesh/mesh.png
-share/salome/resources/smesh/mesh_polygon.png
-share/salome/resources/smesh/mesh_polyhedron.png
-share/salome/resources/smesh/mesh_pyramid_n.png
-share/salome/resources/smesh/mesh_pyramid.png
-share/salome/resources/smesh/mesh_quad_n.png
-share/salome/resources/smesh/mesh_quad.png
-share/salome/resources/smesh/mesh_rem_element.png
-share/salome/resources/smesh/mesh_rem_node.png
-share/salome/resources/smesh/mesh_shading.png
-share/salome/resources/smesh/mesh_shrink.png
-share/salome/resources/smesh/mesh_skew.png
-share/salome/resources/smesh/mesh_taper.png
-share/salome/resources/smesh/mesh_tetra.png
-share/salome/resources/smesh/mesh_tree_algo_hexa.png
-share/salome/resources/smesh/mesh_tree_algo_mefisto.png
-share/salome/resources/smesh/mesh_tree_algo.png
-share/salome/resources/smesh/select1.png
-share/salome/resources/smesh/mesh_tree_algo_quad.png
-share/salome/resources/smesh/mesh_tree_algo_regular.png
-share/salome/resources/smesh/mesh_tree_algo_tetra.png
-share/salome/resources/smesh/mesh_tree_hypo_area.png
-share/salome/resources/smesh/mesh_tree_hypo_length.png
-share/salome/resources/smesh/mesh_tree_hypo.png
-share/salome/resources/smesh/mesh_tree_hypo_segment.png
-share/salome/resources/smesh/mesh_tree_hypo_volume.png
-share/salome/resources/smesh/mesh_tree_mesh.png
-share/salome/resources/smesh/mesh_tree_importedmesh.png
-share/salome/resources/smesh/mesh_tree_mesh_warn.png
-share/salome/resources/smesh/mesh_triangle_n.png
-share/salome/resources/smesh/mesh_triangle.png
-share/salome/resources/smesh/mesh_update.png
-share/salome/resources/smesh/mesh_vertex_n.png
-share/salome/resources/smesh/mesh_vertex.png
-share/salome/resources/smesh/mesh_volume_3d.png
-share/salome/resources/smesh/mesh_wireframe.png
-share/salome/resources/smesh/mesh_points.png
-share/salome/resources/smesh/mesh_wrap.png
-share/salome/resources/smesh/mesh_group.png
-share/salome/resources/smesh/mesh_tree_group.png
-share/salome/resources/smesh/mesh_edit_group.png
-share/salome/resources/smesh/mesh_make_group.png
-share/salome/resources/smesh/mesh_groups_from_gemetry.png
-share/salome/resources/smesh/mesh_union2tri.png
-share/salome/resources/smesh/mesh_uniontri.png
-share/salome/resources/smesh/mesh_cutquad.png
-share/salome/resources/smesh/mesh_smoothing.png
-share/salome/resources/smesh/mesh_renumbering_nodes.png
-share/salome/resources/smesh/mesh_renumbering_elements.png
-share/salome/resources/smesh/mesh_extrusion.png
-share/salome/resources/smesh/mesh_extrusionpath.png
-share/salome/resources/smesh/mesh_revolution.png
-share/salome/resources/smesh/ModuleMesh.png
-share/salome/resources/smesh/mesh_unionGroups.png
-share/salome/resources/smesh/mesh_intersectGroups.png
-share/salome/resources/smesh/mesh_cutGroups.png
-share/salome/resources/smesh/mesh_deleteGroups.png
-share/salome/resources/smesh/mesh_translation_vector.png
-share/salome/resources/smesh/mesh_translation_points.png
-share/salome/resources/smesh/mesh_rotation.png
-share/salome/resources/smesh/mesh_symmetry_point.png
-share/salome/resources/smesh/mesh_symmetry_axis.png
-share/salome/resources/smesh/mesh_symmetry_plane.png
-share/salome/resources/smesh/mesh_sew_freeborders.png
-share/salome/resources/smesh/mesh_sew_conform_freeborders.png
-share/salome/resources/smesh/mesh_sew_bordertoside.png
-share/salome/resources/smesh/mesh_sew_sideelements.png
-share/salome/resources/smesh/mesh_merge_nodes.png
-share/salome/resources/smesh/mesh_merge_elements.png
-share/salome/resources/smesh/StdMeshers.xml
-share/salome/resources/smesh/SalomeApp.xml
-share/salome/resources/smesh/mesh_pattern.png
-share/salome/resources/smesh/pattern_sample_2d.png
-share/salome/resources/smesh/pattern_sample_3D.png
-share/salome/resources/smesh/mesh_add.png
-share/salome/resources/smesh/mesh_remove.png
-share/salome/resources/smesh/mesh_quad_edge.png
-share/salome/resources/smesh/mesh_quad_triangle.png
-share/salome/resources/smesh/mesh_quad_quadrangle.png
-share/salome/resources/smesh/mesh_quad_tetrahedron.png
-share/salome/resources/smesh/mesh_quad_pyramid.png
-share/salome/resources/smesh/mesh_quad_pentahedron.png
-share/salome/resources/smesh/SMESH_images.qm
-share/salome/resources/smesh/mesh_quad_hexahedron.png
-share/salome/resources/smesh/mesh_conv_to_quad.png
-share/salome/resources/smesh/mesh_tree_hypo_layers_distribution.png
-share/salome/resources/smesh/mesh_tree_algo_radial_prism.png
-share/salome/resources/smesh/mesh_tree_algo_projection_2d.png
-share/salome/resources/smesh/mesh_hypo_source_edge.png
-share/salome/resources/smesh/mesh_hypo_source_3d.png
-share/salome/resources/smesh/mesh_hypo_layer_distribution.png
-share/salome/resources/smesh/mesh_hypo_source_face.png
-share/salome/resources/smesh/mesh_tree_hypo_source_face.png
-share/salome/resources/smesh/mesh_tree_hypo_source_edge.png
-share/salome/resources/smesh/mesh_tree_hypo_source_3d_shape.png
-share/salome/resources/smesh/mesh_build_compound.png
-share/salome/resources/smesh/mesh_tree_hypo_projection_3d.png
-share/salome/resources/smesh/mesh_tree_hypo_projection_2d.png
-share/salome/resources/smesh/mesh_node_to_point.png
-share/salome/resources/smesh/mesh_tree_mesh_partial.png
-share/salome/resources/smesh/mesh_extractGroup.png
-share/salome/resources/smesh/mesh_precompute.png
-share/salome/resources/smesh/mesh_2d_from_3d.png
-share/salome/resources/smesh/mesh_free_faces.png
-share/salome/resources/smesh/SMESHCatalog.xml
-share/salome/resources/smesh/SMESH_msg_en.qm
-share/salome/resources/smesh/StdMeshers_images.qm
-share/salome/resources/smesh/StdMeshers_msg_en.qm
-@dirrm share/salome/resources/smesh
+lib/salome/libStdMeshersGUI.so
+lib/salome/libStdMeshersGUI.so.0
+%%DATADIR%%/resources/smesh/ModuleMesh.png
+%%DATADIR%%/resources/smesh/SMESHCatalog.xml
+%%DATADIR%%/resources/smesh/SMESH_images.qm
+%%DATADIR%%/resources/smesh/SMESH_msg_en.qm
+%%DATADIR%%/resources/smesh/SalomeApp.xml
+%%DATADIR%%/resources/smesh/StdMeshers.xml
+%%DATADIR%%/resources/smesh/StdMeshers_images.qm
+%%DATADIR%%/resources/smesh/StdMeshers_msg_en.qm
+%%DATADIR%%/resources/smesh/advanced_mesh_info.png
+%%DATADIR%%/resources/smesh/delete.png
+%%DATADIR%%/resources/smesh/mesh.png
+%%DATADIR%%/resources/smesh/mesh_2d_from_3d.png
+%%DATADIR%%/resources/smesh/mesh_add.png
+%%DATADIR%%/resources/smesh/mesh_add_sub.png
+%%DATADIR%%/resources/smesh/mesh_algo_hexa.png
+%%DATADIR%%/resources/smesh/mesh_algo_mefisto.png
+%%DATADIR%%/resources/smesh/mesh_algo_quad.png
+%%DATADIR%%/resources/smesh/mesh_algo_regular.png
+%%DATADIR%%/resources/smesh/mesh_algo_tetra.png
+%%DATADIR%%/resources/smesh/mesh_angle.png
+%%DATADIR%%/resources/smesh/mesh_area.png
+%%DATADIR%%/resources/smesh/mesh_aspect.png
+%%DATADIR%%/resources/smesh/mesh_aspect_3d.png
+%%DATADIR%%/resources/smesh/mesh_build_compound.png
+%%DATADIR%%/resources/smesh/mesh_clear.png
+%%DATADIR%%/resources/smesh/mesh_compute.png
+%%DATADIR%%/resources/smesh/mesh_conv_to_quad.png
+%%DATADIR%%/resources/smesh/mesh_cutGroups.png
+%%DATADIR%%/resources/smesh/mesh_cutquad.png
+%%DATADIR%%/resources/smesh/mesh_deleteGroups.png
+%%DATADIR%%/resources/smesh/mesh_diagonal.png
+%%DATADIR%%/resources/smesh/mesh_edit.png
+%%DATADIR%%/resources/smesh/mesh_edit_group.png
+%%DATADIR%%/resources/smesh/mesh_extractGroup.png
+%%DATADIR%%/resources/smesh/mesh_extrusion.png
+%%DATADIR%%/resources/smesh/mesh_extrusionpath.png
+%%DATADIR%%/resources/smesh/mesh_find_elem_by_point.png
+%%DATADIR%%/resources/smesh/mesh_free_edges.png
+%%DATADIR%%/resources/smesh/mesh_free_edges_2d.png
+%%DATADIR%%/resources/smesh/mesh_free_faces.png
+%%DATADIR%%/resources/smesh/mesh_free_nodes.png
+%%DATADIR%%/resources/smesh/mesh_group.png
+%%DATADIR%%/resources/smesh/mesh_groups_from_gemetry.png
+%%DATADIR%%/resources/smesh/mesh_hexa.png
+%%DATADIR%%/resources/smesh/mesh_hypo_area.png
+%%DATADIR%%/resources/smesh/mesh_hypo_edit.png
+%%DATADIR%%/resources/smesh/mesh_hypo_layer_distribution.png
+%%DATADIR%%/resources/smesh/mesh_hypo_length.png
+%%DATADIR%%/resources/smesh/mesh_hypo_segment.png
+%%DATADIR%%/resources/smesh/mesh_hypo_source_3d.png
+%%DATADIR%%/resources/smesh/mesh_hypo_source_edge.png
+%%DATADIR%%/resources/smesh/mesh_hypo_source_face.png
+%%DATADIR%%/resources/smesh/mesh_hypo_volume.png
+%%DATADIR%%/resources/smesh/mesh_info.png
+%%DATADIR%%/resources/smesh/mesh_init.png
+%%DATADIR%%/resources/smesh/mesh_intersectGroups.png
+%%DATADIR%%/resources/smesh/mesh_length.png
+%%DATADIR%%/resources/smesh/mesh_length_2d.png
+%%DATADIR%%/resources/smesh/mesh_line.png
+%%DATADIR%%/resources/smesh/mesh_line_n.png
+%%DATADIR%%/resources/smesh/mesh_make_group.png
+%%DATADIR%%/resources/smesh/mesh_merge_elements.png
+%%DATADIR%%/resources/smesh/mesh_merge_nodes.png
+%%DATADIR%%/resources/smesh/mesh_move_node.png
+%%DATADIR%%/resources/smesh/mesh_multi_edges.png
+%%DATADIR%%/resources/smesh/mesh_multi_edges_2d.png
+%%DATADIR%%/resources/smesh/mesh_node_to_point.png
+%%DATADIR%%/resources/smesh/mesh_orientation.png
+%%DATADIR%%/resources/smesh/mesh_pattern.png
+%%DATADIR%%/resources/smesh/mesh_points.png
+%%DATADIR%%/resources/smesh/mesh_polygon.png
+%%DATADIR%%/resources/smesh/mesh_polyhedron.png
+%%DATADIR%%/resources/smesh/mesh_precompute.png
+%%DATADIR%%/resources/smesh/mesh_pyramid.png
+%%DATADIR%%/resources/smesh/mesh_pyramid_n.png
+%%DATADIR%%/resources/smesh/mesh_quad.png
+%%DATADIR%%/resources/smesh/mesh_quad_edge.png
+%%DATADIR%%/resources/smesh/mesh_quad_hexahedron.png
+%%DATADIR%%/resources/smesh/mesh_quad_n.png
+%%DATADIR%%/resources/smesh/mesh_quad_pentahedron.png
+%%DATADIR%%/resources/smesh/mesh_quad_pyramid.png
+%%DATADIR%%/resources/smesh/mesh_quad_quadrangle.png
+%%DATADIR%%/resources/smesh/mesh_quad_tetrahedron.png
+%%DATADIR%%/resources/smesh/mesh_quad_triangle.png
+%%DATADIR%%/resources/smesh/mesh_rem_element.png
+%%DATADIR%%/resources/smesh/mesh_rem_node.png
+%%DATADIR%%/resources/smesh/mesh_remove.png
+%%DATADIR%%/resources/smesh/mesh_renumbering_elements.png
+%%DATADIR%%/resources/smesh/mesh_renumbering_nodes.png
+%%DATADIR%%/resources/smesh/mesh_revolution.png
+%%DATADIR%%/resources/smesh/mesh_rotation.png
+%%DATADIR%%/resources/smesh/mesh_sew_bordertoside.png
+%%DATADIR%%/resources/smesh/mesh_sew_conform_freeborders.png
+%%DATADIR%%/resources/smesh/mesh_sew_freeborders.png
+%%DATADIR%%/resources/smesh/mesh_sew_sideelements.png
+%%DATADIR%%/resources/smesh/mesh_shading.png
+%%DATADIR%%/resources/smesh/mesh_shrink.png
+%%DATADIR%%/resources/smesh/mesh_skew.png
+%%DATADIR%%/resources/smesh/mesh_smoothing.png
+%%DATADIR%%/resources/smesh/mesh_symmetry_axis.png
+%%DATADIR%%/resources/smesh/mesh_symmetry_plane.png
+%%DATADIR%%/resources/smesh/mesh_symmetry_point.png
+%%DATADIR%%/resources/smesh/mesh_taper.png
+%%DATADIR%%/resources/smesh/mesh_tetra.png
+%%DATADIR%%/resources/smesh/mesh_translation_points.png
+%%DATADIR%%/resources/smesh/mesh_translation_vector.png
+%%DATADIR%%/resources/smesh/mesh_tree_algo.png
+%%DATADIR%%/resources/smesh/mesh_tree_algo_0D.png
+%%DATADIR%%/resources/smesh/mesh_tree_algo_existing_2D.png
+%%DATADIR%%/resources/smesh/mesh_tree_algo_hexa.png
+%%DATADIR%%/resources/smesh/mesh_tree_algo_mefisto.png
+%%DATADIR%%/resources/smesh/mesh_tree_algo_prism.png
+%%DATADIR%%/resources/smesh/mesh_tree_algo_projection_2d.png
+%%DATADIR%%/resources/smesh/mesh_tree_algo_quad.png
+%%DATADIR%%/resources/smesh/mesh_tree_algo_radial_prism.png
+%%DATADIR%%/resources/smesh/mesh_tree_algo_radial_quadrangle_1D2D.png
+%%DATADIR%%/resources/smesh/mesh_tree_algo_regular.png
+%%DATADIR%%/resources/smesh/mesh_tree_algo_tetra.png
+%%DATADIR%%/resources/smesh/mesh_tree_group.png
+%%DATADIR%%/resources/smesh/mesh_tree_hypo.png
+%%DATADIR%%/resources/smesh/mesh_tree_hypo_area.png
+%%DATADIR%%/resources/smesh/mesh_tree_hypo_layers_distribution.png
+%%DATADIR%%/resources/smesh/mesh_tree_hypo_length.png
+%%DATADIR%%/resources/smesh/mesh_tree_hypo_projection_2d.png
+%%DATADIR%%/resources/smesh/mesh_tree_hypo_projection_3d.png
+%%DATADIR%%/resources/smesh/mesh_tree_hypo_segment.png
+%%DATADIR%%/resources/smesh/mesh_tree_hypo_source_3d_shape.png
+%%DATADIR%%/resources/smesh/mesh_tree_hypo_source_edge.png
+%%DATADIR%%/resources/smesh/mesh_tree_hypo_source_face.png
+%%DATADIR%%/resources/smesh/mesh_tree_hypo_volume.png
+%%DATADIR%%/resources/smesh/mesh_tree_importedmesh.png
+%%DATADIR%%/resources/smesh/mesh_tree_mesh.png
+%%DATADIR%%/resources/smesh/mesh_tree_mesh_partial.png
+%%DATADIR%%/resources/smesh/mesh_tree_mesh_warn.png
+%%DATADIR%%/resources/smesh/mesh_triangle.png
+%%DATADIR%%/resources/smesh/mesh_triangle_n.png
+%%DATADIR%%/resources/smesh/mesh_union2tri.png
+%%DATADIR%%/resources/smesh/mesh_unionGroups.png
+%%DATADIR%%/resources/smesh/mesh_uniontri.png
+%%DATADIR%%/resources/smesh/mesh_update.png
+%%DATADIR%%/resources/smesh/mesh_vertex.png
+%%DATADIR%%/resources/smesh/mesh_vertex_n.png
+%%DATADIR%%/resources/smesh/mesh_volume_3d.png
+%%DATADIR%%/resources/smesh/mesh_whatis.png
+%%DATADIR%%/resources/smesh/mesh_wireframe.png
+%%DATADIR%%/resources/smesh/mesh_wrap.png
+%%DATADIR%%/resources/smesh/pattern_sample_2d.png
+%%DATADIR%%/resources/smesh/pattern_sample_3D.png
+%%DATADIR%%/resources/smesh/scale.png
+%%DATADIR%%/resources/smesh/scale_along_axes.png
+%%DATADIR%%/resources/smesh/select1.png
+%%DATADIR%%/resources/smesh/split_into_tetra.png
+%%DATADIR%%/resources/smesh/standard_mesh_info.png
+@dirrm %%DATADIR%%/resources/smesh
@dirrm %%PYTHON_SITELIBDIR%%/salome/StdMeshers__POA
@dirrm %%PYTHON_SITELIBDIR%%/salome/StdMeshers
@dirrm %%PYTHON_SITELIBDIR%%/salome/SMESH__POA
diff --git a/cad/salome-visu/Makefile b/cad/salome-visu/Makefile
index c39d2e779d7a..ed04ef5bd050 100644
--- a/cad/salome-visu/Makefile
+++ b/cad/salome-visu/Makefile
@@ -8,6 +8,7 @@ CATEGORIES= cad science
MASTERDIR= ${.CURDIR}/../salome
+PORTNAME= salome
PKGNAMESUFFIX= -visu
SAL_MODULE_UPPER= VISU
diff --git a/cad/salome-visu/pkg-plist b/cad/salome-visu/pkg-plist
index 04a4676335ef..755e659e96fd 100644
--- a/cad/salome-visu/pkg-plist
+++ b/cad/salome-visu/pkg-plist
@@ -1,350 +1,340 @@
adm_local/unix/config_files/check_VISU.m4
bin/salome/VISUConvertor
bin/salome/VISUPipeLine
-bin/salome/VISU_img2vti
+bin/salome/VISU_Example_01.py
+bin/salome/VISU_Example_02.py
+bin/salome/VISU_Example_03.py
+bin/salome/VISU_Example_04.py
+bin/salome/VISU_Example_05.py
+bin/salome/VISU_Example_06.py
+bin/salome/VISU_Example_07.py
+bin/salome/VISU_Example_08.py
+bin/salome/VISU_Example_09.py
bin/salome/VISU_I
+bin/salome/VISU_img2vti
bin/salome/batchmode_visu.py
bin/salome/batchmode_visu_table.py
+bin/salome/batchmode_visu_view.py
bin/salome/batchmode_visu_view3d.py
-bin/salome/visu_med.py
-bin/salome/visu_view3d.py
+bin/salome/libVISU_Swig.py
bin/salome/visu.py
-bin/salome/visu_gui.py
-bin/salome/visu_prs_example.py
-bin/salome/visu_table.py
-bin/salome/visu_big_table.py
-bin/salome/visu_view.py
-bin/salome/visu_delete.py
-bin/salome/visu_split_views.py
-bin/salome/visu_succcessive_animation.py
bin/salome/visu_apply_properties.py
bin/salome/visu_apply_properties_successive.py
-bin/salome/batchmode_visu_view.py
+bin/salome/visu_big_table.py
bin/salome/visu_cache.py
+bin/salome/visu_delete.py
+bin/salome/visu_evolution.py
+bin/salome/visu_gui.py
+bin/salome/visu_med.py
bin/salome/visu_pointmap3d.py
+bin/salome/visu_prs_example.py
+bin/salome/visu_split_views.py
+bin/salome/visu_succcessive_animation.py
+bin/salome/visu_table.py
+bin/salome/visu_view.py
+bin/salome/visu_view3d.py
bin/salome/visu_view3d_parameters.py
-bin/salome/visu_evolution.py
-bin/salome/VISU_Example_01.py
-bin/salome/VISU_Example_02.py
-bin/salome/VISU_Example_03.py
-bin/salome/VISU_Example_04.py
-bin/salome/VISU_Example_05.py
-bin/salome/VISU_Example_06.py
-bin/salome/VISU_Example_07.py
-bin/salome/libVISU_Swig.py
idl/salome/VISU_Gen.idl
-include/salome/VISU_Gen.hh
-include/salome/VISU_TypeList.hxx
-include/salome/VISU_VTKTypeList.hxx
-include/salome/VISU_IDMapper.hxx
-include/salome/VISU_I.hxx
-include/salome/VISU_ConvertorDef.hxx
-include/salome/VISU_Structures.hxx
-include/salome/VISU_Convertor.hxx
-include/salome/VISU_ConvertorDef_impl.hxx
-include/salome/VISU_Structures_impl.hxx
-include/salome/VISU_MeshValue.hxx
-include/salome/VISU_ElnoMeshValue.hxx
-include/salome/VISU_PointCoords.hxx
-include/salome/VISU_Convertor_impl.hxx
-include/salome/VISU_ConvertorUtils.hxx
-include/salome/VISU_MergeFilter.hxx
-include/salome/VISU_MergeFilterUtilities.hxx
+include/salome/SALOME_ExtractGeometry.h
+include/salome/SALOME_ExtractPolyDataGeometry.h
+include/salome/SALOME_GenericObjPointer.hh
+include/salome/VISUConfig.hh
+include/salome/VISUConvertor.hxx
+include/salome/VISUPipeline.hxx
+include/salome/VISU_Actor.h
+include/salome/VISU_ActorBase.h
+include/salome/VISU_ActorFactory.h
include/salome/VISU_AppendFilter.hxx
-include/salome/VISU_AppendPolyData.hxx
include/salome/VISU_AppendFilterUtilities.hxx
-include/salome/VisuGUI.h
-include/salome/VISU_ExtractUnstructuredGrid.hxx
-include/salome/VISU_UsedPointsFilter.hxx
-include/salome/VISU_CommonCellsFilter.hxx
-include/salome/VISUConvertor.hxx
-include/salome/VISU_MedConvertor.hxx
-include/salome/VISU_GaussMergeFilter.hxx
-include/salome/VISU_TableReader.hxx
-include/salome/VISU_Vtk2MedConvertor.hxx
-include/salome/VISU_MapperHolder.hxx
-include/salome/VISU_DataSetMapperHolder.hxx
-include/salome/VISU_PolyDataMapperHolder.hxx
-include/salome/VISU_PointSpriteMapperHolder.hxx
-include/salome/VISU_PipeLineUtils.hxx
-include/salome/VISU_PipeLine.hxx
-include/salome/VVTK.h
+include/salome/VISU_AppendPolyData.hxx
+include/salome/VISU_BoostSignals.h
+include/salome/VISU_ClippingPlaneMgr.hxx
include/salome/VISU_ColoredPL.hxx
-include/salome/VISU_MergedPL.hxx
-include/salome/VISU_UnstructuredGridPL.hxx
-include/salome/VISU_MeshPL.hxx
-include/salome/VISU_ScalarMapPL.hxx
-include/salome/VISU_CutPlanesPL.hxx
+include/salome/VISU_ColoredPrs3dCache_i.hh
+include/salome/VISU_ColoredPrs3dFactory.hh
+include/salome/VISU_ColoredPrs3dHolder_i.hh
+include/salome/VISU_ColoredPrs3d_i.hh
+include/salome/VISU_CommonCellsFilter.hxx
+include/salome/VISU_Convertor.hxx
+include/salome/VISU_ConvertorDef.hxx
+include/salome/VISU_ConvertorDef_impl.hxx
+include/salome/VISU_ConvertorUtils.hxx
+include/salome/VISU_Convertor_impl.hxx
+include/salome/VISU_CorbaMedConvertor.hxx
include/salome/VISU_CutLinesBasePL.hxx
+include/salome/VISU_CutLinesBase_i.hh
include/salome/VISU_CutLinesPL.hxx
+include/salome/VISU_CutLines_i.hh
+include/salome/VISU_CutPlanesPL.hxx
+include/salome/VISU_CutPlanes_i.hh
include/salome/VISU_CutSegmentPL.hxx
-include/salome/VISU_IsoSurfacesPL.hxx
+include/salome/VISU_CutSegment_i.hh
+include/salome/VISU_DataSetActor.h
+include/salome/VISU_DataSetMapperHolder.hxx
+include/salome/VISU_DeformationPL.hxx
+include/salome/VISU_Deformation_i.hh
+include/salome/VISU_DeformedGridPL.hxx
+include/salome/VISU_DeformedShapeAndScalarMapPL.hxx
+include/salome/VISU_DeformedShapeAndScalarMap_i.hh
include/salome/VISU_DeformedShapePL.hxx
-include/salome/VISU_VectorsPL.hxx
-include/salome/VISU_StreamLinesPL.hxx
-include/salome/VISU_LookupTable.hxx
-include/salome/VISU_ScalarBarActor.hxx
+include/salome/VISU_DeformedShape_i.hh
+include/salome/VISU_ElnoAssembleFilter.hxx
+include/salome/VISU_ElnoDisassembleFilter.hxx
+include/salome/VISU_ElnoMeshValue.hxx
+include/salome/VISU_Engine_i.hh
+include/salome/VISU_Event.h
+include/salome/VISU_Evolution.h
+include/salome/VISU_ExtractUnstructuredGrid.hxx
include/salome/VISU_Extractor.hxx
include/salome/VISU_FieldTransform.hxx
-include/salome/VISU_MaskPointsFilter.hxx
-include/salome/VISU_PolyDataPL.hxx
+include/salome/VISU_GaussMergeFilter.hxx
include/salome/VISU_GaussPointsPL.hxx
-include/salome/VISU_Plot3DPL.hxx
-include/salome/VISU_DeformedGridPL.hxx
-include/salome/VISU_OpenGLPointSpriteMapper.hxx
+include/salome/VISU_GaussPoints_i.hh
+include/salome/VISU_GaussPtsAct.h
+include/salome/VISU_GaussPtsActorFactory.h
+include/salome/VISU_GaussPtsDeviceActor.h
+include/salome/VISU_GaussPtsSettings.h
+include/salome/VISU_Gen.hh
+include/salome/VISU_Gen_i.hh
+include/salome/VISU_Gen_s.hh
+include/salome/VISU_I.hxx
+include/salome/VISU_IDMapper.hxx
include/salome/VISU_ImplicitFunctionWidget.hxx
-include/salome/SALOME_ExtractGeometry.h
-include/salome/SALOME_ExtractPolyDataGeometry.h
-include/salome/VISU_ScalarBarCtrl.hxx
-include/salome/VISU_PlanesWidget.hxx
-include/salome/VISU_SphereWidget.hxx
-include/salome/VISU_WidgetCtrl.hxx
-include/salome/VISUPipeline.hxx
-include/salome/VISU_DeformedShapeAndScalarMapPL.hxx
+include/salome/VISU_IsoSurfActor.h
+include/salome/VISU_IsoSurfacesPL.hxx
+include/salome/VISU_IsoSurfaces_i.hh
include/salome/VISU_LabelPointsFilter.hxx
-include/salome/VISU_ElnoDisassembleFilter.hxx
-include/salome/VISU_ElnoAssembleFilter.hxx
-include/salome/VISU_DeformationPL.hxx
+include/salome/VISU_LookupTable.hxx
+include/salome/VISU_MapperHolder.hxx
+include/salome/VISU_MaskPointsFilter.hxx
+include/salome/VISU_MedConvertor.hxx
+include/salome/VISU_MergeFilter.hxx
+include/salome/VISU_MergeFilterUtilities.hxx
+include/salome/VISU_MergedPL.hxx
+include/salome/VISU_MeshAct.h
+include/salome/VISU_MeshPL.hxx
+include/salome/VISU_MeshValue.hxx
+include/salome/VISU_Mesh_i.hh
+include/salome/VISU_MonoColorPrs_i.hh
+include/salome/VISU_MultiResult_i.hh
+include/salome/VISU_OBJECT.h
+include/salome/VISU_OpenGLPointSpriteMapper.hxx
include/salome/VISU_OptionalDeformationPL.hxx
-include/salome/VISU_XYPlotActor.hxx
-include/salome/VISU_BoostSignals.h
-include/salome/VISU_ActorFactory.h
+include/salome/VISU_OptionalDeformation_i.hh
include/salome/VISU_PickingSettings.h
-include/salome/VISU_GaussPtsSettings.h
-include/salome/VISU_GaussPtsActorFactory.h
-include/salome/VISU_GaussPtsDeviceActor.h
-include/salome/VISU_Event.h
-include/salome/VISU_Actor.h
-include/salome/VISU_DataSetActor.h
-include/salome/VISU_MeshAct.h
-include/salome/VISU_ScalarMapAct.h
-include/salome/VISU_GaussPtsAct.h
-include/salome/VISU_VectorsAct.h
+include/salome/VISU_PipeLine.hxx
+include/salome/VISU_PipeLineUtils.hxx
+include/salome/VISU_PlanesWidget.hxx
+include/salome/VISU_Plot3DPL.hxx
+include/salome/VISU_Plot3D_i.hh
+include/salome/VISU_PointCoords.hxx
include/salome/VISU_PointMap3dActor.h
-include/salome/VISU_ActorBase.h
-include/salome/VISU_IsoSurfActor.h
-include/salome/VISU_SelectVisiblePoints.h
-include/salome/VISU_OBJECT.h
-include/salome/VVTK_PrimitiveBox.h
-include/salome/VVTK_SizeBox.h
-include/salome/VisuGUI_TableDlg.h
-include/salome/VisuGUITools.h
-include/salome/VISUConfig.hh
-include/salome/VISU_Gen_i.hh
-include/salome/VISU_Tools.h
-include/salome/VISU_Result_i.hh
-include/salome/VISU_Table_i.hh
-include/salome/VISU_MultiResult_i.hh
-include/salome/VISU_PrsObject_i.hh
-include/salome/VISU_ResultUtils.hh
include/salome/VISU_PointMap3d_i.hh
+include/salome/VISU_PointSpriteMapperHolder.hxx
+include/salome/VISU_PolyDataMapperHolder.hxx
+include/salome/VISU_PolyDataPL.hxx
+include/salome/VISU_Prs3dUtils.hh
include/salome/VISU_Prs3d_i.hh
-include/salome/VISU_Mesh_i.hh
-include/salome/VISU_ColoredPrs3d_i.hh
-include/salome/VISU_CorbaMedConvertor.hxx
+include/salome/VISU_PrsObject_i.hh
+include/salome/VISU_ResultUtils.hh
+include/salome/VISU_Result_i.hh
+include/salome/VISU_ScalarBarActor.hxx
+include/salome/VISU_ScalarBarCtrl.hxx
+include/salome/VISU_ScalarMapAct.h
+include/salome/VISU_ScalarMapPL.hxx
include/salome/VISU_ScalarMap_i.hh
-include/salome/VISU_IsoSurfaces_i.hh
-include/salome/VISU_DeformedShape_i.hh
-include/salome/VISU_Plot3D_i.hh
-include/salome/VISU_CutPlanes_i.hh
-include/salome/VISU_CutLinesBase_i.hh
-include/salome/VISU_CutLines_i.hh
-include/salome/VISU_CutSegment_i.hh
-include/salome/VISU_Prs3dUtils.hh
-include/salome/VISU_Vectors_i.hh
+include/salome/VISU_SelectVisiblePoints.h
+include/salome/VISU_SphereWidget.hxx
+include/salome/VISU_StreamLine.hxx
+include/salome/VISU_StreamLinesPL.hxx
include/salome/VISU_StreamLines_i.hh
-include/salome/VISU_GaussPoints_i.hh
+include/salome/VISU_Streamer.hxx
+include/salome/VISU_Structures.hxx
+include/salome/VISU_Structures_impl.hxx
+include/salome/VISU_TableDlg.h
+include/salome/VISU_TableReader.hxx
+include/salome/VISU_Table_i.hh
+include/salome/VISU_TimeAnimation.h
+include/salome/VISU_Tools.h
+include/salome/VISU_TypeList.hxx
+include/salome/VISU_UnstructuredGridPL.hxx
+include/salome/VISU_UsedPointsFilter.hxx
+include/salome/VISU_VTKTypeList.hxx
+include/salome/VISU_VectorsAct.h
+include/salome/VISU_VectorsPL.hxx
+include/salome/VISU_Vectors_i.hh
include/salome/VISU_ViewManager_i.hh
include/salome/VISU_View_i.hh
-include/salome/VISU_TimeAnimation.h
-include/salome/VISU_Evolution.h
-include/salome/VISU_DeformedShapeAndScalarMap_i.hh
-include/salome/VISU_ColoredPrs3dCache_i.hh
-include/salome/VISU_ColoredPrs3dHolder_i.hh
-include/salome/VISU_ColoredPrs3dFactory.hh
-include/salome/VISU_MonoColorPrs_i.hh
-include/salome/VISU_Deformation_i.hh
-include/salome/VISU_OptionalDeformation_i.hh
-include/salome/SALOME_GenericObjPointer.hh
-include/salome/VISU_ClippingPlaneMgr.hxx
-include/salome/VisuGUI_Tools.h
-include/salome/VisuGUI_Prs3dTools.h
+include/salome/VISU_Vtk2MedConvertor.hxx
+include/salome/VISU_WidgetCtrl.hxx
+include/salome/VISU_XYPlotActor.hxx
+include/salome/VISU_version.h
+include/salome/VisuGUI.h
include/salome/VisuGUI_ActionsDef.h
-include/salome/VisuGUI_Module.h
-include/salome/VisuGUI_Selection.h
-include/salome/VisuGUI_ViewTools.h
-include/salome/VisuGUI_NameDlg.h
-include/salome/VisuGUI_FileDlg.h
-include/salome/VisuGUI_CursorDlg.h
-include/salome/VisuGUI_TimeAnimation.h
-include/salome/VisuGUI_EvolutionDlg.h
-include/salome/VisuGUI_EditContainerDlg.h
+include/salome/VisuGUI_BuildProgressDlg.h
include/salome/VisuGUI_ClippingDlg.h
+include/salome/VisuGUI_CursorDlg.h
+include/salome/VisuGUI_CutLinesDlg.h
+include/salome/VisuGUI_CutPlanesDlg.h
+include/salome/VisuGUI_CutSegmentDlg.h
+include/salome/VisuGUI_DeformedShapeAndScalarMapDlg.h
+include/salome/VisuGUI_DeformedShapeDlg.h
include/salome/VisuGUI_DialogRunner.h
+include/salome/VisuGUI_Displayer.h
+include/salome/VisuGUI_EditContainerDlg.h
+include/salome/VisuGUI_EvolutionDlg.h
+include/salome/VisuGUI_FieldFilter.h
+include/salome/VisuGUI_FileDlg.h
+include/salome/VisuGUI_GaussPointsDlg.h
+include/salome/VisuGUI_InputPane.h
+include/salome/VisuGUI_IsoSurfacesDlg.h
+include/salome/VisuGUI_Module.h
+include/salome/VisuGUI_NameDlg.h
include/salome/VisuGUI_OffsetDlg.h
+include/salome/VisuGUI_Plot3DDlg.h
+include/salome/VisuGUI_PrimitiveBox.h
include/salome/VisuGUI_Prs3dDlg.h
+include/salome/VisuGUI_Prs3dTools.h
include/salome/VisuGUI_ScalarBarDlg.h
-include/salome/VisuGUI_Plot3DDlg.h
-include/salome/VisuGUI_GaussPointsDlg.h
-include/salome/VisuGUI_DeformedShapeDlg.h
-include/salome/VisuGUI_IsoSurfacesDlg.h
-include/salome/VisuGUI_CutLinesDlg.h
-include/salome/VisuGUI_CutSegmentDlg.h
-include/salome/VisuGUI_CutPlanesDlg.h
-include/salome/VisuGUI_StreamLinesDlg.h
-include/salome/VisuGUI_VectorsDlg.h
-include/salome/VisuGUI_Displayer.h
-include/salome/VisuGUI_DeformedShapeAndScalarMapDlg.h
+include/salome/VisuGUI_Selection.h
include/salome/VisuGUI_SetupPlot2dDlg.h
-include/salome/VisuGUI_BuildProgressDlg.h
-include/salome/VisuGUI_Timer.h
-include/salome/VisuGUI_TransparencyDlg.h
include/salome/VisuGUI_ShrinkFactorDlg.h
+include/salome/VisuGUI_SizeBox.h
include/salome/VisuGUI_Slider.h
-include/salome/VisuGUI_InputPane.h
-include/salome/VisuGUI_FieldFilter.h
+include/salome/VisuGUI_StreamLinesDlg.h
+include/salome/VisuGUI_TimeAnimation.h
+include/salome/VisuGUI_Timer.h
+include/salome/VisuGUI_Tools.h
+include/salome/VisuGUI_TransparencyDlg.h
include/salome/VisuGUI_ValuesLabelingDlg.h
+include/salome/VisuGUI_VectorsDlg.h
+include/salome/VisuGUI_ViewTools.h
include/salome/libVISU_Swig.i
-include/salome/VISU_Gen_s.hh
-include/salome/VISU_Engine_i.hh
-include/salome/VISU_version.h
-%%PYTHON_SITELIBDIR%%/salome/shared_modules/VISU_shared_modules.py
-%%PYTHON_SITELIBDIR%%/salome/VISU_Gen_idl.py
%%PYTHON_SITELIBDIR%%/salome/VISU/__init__.py
+%%PYTHON_SITELIBDIR%%/salome/VISU_Gen_idl.py
%%PYTHON_SITELIBDIR%%/salome/VISU__POA/__init__.py
-lib/salome/libVVTK.so
-lib/salome/libSalomeIDLVISU.so.0
-lib/salome/libSalomeIDLVISU.so
+%%PYTHON_SITELIBDIR%%/salome/shared_modules/VISU_shared_modules.py
+lib/salome/_libVISU_Swig.la
+lib/salome/_libVISU_Swig.so
+lib/salome/_libVISU_Swig.so.0
lib/salome/libSalomeIDLVISU.la
-lib/salome/libVisuConvertor.so.0
-lib/salome/libVisuConvertor.so
-lib/salome/libVisuConvertor.la
-lib/salome/libVisuPipeLine.so.0
-lib/salome/libVisuPipeLine.so
-lib/salome/libVisuPipeLine.la
-lib/salome/libVisuObject.so.0
-lib/salome/libVisuObject.so
-lib/salome/libVisuObject.la
-lib/salome/libVVTK.so.0
-lib/salome/libVVTK.la
-lib/salome/libVISUGUITOOLS.so.0
-lib/salome/libVISUGUITOOLS.so
-lib/salome/libVISUGUITOOLS.la
-lib/salome/libVISUEngineImpl.so.0
-lib/salome/libVISUEngineImpl.so
-lib/salome/libVISUEngineImpl.la
-lib/salome/libVISU.so.0
-lib/salome/libVISU.so
+lib/salome/libSalomeIDLVISU.so
+lib/salome/libSalomeIDLVISU.so.0
lib/salome/libVISU.la
-lib/salome/_libVISU_Swig.so.0
-lib/salome/_libVISU_Swig.so
-lib/salome/_libVISU_Swig.la
-lib/salome/libVISUEngine.so.0
-lib/salome/libVISUEngine.so
+lib/salome/libVISU.so
+lib/salome/libVISU.so.0
lib/salome/libVISUEngine.la
-share/salome/resources/visu/ModuleVisu.png
-share/salome/resources/visu/SalomeApp.xml
-share/salome/resources/visu/sprite_alpha.bmp
-share/salome/resources/visu/sprite_texture.bmp
-share/salome/resources/visu/Vertex_Program_ARB.txt
-share/salome/resources/visu/Visu_actor_selection.png
-share/salome/resources/visu/Visu_add.png
-share/salome/resources/visu/Visu_apply.png
-share/salome/resources/visu/Visu_anim.png
-share/salome/resources/visu/Visu_cell_selection.png
-share/salome/resources/visu/Visu_close.png
-share/salome/resources/visu/VISU.config
-share/salome/resources/visu/Visu_cutlines.png
-share/salome/resources/visu/Visu_cutsegment.png
-share/salome/resources/visu/Visu_cutplanes.png
-share/salome/resources/visu/Visu_deformed_anim.png
-share/salome/resources/visu/Visu_deformed.png
-share/salome/resources/visu/VISU_en.xml
-share/salome/resources/visu/Visu_eraseall.png
-share/salome/resources/visu/VISU_fr.xml
-share/salome/resources/visu/Visu_gauss_point_selection.png
-share/salome/resources/visu/Visu_gauss_points.png
-share/salome/resources/visu/Visu_graduated_axes.png
-share/salome/resources/visu/Visu_help.png
-share/salome/resources/visu/Visu_import_med.png
-share/salome/resources/visu/Visu_isosurfaces.png
-share/salome/resources/visu/Visu_load_texture.png
-share/salome/resources/visu/Visu_ok.png
-share/salome/resources/visu/Visu_PlaneSegmentation.png
-share/salome/resources/visu/Visu_plot2d.png
-share/salome/resources/visu/Visu_plot3d.png
-share/salome/resources/visu/Visu_point_selection.png
-share/salome/resources/visu/Visu_points.png
-share/salome/resources/visu/Visu_recording_pause.png
-share/salome/resources/visu/Visu_recording_play.png
-share/salome/resources/visu/Visu_recording_start.png
-share/salome/resources/visu/Visu_recording_stop.png
-share/salome/resources/visu/Visu_remove.png
-share/salome/resources/visu/Visu_sameas.png
-share/salome/resources/visu/Visu_scalarmapondeformedshape.png
-share/salome/resources/visu/Visu_scalars_anim.png
-share/salome/resources/visu/Visu_scalars.png
-share/salome/resources/visu/Visu_scaling.png
-share/salome/resources/visu/Visu_selectall.png
-share/salome/resources/visu/Visu_selection_panel.png
-share/salome/resources/visu/Visu_slider_panel.png
-share/salome/resources/visu/Visu_sweep_panel.png
-share/salome/resources/visu/Visu_selectionactor.png
-share/salome/resources/visu/Visu_selectioncell.png
-share/salome/resources/visu/Visu_selectionedge.png
-share/salome/resources/visu/Visu_selectionpoint.png
-share/salome/resources/visu/Visu_selectonly.png
-share/salome/resources/visu/Visu_SphereSegmentation.png
-share/salome/resources/visu/Visu_streamlines.png
-share/salome/resources/visu/Visu_surface.png
-share/salome/resources/visu/Visu_tree_container.png
-share/salome/resources/visu/Visu_tree_curve.png
-share/salome/resources/visu/Visu_tree_cutlines_gr.png
-share/salome/resources/visu/Visu_tree_cutlines.png
-share/salome/resources/visu/Visu_tree_cutsegment_gr.png
-share/salome/resources/visu/Visu_tree_cutsegment.png
-share/salome/resources/visu/Visu_tree_cutplanes_gr.png
-share/salome/resources/visu/Visu_tree_cutplanes.png
-share/salome/resources/visu/Visu_tree_deformed_gr.png
-share/salome/resources/visu/Visu_tree_deformed.png
-share/salome/resources/visu/Visu_tree_gauss_points.png
-share/salome/resources/visu/Visu_tree_isosurfaces_gr.png
-share/salome/resources/visu/Visu_tree_isosurfaces.png
-share/salome/resources/visu/Visu_tree_mesh.png
-share/salome/resources/visu/Visu_tree_multipr_full.png
-share/salome/resources/visu/Visu_tree_multipr_hide.png
-share/salome/resources/visu/Visu_tree_multipr_low.png
-share/salome/resources/visu/Visu_tree_multipr_medium.png
-share/salome/resources/visu/Visu_tree_plot3d_gr.png
-share/salome/resources/visu/Visu_tree_plot3d.png
-share/salome/resources/visu/Visu_tree_result.png
-share/salome/resources/visu/Visu_tree_scalarmapondeformedshape_gr.png
-share/salome/resources/visu/Visu_tree_scalarmapondeformedshape.png
-share/salome/resources/visu/Visu_tree_scalars_gr.png
-share/salome/resources/visu/Visu_tree_table.png
-share/salome/resources/visu/Visu_tree_scalars.png
-share/salome/resources/visu/Visu_tree_streamlines_gr.png
-share/salome/resources/visu/Visu_tree_streamlines.png
-share/salome/resources/visu/Visu_tree_vectors_gr.png
-share/salome/resources/visu/Visu_tree_vectors.png
-share/salome/resources/visu/Visu_tree_visu.png
-share/salome/resources/visu/Visu_vectors.png
-share/salome/resources/visu/Visu_vvtk_switch.png
-share/salome/resources/visu/Visu_wireframe.png
-share/salome/resources/visu/Visu_slider_more.png
-share/salome/resources/visu/Visu_slider_avi.png
-share/salome/resources/visu/Visu_slider_first.png
-share/salome/resources/visu/Visu_slider_previous.png
-share/salome/resources/visu/Visu_slider_play.png
-share/salome/resources/visu/Visu_slider_pause.png
-share/salome/resources/visu/VISUCatalog.xml
-share/salome/resources/visu/Visu_slider_next.png
-share/salome/resources/visu/Visu_holo_render.png
-share/salome/resources/visu/Visu_slider_last.png
-share/salome/resources/visu/Visu_DeactivatePlane.png
-share/salome/resources/visu/Visu_planemanager.png
-share/salome/resources/visu/VISU_msg_en.qm
-share/salome/resources/visu/VISU_images.qm
-@dirrm share/salome/resources/visu
+lib/salome/libVISUEngine.so
+lib/salome/libVISUEngine.so.0
+lib/salome/libVISUEngineImpl.la
+lib/salome/libVISUEngineImpl.so
+lib/salome/libVISUEngineImpl.so.0
+lib/salome/libVisuConvertor.la
+lib/salome/libVisuConvertor.so
+lib/salome/libVisuConvertor.so.0
+lib/salome/libVisuObject.la
+lib/salome/libVisuObject.so
+lib/salome/libVisuObject.so.0
+lib/salome/libVisuPipeLine.la
+lib/salome/libVisuPipeLine.so
+lib/salome/libVisuPipeLine.so.0
+%%DATADIR%%/resources/visu/ModuleVisu.png
+%%DATADIR%%/resources/visu/SalomeApp.xml
+%%DATADIR%%/resources/visu/VISU.config
+%%DATADIR%%/resources/visu/VISUCatalog.xml
+%%DATADIR%%/resources/visu/VISU_en.xml
+%%DATADIR%%/resources/visu/VISU_fr.xml
+%%DATADIR%%/resources/visu/VISU_images.qm
+%%DATADIR%%/resources/visu/VISU_msg_en.qm
+%%DATADIR%%/resources/visu/Vertex_Program_ARB.txt
+%%DATADIR%%/resources/visu/Visu_DeactivatePlane.png
+%%DATADIR%%/resources/visu/Visu_actor_selection.png
+%%DATADIR%%/resources/visu/Visu_add.png
+%%DATADIR%%/resources/visu/Visu_anim.png
+%%DATADIR%%/resources/visu/Visu_apply.png
+%%DATADIR%%/resources/visu/Visu_cell_selection.png
+%%DATADIR%%/resources/visu/Visu_close.png
+%%DATADIR%%/resources/visu/Visu_cutlines.png
+%%DATADIR%%/resources/visu/Visu_cutplanes.png
+%%DATADIR%%/resources/visu/Visu_cutsegment.png
+%%DATADIR%%/resources/visu/Visu_deformed.png
+%%DATADIR%%/resources/visu/Visu_deformed_anim.png
+%%DATADIR%%/resources/visu/Visu_eraseall.png
+%%DATADIR%%/resources/visu/Visu_gauss_point_selection.png
+%%DATADIR%%/resources/visu/Visu_gauss_points.png
+%%DATADIR%%/resources/visu/Visu_graduated_axes.png
+%%DATADIR%%/resources/visu/Visu_help.png
+%%DATADIR%%/resources/visu/Visu_holo_render.png
+%%DATADIR%%/resources/visu/Visu_import_med.png
+%%DATADIR%%/resources/visu/Visu_isosurfaces.png
+%%DATADIR%%/resources/visu/Visu_load_texture.png
+%%DATADIR%%/resources/visu/Visu_ok.png
+%%DATADIR%%/resources/visu/Visu_planemanager.png
+%%DATADIR%%/resources/visu/Visu_plot2d.png
+%%DATADIR%%/resources/visu/Visu_plot3d.png
+%%DATADIR%%/resources/visu/Visu_point_selection.png
+%%DATADIR%%/resources/visu/Visu_points.png
+%%DATADIR%%/resources/visu/Visu_recording_stop.png
+%%DATADIR%%/resources/visu/Visu_remove.png
+%%DATADIR%%/resources/visu/Visu_sameas.png
+%%DATADIR%%/resources/visu/Visu_scalarmapondeformedshape.png
+%%DATADIR%%/resources/visu/Visu_scalars.png
+%%DATADIR%%/resources/visu/Visu_scalars_anim.png
+%%DATADIR%%/resources/visu/Visu_scaling.png
+%%DATADIR%%/resources/visu/Visu_selectall.png
+%%DATADIR%%/resources/visu/Visu_selection_panel.png
+%%DATADIR%%/resources/visu/Visu_selectionactor.png
+%%DATADIR%%/resources/visu/Visu_selectioncell.png
+%%DATADIR%%/resources/visu/Visu_selectionedge.png
+%%DATADIR%%/resources/visu/Visu_selectionpoint.png
+%%DATADIR%%/resources/visu/Visu_selectonly.png
+%%DATADIR%%/resources/visu/Visu_slider_avi.png
+%%DATADIR%%/resources/visu/Visu_slider_first.png
+%%DATADIR%%/resources/visu/Visu_slider_last.png
+%%DATADIR%%/resources/visu/Visu_slider_more.png
+%%DATADIR%%/resources/visu/Visu_slider_next.png
+%%DATADIR%%/resources/visu/Visu_slider_panel.png
+%%DATADIR%%/resources/visu/Visu_slider_pause.png
+%%DATADIR%%/resources/visu/Visu_slider_play.png
+%%DATADIR%%/resources/visu/Visu_slider_previous.png
+%%DATADIR%%/resources/visu/Visu_streamlines.png
+%%DATADIR%%/resources/visu/Visu_surface.png
+%%DATADIR%%/resources/visu/Visu_sweep_panel.png
+%%DATADIR%%/resources/visu/Visu_tree_container.png
+%%DATADIR%%/resources/visu/Visu_tree_curve.png
+%%DATADIR%%/resources/visu/Visu_tree_cutlines.png
+%%DATADIR%%/resources/visu/Visu_tree_cutlines_gr.png
+%%DATADIR%%/resources/visu/Visu_tree_cutplanes.png
+%%DATADIR%%/resources/visu/Visu_tree_cutplanes_gr.png
+%%DATADIR%%/resources/visu/Visu_tree_cutsegment.png
+%%DATADIR%%/resources/visu/Visu_tree_cutsegment_gr.png
+%%DATADIR%%/resources/visu/Visu_tree_deformed.png
+%%DATADIR%%/resources/visu/Visu_tree_deformed_gr.png
+%%DATADIR%%/resources/visu/Visu_tree_gauss_points.png
+%%DATADIR%%/resources/visu/Visu_tree_isosurfaces.png
+%%DATADIR%%/resources/visu/Visu_tree_isosurfaces_gr.png
+%%DATADIR%%/resources/visu/Visu_tree_mesh.png
+%%DATADIR%%/resources/visu/Visu_tree_multipr_full.png
+%%DATADIR%%/resources/visu/Visu_tree_multipr_hide.png
+%%DATADIR%%/resources/visu/Visu_tree_multipr_low.png
+%%DATADIR%%/resources/visu/Visu_tree_multipr_medium.png
+%%DATADIR%%/resources/visu/Visu_tree_plot3d.png
+%%DATADIR%%/resources/visu/Visu_tree_plot3d_gr.png
+%%DATADIR%%/resources/visu/Visu_tree_result.png
+%%DATADIR%%/resources/visu/Visu_tree_scalarmapondeformedshape.png
+%%DATADIR%%/resources/visu/Visu_tree_scalarmapondeformedshape_gr.png
+%%DATADIR%%/resources/visu/Visu_tree_scalars.png
+%%DATADIR%%/resources/visu/Visu_tree_scalars_gr.png
+%%DATADIR%%/resources/visu/Visu_tree_streamlines.png
+%%DATADIR%%/resources/visu/Visu_tree_streamlines_gr.png
+%%DATADIR%%/resources/visu/Visu_tree_table.png
+%%DATADIR%%/resources/visu/Visu_tree_vectors.png
+%%DATADIR%%/resources/visu/Visu_tree_vectors_gr.png
+%%DATADIR%%/resources/visu/Visu_tree_visu.png
+%%DATADIR%%/resources/visu/Visu_vectors.png
+%%DATADIR%%/resources/visu/Visu_wireframe.png
+%%DATADIR%%/resources/visu/sprite_alpha.bmp
+%%DATADIR%%/resources/visu/sprite_texture.bmp
+@dirrm %%DATADIR%%/resources/visu
@dirrm %%PYTHON_SITELIBDIR%%/salome/VISU__POA
@dirrm %%PYTHON_SITELIBDIR%%/salome/VISU
diff --git a/cad/salome-yacs/Makefile b/cad/salome-yacs/Makefile
index 0c3d6fecdc9c..e6172e417057 100644
--- a/cad/salome-yacs/Makefile
+++ b/cad/salome-yacs/Makefile
@@ -8,6 +8,7 @@ CATEGORIES= cad science
MASTERDIR= ${.CURDIR}/../salome
+PORTNAME= salome
PKGNAMESUFFIX= -yacs
SAL_MODULE_UPPER= YACS
diff --git a/cad/salome-yacs/files/patch-runtime_DistributedPythonNode.cxx b/cad/salome-yacs/files/patch-runtime_DistributedPythonNode.cxx
new file mode 100644
index 000000000000..d733d1152dd8
--- /dev/null
+++ b/cad/salome-yacs/files/patch-runtime_DistributedPythonNode.cxx
@@ -0,0 +1,18 @@
+--- src/runtime/DistributedPythonNode.cxx.orig 2010-11-08 15:29:37.000000000 +0600
++++ src/runtime/DistributedPythonNode.cxx 2010-11-08 15:29:44.000000000 +0600
+@@ -17,6 +17,7 @@
+ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+ //
+
++#include "PyStdout.hxx"
+ #include "DistributedPythonNode.hxx"
+ #include "RuntimeSALOME.hxx"
+ #include "SalomeContainer.hxx"
+@@ -24,7 +25,6 @@
+
+ #include "PythonPorts.hxx"
+ #include "YacsTrace.hxx"
+-#include "PyStdout.hxx"
+
+ using namespace YACS::ENGINE;
+ using namespace std;
diff --git a/cad/salome-yacs/files/patch-src_engine_swig_Makefile.am b/cad/salome-yacs/files/patch-src_engine_swig_Makefile.am
index d8d17d0072ab..b4c5df4334ec 100644
--- a/cad/salome-yacs/files/patch-src_engine_swig_Makefile.am
+++ b/cad/salome-yacs/files/patch-src_engine_swig_Makefile.am
@@ -1,23 +1,26 @@
---- src/engine_swig/Makefile.am.orig 2010-05-07 11:14:01.000000000 +0700
-+++ src/engine_swig/Makefile.am 2010-05-07 11:14:33.000000000 +0700
-@@ -21,9 +21,6 @@
+--- src/engine_swig/Makefile.am.orig 2010-11-12 14:52:29.000000000 +0600
++++ src/engine_swig/Makefile.am 2010-11-12 14:53:06.000000000 +0600
+@@ -22,9 +22,9 @@
BUILT_SOURCES = pilotWRAP.cxx pypilotWRAP.cxx pypilotWRAP.h pilotWRAP.h
MYSWIG_FLAGS = -noexcept -DYACS_PTHREAD -I$(srcdir)/../bases -I$(srcdir)/../engine
-if DOXYGEN_IS_OK
-MYSWIG_FLAGS += -DDOXYGEN_IS_OK
-endif
++#if DOXYGEN_IS_OK
++#MYSWIG_FLAGS += -DDOXYGEN_IS_OK
++#endif
salomepython_PYTHON = pilot.py pypilot.py
salomepyexec_LTLIBRARIES = _pilot.la _pypilot.la
-@@ -81,8 +78,8 @@
+@@ -82,8 +82,8 @@
_pypilot_la_LIBADD = ../engine/libYACSlibEngine.la $(OMNIORB_LIBS) $(PYTHON_LIBS)
docengine.i:$(SWIGINCLUDES)
-- (cd $(srcdir)/../engine;doxygen ../../Misc/Doxyfile)
-- python $(top_srcdir)/Misc/doxy2swig.py -n $(srcdir)/../engine/xml/index.xml docengine.i;rm -rf $(srcdir)/../engine/xml
-+# (cd $(srcdir)/../engine;doxygen ../../Misc/Doxyfile)
-+# python $(top_srcdir)/Misc/doxy2swig.py -n $(srcdir)/../engine/xml/index.xml docengine.i;rm -rf $(srcdir)/../engine/xml
+- DOXSRCDIR=$(top_srcdir)/src/engine doxygen $(top_srcdir)/Misc/Doxyfile
+- $(PYTHON) $(top_srcdir)/Misc/doxy2swig.py -n xml/index.xml docengine.i
++# DOXSRCDIR=$(top_srcdir)/src/engine doxygen $(top_srcdir)/Misc/Doxyfile
++# $(PYTHON) $(top_srcdir)/Misc/doxy2swig.py -n xml/index.xml docengine.i
EXTRA_DIST = ExecutorSwig.hxx pilot.i pypilot.i engtypemaps.i pypilotWRAP.h
diff --git a/cad/salome-yacs/files/patch-src_runtime_SalomeOptimizerLoop.cxx b/cad/salome-yacs/files/patch-src_runtime_SalomeOptimizerLoop.cxx
new file mode 100644
index 000000000000..77414d0adf5d
--- /dev/null
+++ b/cad/salome-yacs/files/patch-src_runtime_SalomeOptimizerLoop.cxx
@@ -0,0 +1,14 @@
+--- src/runtime/SalomeOptimizerLoop.cxx.orig 2010-11-08 13:35:05.000000000 +0600
++++ src/runtime/SalomeOptimizerLoop.cxx 2010-11-08 13:35:25.000000000 +0600
+@@ -17,10 +17,10 @@
+ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+ //
+
++#include "PyStdout.hxx"
+ #include "SalomeOptimizerLoop.hxx"
+ #include <Python.h>
+ #include "TypeCode.hxx"
+-#include "PyStdout.hxx"
+
+ //#define _DEVDEBUG_
+ #include "YacsTrace.hxx"
diff --git a/cad/salome-yacs/files/patch-src_runtime_swig_Makefile.am b/cad/salome-yacs/files/patch-src_runtime_swig_Makefile.am
index 10ad7cb00690..b5a7cda028dd 100644
--- a/cad/salome-yacs/files/patch-src_runtime_swig_Makefile.am
+++ b/cad/salome-yacs/files/patch-src_runtime_swig_Makefile.am
@@ -1,24 +1,26 @@
---- src/runtime_swig/Makefile.am.orig 2010-05-07 11:24:21.000000000 +0700
-+++ src/runtime_swig/Makefile.am 2010-05-07 11:24:45.000000000 +0700
-@@ -30,10 +30,6 @@
+--- src/runtime_swig/Makefile.am.orig 2010-11-12 14:53:23.000000000 +0600
++++ src/runtime_swig/Makefile.am 2010-11-12 14:53:33.000000000 +0600
+@@ -31,9 +31,9 @@
MYSWIG_FLAGS = -noexcept -DYACS_PTHREAD -I$(srcdir)/../bases -I$(srcdir)/../engine -I$(srcdir)/../runtime \
-I$(srcdir)/../engine_swig -I../engine_swig
-if DOXYGEN_IS_OK
-MYSWIG_FLAGS += -DDOXYGEN_IS_OK
-endif
--
++#if DOXYGEN_IS_OK
++#MYSWIG_FLAGS += -DDOXYGEN_IS_OK
++#endif
+
RUNTIMEINCLUDES= RuntimeSALOME.hxx SALOMEDispatcher.hxx SalomeProc.hxx PythonNode.hxx PythonPorts.hxx \
CORBANode.hxx CORBAPorts.hxx TypeConversions.hxx SalomeOptimizerLoop.hxx
-
-@@ -61,8 +57,8 @@
+@@ -62,8 +62,8 @@
_SALOMERuntime_la_LIBADD = ../runtime/libYACSRuntimeSALOME.la
docruntime.i:$(SWIGINCLUDES)
-- (cd $(srcdir)/../runtime;doxygen ../../Misc/Doxyfile)
-- python $(top_srcdir)/Misc/doxy2swig.py -n $(srcdir)/../runtime/xml/index.xml docruntime.i;rm -rf $(srcdir)/../runtime/xml
-+# (cd $(srcdir)/../runtime;doxygen ../../Misc/Doxyfile)
-+# python $(top_srcdir)/Misc/doxy2swig.py -n $(srcdir)/../runtime/xml/index.xml docruntime.i;rm -rf $(srcdir)/../runtime/xml
+- DOXSRCDIR=$(top_srcdir)/src/runtime doxygen $(top_srcdir)/Misc/Doxyfile
+- $(PYTHON) $(top_srcdir)/Misc/doxy2swig.py -n xml/index.xml docruntime.i
++# DOXSRCDIR=$(top_srcdir)/src/runtime doxygen $(top_srcdir)/Misc/Doxyfile
++# $(PYTHON) $(top_srcdir)/Misc/doxy2swig.py -n xml/index.xml docruntime.i
EXTRA_DIST = SALOMERuntime.i
diff --git a/cad/salome-yacs/files/patch-src_salomegui_swig_Makefile.am b/cad/salome-yacs/files/patch-src_salomegui_swig_Makefile.am
index 323cd723dd44..69bf0a5a4a5c 100644
--- a/cad/salome-yacs/files/patch-src_salomegui_swig_Makefile.am
+++ b/cad/salome-yacs/files/patch-src_salomegui_swig_Makefile.am
@@ -1,22 +1,26 @@
---- src/salomegui_swig/Makefile.am.orig 2010-05-07 12:05:34.000000000 +0700
-+++ src/salomegui_swig/Makefile.am 2010-05-07 12:05:43.000000000 +0700
-@@ -24,7 +24,7 @@
+--- src/salomegui_swig/Makefile.am.orig 2010-11-12 14:53:59.000000000 +0600
++++ src/salomegui_swig/Makefile.am 2010-11-12 14:54:11.000000000 +0600
+@@ -23,9 +23,9 @@
+ SWIGSRC=libYACS_Swig.i
MYSWIG_FLAGS =
- if DOXYGEN_IS_OK
+-if DOXYGEN_IS_OK
-MYSWIG_FLAGS += -DDOXYGEN_IS_OK
+-endif
++#if DOXYGEN_IS_OK
+#MYSWIG_FLAGS += -DDOXYGEN_IS_OK
- endif
++#endif
salomepython_PYTHON = libYACS_Swig.py
+ salomepyexec_LTLIBRARIES = _libYACS_Swig.la
@@ -51,8 +51,8 @@
$(SWIG) $(SWIG_PYTHON_OPT) $(SWIG_PYTHON_INCLUDES) $(MYSWIG_FLAGS) -o $@ $<
doc.i:YACSGUI_Swig.hxx YACSGUI_Swig.cxx
-- (cd $(srcdir);doxygen ../../Misc/Doxyfile)
-- python $(top_srcdir)/Misc/doxy2swig.py -n $(srcdir)/xml/index.xml doc.i; rm -rf $(srcdir)/xml
-+# (cd $(srcdir);doxygen ../../Misc/Doxyfile)
-+# python $(top_srcdir)/Misc/doxy2swig.py -n $(srcdir)/xml/index.xml doc.i; rm -rf $(srcdir)/xml
+- DOXSRCDIR=$(srcdir) doxygen $(top_srcdir)/Misc/Doxyfile
+- $(PYTHON) $(top_srcdir)/Misc/doxy2swig.py -n xml/index.xml doc.i
++# DOXSRCDIR=$(srcdir) doxygen $(top_srcdir)/Misc/Doxyfile
++# $(PYTHON) $(top_srcdir)/Misc/doxy2swig.py -n xml/index.xml doc.i
- CLEANFILES = libYACS_SwigWRAP.cxx libYACS_Swig.py doc.i
+ EXTRA_DIST = YACSGUI_Swig.hxx
diff --git a/cad/salome-yacs/files/patch-src_yacsloader_swig_Makefile.am b/cad/salome-yacs/files/patch-src_yacsloader_swig_Makefile.am
index 715d8b6d86f8..9405f6151cfb 100644
--- a/cad/salome-yacs/files/patch-src_yacsloader_swig_Makefile.am
+++ b/cad/salome-yacs/files/patch-src_yacsloader_swig_Makefile.am
@@ -1,22 +1,26 @@
---- src/yacsloader_swig/Makefile.am.orig 2010-05-07 12:03:58.000000000 +0700
-+++ src/yacsloader_swig/Makefile.am 2010-05-07 12:04:19.000000000 +0700
-@@ -28,7 +28,7 @@
+--- src/yacsloader_swig/Makefile.am.orig 2010-11-12 15:18:52.000000000 +0600
++++ src/yacsloader_swig/Makefile.am 2010-11-12 15:19:14.000000000 +0600
+@@ -28,9 +28,9 @@
+
MYSWIG_FLAGS =
- if DOXYGEN_IS_OK
+-if DOXYGEN_IS_OK
-MYSWIG_FLAGS += -DDOXYGEN_IS_OK
+-endif
++#if DOXYGEN_IS_OK
+#MYSWIG_FLAGS += -DDOXYGEN_IS_OK
- endif
++#endif
LOADERINCLUDES=parsers.hxx LoadState.hxx xmlParserBase.hxx ProcCataLoader.hxx
-@@ -61,8 +61,8 @@
+
+@@ -62,8 +62,8 @@
_loader_la_LIBADD = ../yacsloader/libYACSloader.la $(OMNIORB_LIBS) $(PYTHON_LIBS)
docyacsloader.i:$(SWIGINCLUDES)
-- (cd $(srcdir)/../yacsloader;doxygen ../../Misc/Doxyfile)
-- python $(top_srcdir)/Misc/doxy2swig.py -n $(srcdir)/../yacsloader/xml/index.xml docyacsloader.i;rm -rf $(srcdir)/../yacsloader/xml
-+# (cd $(srcdir)/../yacsloader;doxygen ../../Misc/Doxyfile)
-+# python $(top_srcdir)/Misc/doxy2swig.py -n $(srcdir)/../yacsloader/xml/index.xml docyacsloader.i;rm -rf $(srcdir)/../yacsloader/xml
+- DOXSRCDIR=$(top_srcdir)/src/yacsloader doxygen $(top_srcdir)/Misc/Doxyfile
+- $(PYTHON) $(top_srcdir)/Misc/doxy2swig.py -n xml/index.xml docyacsloader.i
++# DOXSRCDIR=$(top_srcdir)/src/yacsloader doxygen $(top_srcdir)/Misc/Doxyfile
++# $(PYTHON) $(top_srcdir)/Misc/doxy2swig.py -n xml/index.xml docyacsloader.i
EXTRA_DIST = loader.i
diff --git a/cad/salome-yacs/pkg-plist b/cad/salome-yacs/pkg-plist
index c6413d6cca8b..e05e6e32c7ba 100644
--- a/cad/salome-yacs/pkg-plist
+++ b/cad/salome-yacs/pkg-plist
@@ -93,9 +93,7 @@ bin/HXX2SALOME_Test/parse5.awk
bin/HXX2SALOME_Test/renameSalomeModule
bin/HXX2SALOME_Test/runIDLparser
bin/salome/debugger
-bin/salome/display.sh
bin/salome/driver
-bin/salome/echoSrv
bin/salome/echoSrvDemo
bin/salome/resume
bin/salome/salomeloader.sh
@@ -135,6 +133,7 @@ include/salome/DataPort.hxx
include/salome/DataStreamPort.hxx
include/salome/DeploymentTree.hxx
include/salome/Dispatcher.hxx
+include/salome/DistributedPythonNode.hxx
include/salome/DrivenCondition.hxx
include/salome/DrivenConditionPT.hxx
include/salome/DynLibLoader.hxx
@@ -199,6 +198,7 @@ include/salome/SalomePythonNode.hxx
include/salome/Scheduler.hxx
include/salome/Semaphore.hxx
include/salome/SemaphorePT.hxx
+include/salome/ServerNode.hxx
include/salome/ServiceInlineNode.hxx
include/salome/ServiceNode.hxx
include/salome/SessionCataLoader.hxx
@@ -238,6 +238,7 @@ include/salome/containerParsers.hxx
include/salome/dataParsers.hxx
include/salome/define.hxx
include/salome/factory.hxx
+include/salome/inlineParsers.hxx
include/salome/linkParsers.hxx
include/salome/loopParsers.hxx
include/salome/nodeParsers.hxx
@@ -248,7 +249,11 @@ include/salome/portParsers.hxx
include/salome/presetParsers.hxx
include/salome/procParsers.hxx
include/salome/propertyParsers.hxx
+include/salome/remoteParsers.hxx
include/salome/rootParser.hxx
+include/salome/serverParsers.hxx
+include/salome/serviceParsers.hxx
+include/salome/sinlineParsers.hxx
include/salome/switchParsers.hxx
include/salome/typeParsers.hxx
include/salome/xmlParserBase.hxx
@@ -288,9 +293,6 @@ include/salome/yacsconfig.h
%%PYTHON_SITELIBDIR%%/salome/_pypilot.la
%%PYTHON_SITELIBDIR%%/salome/_pypilot.so
%%PYTHON_SITELIBDIR%%/salome/_pypilot.so.0
-%%PYTHON_SITELIBDIR%%/salome/echo_idl.py
-%%PYTHON_SITELIBDIR%%/salome/eo/__init__.py
-%%PYTHON_SITELIBDIR%%/salome/eo__POA/__init__.py
%%PYTHON_SITELIBDIR%%/salome/graph.py
%%PYTHON_SITELIBDIR%%/salome/graph.pyc
%%PYTHON_SITELIBDIR%%/salome/graph.pyo
@@ -358,220 +360,221 @@ lib/salome/libYACSloader.a
lib/salome/libYACSloader.la
lib/salome/libYACSloader.so
lib/salome/libYACSloader.so.0
-share/salome/resources/yacs/ExecYACS.png
-share/salome/resources/yacs/ModuleYacs.png
-share/salome/resources/yacs/SalomeApp.xml
-share/salome/resources/yacs/YACSCatalog.xml
-share/salome/resources/yacs/YACSSchemaCatalog.xml
-share/salome/resources/yacs/YACS_msg_en.qm
-share/salome/resources/yacs/YACS_msg_en.ts
-share/salome/resources/yacs/YACS_msg_fr.qm
-share/salome/resources/yacs/YACS_msg_fr.ts
-share/salome/resources/yacs/addRowCols.png
-share/salome/resources/yacs/add_in_study.png
-share/salome/resources/yacs/add_node.png
-share/salome/resources/yacs/arrange_nodes.png
-share/salome/resources/yacs/autoComputeLink.png
-share/salome/resources/yacs/bad.txt
-share/salome/resources/yacs/bad.wav
-share/salome/resources/yacs/batch.png
-share/salome/resources/yacs/batch_alarm.py
-share/salome/resources/yacs/batch_graph.xml
-share/salome/resources/yacs/batch_launcher.py
-share/salome/resources/yacs/block_node.png
-share/salome/resources/yacs/breakpoints.png
-share/salome/resources/yacs/breakpoints_active.png
-share/salome/resources/yacs/centerOnNode.png
-share/salome/resources/yacs/change_informations.png
-share/salome/resources/yacs/component.png
-share/salome/resources/yacs/connect_to_batch_session.png
-share/salome/resources/yacs/container.png
-share/salome/resources/yacs/control_link.png
-share/salome/resources/yacs/control_view.png
-share/salome/resources/yacs/copy.png
-share/salome/resources/yacs/cut.png
-share/salome/resources/yacs/data_link.png
-share/salome/resources/yacs/dataflow_view.png
-share/salome/resources/yacs/datastream_view.png
-share/salome/resources/yacs/delete.png
-share/salome/resources/yacs/emphasisLink.png
-share/salome/resources/yacs/execute_in_batch.png
-share/salome/resources/yacs/export_dataflow.png
-share/salome/resources/yacs/filter_next_steps.png
-share/salome/resources/yacs/filter_notification.png
-share/salome/resources/yacs/folder_cyan.png
-share/salome/resources/yacs/folder_cyan_open.png
-share/salome/resources/yacs/force2nodeLink.png
-share/salome/resources/yacs/full_view.png
-share/salome/resources/yacs/good.txt
-share/salome/resources/yacs/good.wav
-share/salome/resources/yacs/hideLink.png
-share/salome/resources/yacs/icon_down.png
-share/salome/resources/yacs/icon_insert.png
-share/salome/resources/yacs/icon_minus.png
-share/salome/resources/yacs/icon_plus.png
-share/salome/resources/yacs/icon_select.png
-share/salome/resources/yacs/icon_text.png
-share/salome/resources/yacs/icon_up.png
-share/salome/resources/yacs/import_dataflow.png
-share/salome/resources/yacs/import_superv_dataflow.png
-share/salome/resources/yacs/in_port.png
-share/salome/resources/yacs/insert_file.png
-share/salome/resources/yacs/kill.png
-share/salome/resources/yacs/load_execution_state.png
-share/salome/resources/yacs/loop_node.png
-share/salome/resources/yacs/mode_continue.png
-share/salome/resources/yacs/modify_dataflow.png
-share/salome/resources/yacs/modify_superv_dataflow.png
-share/salome/resources/yacs/new_batch_execution.png
-share/salome/resources/yacs/new_block_node.png
-share/salome/resources/yacs/new_corba_component.png
-share/salome/resources/yacs/new_corba_service_node.png
-share/salome/resources/yacs/new_cpp_node.png
-share/salome/resources/yacs/new_dataflow.png
-share/salome/resources/yacs/new_edition.png
-share/salome/resources/yacs/new_execution.png
-share/salome/resources/yacs/new_for_loop_node.png
-share/salome/resources/yacs/new_foreach_loop_node.png
-share/salome/resources/yacs/new_from_library_node.png
-share/salome/resources/yacs/new_inline_function_node.png
-share/salome/resources/yacs/new_inline_script_node.png
-share/salome/resources/yacs/new_link.png
-share/salome/resources/yacs/new_nodenode_service_node.png
-share/salome/resources/yacs/new_salome_component.png
-share/salome/resources/yacs/new_salome_service_node.png
-share/salome/resources/yacs/new_salomepy_component.png
-share/salome/resources/yacs/new_service_inline_node.png
-share/salome/resources/yacs/new_switch_loop_node.png
-share/salome/resources/yacs/new_while_loop_node.png
-share/salome/resources/yacs/new_xml_node.png
-share/salome/resources/yacs/node.png
-share/salome/resources/yacs/ob_service_node.png
-share/salome/resources/yacs/out_port.png
-share/salome/resources/yacs/paste.png
-share/salome/resources/yacs/pause.png
-share/salome/resources/yacs/rebuild_links.png
-share/salome/resources/yacs/reload.png
-share/salome/resources/yacs/remote_run.png
-share/salome/resources/yacs/reset.png
-share/salome/resources/yacs/resume.png
-share/salome/resources/yacs/run.png
-share/salome/resources/yacs/run_active.png
-share/salome/resources/yacs/run_object.png
-share/salome/resources/yacs/sample.png
-share/salome/resources/yacs/save_dataflow.png
-share/salome/resources/yacs/save_dataflow_state.png
-share/salome/resources/yacs/schema.png
-share/salome/resources/yacs/showLink.png
-share/salome/resources/yacs/simplifyLink.png
-share/salome/resources/yacs/step_by_step.png
-share/salome/resources/yacs/step_by_step_active.png
-share/salome/resources/yacs/straightLink.png
-share/salome/resources/yacs/stream_link.png
-share/salome/resources/yacs/suspend_resume.png
-share/salome/resources/yacs/switch_node.png
-share/salome/resources/yacs/table_view.png
-share/salome/resources/yacs/test_calculator.xml
-share/salome/resources/yacs/test_hello.xml
-share/salome/resources/yacs/toggleVisibility.png
-share/salome/resources/yacs/toggle_stop_on_error.png
-share/salome/resources/yacs/whatsThis.png
-share/salome/resources/yacs/zoomToBloc.png
-share/salome/yacssamples/SchemaIOFile.xml
-share/salome/yacssamples/SchemaInputOutputGeom.xml
-share/salome/yacssamples/aschema.xml
-share/salome/yacssamples/bid.xml
-share/salome/yacssamples/bloc1.xml
-share/salome/yacssamples/bloc2.xml
-share/salome/yacssamples/bloc3.xml
-share/salome/yacssamples/bloc4.xml
-share/salome/yacssamples/bool1.xml
-share/salome/yacssamples/bschema.xml
-share/salome/yacssamples/calcium0.xml
-share/salome/yacssamples/calcium1.xml
-share/salome/yacssamples/calcium2.xml
-share/salome/yacssamples/calcium3.xml
-share/salome/yacssamples/calcium4.xml
-share/salome/yacssamples/cpp1.xml
-share/salome/yacssamples/cschema.xml
-share/salome/yacssamples/datanode0.xml
-share/salome/yacssamples/double1.xml
-share/salome/yacssamples/dschema.xml
-share/salome/yacssamples/err0.xml
-share/salome/yacssamples/err1.xml
-share/salome/yacssamples/err2.xml
-share/salome/yacssamples/err3.xml
-share/salome/yacssamples/eschema.xml
-share/salome/yacssamples/f.data
-share/salome/yacssamples/file1.xml
-share/salome/yacssamples/foreach1.xml
-share/salome/yacssamples/foreach2.xml
-share/salome/yacssamples/foreach3.xml
-share/salome/yacssamples/foreach4.xml
-share/salome/yacssamples/foreach5.xml
-share/salome/yacssamples/foreach6.xml
-share/salome/yacssamples/foreach_LongCorba.xml
-share/salome/yacssamples/foreach_LongPython.xml
-share/salome/yacssamples/forloop1.xml
-share/salome/yacssamples/forloop2.xml
-share/salome/yacssamples/forloop3.xml
-share/salome/yacssamples/forloop4.xml
-share/salome/yacssamples/forloop5.xml
-share/salome/yacssamples/forloop6.xml
-share/salome/yacssamples/forloop7.xml
-share/salome/yacssamples/forwhile1.xml
-share/salome/yacssamples/fschema.xml
-share/salome/yacssamples/gobj1.xml
-share/salome/yacssamples/integer1.xml
-share/salome/yacssamples/legendre7.xml
-share/salome/yacssamples/objref1.xml
-share/salome/yacssamples/objref2.xml
-share/salome/yacssamples/optimizer1.xml
-share/salome/yacssamples/optimizer2.xml
-share/salome/yacssamples/oschema.xml
-share/salome/yacssamples/pschema.xml
-share/salome/yacssamples/refcnt1.xml
-share/salome/yacssamples/refcnt2.xml
-share/salome/yacssamples/schema.xml
-share/salome/yacssamples/schema2.xml
-share/salome/yacssamples/setports.xml
-share/salome/yacssamples/sinline1.xml
-share/salome/yacssamples/sinline2.xml
-share/salome/yacssamples/sinline3.xml
-share/salome/yacssamples/sinline4.xml
-share/salome/yacssamples/sinline5.xml
-share/salome/yacssamples/stream1.xml
-share/salome/yacssamples/stream2.xml
-share/salome/yacssamples/stream3.xml
-share/salome/yacssamples/stream4.xml
-share/salome/yacssamples/string1.xml
-share/salome/yacssamples/struct1.xml
-share/salome/yacssamples/struct2.xml
-share/salome/yacssamples/study1.xml
-share/salome/yacssamples/switch1.xml
-share/salome/yacssamples/switch2.xml
-share/salome/yacssamples/switch3.xml
-share/salome/yacssamples/switch4.xml
-share/salome/yacssamples/switch5.xml
-share/salome/yacssamples/switch6.xml
-share/salome/yacssamples/switch7.xml
-share/salome/yacssamples/switch8.xml
-share/salome/yacssamples/switch9.xml
-share/salome/yacssamples/triangle5error.xml
-share/salome/yacssamples/while1.xml
-share/salome/yacssamples/while2.xml
-share/salome/yacssamples/while3.xml
-share/salome/yacssupervsamples/GeomGraph.xml
-share/salome/yacssupervsamples/GeomGraphGates.xml
-share/salome/yacssupervsamples/GeomGraphGates_py.xml
-share/salome/yacssupervsamples/GeomGraph_py.xml
-share/salome/yacssupervsamples/Graph_couronne.xml
-share/salome/yacssupervsamples/testvisu20.xml
-@dirrm share/salome/yacssupervsamples
-@dirrm share/salome/yacssamples
-@dirrm share/salome/resources/yacs
-@dirrm %%PYTHON_SITELIBDIR%%/salome/eo__POA
-@dirrm %%PYTHON_SITELIBDIR%%/salome/eo
+%%DATADIR%%/resources/yacs/ExecYACS.png
+%%DATADIR%%/resources/yacs/ModuleYacs.png
+%%DATADIR%%/resources/yacs/SalomeApp.xml
+%%DATADIR%%/resources/yacs/YACSCatalog.xml
+%%DATADIR%%/resources/yacs/YACSSchemaCatalog.xml
+%%DATADIR%%/resources/yacs/YACS_msg_en.qm
+%%DATADIR%%/resources/yacs/YACS_msg_en.ts
+%%DATADIR%%/resources/yacs/YACS_msg_fr.qm
+%%DATADIR%%/resources/yacs/YACS_msg_fr.ts
+%%DATADIR%%/resources/yacs/addRowCols.png
+%%DATADIR%%/resources/yacs/add_in_study.png
+%%DATADIR%%/resources/yacs/add_node.png
+%%DATADIR%%/resources/yacs/arrange_nodes.png
+%%DATADIR%%/resources/yacs/autoComputeLink.png
+%%DATADIR%%/resources/yacs/bad.txt
+%%DATADIR%%/resources/yacs/bad.wav
+%%DATADIR%%/resources/yacs/batch.png
+%%DATADIR%%/resources/yacs/batch_alarm.py
+%%DATADIR%%/resources/yacs/batch_graph.xml
+%%DATADIR%%/resources/yacs/block_node.png
+%%DATADIR%%/resources/yacs/breakpoints.png
+%%DATADIR%%/resources/yacs/breakpoints_active.png
+%%DATADIR%%/resources/yacs/centerOnNode.png
+%%DATADIR%%/resources/yacs/change_informations.png
+%%DATADIR%%/resources/yacs/component.png
+%%DATADIR%%/resources/yacs/connect_to_batch_session.png
+%%DATADIR%%/resources/yacs/container.png
+%%DATADIR%%/resources/yacs/control_link.png
+%%DATADIR%%/resources/yacs/control_view.png
+%%DATADIR%%/resources/yacs/copy.png
+%%DATADIR%%/resources/yacs/cut.png
+%%DATADIR%%/resources/yacs/data_link.png
+%%DATADIR%%/resources/yacs/dataflow_view.png
+%%DATADIR%%/resources/yacs/datastream_view.png
+%%DATADIR%%/resources/yacs/delete.png
+%%DATADIR%%/resources/yacs/emphasisLink.png
+%%DATADIR%%/resources/yacs/execute_in_batch.png
+%%DATADIR%%/resources/yacs/export_dataflow.png
+%%DATADIR%%/resources/yacs/filter_next_steps.png
+%%DATADIR%%/resources/yacs/filter_notification.png
+%%DATADIR%%/resources/yacs/folder_cyan.png
+%%DATADIR%%/resources/yacs/folder_cyan_open.png
+%%DATADIR%%/resources/yacs/force2nodeLink.png
+%%DATADIR%%/resources/yacs/full_view.png
+%%DATADIR%%/resources/yacs/good.txt
+%%DATADIR%%/resources/yacs/good.wav
+%%DATADIR%%/resources/yacs/hideLink.png
+%%DATADIR%%/resources/yacs/icon_down.png
+%%DATADIR%%/resources/yacs/icon_insert.png
+%%DATADIR%%/resources/yacs/icon_minus.png
+%%DATADIR%%/resources/yacs/icon_plus.png
+%%DATADIR%%/resources/yacs/icon_select.png
+%%DATADIR%%/resources/yacs/icon_text.png
+%%DATADIR%%/resources/yacs/icon_up.png
+%%DATADIR%%/resources/yacs/import_dataflow.png
+%%DATADIR%%/resources/yacs/import_superv_dataflow.png
+%%DATADIR%%/resources/yacs/in_port.png
+%%DATADIR%%/resources/yacs/insert_file.png
+%%DATADIR%%/resources/yacs/kill.png
+%%DATADIR%%/resources/yacs/load_execution_state.png
+%%DATADIR%%/resources/yacs/loop_node.png
+%%DATADIR%%/resources/yacs/mode_continue.png
+%%DATADIR%%/resources/yacs/modify_dataflow.png
+%%DATADIR%%/resources/yacs/modify_superv_dataflow.png
+%%DATADIR%%/resources/yacs/new_batch_execution.png
+%%DATADIR%%/resources/yacs/new_block_node.png
+%%DATADIR%%/resources/yacs/new_corba_component.png
+%%DATADIR%%/resources/yacs/new_corba_service_node.png
+%%DATADIR%%/resources/yacs/new_cpp_node.png
+%%DATADIR%%/resources/yacs/new_dataflow.png
+%%DATADIR%%/resources/yacs/new_edition.png
+%%DATADIR%%/resources/yacs/new_execution.png
+%%DATADIR%%/resources/yacs/new_for_loop_node.png
+%%DATADIR%%/resources/yacs/new_foreach_loop_node.png
+%%DATADIR%%/resources/yacs/new_from_library_node.png
+%%DATADIR%%/resources/yacs/new_inline_function_node.png
+%%DATADIR%%/resources/yacs/new_inline_script_node.png
+%%DATADIR%%/resources/yacs/new_link.png
+%%DATADIR%%/resources/yacs/new_nodenode_service_node.png
+%%DATADIR%%/resources/yacs/new_salome_component.png
+%%DATADIR%%/resources/yacs/new_salome_service_node.png
+%%DATADIR%%/resources/yacs/new_salomepy_component.png
+%%DATADIR%%/resources/yacs/new_service_inline_node.png
+%%DATADIR%%/resources/yacs/new_switch_loop_node.png
+%%DATADIR%%/resources/yacs/new_while_loop_node.png
+%%DATADIR%%/resources/yacs/new_xml_node.png
+%%DATADIR%%/resources/yacs/node.png
+%%DATADIR%%/resources/yacs/ob_service_node.png
+%%DATADIR%%/resources/yacs/out_port.png
+%%DATADIR%%/resources/yacs/paste.png
+%%DATADIR%%/resources/yacs/pause.png
+%%DATADIR%%/resources/yacs/rebuild_links.png
+%%DATADIR%%/resources/yacs/redo.png
+%%DATADIR%%/resources/yacs/reload.png
+%%DATADIR%%/resources/yacs/remote_run.png
+%%DATADIR%%/resources/yacs/reset.png
+%%DATADIR%%/resources/yacs/resume.png
+%%DATADIR%%/resources/yacs/run.png
+%%DATADIR%%/resources/yacs/run_active.png
+%%DATADIR%%/resources/yacs/run_object.png
+%%DATADIR%%/resources/yacs/sample.png
+%%DATADIR%%/resources/yacs/save_dataflow.png
+%%DATADIR%%/resources/yacs/save_dataflow_state.png
+%%DATADIR%%/resources/yacs/schema.png
+%%DATADIR%%/resources/yacs/showLink.png
+%%DATADIR%%/resources/yacs/shrinkExpand.png
+%%DATADIR%%/resources/yacs/simplifyLink.png
+%%DATADIR%%/resources/yacs/step_by_step.png
+%%DATADIR%%/resources/yacs/step_by_step_active.png
+%%DATADIR%%/resources/yacs/straightLink.png
+%%DATADIR%%/resources/yacs/stream_link.png
+%%DATADIR%%/resources/yacs/suspend_resume.png
+%%DATADIR%%/resources/yacs/switch_node.png
+%%DATADIR%%/resources/yacs/table_view.png
+%%DATADIR%%/resources/yacs/test_calculator.xml
+%%DATADIR%%/resources/yacs/test_hello.xml
+%%DATADIR%%/resources/yacs/test_mpi.xml
+%%DATADIR%%/resources/yacs/toggleVisibility.png
+%%DATADIR%%/resources/yacs/toggle_stop_on_error.png
+%%DATADIR%%/resources/yacs/undo.png
+%%DATADIR%%/resources/yacs/whatsThis.png
+%%DATADIR%%/resources/yacs/zoomToBloc.png
+%%DATADIR%%/yacssamples/SchemaIOFile.xml
+%%DATADIR%%/yacssamples/SchemaInputOutputGeom.xml
+%%DATADIR%%/yacssamples/aschema.xml
+%%DATADIR%%/yacssamples/bid.xml
+%%DATADIR%%/yacssamples/bloc1.xml
+%%DATADIR%%/yacssamples/bloc2.xml
+%%DATADIR%%/yacssamples/bloc3.xml
+%%DATADIR%%/yacssamples/bloc4.xml
+%%DATADIR%%/yacssamples/bool1.xml
+%%DATADIR%%/yacssamples/bschema.xml
+%%DATADIR%%/yacssamples/calcium0.xml
+%%DATADIR%%/yacssamples/calcium1.xml
+%%DATADIR%%/yacssamples/calcium2.xml
+%%DATADIR%%/yacssamples/calcium3.xml
+%%DATADIR%%/yacssamples/calcium4.xml
+%%DATADIR%%/yacssamples/cpp1.xml
+%%DATADIR%%/yacssamples/cschema.xml
+%%DATADIR%%/yacssamples/datanode0.xml
+%%DATADIR%%/yacssamples/double1.xml
+%%DATADIR%%/yacssamples/dschema.xml
+%%DATADIR%%/yacssamples/err0.xml
+%%DATADIR%%/yacssamples/err1.xml
+%%DATADIR%%/yacssamples/err2.xml
+%%DATADIR%%/yacssamples/err3.xml
+%%DATADIR%%/yacssamples/eschema.xml
+%%DATADIR%%/yacssamples/f.data
+%%DATADIR%%/yacssamples/file1.xml
+%%DATADIR%%/yacssamples/foreach1.xml
+%%DATADIR%%/yacssamples/foreach2.xml
+%%DATADIR%%/yacssamples/foreach3.xml
+%%DATADIR%%/yacssamples/foreach4.xml
+%%DATADIR%%/yacssamples/foreach5.xml
+%%DATADIR%%/yacssamples/foreach6.xml
+%%DATADIR%%/yacssamples/foreach_LongCorba.xml
+%%DATADIR%%/yacssamples/foreach_LongPython.xml
+%%DATADIR%%/yacssamples/forloop1.xml
+%%DATADIR%%/yacssamples/forloop2.xml
+%%DATADIR%%/yacssamples/forloop3.xml
+%%DATADIR%%/yacssamples/forloop4.xml
+%%DATADIR%%/yacssamples/forloop5.xml
+%%DATADIR%%/yacssamples/forloop6.xml
+%%DATADIR%%/yacssamples/forloop7.xml
+%%DATADIR%%/yacssamples/forwhile1.xml
+%%DATADIR%%/yacssamples/fschema.xml
+%%DATADIR%%/yacssamples/gobj1.xml
+%%DATADIR%%/yacssamples/integer1.xml
+%%DATADIR%%/yacssamples/legendre7.xml
+%%DATADIR%%/yacssamples/objref1.xml
+%%DATADIR%%/yacssamples/objref2.xml
+%%DATADIR%%/yacssamples/optimizer1.xml
+%%DATADIR%%/yacssamples/optimizer2.xml
+%%DATADIR%%/yacssamples/oschema.xml
+%%DATADIR%%/yacssamples/pschema.xml
+%%DATADIR%%/yacssamples/refcnt1.xml
+%%DATADIR%%/yacssamples/refcnt2.xml
+%%DATADIR%%/yacssamples/schema.xml
+%%DATADIR%%/yacssamples/schema2.xml
+%%DATADIR%%/yacssamples/setports.xml
+%%DATADIR%%/yacssamples/sinline1.xml
+%%DATADIR%%/yacssamples/sinline2.xml
+%%DATADIR%%/yacssamples/sinline3.xml
+%%DATADIR%%/yacssamples/sinline4.xml
+%%DATADIR%%/yacssamples/sinline5.xml
+%%DATADIR%%/yacssamples/stream1.xml
+%%DATADIR%%/yacssamples/stream2.xml
+%%DATADIR%%/yacssamples/stream3.xml
+%%DATADIR%%/yacssamples/stream4.xml
+%%DATADIR%%/yacssamples/string1.xml
+%%DATADIR%%/yacssamples/struct1.xml
+%%DATADIR%%/yacssamples/struct2.xml
+%%DATADIR%%/yacssamples/study1.xml
+%%DATADIR%%/yacssamples/switch1.xml
+%%DATADIR%%/yacssamples/switch2.xml
+%%DATADIR%%/yacssamples/switch3.xml
+%%DATADIR%%/yacssamples/switch4.xml
+%%DATADIR%%/yacssamples/switch5.xml
+%%DATADIR%%/yacssamples/switch6.xml
+%%DATADIR%%/yacssamples/switch7.xml
+%%DATADIR%%/yacssamples/switch8.xml
+%%DATADIR%%/yacssamples/switch9.xml
+%%DATADIR%%/yacssamples/triangle5error.xml
+%%DATADIR%%/yacssamples/while1.xml
+%%DATADIR%%/yacssamples/while2.xml
+%%DATADIR%%/yacssamples/while3.xml
+%%DATADIR%%/yacssupervsamples/GeomGraph.xml
+%%DATADIR%%/yacssupervsamples/GeomGraphGates.xml
+%%DATADIR%%/yacssupervsamples/GeomGraphGates_py.xml
+%%DATADIR%%/yacssupervsamples/GeomGraph_py.xml
+%%DATADIR%%/yacssupervsamples/Graph_couronne.xml
+%%DATADIR%%/yacssupervsamples/testvisu20.xml
+@dirrm %%DATADIR%%/yacssupervsamples
+@dirrm %%DATADIR%%/yacssamples
+@dirrm %%DATADIR%%/resources/yacs
@dirrm %%PYTHON_SITELIBDIR%%/salome/YACS_ORB__POA
@dirrm %%PYTHON_SITELIBDIR%%/salome/YACS_ORB
@dirrm bin/HXX2SALOME_Test/HXX2SALOME_GENERIC_CLASS_NAME_SRC/src/HXX2SALOME_GENERIC_CLASS_NAME_SWIG
diff --git a/cad/salome/Makefile b/cad/salome/Makefile
index 9d1c80fdafb0..4c6d0ce1c1fb 100644
--- a/cad/salome/Makefile
+++ b/cad/salome/Makefile
@@ -5,11 +5,10 @@
# $FreeBSD$
PORTNAME= salome
-PORTVERSION= 5.1.3
-PORTREVISION= 4
+PORTVERSION= 5.1.4
CATEGORIES= cad science
MASTER_SITES= http://www.stasyan.com/devel/distfiles/
-DISTNAME= src5.1.3
+DISTNAME= src5.1.4
DIST_SUBDIR= ${PORTNAME}
.if !defined(PKGNAMESUFFIX)
EXTRACT_ONLY= #none
@@ -21,20 +20,22 @@ OPTIONS= \
GEOM "GEOM module" on \
MED "MED module" on \
SMESH "SMESH module (require MED & GEOM)" on \
+ NETGENPLUGIN "Netgen-meser plugin" on \
VISU "VISU module (require MED)" on \
LIGHT "LIGHT module" on \
YACS "Yacs module" on \
MULTIPR "Multipr module" on \
RANDOMIZER "Randomizer module" on \
SIERPINSKY "Sierpinsky module" on \
- CPPUNIT "build with C++ unit testing framework" off \
- MPI "build with support parrallel calculation" off
+ JOBMAN "Job manager module" on \
+ MPI "build with support parrallel calculation" on
-RESOURCEDIR= ${DATADIR}/resources
+RESOURCEDIR= ${PREFIX}/share/salome/resources
SLAVEDIRS= cad/salome-kernel cad/salome-gui cad/salome-geom cad/salome-light \
cad/salome-yacs cad/salome-randomizer cad/salome-visu cad/salome-med \
- cad/salome-sierpinsky cad/salome-smesh cad/salome-multipr
+ cad/salome-sierpinsky cad/salome-smesh cad/salome-multipr cad/salome-jobmanager \
+ cad/salome-netgenplugin
.include <bsd.port.options.mk>
@@ -72,9 +73,15 @@ RUN_DEPENDS+= ${RESOURCEDIR}/sierpinsky:${PORTSDIR}/cad/salome-sierpinsky
.if defined(WITH_SMESH)
RUN_DEPENDS+= ${RESOURCEDIR}/smesh:${PORTSDIR}/cad/salome-smesh
.endif
+.if defined(WITH_NETGENPLUGIN)
+RUN_DEPENDS+= ${RESOURCEDIR}/netgenplugin:${PORTSDIR}/cad/salome-netgenplugin
+.endif
.if defined(WITH_MULTIPR)
RUN_DEPENDS+= ${RESOURCEDIR}/multipr:${PORTSDIR}/cad/salome-multipr
.endif
+.if defined(WITH_JOBMAN)
+RUN_DEPENDS+= ${RESOURCEDIR}/jobmanager:${PORTSDIR}/cad/salome-jobmanager
+.endif
SUB_LIST= PREFIX=${PREFIX}
SUB_FILES= pkg-message runSalome.csh
diff --git a/cad/salome/Makefile.ext b/cad/salome/Makefile.ext
index 29206e35f07b..2fc355f999b3 100644
--- a/cad/salome/Makefile.ext
+++ b/cad/salome/Makefile.ext
@@ -22,16 +22,23 @@ GUI_DEPEND= KERNEL QWT
GEOM_DEPEND= KERNEL GUI
MED_DEPEND= KERNEL GUI MED2
SMESH_DEPEND= KERNEL GUI MED GEOM
+NETGENPLUGIN_DEPEND= KERNEL GUI MED GEOM MED SMESH NETGEN
VISU_DEPEND= KERNEL GUI MED
LIGHT_DEPEND= KERNEL GUI
YACS_DEPEND= KERNEL GUI
RANDOMIZER_DEPEND= KERNEL GUI
+JOBMANAGER_DEPEND= KERNEL GUI
SIERPINSKY_DEPEND= KERNEL GUI VISU MED RANDOMIZER
FILTER_DEPEND= KERNEL GUI MED
MULTIPR_DEPEND= KERNEL GUI MED MED2 HDF5 CAS QT OMNIORB
-RELEASENAME= 5.1.3
+.if !${SAL_MODULE} == "jobmanager"
+RELEASENAME= 5.1.4
+.else
+RELEASENAME= 0.1
+.endif
+
HAS_CONFIGURE= yes
CONFIGURE_ARGS+= --prefix=${PREFIX}
CONFIGURE_ARGS+= --enable-debug
@@ -82,6 +89,13 @@ BUILD_DEPENDS+= ${RESOURCEDIR}/geom:${PORTSDIR}/cad/salome-geom
RUN_DEPENDS+= ${RESOURCEDIR}/geom:${PORTSDIR}/cad/salome-geom
.endif
+#Depndency from SMESH module
+.if ${SAL_MODULE} == "netgenplugin"
+BUILD_DEPENDS+= ${RESOURCEDIR}/smesh:${PORTSDIR}/cad/salome-smesh
+RUN_DEPENDS+= ${RESOURCEDIR}/smesh:${PORTSDIR}/cad/salome-smesh
+.endif
+
+
#Dependency for SIERPINSKY
.if ${SAL_MODULE} == "sierpinsky"
BUILD_DEPENDS+= ${RESOURCEDIR}/visu:${PORTSDIR}/cad/salome-visu \
@@ -103,19 +117,24 @@ USE_AUTOTOOLS= autoconf automake libtool aclocal
USE_AUTOTOOLS+= autoheader
AUTOHEADER_ARGS= -I adm/unix/config_files
. else
- ACLOCAL_ARGS= -I adm_local/unix/config_files -I ${LOCALBASE}/salome_adm/unix/config_files
-. if ${SAL_MODULE} != "gui"
+. if ${SAL_MODULE} != "jobmanager"
+ ACLOCAL_ARGS= -I adm_local/unix/config_files -I ${LOCALBASE}/salome_adm/unix/config_files
+. else
+ ACLOCAL_ARGS= -I m4
+ AUTOHEADER_ARGS+= -I m4
+. endif
+. if ${SAL_MODULE} != "gui" && ${SAL_MODULE} != "jobmanager"
ACLOCAL_ARGS+= -I ${LOCALBASE}/adm_local/unix/config_files
. endif
. endif
.endif
-LIBTOOLFLAGS=--force --copy --automake
+LIBTOOLFLAGS=--force --copy --automake
AUTOMAKE_ARGS=--add-missing --copy --gnu
#Dependency from HDF5
.if !${SAL_MODULE} == "randomizer" && !${SAL_MODULE} == "yacs" && !${SAL_MODULE} == "hello" && !${SAL_MODULE} == "pyhello"
LIB_DEPENDS+= hdf5.0:${PORTSDIR}/science/hdf5
-CONFIGURE_ARGS+= --with-hdf5=${LOCALBASE}
+CONFIGURE_ARGS+= --with-hdf5=${LOCALBASE}
AUTOTOOLS_ENV+= HDF5HOME=${LOCALBASE}
.endif
@@ -134,7 +153,7 @@ BUILD_DEPENDS+= swig:${PORTSDIR}/devel/swig13
.endif
#Dependency from libxml2
-.if ${SAL_MODULE} == "gui" || ${SAL_MODULE} == "kernel" || ${SAL_MODULE} == "med" || ${SAL_MODULE} == "yacs"
+.if ${SAL_MODULE} == "gui" || ${SAL_MODULE} == "kernel" || ${SAL_MODULE} == "med" || ${SAL_MODULE} == "yacs"
LIB_DEPENDS+= xml2.5:${PORTSDIR}/textproc/libxml2
CPPFLAGS+= -I${LOCALBASE}/include/libxml2
CONFIGURE_ENV+= LIBXML_DIR=${LOCALBASE}
@@ -172,10 +191,17 @@ CONFIGURE_ARGS+= --with-vtk=${LOCALBASE}
#CONFIGURE_ENV+= VTKHOME=${LOCALBASE}
.endif
+#Dependency from cad/netgen
+.if ${SAL_MODULE} == "netgenplugin"
+LIB_DEPENDS+= nglib.1:${PORTSDIR}/cad/netgen
+CONFIGURE_ENV+= NETGENHOME=${LOCALBASE}
+AUTOTOOLS_ENV+= NETGENHOME=${LOCALBASE}
+.endif
+
+
#Dependency from qwt5
.if ${SAL_MODULE} == "gui" || ${SAL_MODULE} == "component" || ${SAL_MODULE} == "smesh" || ${SAL_MODULE} == "visu" || ${SAL_MODULE} == "filter"
LIB_DEPENDS+= qwt.5:${PORTSDIR}/x11-toolkits/qwt5
-#CONFIGURE_ENV+= QWTHOME=${LOCALBASE}
CONFIGURE_ARGS+= --with-qwt=${LOCALBASE}
CPPFLAGS+= -I/${LOCALBASE}/include/qwt/
AUTOTOOLS_ENV+= QWTHOME=${LOCALBASE}
@@ -234,30 +260,30 @@ LIB_DEPENDS+= gd.4:${PORTSDIR}/graphics/gd
LIB_DEPENDS+= argp.0:${PORTSDIR}/devel/argp-standalone
LIB_DEPENDS+= expat.6:${PORTSDIR}/textproc/expat2
LIB_DEPENDS+= gvc.5:${PORTSDIR}/graphics/graphviz
-LDFLAGS+= -largp
+LDFLAGS+= -largp
.endif
-#Don't strip binaries
+#Don't strip binaries
.if ${SAL_MODULE} == "multipr"
-STRIP=
+STRIP=
.endif
-#optionally dependency from cppunit
+#turn off cppunit support
.if ${SAL_MODULE} == "kernel" || ${SAL_MODULE} == "gui" || ${SAL_MODULE} == "yacs" || ${SAL_MODULE} == "med"
-.if defined(WITH_CPPUNIT)
-CONFIGURE_ARGS+= --with-cppunit=${LOCALBASE} --with-cppunit_inc=${LOCALBASE}/include/cppunit
-BUILD_DEPENDS+= cppunit-config:${PORTSDIR}/devel/cppunit
-PLIST_SUB+= CPPUNIT=""
-. else
+#.if defined(WITH_CPPUNIT)
+#CONFIGURE_ARGS+= --with-cppunit=${LOCALBASE} --with-cppunit_inc=${LOCALBASE}/include/cppunit
+#BUILD_DEPENDS+= cppunit-config:${PORTSDIR}/devel/cppunit
+#PLIST_SUB+= CPPUNIT=""
+#. else
CONFIGURE_ARGS+= --with-cppunit=no
PLIST_SUB+= CPPUNIT="@comment "
-.endif
+#.endif
.endif
#optionally dependency from mpich2
.if ${SAL_MODULE} == "kernel" || ${SAL_MODULE} == "med"
.if defined(WITH_MPI)
-LIB_DEPENDS+= mpich.1:${PORTSDIR}/net/mpich2
+LIB_DEPENDS+= mpich.2:${PORTSDIR}/net/mpich2
CONFIGURE_ARGS+= --with-mpich=${LOCALBASE}/mpich2 --with-mpi=${LOCALBASE}/mpich2
PLIST_SUB+= MPI=""
. else
@@ -290,11 +316,6 @@ CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" CXXFLAGS="${QSCIFLAGS} ${QTFLAGS} ${CXXFLA
${CP} ${WRKSRC}/configure.in.base ${WRKSRC}/configure.in
.endif
-.if ${SAL_MODULE} == "med"
- post-install:
- ${MV} ${PREFIX}/include/salome/Node.hxx ${PREFIX}/include/salome/MEDNode.hxx
-.endif
-
.if ${SAL_MODULE} == "kernel"
pre-patch:
@@ -328,7 +349,7 @@ run-autotools-automake:
${AUTOMAKE_ARGS})
echo "End of automake"
-.if ${SAL_MODULE} == "yacs"
+.if ${SAL_MODULE} == "yacs" || ${SAL_MODULE} == "jobmanager"
run-autotools-autoheader:
echo "Start of autoheader"
@(cd ${PATCH_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} \
diff --git a/cad/salome/distinfo b/cad/salome/distinfo
index 01f42435a057..0fa162aa2a39 100644
--- a/cad/salome/distinfo
+++ b/cad/salome/distinfo
@@ -1,3 +1,2 @@
-MD5 (salome/src5.1.3.tar.gz) = 8564d0a7ef94d4d6d4b4c82ade84b1b0
-SHA256 (salome/src5.1.3.tar.gz) = 78ce2acc9cfa474e030723674f4420c420fd2de926b1939455c3716f1fd48a2b
-SIZE (salome/src5.1.3.tar.gz) = 106470135
+SHA256 (salome/src5.1.4.tar.gz) = dd59384ad4fbbbe49c72e946eed9e0f6144a01c799efab62033113a3db46eeae
+SIZE (salome/src5.1.4.tar.gz) = 120063320