new salome profile for V8.1.0a1

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef0112e916cb9b47b208e38bb254c2aa3a34dc65..10cc158d4866533d8e39ba7de8137635b1897be6 100644 (file)
--- 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 (file)
Binary files a/resources/app_logo.png and b/resources/app_logo.png differ

diff --git a/src/resources/LightApp_msg_en.ts b/src/resources/LightApp_msg_en.ts
index 5b0bd4633142ba322dfc73ef34f38f8df37f779b..885798860016651b6e812e996a43cd3f8b922ae3 100644 (file)
--- a/src/resources/LightApp_msg_en.ts
+++ b/src/resources/LightApp_msg_en.ts
@@ -17,7 +17,7 @@
     </message>
     <message>
         <source>APP_VERSION</source>
-        <translation>Master</translation>
+        <translation>V8.1.0a1</translation>
     </message>
     <message>
         <source>ABOUT_LICENSE</source>
@@ -25,7 +25,7 @@
     </message>
     <message>
         <source>ABOUT_VERSION</source>
-        <translation>Version Master</translation>
+        <translation>Version 8.1.0a1</translation>
     </message>
     <message>
         <source>ABOUT_TITLE</source>

diff --git a/src/resources/LightApp_msg_fr.ts b/src/resources/LightApp_msg_fr.ts
index ccc6753c0dc43f83201e4b299716968dadb564fc..472af4462f8d8db8064e4f562d90c43549b31ba0 100644 (file)
--- a/src/resources/LightApp_msg_fr.ts
+++ b/src/resources/LightApp_msg_fr.ts
@@ -17,7 +17,7 @@
     </message>
     <message>
         <source>APP_VERSION</source>
-        <translation>Master</translation>
+        <translation>V8.1.0a1</translation>
     </message>
     <message>
         <source>ABOUT_LICENSE</source>
@@ -25,7 +25,7 @@
     </message>
     <message>
         <source>ABOUT_VERSION</source>
-        <translation>Version Master</translation>
+        <translation>Version 8.1.0a1</translation>
     </message>
     <message>
         <source>ABOUT_TITLE</source>

diff --git a/src/resources/LightApp_msg_ja.ts b/src/resources/LightApp_msg_ja.ts
index 77907b4d8393cae642370d2e61f117088b40549c..aea5c1e22aa96d17151b533c41e9d478beabe9d2 100644 (file)
--- a/src/resources/LightApp_msg_ja.ts
+++ b/src/resources/LightApp_msg_ja.ts
@@ -17,7 +17,7 @@
     </message>
     <message>
       <source>APP_VERSION</source>
-      <translation>Master</translation>
+      <translation>V8.1.0a1</translation>
     </message>
     <message>
       <source>ABOUT_LICENSE</source>
@@ -25,7 +25,7 @@
     </message>
     <message>
       <source>ABOUT_VERSION</source>
-      <translation>Version Master</translation>
+      <translation>Version 8.1.0a1</translation>
     </message>
     <message>
       <source>ABOUT_TITLE</source>

diff --git a/src/salomeContext.py b/src/salomeContext.py
index 00ded0acfdc8db4204a5a33f3022f22742a5a35a..2bed9040420850b03b6122bada1bef81d7837802 100755 (executable)
--- 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"""