Moving example from SMESH_SWIG into doc/salome/examples and adding them to salome test

doc/salome/examples/CMakeLists.txt

@@ -43,7 +43,7 @@ SALOME_INSTALL_SCRIPTS("${EXAMPLES_TESTS}" ${SALOME_INSTALL_DOC}/examples/SMESH)
 
 # Application tests
 
-INSTALL(FILES ${GOOD_TESTS} ${BAD_TESTS} ${SESSION_FREE_TESTS} DESTINATION ${TEST_INSTALL_DIRECTORY})
+INSTALL(FILES ${GOOD_TESTS} ${BAD_TESTS} ${SESSION_FREE_TESTS} ${SWIG_TESTS} DESTINATION ${TEST_INSTALL_DIRECTORY})
 INSTALL(FILES Mesh_tri.med test_homard_adapt.med tutorial_4.00.med tutorial_4.xao tutorial_5.00.med tutorial_5.fr.med DESTINATION ${TEST_INSTALL_DIRECTORY})
 INSTALL(FILES tests.set DESTINATION ${TEST_INSTALL_DIRECTORY})
 INSTALL(DIRECTORY MGAdapt_med_files DESTINATION ${TEST_INSTALL_DIRECTORY})

doc/salome/examples/CTestTestfileInstall.cmake

@@ -24,7 +24,7 @@ SET(TIMEOUT        300)
 
 INCLUDE(tests.set)
 
-FOREACH(tfile ${GOOD_TESTS} ${BAD_TESTS})
+FOREACH(tfile ${GOOD_TESTS} ${BAD_TESTS} ${SWIG_TESTS})
   GET_FILENAME_COMPONENT(BASE_NAME ${tfile} NAME_WE)
   SET(TEST_NAME SMESH_${BASE_NAME})
   ADD_TEST(${TEST_NAME} python ${PYTHON_TEST_DRIVER} ${TIMEOUT} ${tfile})

doc/salome/examples/tests.set

@@ -205,6 +205,75 @@ SET(GOOD_TESTS
   test_polyhedron_per_solid.py
 )
 
+set(SWIG_TESTS
+  ex01_cube2build.py
+  ex02_cube2primitive.py
+  ex03_cube2partition.py
+  ex04_cube5tetraHexa.py
+  ex05_hole1build.py
+  ex06_hole1boolean.py
+  ex07_hole1partition.py
+  ex08_hole2build.py
+  ex09_grid4build.py
+  ex10_grid4geometry.py
+  ex11_grid3partition.py
+  ex12_grid17partition.py
+  ex13_hole1partial.py
+  ex14_cyl1holed.py
+  ex15_cyl2geometry.py
+  ex16_cyl2complementary.py
+  ex17_dome1.py
+  ex18_dome2.py
+  ex19_sphereINcube.py
+  ex21_lamp.py
+  ex24_cylinder.py
+  ex29_refine.py
+  ex30_tepal.py
+  ex30_groupsOp.py
+  ex31_dimGroup.py
+  SMESH_test.py
+  SMESH_test0.py
+  SMESH_test1.py
+  SMESH_test1_AndDisplay.py
+  SMESH_test2.py
+  SMESH_test3.py
+  SMESH_test4.py
+  SMESH_test5.py
+  SMESH_mechanic.py
+  SMESH_mechanic_tetra.py
+  SMESH_mechanic_editor.py
+  SMESH_mechanic_netgen.py
+  SMESH_fixation.py
+  SMESH_fixation_hexa.py
+  SMESH_fixation_tetra.py
+  SMESH_fixation_netgen.py
+  SMESH_box_tetra.py
+  SMESH_box2_tetra.py
+  SMESH_box3_tetra.py
+  SMESH_flight_skin.py
+  SMESH_Partition1_tetra.py
+  SMESH_controls.py
+  SMESH_freebord.py
+  SMESH_blocks.py
+  SMESH_BelongToGeom.py
+  SMESH_GroupFromGeom2.py
+  SMESH_box.py
+  SMESH_demo_hexa2_upd.py
+  SMESH_hexaedre.py
+  SMESH_Sphere.py
+  SMESH_GroupFromGeom.py
+  SMESH_Nut.py
+  SMESH_GroupLyingOnGeom.py
+  SMESH_AdvancedEditor.py
+  SMESH_BuildCompound.py
+  PAL_MESH_041_mesh.py
+  PAL_MESH_043_2D.py
+  PAL_MESH_043_3D.py
+  SMESH_reg.py
+  smesh_selection.py
+  YACS_geomesh0.py
+)
+
 set(SESSION_FREE_TESTS
   basic_geom_smesh_without_session.py
   basic_shaper_smesh_without_session.py
@@ -214,4 +283,4 @@ set(SESSION_FREE_TESTS
   doublenodes_polyhedra.py
 )
 
-SET(EXAMPLES_TESTS ${BAD_TESTS} ${GOOD_TESTS} ${SESSION_FREE_TESTS} testme.py)
+SET(EXAMPLES_TESTS ${BAD_TESTS} ${GOOD_TESTS} ${SESSION_FREE_TESTS} ${SWIG_TESTS} testme.py)

src/SMESH_SWIG/CMakeLists.txt

@@ -32,75 +32,6 @@ include_directories(
 )
 
 # scripts / static
-SET(_bin_SCRIPTS
-  ex00_all.py
-  ex01_cube2build.py
-  ex02_cube2primitive.py
-  ex03_cube2partition.py
-  ex04_cube5tetraHexa.py
-  ex05_hole1build.py
-  ex06_hole1boolean.py
-  ex07_hole1partition.py
-  ex08_hole2build.py
-  ex09_grid4build.py
-  ex10_grid4geometry.py
-  ex11_grid3partition.py
-  ex12_grid17partition.py
-  ex13_hole1partial.py
-  ex14_cyl1holed.py
-  ex15_cyl2geometry.py
-  ex16_cyl2complementary.py
-  ex17_dome1.py
-  ex18_dome2.py
-  ex19_sphereINcube.py
-  ex21_lamp.py
-  ex24_cylinder.py
-  ex29_refine.py
-  ex30_tepal.py
-  ex30_groupsOp.py
-  ex31_dimGroup.py
-  SMESH_test.py
-  SMESH_test0.py
-  SMESH_test1.py
-  SMESH_test1_AndDisplay.py
-  SMESH_test2.py
-  SMESH_test3.py
-  SMESH_test4.py
-  SMESH_test5.py
-  SMESH_mechanic.py
-  SMESH_mechanic_tetra.py
-  SMESH_mechanic_editor.py
-  SMESH_mechanic_netgen.py
-  SMESH_fixation.py
-  SMESH_fixation_hexa.py
-  SMESH_fixation_tetra.py
-  SMESH_fixation_netgen.py
-  SMESH_box_tetra.py
-  SMESH_box2_tetra.py
-  SMESH_box3_tetra.py
-  SMESH_flight_skin.py
-  SMESH_Partition1_tetra.py
-  SMESH_controls.py
-  SMESH_freebord.py
-  SMESH_blocks.py
-  SMESH_BelongToGeom.py
-  SMESH_GroupFromGeom2.py
-  SMESH_box.py
-  SMESH_demo_hexa2_upd.py
-  SMESH_hexaedre.py
-  SMESH_Sphere.py
-  SMESH_GroupFromGeom.py
-  SMESH_Nut.py
-  SMESH_GroupLyingOnGeom.py
-  SMESH_AdvancedEditor.py
-  SMESH_BuildCompound.py
-  PAL_MESH_041_mesh.py
-  PAL_MESH_043_2D.py
-  PAL_MESH_043_3D.py
-  SMESH_reg.py
-  smesh_selection.py
-  YACS_geomesh0.py
-)
 
 SET(smesh_SCRIPTS
   smeshBuilder.py
@@ -120,7 +51,7 @@ SET_SOURCE_FILES_PROPERTIES(SMeshHelper.i PROPERTIES CPLUSPLUS ON)
 SET_SOURCE_FILES_PROPERTIES(SMeshHelper.i PROPERTIES SWIG_FLAGS "-py3")
 SET_SOURCE_FILES_PROPERTIES(SMeshHelper_wrap.cpp PROPERTIES COMPILE_FLAGS "-DHAVE_CONFIG_H")
 SET(_swig_SCRIPTS ${CMAKE_CURRENT_BINARY_DIR}/SMeshHelper.py )
-IF(${CMAKE_VERSION} VERSION_LESS "3.8.0") 
+IF(${CMAKE_VERSION} VERSION_LESS "3.8.0")
   SWIG_ADD_MODULE(SMeshHelper python ${SMeshHelper_SOURCES})
 ELSE()
   SWIG_ADD_LIBRARY(SMeshHelper LANGUAGE python SOURCES ${SMeshHelper_SOURCES})
@@ -135,7 +66,6 @@ install(FILES ${SMeshHelper_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
 SALOME_INSTALL_SCRIPTS("${_swig_SCRIPTS}"  ${SALOME_INSTALL_BINS} EXTRA_DPYS "${SWIG_MODULE_SMeshHelper_REAL_NAME}")
 
 # --- rules ---
-SALOME_INSTALL_SCRIPTS("${_bin_SCRIPTS}" ${SALOME_INSTALL_PYTHON} DEF_PERMS)
 SALOME_INSTALL_SCRIPTS("${smesh_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/smesh DEF_PERMS)
 SALOME_INSTALL_SCRIPTS("${StdMeshers_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/StdMeshers DEF_PERMS)
 SALOME_INSTALL_SCRIPTS(SMESH_shared_modules.py ${SALOME_INSTALL_PYTHON}/shared_modules DEF_PERMS)

src/SMESH_SWIG/ex00_all.py

@@ -1,46 +0,0 @@
-#  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-# Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-# ==================================
-# Load all examples
-# -----------------
-#
-import ex01_cube2build
-import ex02_cube2primitive
-import ex03_cube2partition
-import ex04_cube5tetraHexa
-import ex05_hole1build
-import ex06_hole1boolean
-import ex07_hole1partition
-import ex08_hole2build
-import ex09_grid4build
-import ex10_grid4geometry
-import ex11_grid3partition
-import ex12_grid17partition
-import ex13_hole1partial
-import ex14_cyl1holed
-import ex15_cyl2geometry
-import ex16_cyl2complementary
-import ex17_dome1
-import ex18_dome2
-import ex19_sphereINcube