From: S. Pomarede <support-salome@cea.fr>
Date: Tue, 2 Aug 2016 13:20:29 +0000 (+0200)
Subject: new salome profile for V8.1.0a1
X-Git-Tag: V8_1_0a1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=be900568bcf2c0d5c9321d341d332eb9d91c8cd6;p=tools%2FSALOME.git

new salome profile for V8.1.0a1
---

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 1e7605d..7052c47 100644
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 5b0bd46..8857988 100644
--- 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 ccc6753..472af44 100644
--- 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 77907b4..aea5c1e 100644
--- 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 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"""