From be900568bcf2c0d5c9321d341d332eb9d91c8cd6 Mon Sep 17 00:00:00 2001 From: "S. Pomarede" Date: Tue, 2 Aug 2016 15:20:29 +0200 Subject: [PATCH] new salome profile for V8.1.0a1 --- CMakeLists.txt | 2 +- resources/app_logo.png | Bin 3662 -> 808 bytes src/resources/LightApp_msg_en.ts | 4 ++-- src/resources/LightApp_msg_fr.ts | 4 ++-- src/resources/LightApp_msg_ja.ts | 4 ++-- src/salomeContext.py | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ef0112e..10cc158 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -120,5 +120,5 @@ SALOME_INSTALL_SCRIPTS("${_salome_context_API_SCRIPTS}" ${SALOME_INSTALL_SCRIPT_ SET(_salome_context_BASHRC ${KERNEL_ROOT_DIR}/bin/salome/appliskel/.bashrc ) -FILE(TO_CMAKE_PATH $ENV{SALOME_PROFILE_ROOT_DIR} _SALOME_PROFILE_ROOT_DIR) +FILE(TO_CMAKE_PATH ${CMAKE_INSTALL_PREFIX} _SALOME_PROFILE_ROOT_DIR) SALOME_INSTALL_SCRIPTS("${_salome_context_BASHRC}" ${_SALOME_PROFILE_ROOT_DIR}) diff --git a/resources/app_logo.png b/resources/app_logo.png index 1e7605dcb90b19f2d9f12d5d7705423b942dba1c..7052c47223538890605e7d658c5985f8037db566 100644 GIT binary patch literal 808 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 APP_VERSION - Master + V8.1.0a1 ABOUT_LICENSE @@ -25,7 +25,7 @@ ABOUT_VERSION - Version Master + Version 8.1.0a1 ABOUT_TITLE diff --git a/src/resources/LightApp_msg_fr.ts b/src/resources/LightApp_msg_fr.ts index ccc6753..472af44 100644 --- a/src/resources/LightApp_msg_fr.ts +++ b/src/resources/LightApp_msg_fr.ts @@ -17,7 +17,7 @@ APP_VERSION - Master + V8.1.0a1 ABOUT_LICENSE @@ -25,7 +25,7 @@ ABOUT_VERSION - Version Master + Version 8.1.0a1 ABOUT_TITLE diff --git a/src/resources/LightApp_msg_ja.ts b/src/resources/LightApp_msg_ja.ts index 77907b4..aea5c1e 100644 --- a/src/resources/LightApp_msg_ja.ts +++ b/src/resources/LightApp_msg_ja.ts @@ -17,7 +17,7 @@ APP_VERSION - Master + V8.1.0a1 ABOUT_LICENSE @@ -25,7 +25,7 @@ ABOUT_VERSION - Version Master + Version 8.1.0a1 ABOUT_TITLE diff --git a/src/salomeContext.py b/src/salomeContext.py index 00ded0a..2bed904 100755 --- a/src/salomeContext.py +++ b/src/salomeContext.py @@ -143,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""" -- 2.39.2