Merge branch 'V9_11_BR'

diff --cc CMakeLists.txt
Simple merge

diff --cc SalomeKERNELConfig.cmake.in
Simple merge

diff --cc bin/appli_gen.py
Simple merge

diff --cc bin/appliskel/salome_common.py
index cb9393113829622a88f35da3d420e91ff8da057a,9b9b25b77d54724801da923841e9012243f6b0d3..51cecf85f6c247feaa3bdd60b170c1d6ff5e52be
--- 1/bin/appliskel/salome_common.py
--- 2/bin/appliskel/salome_common.py
+++ b/bin/appliskel/salome_common.py
@@@ -1,5 -1,5 +1,5 @@@
 -    #! /usr/bin/env python3
 +#! /usr/bin/env python3
- # Copyright (C) 2021-2022  CEA/DEN, EDF R&D
+ # Copyright (C) 2021-2023  CEA, EDF
  #
  # This library is free software; you can redistribute it and/or
  # modify it under the terms of the GNU Lesser General Public

diff --cc bin/salomeContext.py
Simple merge

diff --cc idl/SALOME_Comm.idl
Simple merge

diff --cc idl/SALOME_PyNode.idl
Simple merge

diff --cc src/Basics/CMakeLists.txt
Simple merge

diff --cc src/Basics/KernelBasis.i
Simple merge

diff --cc src/Basics/libSALOMELog.cxx
index cfaaeada518c6e6651d0fffe746f98d1d5064208,0000000000000000000000000000000000000000..fe0beeb2a355239ec7f13f1afedef8a2e98e9b92
mode 100644,000000..100644
--- 1/src/Basics/libSALOMELog.cxx
--- /dev/null
+++ b/src/Basics/libSALOMELog.cxx
@@@ -1,69 -1,0 +1,69 @@@
- // Copyright (C) 2007-2022  CEA/DEN, EDF R&D, OPEN CASCADE
++// Copyright (C) 2007-2023  CEA, EDF, OPEN CASCADE
 +//
 +// 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
 +//
 +
 +//  Author : Konstantin Leontev (OpenCascade)
 +//  Module : KERNEL
 +//  $Header$
 +//
 +
 +#include "libSALOMELog.hxx"
 +
 +#include <string>
 +#include <iostream>
 +
 +namespace SALOME
 +{
 +
 +// ============================================================================
 +/*!
 + *  Called by any log message macros to decide about log output in Release and
 + *  Debug mode dynamically rely on SALOME_VERBOSE environment variable.
 + *  Checks SALOME_VERBOSE only on the very first call and returns cached result
 + *  for all followed calls.
 + *  Returns true if SALOME_VERBOSE is positioned and not empty and if its
 + *  numeric value greater than 0.
 + */
 +// ============================================================================
 +
 +  bool VerbosityActivated()
 +  {
 +    auto isEnvVarSet = []() -> bool
 +    {
 +      const char* envVar = std::getenv("SALOME_VERBOSE");
 +
 +      if (envVar && (envVar[0] != '\0'))
 +      {
 +        try
 +        {
 +          const long long numValue = std::stoll(envVar);
 +          return numValue > 0;
 +        }
 +        catch(const std::exception& e)
 +        {
 +          std::cerr << e.what() << '\n';
 +        }
 +      }
 +
 +      return false;
 +    };
 +
 +    static const bool isActivated = isEnvVarSet();
 +    return isActivated;
 +  }
 +}

diff --cc src/Basics/libSALOMELog.hxx
index 1a53ec133c64ef6619af7c542869d0f8a2601762,0000000000000000000000000000000000000000..93949515b382eac5203a0fd74722f9e895e1020d
mode 100644,000000..100644
--- 1/src/Basics/libSALOMELog.hxx
--- /dev/null
+++ b/src/Basics/libSALOMELog.hxx
@@@ -1,32 -1,0 +1,32 @@@
- // Copyright (C) 2007-2022  CEA/DEN, EDF R&D, OPEN CASCADE
++// Copyright (C) 2007-2023  CEA, EDF, OPEN CASCADE
 +//
 +// 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
 +//
 +
 +//  File   : libSALOMELog.hxx
 +//  Author : Konstantin Leontev (OpenCascade)
 +//  Module : KERNEL
 +//  $Header$
 +//
 +#pragma once
 +
 +#include "SALOME_Basics.hxx"
 +
 +namespace SALOME
 +{
 +  bool BASICS_EXPORT VerbosityActivated();
 +}

diff --cc src/Container/SALOME_ContainerManager.cxx
Simple merge

diff --cc src/Container/SALOME_ContainerManager.hxx
Simple merge

diff --cc src/Container/SALOME_PyNode.py
Simple merge

diff --cc src/SALOMELocalTrace/CMakeLists.txt
Simple merge