From 0f8157a7f5279f80067af7140686e04f86d605c7 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Tue, 12 Dec 2023 16:08:05 +0100 Subject: [PATCH] bos #37834: V9_12_0rc1 --- applications/MEDCOUPLING-9.12.0-MPI.pyconf | 4 ++-- applications/MEDCOUPLING-9.12.0-int32.pyconf | 2 +- applications/MEDCOUPLING-9.12.0-native.pyconf | 4 ++-- .../MEDCOUPLING-9.12.0-windows.pyconf | 2 +- applications/MEDCOUPLING-9.12.0.pyconf | 2 +- applications/SALOME-9.12.0-MPI.pyconf | 18 ++++++++-------- applications/SALOME-9.12.0-int32.pyconf | 10 ++++----- applications/SALOME-9.12.0-native.pyconf | 21 ++++++++++--------- applications/SALOME-9.12.0-windows.pyconf | 2 +- applications/SALOME-9.12.0.pyconf | 10 ++++----- applications/SALOME-master-native.pyconf | 1 + products/PERSALYS.pyconf | 4 ++-- products/YDEFX.pyconf | 13 +++++++++++- .../PERSALYS-v14.1-004-launch_html.patch | 13 ++++++++++++ 14 files changed, 66 insertions(+), 40 deletions(-) create mode 100644 products/patches/PERSALYS-v14.1-004-launch_html.patch diff --git a/applications/MEDCOUPLING-9.12.0-MPI.pyconf b/applications/MEDCOUPLING-9.12.0-MPI.pyconf index b1fba70..86d1ee0 100644 --- a/applications/MEDCOUPLING-9.12.0-MPI.pyconf +++ b/applications/MEDCOUPLING-9.12.0-MPI.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'MEDCOUPLING-9.12.0-MPI' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist - tag : 'V9_12_BR' + tag : 'V9_12_0rc1' base : 'no' debug : 'no' python3 : 'yes' @@ -71,7 +71,7 @@ APPLICATION : # SALOME MODULES : 'CONFIGURATION' - 'MEDCOUPLING' : {tag:'V9_12_BR', base: 'no', section: 'default_MPI_STD', hpc: 'yes'} # FIXME + 'MEDCOUPLING' : {tag:'V9_12_0rc1', base: 'no', section: 'default_MPI_STD', hpc: 'yes'} # FIXME } test_base : { diff --git a/applications/MEDCOUPLING-9.12.0-int32.pyconf b/applications/MEDCOUPLING-9.12.0-int32.pyconf index 73b1262..175a8ab 100644 --- a/applications/MEDCOUPLING-9.12.0-int32.pyconf +++ b/applications/MEDCOUPLING-9.12.0-int32.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'MEDCOUPLING-9.12.0-int32' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist - tag : 'V9_12_BR' + tag : 'V9_12_0rc1' base : 'no' debug : 'no' python3 : 'yes' diff --git a/applications/MEDCOUPLING-9.12.0-native.pyconf b/applications/MEDCOUPLING-9.12.0-native.pyconf index 479450d..339cae8 100644 --- a/applications/MEDCOUPLING-9.12.0-native.pyconf +++ b/applications/MEDCOUPLING-9.12.0-native.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'MEDCOUPLING-9.12.0-native' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist - tag : 'V9_12_BR' + tag : 'V9_12_0rc1' base : 'no' debug : 'no' python3 : 'yes' @@ -69,7 +69,7 @@ APPLICATION : # SALOME MODULES : 'CONFIGURATION' - 'MEDCOUPLING' : {tag:'V9_12_BR', base:'no', section:'default_MPI', hpc:'yes'} + 'MEDCOUPLING' : {tag:'V9_12_0rc1', base:'no', section:'default_MPI', hpc:'yes'} } test_base : { diff --git a/applications/MEDCOUPLING-9.12.0-windows.pyconf b/applications/MEDCOUPLING-9.12.0-windows.pyconf index 0599ec2..17edbe7 100644 --- a/applications/MEDCOUPLING-9.12.0-windows.pyconf +++ b/applications/MEDCOUPLING-9.12.0-windows.pyconf @@ -6,7 +6,7 @@ APPLICATION : name : 'MEDCOUPLING-9.12.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name cmake_generator : 'Visual Studio 15 2017 Win64' - tag : 'V9_12_BR' + tag : 'V9_12_0rc1' debug : 'no' base : 'no' python3 : 'yes' diff --git a/applications/MEDCOUPLING-9.12.0.pyconf b/applications/MEDCOUPLING-9.12.0.pyconf index 5bba24a..0ed600b 100644 --- a/applications/MEDCOUPLING-9.12.0.pyconf +++ b/applications/MEDCOUPLING-9.12.0.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'MEDCOUPLING-9.12.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist - tag : 'V9_12_BR' + tag : 'V9_12_0rc1' base : 'no' debug : 'no' python3 : 'yes' diff --git a/applications/SALOME-9.12.0-MPI.pyconf b/applications/SALOME-9.12.0-MPI.pyconf index 9794fcc..1890726 100644 --- a/applications/SALOME-9.12.0-MPI.pyconf +++ b/applications/SALOME-9.12.0-MPI.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'SALOME-9.12.0-MPI' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist - tag : 'V9_12_BR' + tag : 'V9_12_0rc1' dev : 'no' verbose :'no' debug : 'no' @@ -147,8 +147,8 @@ APPLICATION : 'SHAPERSTUDY' 'RESTRICTED' 'LIBBATCH' : 'V2_5_0' - 'KERNEL' : {tag:'V9_12_BR', base: 'no', section: 'default_MPI', hpc: 'yes', verbose: 'yes'} - 'MEDCOUPLING' : {tag:'V9_12_BR', base: 'no', section: 'default_MPI_STD', hpc: 'yes', verbose: 'yes'} + 'KERNEL' : {tag:'V9_12_0rc1', base: 'no', section: 'default_MPI', hpc: 'yes', verbose: 'yes'} + 'MEDCOUPLING' : {tag:'V9_12_0rc1', base: 'no', section: 'default_MPI_STD', hpc: 'yes', verbose: 'yes'} 'GUI' : {verbose : 'yes'} 'GEOM' 'SMESH' @@ -158,12 +158,12 @@ APPLICATION : 'HYBRIDPLUGIN' 'HexoticPLUGIN' 'GMSHPLUGIN' - 'HEXABLOCK' : {tag:'V9_12_BR', base: 'no', section: 'default_MPI', hpc: 'yes', verbose: 'yes'} + 'HEXABLOCK' : {tag:'V9_12_0rc1', base: 'no', section: 'default_MPI', hpc: 'yes', verbose: 'yes'} 'HEXABLOCKPLUGIN' - 'HOMARD' : {tag:'V9_12_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} - 'FIELDS' : {tag:'V9_12_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} - 'PARAVIS' : {tag:'V9_12_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} - 'JOBMANAGER': {tag:'V9_12_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'HOMARD' : {tag:'V9_12_0rc1', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'FIELDS' : {tag:'V9_12_0rc1', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'PARAVIS' : {tag:'V9_12_0rc1', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'JOBMANAGER': {tag:'V9_12_0rc1', base: 'no', section: 'default_MPI', hpc: 'yes'} 'YACS' 'YACSGEN' 'DOCUMENTATION' @@ -183,7 +183,7 @@ APPLICATION : 'YDEFX' 'pmml' 'SALOMEBOOTSTRAP' - 'SOLVERLAB' : {tag:'V9_12_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'SOLVERLAB' : {tag:'V9_12_0rc1', base: 'no', section: 'default_MPI', hpc: 'yes'} 'SOLVERLABGUI' 'TopIIVolMesh' #'TESTBASE' diff --git a/applications/SALOME-9.12.0-int32.pyconf b/applications/SALOME-9.12.0-int32.pyconf index 027af4f..3cbebd7 100644 --- a/applications/SALOME-9.12.0-int32.pyconf +++ b/applications/SALOME-9.12.0-int32.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'SALOME-9.12.0-int32' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist - tag : 'V9_12_BR' + tag : 'V9_12_0rc1' dev : 'no' verbose :'no' debug : 'no' @@ -146,8 +146,8 @@ APPLICATION : 'SHAPERSTUDY' 'RESTRICTED' 'LIBBATCH' : 'V2_5_0' - 'KERNEL' : {tag:'V9_12_BR', base: 'no', section: 'default_32BIT_IDS', hpc: 'no' } - 'MEDCOUPLING' : {tag:'V9_12_BR', base: 'no', section: 'default_32BIT_IDS_MPI_STD', hpc: 'yes'} + 'KERNEL' : {tag:'V9_12_0rc1', base: 'no', section: 'default_32BIT_IDS', hpc: 'no' } + 'MEDCOUPLING' : {tag:'V9_12_0rc1', base: 'no', section: 'default_32BIT_IDS_MPI_STD', hpc: 'yes'} 'GUI' 'GEOM' 'SMESH' @@ -161,7 +161,7 @@ APPLICATION : 'HEXABLOCKPLUGIN' 'HOMARD' 'FIELDS' - 'PARAVIS' : {tag:'V9_12_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'PARAVIS' : {tag:'V9_12_0rc1', base: 'no', section: 'default_MPI', hpc: 'yes'} 'JOBMANAGER' 'YACS' 'YACSGEN' @@ -182,7 +182,7 @@ APPLICATION : 'YDEFX' 'pmml' 'SALOMEBOOTSTRAP' - 'SOLVERLAB' : {tag: 'V9_12_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'SOLVERLAB' : {tag: 'V9_12_0rc1', base: 'no', section: 'default_MPI', hpc: 'yes'} 'SOLVERLABGUI' 'TopIIVolMesh' #'TESTBASE' diff --git a/applications/SALOME-9.12.0-native.pyconf b/applications/SALOME-9.12.0-native.pyconf index 8d4eaab..2531def 100644 --- a/applications/SALOME-9.12.0-native.pyconf +++ b/applications/SALOME-9.12.0-native.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'SALOME-9.12.0-native' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist - tag : 'V9_12_BR' + tag : 'V9_12_0rc1' dev : 'no' verbose :'no' debug : 'no' @@ -145,7 +145,7 @@ APPLICATION : 'RESTRICTED' 'LIBBATCH' : 'V2_5_0' 'KERNEL' - 'MEDCOUPLING' : {tag:'V9_12_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'MEDCOUPLING' : {tag:'V9_12_0rc1', base: 'no', section: 'default_MPI', hpc: 'yes'} 'GUI' 'GEOM' 'SMESH' @@ -159,7 +159,7 @@ APPLICATION : 'HEXABLOCKPLUGIN' 'HOMARD' 'FIELDS' - 'PARAVIS': {tag:'V9_12_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'PARAVIS': {tag:'V9_12_0rc1', base: 'no', section: 'default_MPI', hpc: 'yes'} 'JOBMANAGER' 'YACS' 'YACSGEN' @@ -246,14 +246,14 @@ __overwrite__ : 'APPLICATION.products.scipy' : {tag: '1.5.2', base: 'no', section: 'version_1_5_2_no_pip' } # scipy >= 1.4 - system one too old 'APPLICATION.products.swig' : '4.0.2' 'APPLICATION.products.openmpi' : '4.1.5' - 'APPLICATION.products.MEDCOUPLING' : {tag:'V9_12_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'APPLICATION.products.MEDCOUPLING' : {tag:'V9_12_0rc1', base: 'no', section: 'default_MPI', hpc: 'yes'} } { __condition__ : "VARS.dist in ['DB11']" 'APPLICATION.products.opencv' : '3.2.0' 'APPLICATION.products.cminpack' : 'native' 'APPLICATION.products.PyFMI' : {tag:'2.6', base: 'no', section: 'version_2_6_no_pip'} - 'APPLICATION.products.MEDCOUPLING' : {tag:'V9_12_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'APPLICATION.products.MEDCOUPLING' : {tag:'V9_12_0rc1', base: 'no', section: 'default_MPI', hpc: 'yes'} } { # CentOS 8 repositories don't include sphinxintl package which must be installed through pip. @@ -285,7 +285,8 @@ __overwrite__ : 'APPLICATION.products.statsmodels' : {tag: '0.6.1', base: 'no', section: 'version_0_6_1_no_pip' } 'APPLICATION.products.nose' : {tag: '1.3.7', base: 'no', section: 'version_1_3_7_no_pip' } 'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_CO9', hpc: 'yes'} - 'APPLICATION.products.YACS' : {tag: 'V9_12_BR',base: 'no',section: 'version_V9_12_0_CO9' } + 'APPLICATION.products.YDEFX' : {tag: 'V9_12_0rc1',base: 'no', section: 'version_V9_12_0_CO9' } + 'APPLICATION.products.YACS' : {tag: 'V9_12_0rc1',base: 'no',section: 'version_V9_12_0_CO9' } } { __condition__ : "VARS.dist in ['FD32']" @@ -333,8 +334,8 @@ __overwrite__ : 'APPLICATION.products.PyFMI' : {tag: '2.6', base: 'no', section: 'version_2_6_FD37' } 'APPLICATION.products.medfile' : {tag: '4.1.1', base: 'no', section: 'version_4_1_1_FD37' } 'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_FD37', hpc: 'yes'} - 'APPLICATION.products.CONFIGURATION' : {tag:'V9_12_BR', base: 'no', section: 'default' } - 'APPLICATION.products.SHAPER' : {tag:'V9_12_BR', base: 'no', section: 'default', hpc: 'no' } + 'APPLICATION.products.CONFIGURATION' : {tag:'V9_12_0rc1', base: 'no', section: 'default' } + 'APPLICATION.products.SHAPER' : {tag:'V9_12_0rc1', base: 'no', section: 'default', hpc: 'no' } } { @@ -353,7 +354,7 @@ __overwrite__ : 'APPLICATION.products.catalyst' : {tag: '2.0', base: 'no', section: 'version_2_0_FD38' } 'APPLICATION.products.gmsh' : {tag: '4.10.3', base: 'no', section: 'version_4_10_3_FD38' } 'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_FD38', hpc: 'yes' } - 'APPLICATION.products.CONFIGURATION' : {tag:'V9_12_BR', base: 'no', section: 'default' } - 'APPLICATION.products.SHAPER' : {tag:'V9_12_BR', base: 'no', section: 'default', hpc: 'no' } + 'APPLICATION.products.CONFIGURATION' : {tag:'V9_12_0rc1', base: 'no', section: 'default' } + 'APPLICATION.products.SHAPER' : {tag:'V9_12_0rc1', base: 'no', section: 'default', hpc: 'no' } } ] diff --git a/applications/SALOME-9.12.0-windows.pyconf b/applications/SALOME-9.12.0-windows.pyconf index cad38b5..704a20c 100644 --- a/applications/SALOME-9.12.0-windows.pyconf +++ b/applications/SALOME-9.12.0-windows.pyconf @@ -6,7 +6,7 @@ APPLICATION : name : 'SALOME-9.12.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name cmake_generator : 'Visual Studio 15 2017 Win64' - tag : 'V9_12_BR' + tag : 'V9_12_0rc1' dev : 'no' verbose : 'no' debug : 'no' diff --git a/applications/SALOME-9.12.0.pyconf b/applications/SALOME-9.12.0.pyconf index 23ee66b..5270286 100644 --- a/applications/SALOME-9.12.0.pyconf +++ b/applications/SALOME-9.12.0.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'SALOME-9.12.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist - tag : 'V9_12_BR' + tag : 'V9_12_0rc1' dev : 'no' verbose :'no' debug : 'no' @@ -148,7 +148,7 @@ APPLICATION : 'RESTRICTED' 'LIBBATCH' : 'V2_5_0' 'KERNEL' - 'MEDCOUPLING' : {tag:'V9_12_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'MEDCOUPLING' : {tag:'V9_12_0rc1', base: 'no', section: 'default_MPI', hpc: 'yes'} 'GUI' 'GEOM' 'SMESH' @@ -162,7 +162,7 @@ APPLICATION : 'HEXABLOCKPLUGIN' 'HOMARD' 'FIELDS' - 'PARAVIS' : {tag:'V9_12_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'PARAVIS' : {tag:'V9_12_0rc1', base: 'no', section: 'default_MPI', hpc: 'yes'} 'JOBMANAGER' 'YACS' 'YACSGEN' @@ -183,7 +183,7 @@ APPLICATION : 'YDEFX' 'pmml' 'SALOMEBOOTSTRAP' - 'SOLVERLAB' : {tag: 'V9_12_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'SOLVERLAB' : {tag: 'V9_12_0rc1', base: 'no', section: 'default_MPI', hpc: 'yes'} 'SOLVERLABGUI' 'TopIIVolMesh' #'TESTBASE' @@ -240,7 +240,7 @@ __overwrite__ : { __condition__ : "VARS.dist in ['DB09']" 'APPLICATION.products.openturns' : {tag: '1.21', base: 'no', section: 'version_1_21_DB09' } - 'MEDCOUPLING' : {tag:'V9_12_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'MEDCOUPLING' : {tag:'V9_12_0rc1', base: 'no', section: 'default_MPI', hpc: 'yes'} } { __condition__ : "VARS.dist in ['UB18.04']" diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index 0a9b7df..b1717f5 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -285,6 +285,7 @@ __overwrite__ : 'APPLICATION.products.statsmodels' : {tag: '0.6.1', base: 'no', section: 'version_0_6_1_no_pip' } 'APPLICATION.products.nose' : {tag: '1.3.7', base: 'no', section: 'version_1_3_7_no_pip' } 'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_CO9', hpc: 'yes'} + 'APPLICATION.products.YDEFX' : {tag: 'master', base: 'no', section: 'version_master_CO9' } 'APPLICATION.products.YACS' : {tag: 'master', base: 'no', section: 'version_master_CO9' } } { diff --git a/products/PERSALYS.pyconf b/products/PERSALYS.pyconf index d87bc42..6710d35 100644 --- a/products/PERSALYS.pyconf +++ b/products/PERSALYS.pyconf @@ -61,7 +61,7 @@ default_win : version_v14_1 : { - patches : ['PERSALYS-v14.1-001.patch'] + patches : ['PERSALYS-v14.1-001.patch', 'PERSALYS-v14.1-004-launch_html.patch'] } version_v14_1_win : @@ -93,7 +93,7 @@ version_v14_1_win : 'openblas', 'pthreads' ] - patches : ['PERSALYS-v14.1-002.patch', 'PERSALYS-v14.1-003.patch'] + patches : ['PERSALYS-v14.1-002.patch', 'PERSALYS-v14.1-003.patch', 'PERSALYS-v14.1-004-launch_html.patch'] } version_v14_0_1 : diff --git a/products/YDEFX.pyconf b/products/YDEFX.pyconf index 42a9ae0..6d5560d 100644 --- a/products/YDEFX.pyconf +++ b/products/YDEFX.pyconf @@ -18,7 +18,8 @@ default : "Python", "KERNEL", "PY2CPP", - "YACS" + "YACS", + "qt" ] opt_depend: [] build_depend : ["cmake", "cppunit"] @@ -40,6 +41,16 @@ default_win : patches : [] } +version_master_CO9 : +{ + cmake_options : " -DQt5_DIR=${QT5_ROOT_DIR}/lib/cmake/Qt5 -DQt5Core_DIR=${QT5_ROOT_DIR}/lib/cmake/Qt5Core -DQt5Gui_DIR=${QT5_ROOT_DIR}/lib/cmake/Qt5Gui -DQt5Widgets_DIR=${QT5_ROOT_DIR}/lib/cmake/Qt5Widgets" +} + +version_V9_12_0_CO9 : +{ + cmake_options : " -DQt5_DIR=${QT5_ROOT_DIR}/lib/cmake/Qt5 -DQt5Core_DIR=${QT5_ROOT_DIR}/lib/cmake/Qt5Core -DQt5Gui_DIR=${QT5_ROOT_DIR}/lib/cmake/Qt5Gui -DQt5Widgets_DIR=${QT5_ROOT_DIR}/lib/cmake/Qt5Widgets" +} + version_V9_10_0 : { # prescription de EDF ne fonctionne pas en dehors de YAMS diff --git a/products/patches/PERSALYS-v14.1-004-launch_html.patch b/products/patches/PERSALYS-v14.1-004-launch_html.patch new file mode 100644 index 0000000..c5b50fa --- /dev/null +++ b/products/patches/PERSALYS-v14.1-004-launch_html.patch @@ -0,0 +1,13 @@ +--- persalys-14.1_ref/lib/src/view/WelcomeWindow.cxx 2023-07-25 11:23:39.000000000 +0200 ++++ persalys-14.1_dev/lib/src/view/WelcomeWindow.cxx 2023-12-01 17:35:04.772748488 +0100 +@@ -36,9 +36,7 @@ + margins.setTop(0); + margins.setBottom(0); + widgetLayout->setContentsMargins(margins); +- +- widgetLayout->addWidget(new TitleLabel(tr("Study creation"), "user_manual/graphical_interface/getting_started/user_manual_getting_started.html#create-a-study")); +- ++ widgetLayout->addWidget(new TitleLabel(tr("Study creation"), "user_manual/graphical_interface/getting_started/user_manual_getting_started.html")); + QScrollArea * scrollArea = new QScrollArea; + scrollArea->setWidgetResizable(true); + widgetLayout->addWidget(scrollArea); -- 2.39.2