From: Nabil Ghodbane Date: Wed, 24 Mar 2021 15:53:12 +0000 (+0100) Subject: using CR750-SALOME-PATCH OCCT branch X-Git-Tag: V9_7_0~73 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1228dd8b5800df9e9cf1010f8ed3df703a1ba5d8;p=tools%2Fsat_salome.git using CR750-SALOME-PATCH OCCT branch --- diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf index 3805d7f..aa0764c 100644 --- a/applications/SALOME-master-MPI.pyconf +++ b/applications/SALOME-master-MPI.pyconf @@ -29,7 +29,7 @@ APPLICATION : alabaster : '0.7.6' Babel : '2.7.0' boost : '1.58.0' - CAS : 'V7_5_0' + CAS : {tag: 'CR750-SALOME-PATCH', section: 'version_V7_5_0'} certifi : '2018.8.24' cgns : {tag : '3.3.1', hpc : 'yes'} chardet : '3.0.4' diff --git a/applications/SALOME-master-int32.pyconf b/applications/SALOME-master-int32.pyconf index 27107cd..e192305 100644 --- a/applications/SALOME-master-int32.pyconf +++ b/applications/SALOME-master-int32.pyconf @@ -28,7 +28,7 @@ APPLICATION : alabaster : '0.7.6' Babel : '2.7.0' boost : '1.58.0' - CAS : 'V7_5_0' + CAS : {tag: 'CR750-SALOME-PATCH', section: 'version_V7_5_0'} certifi : '2018.8.24' cgns : '3.3.1' chardet : '3.0.4' diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index 03639a3..e536c8a 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -29,7 +29,7 @@ APPLICATION : alabaster : 'native' Babel : 'native' boost : 'native' - CAS : 'CR740-SALOME-PATCH' + CAS : {tag: 'CR750-SALOME-PATCH', section: 'version_V7_5_0'} certifi : 'native' cgns : 'native' chardet : 'native' diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf index c606541..24ff245 100644 --- a/applications/SALOME-master-windows.pyconf +++ b/applications/SALOME-master-windows.pyconf @@ -33,7 +33,7 @@ APPLICATION : alabaster : '0.7.6' Babel : '2.7.0' boost : '1.67.0' - CAS : {section: 'version_V7_5_0_win', tag: 'V7_5_0'} + CAS : {tag: 'CR750-SALOME-PATCH', section: 'version_V7_5_0_win'} certifi : '2019.6.16' cgns : '3.3.1' chardet : '3.0.4' diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index 6f543a4..bcefa7c 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -30,7 +30,7 @@ APPLICATION : alabaster : '0.7.6' Babel : '2.7.0' boost : '1.58.0' - CAS : 'V7_5_0' + CAS : {tag: 'CR750-SALOME-PATCH', section: 'version_V7_5_0'} certifi : '2018.8.24' cgns : '3.3.1' chardet : '3.0.4' diff --git a/products/CAS.pyconf b/products/CAS.pyconf index 161ae81..f9be06d 100755 --- a/products/CAS.pyconf +++ b/products/CAS.pyconf @@ -42,8 +42,8 @@ version_V7_5_0 : 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" - get_source : "archive" + get_source : "git" + #get_source : "archive" git_info: { repo : "http://git.dev.opencascade.org/repos/occt.git" @@ -81,8 +81,8 @@ version_V7_5_0_win : name : "CAS" build_source : "script" compil_script : "CAS_7.5.bat" - #get_source : "git" - get_source : "archive" + get_source : "git" + #get_source : "archive" archive_info : { archive_name : "CAS-V7_5_0.tar.gz" @@ -133,97 +133,6 @@ version_V7_5_0_win : } } -version_CR740_SALOME_PATCH : -{ - 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_CR740_SALOME_PATCH_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_0p2 : { name : "CAS"