Master serie 8

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d99188ecf7c4f5c6494649196b76a1ace307e468..ef0112e916cb9b47b208e38bb254c2aa3a34dc65 100644 (file)
--- 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
@@ -56,7 +56,8 @@ ENDIF()
 
 # KERNEL optionals:
 IF(SALOME_BUILD_DOC)
-  FIND_PACKAGE(SalomePython)
+  FIND_PACKAGE(SalomePythonInterp REQUIRED)
+  FIND_PACKAGE(SalomePythonLibs REQUIRED)
   FIND_PACKAGE(SalomeSphinx)
   SALOME_LOG_OPTIONAL_PACKAGE(Sphinx SALOME_BUILD_DOC)
 ENDIF()
@@ -119,4 +120,5 @@ SALOME_INSTALL_SCRIPTS("${_salome_context_API_SCRIPTS}" ${SALOME_INSTALL_SCRIPT_
 SET(_salome_context_BASHRC
    ${KERNEL_ROOT_DIR}/bin/salome/appliskel/.bashrc
 )
-SALOME_INSTALL_SCRIPTS("${_salome_context_BASHRC}" $ENV{SALOME_PROFILE_ROOT_DIR})
+FILE(TO_CMAKE_PATH $ENV{SALOME_PROFILE_ROOT_DIR} _SALOME_PROFILE_ROOT_DIR)
+SALOME_INSTALL_SCRIPTS("${_salome_context_BASHRC}" ${_SALOME_PROFILE_ROOT_DIR})

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index c8a2d79a625742fdaa50ba799e814fa26756b972..832706162a2e3b488401477a636e52b83d89db48 100644 (file)
--- 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 db93f5fd00513f02bbea2512d4fff6d351d9120f..be88a545f6af59b3f0a5c5a4e35cf663e9dcf2a6 100644 (file)
--- 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
@@ -92,7 +92,7 @@ pygments_style = 'sphinx'
 
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
 # Sphinx are currently 'default' and 'sphinxdoc'.
-html_theme = 'default'
+html_theme = '@SPHINX_THEME@'
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".

diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
index b1797a93cce27bda3b1eae1c46808adc377e508e..91e0358f25686e581df1d83fc3b872e92a01198c 100644 (file)
--- 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 6773631820df833a87fb88d34d3c8eeff7bf94f9..761653d112055f78aa95fabc0851a71a3e85d303 100644 (file)
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 33971d224ee0b70bd212c2e5eeea6129bcf228da..1e7605dcb90b19f2d9f12d5d7705423b942dba1c 100644 (file)
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 5852f682334781121ad73efe71a024f2f1ef567d..660f62173632ab06343717774757260f8eaf1921 100644 (file)
--- 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 6773631820df833a87fb88d34d3c8eeff7bf94f9..761653d112055f78aa95fabc0851a71a3e85d303 100644 (file)
Binary files a/resources/splash.png and b/resources/splash.png differ

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5dc593a7a75a298034d216588127d4ed3dec8862..847da555d33c243c27708f043aa4ed397ecc2240 100644 (file)
--- 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 e6c2bde9dcf97716e130ea6de0d06207f70021c3..58ff8af7ef440aa8b37719df2efbebf8a5a801b0 100755 (executable)
--- 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 d10001d18ac351a93ca2c590ac37a4e324259047..786799681cf86d89472e4620031a8baae4225702 100644 (file)
--- 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 d51a8bbdde047d319cad3133c861db7d354b02fb..81559019031e9d98a723f7f0249ade3ff4e6f908 100644 (file)
--- a/src/resources/LightApp_msg_en.ts
+++ b/src/resources/LightApp_msg_en.ts
@@ -13,11 +13,11 @@
     </message>
     <message>
         <source>APP_NAME</source>
-        <translation>SALOME SALOME</translation>
+        <translation>SALOME </translation>
     </message>
     <message>
         <source>APP_VERSION</source>
-        <translation>Vmaster</translation>
+        <translation>VMaster</translation>
     </message>
     <message>
         <source>ABOUT_LICENSE</source>
@@ -25,7 +25,7 @@
     </message>
     <message>
         <source>ABOUT_VERSION</source>
-        <translation>Version master</translation>
+        <translation>Version Master</translation>
     </message>
     <message>
         <source>ABOUT_TITLE</source>

diff --git a/src/resources/LightApp_msg_fr.ts b/src/resources/LightApp_msg_fr.ts
index a3e73e0d451d7d4715dfa9b5f331b15bbd9f7e0a..69d400d189e57850883d2fb2f7e8a56f90c572ad 100644 (file)
--- a/src/resources/LightApp_msg_fr.ts
+++ b/src/resources/LightApp_msg_fr.ts
@@ -13,11 +13,11 @@
     </message>
     <message>
         <source>APP_NAME</source>
-        <translation>SALOME SALOME</translation>
+        <translation>SALOME </translation>
     </message>
     <message>
         <source>APP_VERSION</source>
-        <translation>Vmaster</translation>
+        <translation>VMaster</translation>
     </message>
     <message>
         <source>ABOUT_LICENSE</source>
@@ -25,7 +25,7 @@
     </message>
     <message>
         <source>ABOUT_VERSION</source>
-        <translation>Version master</translation>
+        <translation>Version Master</translation>
     </message>
     <message>
         <source>ABOUT_TITLE</source>

diff --git a/src/resources/LightApp_msg_ja.ts b/src/resources/LightApp_msg_ja.ts
index 5cfc9ec04c8f9376b35a26e65c27ceed8986d45f..e8ed4e8ca2ced3fb5c69953a7068d585d081f32a 100644 (file)
--- a/src/resources/LightApp_msg_ja.ts
+++ b/src/resources/LightApp_msg_ja.ts
@@ -13,11 +13,11 @@
     </message>
     <message>
       <source>APP_NAME</source>
-      <translation>SALOME SALOME</translation>
+      <translation>SALOME </translation>
     </message>
     <message>
       <source>APP_VERSION</source>
-      <translation>Vmaster</translation>
+      <translation>VMaster</translation>
     </message>
     <message>
       <source>ABOUT_LICENSE</source>
@@ -25,7 +25,7 @@
     </message>
     <message>
       <source>ABOUT_VERSION</source>
-      <translation>Version master</translation>
+      <translation>Version Master</translation>
     </message>
     <message>
       <source>ABOUT_TITLE</source>

diff --git a/src/salomeContext.py b/src/salomeContext.py
index 7a89e9666250300eeacf871ac046996629bb54e8..00ded0acfdc8db4204a5a33f3022f22742a5a35a 100755 (executable)
--- 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
@@ -153,7 +154,10 @@ class SalomeContext:
 
   """Append value to LD_LIBRARY_PATH environment variable"""
   def addToLdLibraryPath(self, value):
-    self.addToVariable('LD_LIBRARY_PATH', value)
+    if platform.system() == 'Windows':
+      self.addToVariable('PATH', value)
+    else:
+      self.addToVariable('LD_LIBRARY_PATH', value)
   #
 
   """Append value to DYLD_LIBRARY_PATH environment variable"""
@@ -425,6 +429,7 @@ class SalomeContext:
             p.start()
             p.join()
     except ImportError:
+      # :TODO: should be declared obsolete
       from killSalome import killAllPorts
       killAllPorts()
       pass

diff --git a/src/salomeContextUtils.py b/src/salomeContextUtils.py
index eed1dd58802d0a9170aae5ebd6e02c5018544d44..36bec2572f827569896949fd19538ed8ccec3174 100755 (executable)
--- 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 b0e95da057507ff501043b1f612f85667a635de2..1895f45aa487d02dd1c526cd857ab39ba7fbac80 100644 (file)
--- 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