From: S. Pomarede Date: Mon, 23 May 2016 08:12:40 +0000 (+0200) Subject: release 7.8.0 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=630709e45966a3b4e53726c573a9538c91c16ddd;p=tools%2FSALOME.git release 7.8.0 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ba49a9..376d538 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2016 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index c8a2d79..8327061 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2016 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/doc/conf.py.in b/doc/conf.py.in index c9563b0..be88a54 100644 --- a/doc/conf.py.in +++ b/doc/conf.py.in @@ -36,7 +36,7 @@ master_doc = 'index' # General information about the project. project = 'salome' -copyright = '2010-2015 CEA/DEN, EDF R&D, OPEN CASCADE, ASTEK INDUSTRIE' +copyright = '2010-2016 CEA/DEN, EDF R&D, OPEN CASCADE, ASTEK INDUSTRIE' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt index b1797a9..91e0358 100644 --- a/resources/CMakeLists.txt +++ b/resources/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2016 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/resources/about.png b/resources/about.png index c73d028..b725ce1 100644 Binary files a/resources/about.png and b/resources/about.png differ diff --git a/resources/app_logo.png b/resources/app_logo.png index e5c1f96..33971d2 100644 Binary files a/resources/app_logo.png and b/resources/app_logo.png differ diff --git a/resources/doc/CMakeLists.txt b/resources/doc/CMakeLists.txt index 5852f68..660f621 100644 --- a/resources/doc/CMakeLists.txt +++ b/resources/doc/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2016 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/resources/splash.png b/resources/splash.png index c73d028..b725ce1 100644 Binary files a/resources/splash.png and b/resources/splash.png differ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5dc593a..847da55 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2016 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/parseConfigFile.py b/src/parseConfigFile.py index e6c2bde..58ff8af 100755 --- a/src/parseConfigFile.py +++ b/src/parseConfigFile.py @@ -1,4 +1,4 @@ -# Copyright (C) 2013-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2013-2016 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/resources/CMakeLists.txt b/src/resources/CMakeLists.txt index 812fddc..b0a2d0f 100644 --- a/src/resources/CMakeLists.txt +++ b/src/resources/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2016 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/resources/LightApp_msg_en.ts b/src/resources/LightApp_msg_en.ts index e729f8e..8b43b8f 100644 --- a/src/resources/LightApp_msg_en.ts +++ b/src/resources/LightApp_msg_en.ts @@ -17,7 +17,7 @@ APP_VERSION - V7.8.0BR + V7.8.0 ABOUT_LICENSE @@ -25,7 +25,7 @@ ABOUT_VERSION - Version 7.8.0BR + Version 7.8.0 ABOUT_TITLE diff --git a/src/resources/LightApp_msg_fr.ts b/src/resources/LightApp_msg_fr.ts index 1fe8411..093d78a 100644 --- a/src/resources/LightApp_msg_fr.ts +++ b/src/resources/LightApp_msg_fr.ts @@ -17,7 +17,7 @@ APP_VERSION - V7.8.0BR + V7.8.0 ABOUT_LICENSE @@ -25,7 +25,7 @@ ABOUT_VERSION - Version 7.8.0BR + Version 7.8.0 ABOUT_TITLE diff --git a/src/resources/LightApp_msg_ja.ts b/src/resources/LightApp_msg_ja.ts index b568d19..48a5c25 100644 --- a/src/resources/LightApp_msg_ja.ts +++ b/src/resources/LightApp_msg_ja.ts @@ -17,7 +17,7 @@ APP_VERSION - V7.8.0BR + V7.8.0 ABOUT_LICENSE @@ -25,7 +25,7 @@ ABOUT_VERSION - Version 7.8.0BR + Version 7.8.0 ABOUT_TITLE diff --git a/src/salomeContext.py b/src/salomeContext.py index f30c015..00fa1bc 100755 --- a/src/salomeContext.py +++ b/src/salomeContext.py @@ -1,4 +1,4 @@ -# Copyright (C) 2013-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2013-2016 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -85,6 +85,7 @@ class SalomeContext: to .cfg format before setting the context. """ def __init__(self, configFileNames=0): + self.getLogger().setLevel(logging.INFO) #it could be None explicitely (if user use multiples setVariable...for standalone) if configFileNames is None: return @@ -142,8 +143,8 @@ class SalomeContext: absoluteAppliPath = os.getenv('ABSOLUTE_APPLI_PATH','') env_copy = os.environ.copy() proc = subprocess.Popen(['python', os.path.join(absoluteAppliPath,"bin","salome","salomeContext.py"), pickle.dumps(self), pickle.dumps(args)], shell=False, close_fds=True, env=env_copy) - msg = proc.communicate() - return msg, proc.returncode + out, err = proc.communicate() + return out, err, proc.returncode # """Append value to PATH environment variable""" diff --git a/src/salomeContextUtils.py b/src/salomeContextUtils.py index eed1dd5..36bec25 100755 --- a/src/salomeContextUtils.py +++ b/src/salomeContextUtils.py @@ -1,6 +1,6 @@ #! /usr/bin/env python -# Copyright (C) 2013-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2013-2016 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index b0e95da..1895f45 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2016 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public