From f3c975efde4d3e0526f5cf775f2b10c460da5889 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Mon, 9 Nov 2020 12:22:22 +0100 Subject: [PATCH] use V9_6_0 final tag --- applications/MEDCOUPLING-9.6.0-windows.pyconf | 2 +- applications/MEDCOUPLING-9.6.0.pyconf | 2 +- applications/SALOME-9.6.0-MPI.pyconf | 10 +-- applications/SALOME-9.6.0-windows.pyconf | 10 +-- applications/SALOME-9.6.0.pyconf | 12 +-- products/CAS.pyconf | 90 +++++++++++++++++++ 6 files changed, 108 insertions(+), 18 deletions(-) diff --git a/applications/MEDCOUPLING-9.6.0-windows.pyconf b/applications/MEDCOUPLING-9.6.0-windows.pyconf index 86bf709..10ca055 100644 --- a/applications/MEDCOUPLING-9.6.0-windows.pyconf +++ b/applications/MEDCOUPLING-9.6.0-windows.pyconf @@ -6,7 +6,7 @@ APPLICATION : name : 'MEDCOUPLING-9.6.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name cmake_generator : 'Visual Studio 15 2017 Win64' - tag : 'V9_6_BR' + tag : 'V9_6_0' debug : 'no' base : 'no' python3 : 'yes' diff --git a/applications/MEDCOUPLING-9.6.0.pyconf b/applications/MEDCOUPLING-9.6.0.pyconf index edae448..0e533ba 100644 --- a/applications/MEDCOUPLING-9.6.0.pyconf +++ b/applications/MEDCOUPLING-9.6.0.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'MEDCOUPLING-9.6.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist - tag : 'V9_6_BR' + tag : 'V9_6_0' base : 'no' debug : 'no' python3 : 'yes' diff --git a/applications/SALOME-9.6.0-MPI.pyconf b/applications/SALOME-9.6.0-MPI.pyconf index 729a54c..e3a5932 100644 --- a/applications/SALOME-9.6.0-MPI.pyconf +++ b/applications/SALOME-9.6.0-MPI.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'SALOME-9.6.0-MPI' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist - tag : 'V9_6_BR' + tag : 'V9_6_0' dev : 'no' verbose :'no' debug : 'no' @@ -29,7 +29,7 @@ APPLICATION : alabaster : '0.7.6' Babel : '2.7.0' boost : '1.58.0' - CAS : 'CR740-SALOME-PATCH' + CAS : 'V7_4_0p2' certifi : '2018.8.24' cgns : {tag : '3.3.1', hpc : 'yes'} chardet : '3.0.4' @@ -111,7 +111,7 @@ APPLICATION : 'SHAPER' 'SHAPERSTUDY' 'RESTRICTED' - 'LIBBATCH' : {tag :'V2_4_4rc1'} + 'LIBBATCH' : {tag :'V2_4_4'} 'KERNEL' : {section : 'default_MPI', verbose : 'yes'} 'MEDCOUPLING' : {section : 'default_MPI', verbose : 'yes'} 'GUI' : {verbose : 'yes'} @@ -140,8 +140,8 @@ APPLICATION : 'CALCULATOR' 'HELLO' 'PYHELLO' - 'EFICAS' : {tag: 'master'} - 'EFICAS_TOOLS' : {tag : 'master'} + 'EFICAS' + 'EFICAS_TOOLS' 'PY2CPP' : {tag: 'v2.0'} 'ADAO' 'ADAO_INTERFACE' diff --git a/applications/SALOME-9.6.0-windows.pyconf b/applications/SALOME-9.6.0-windows.pyconf index 50da5ba..2ab313d 100644 --- a/applications/SALOME-9.6.0-windows.pyconf +++ b/applications/SALOME-9.6.0-windows.pyconf @@ -6,7 +6,7 @@ APPLICATION : name : 'SALOME-9.6.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name cmake_generator : 'Visual Studio 15 2017 Win64' - tag : 'V9_6_BR' + tag : 'V9_6_0' dev : 'no' verbose :'no' debug : 'no' @@ -34,7 +34,7 @@ APPLICATION : alabaster : '0.7.6' Babel : '2.7.0' boost : '1.67.0' - CAS : {section: 'version_CR740_SALOME_PATCH_win', tag: 'CR740-SALOME-PATCH'} + CAS : 'V7_4_0p2' certifi : '2019.6.16' cgns : '3.3.1' chardet : '3.0.4' @@ -127,7 +127,7 @@ APPLICATION : 'SHAPER' 'SHAPERSTUDY' 'RESTRICTED' - 'LIBBATCH' : {tag :'V2_4_4rc2'} + 'LIBBATCH' : {tag :'V2_4_4'} 'KERNEL' 'MEDCOUPLING' 'GUI' @@ -154,8 +154,8 @@ APPLICATION : 'CALCULATOR' 'HELLO' 'PYHELLO' - 'EFICAS' : {tag : 'master'} - 'EFICAS_TOOLS' : {tag : 'master'} + 'EFICAS' + 'EFICAS_TOOLS' 'ADAO' 'CEATESTBASE' : {tag: 'SalomeV9'} } diff --git a/applications/SALOME-9.6.0.pyconf b/applications/SALOME-9.6.0.pyconf index 3a9fd71..a094ea9 100644 --- a/applications/SALOME-9.6.0.pyconf +++ b/applications/SALOME-9.6.0.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'SALOME-9.6.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist - tag : 'V9_6_BR' + tag : 'V9_6_0' dev : 'no' verbose :'no' debug : 'no' @@ -30,7 +30,7 @@ APPLICATION : alabaster : '0.7.6' Babel : '2.7.0' boost : '1.58.0' - CAS : 'CR740-SALOME-PATCH' + CAS : 'V7_4_0p2' certifi : '2018.8.24' cgns : '3.3.1' chardet : '3.0.4' @@ -111,7 +111,7 @@ APPLICATION : 'SHAPER' 'SHAPERSTUDY' 'RESTRICTED' - 'LIBBATCH' : {tag : 'V2_4_4rc2'} + 'LIBBATCH' : {tag : 'V2_4_4'} 'KERNEL' 'MEDCOUPLING' : {section: 'default_int64'} # this will trigger other modules as int64 'GUI' @@ -140,11 +140,11 @@ APPLICATION : 'CALCULATOR' 'HELLO' 'PYHELLO' - 'EFICAS' : {tag: 'master'} - 'EFICAS_TOOLS' : {tag : 'master'} + 'EFICAS' + 'EFICAS_TOOLS' 'PY2CPP' : {tag: 'v2.0'} 'ADAO' - 'ADAO_INTERFACE': {tag : 'master'} + 'ADAO_INTERFACE' 'CEATESTBASE' : {tag: 'SalomeV9'} } profile : diff --git a/products/CAS.pyconf b/products/CAS.pyconf index 509cc05..a40de48 100755 --- a/products/CAS.pyconf +++ b/products/CAS.pyconf @@ -128,6 +128,96 @@ version_CR740_SALOME_PATCH_win : } } +version_V7_4_0p2 : +{ + name : "CAS" + build_source : "cmake" + cmake_options : "-DUSE_TCL=OFF -DBUILD_MODULE_Draw=OFF -DUSE_FREETYPE=ON -D3RDPARTY_FREETYPE_DIR=$FREETYPEDIR -DUSE_GL2PS=OFF -DUSE_FREEIMAGE=ON -D3RDPARTY_FREEIMAGE_DIR=$FREEIMAGEDIR" + get_source : "git" + git_info: + { + repo : "http://git.dev.opencascade.org/repos/occt.git" + repo_dev : $repo + } + environ : + { + # OP 19/04/2017 Artifact 8482 : Ajout des variables CAS dans la + # section environ pour conserver + # la generalite du script CAS.py + CSF_ShadersDirectory : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "Shaders" + CSF_UnitsLexicon : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "UnitsAPI" + $VARS.sep + "Lexi_Expr.dat" + CSF_UnitsDefinition : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "UnitsAPI" + $VARS.sep + "Units.dat" + CSF_SHMessage : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "SHMessage" + CSF_XSMessage : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "XSMessage" + CSF_MDTVTexturesDirectory : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "Textures" + MMGT_REENTRANT : "1" + CSF_StandardDefaults : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "StdResource" + CSF_PluginDefaults : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "StdResource" + + env_script : $name + ".py" + } + depend : ['freetype', 'freeimage'] + build_depend : ["cmake", "doxygen"] + 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 : "no" + } +} + +version_V7_4_0p2_win : +{ + name : "CAS" + build_source : "script" + compil_script : "CAS_7.4.bat" + get_source : "git" + git_info: + { + repo : "http://git.dev.opencascade.org/repos/occt.git" + repo_dev : $repo + } + environ : + { + CSF_OCCTBinPath : $install_dir + $VARS.sep + "win64" + $VARS.sep + "vc14" + $VARS.sep + "bin" + CSF_OCCTLibPath : $install_dir + $VARS.sep + "win64" + $VARS.sep + "vc14" + $VARS.sep + "lib" + CSF_OCCTIncludePath : $install_dir + $VARS.sep + "inc" + CSF_OCCTResourcePath : $install_dir + $VARS.sep + "src" + CSF_OCCTDataPath : $install_dir + $VARS.sep + "data" + CSF_OCCTSamplesPath : $install_dir + $VARS.sep + "samples" + CSF_OCCTTestsPath : $install_dir + $VARS.sep + "tests" + CSF_OCCTDocPath : $install_dir + $VARS.sep + "doc" + CSF_SHMessage : $install_dir + $VARS.sep + "src" + $VARS.sep + "SHMessage" + CSF_MDTVTexturesDirectory: $install_dir + $VARS.sep + "src" + $VARS.sep + "Textures" + CSF_ShadersDirectory : $install_dir + $VARS.sep + "src" + $VARS.sep + "Shaders" + CSF_XSMessage : $install_dir + $VARS.sep + "src" + $VARS.sep + "XSMessage" + CSF_TObjMessage : $install_dir + $VARS.sep + "src" + $VARS.sep + "TObj" + CSF_StandardDefaults : $install_dir + $VARS.sep + "src" + $VARS.sep + "StdResource" + CSF_PluginDefaults : $install_dir + $VARS.sep + "src" + $VARS.sep + "StdResource" + CSF_XCAFDefaults : $install_dir + $VARS.sep + "src" + $VARS.sep + "StdResource" + CSF_TObjDefaults : $install_dir + $VARS.sep + "src" + $VARS.sep + "StdResource" + CSF_StandardLiteDefaults : $install_dir + $VARS.sep + "src" + $VARS.sep + "StdResource" + CSF_IGESDefaults : $install_dir + $VARS.sep + "src" + $VARS.sep + "XSTEPResource" + CSF_STEPDefaults : $install_dir + $VARS.sep + "src" + $VARS.sep + "XSTEPResource" + CSF_XmlOcafResource : $install_dir + $VARS.sep + "src" + $VARS.sep + "XmlOcafResource" + CSF_MIGRATION_TYPES : $install_dir + $VARS.sep + "src" + $VARS.sep + "StdResource" + $VARS.sep + "MigrationSheet.txt" + CSF_UnitsDefinition : $install_dir + $VARS.sep + "src" + $VARS.sep + "UnitsAPI" + $VARS.sep + "Units.dat" + MMGT_CLEAR : "1" + MMGT_REENTRANT : "1" + CSF_LANGUAGE : "us" + + env_script : "CAS.py" + } + depend : ['freetype', 'freeimage', 'tbb'] + build_depend : ["cmake", "doxygen"] + source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name + build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name + properties: + { + incremental : "no" + } +} version_V7_4_0p1 : { -- 2.39.2