From: Gbkng Date: Wed, 26 Jun 2024 14:16:41 +0000 (+0200) Subject: remove dependency to SOLVERLABGUI and packagespy X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b5fb3f41e0b572ea43ee5c3a4352fce3542e0937;p=tools%2Fsat_salome.git remove dependency to SOLVERLABGUI and packagespy --- diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf index 3f61f4d..a914902 100644 --- a/applications/SALOME-master-MPI.pyconf +++ b/applications/SALOME-master-MPI.pyconf @@ -200,7 +200,6 @@ APPLICATION : 'pmml' 'SALOMEBOOTSTRAP' 'SOLVERLAB' : {tag: 'master', base: 'no', section: 'default_MPI', hpc: 'yes'} - 'SOLVERLABGUI' 'TopIIVolMesh' #'TESTBASE' 'CEATESTBASE' : 'SalomeV9' diff --git a/applications/SALOME-master-int32.pyconf b/applications/SALOME-master-int32.pyconf index 4393da2..9afedb2 100644 --- a/applications/SALOME-master-int32.pyconf +++ b/applications/SALOME-master-int32.pyconf @@ -206,7 +206,6 @@ APPLICATION : 'pmml' 'SALOMEBOOTSTRAP' 'SOLVERLAB' : {tag: 'master', base: 'no', section: 'default_MPI', hpc: 'yes'} - 'SOLVERLABGUI' 'TopIIVolMesh' #'TESTBASE' 'CEATESTBASE' : 'SalomeV9' diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index 69a7f7b..2649fce 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -103,7 +103,6 @@ APPLICATION : openturns: '1.22' ospray : '2.4.0' packaging : 'native' - packagespy : '74152cd' pandas : 'native' ParaView : {tag:'5.11.0', base: 'no', section: 'version_5_11_0_MPI', hpc: 'yes'} PERSALYS : 'v16.0.1' @@ -190,7 +189,6 @@ APPLICATION : 'pmml' 'SALOMEBOOTSTRAP' 'SOLVERLAB' - 'SOLVERLABGUI' 'TopIIVolMesh' #'TESTBASE' 'CEATESTBASE' : 'SalomeV9' diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index 96ad50f..abaefcb 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -209,7 +209,6 @@ APPLICATION : 'pmml' 'SALOMEBOOTSTRAP' 'SOLVERLAB' : {tag: 'master', base: 'no', section: 'default_MPI', hpc: 'yes'} - 'SOLVERLABGUI' 'TopIIVolMesh' #'TESTBASE' 'CEATESTBASE' : 'SalomeV9' diff --git a/products/SOLVERLABGUI.pyconf b/products/SOLVERLABGUI.pyconf deleted file mode 100644 index 6ec27a0..0000000 --- a/products/SOLVERLABGUI.pyconf +++ /dev/null @@ -1,35 +0,0 @@ -default : -{ - name : "SOLVERLABGUI" - build_source : "cmake" - build_command : "-DPython_ROOT_DIR=${PYTHON_ROOT_DIR} -DPython_EXECUTABLE=${PYTHONBIN} -DPACKAGESPY_ROOT_DIR=${PACKAGESPY_ROOT_DIR}" - get_source : "dir" - dir_info : - { - dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + 'SOLVERLAB' + $VARS.sep + 'solverlabGUI' - } - environ : - { - SalomeAppConfig_ : $install_dir + $VARS.sep + "share" + $VARS.sep + "salome" + $VARS.sep + "resources" + $VARS.sep + "solverlabgui" - env_script : $name + ".py" - } - depend : - [ - 'KERNEL', - 'GUI', - 'SOLVERLAB', - 'MEDCOUPLING', - 'packagespy' - ] - build_depend : ["cmake", "swig", "doxygen", "graphviz","cppunit"] - source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + 'SOLVERLAB' + $VARS.sep + 'solverlabGUI' - build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name - nb_proc : 1 - properties: - { - is_SALOME_module : "yes" - incremental : "yes" - has_salome_gui : "yes" - } - patches: [] -} diff --git a/products/packagespy.pyconf b/products/packagespy.pyconf deleted file mode 100644 index 5a74498..0000000 --- a/products/packagespy.pyconf +++ /dev/null @@ -1,26 +0,0 @@ -default : -{ - name : "packagespy" - build_source : "script" - compil_script : $name + $VARS.scriptExtension - get_source : "archive" - environ : - { - env_script : $name + ".py" - } - patches : [] - depend : ["Python", "setuptools"] - source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name - build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name - install_dir : 'base' - properties : - { - incremental : "yes" - } -} - -version_74152cd : -{ - archive_info : {archive_name : "packagespy-74152cd.tar.gz"} - patches : ["packagespy-74152cd-verbosity-level.patch"] -}