Update for SALOME-7.7.1

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab6fa02e5e31ec7ced8eaee1cfa9d67dfccdd3f4..84f696ddb2e299d1ea47f356dec25dae0bf452f1 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR)
-PROJECT(Salome_SALOME_Profile C CXX)
+PROJECT(Salome_SALOME-7.7.0_Profile C CXX)
 
 # Ensure a proper linker behavior:
 CMAKE_POLICY(SET CMP0003 NEW)
@@ -48,7 +48,7 @@ ENDIF(EXISTS ${KERNEL_ROOT_DIR})
 # User options
 # ============
 OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON)
-OPTION(SALOME_BUILD_DOC "Generate SALOME SALOME documentation" ON)
+OPTION(SALOME_BUILD_DOC "Generate SALOME SALOME-7.7.0 documentation" ON)
 
 IF(SALOME_BUILD_TESTS)
   ENABLE_TESTING()
@@ -90,10 +90,10 @@ INCLUDE(${QT_USE_FILE})
 # ===========
 SET(SALOME_INSTALL_SCRIPT_PYTHON "${SALOME_INSTALL_SCRIPT_PYTHON}" CACHE PATH "Install path: SALOME Python scripts")
 
-# Specific to SALOME:
-SET(SALOME_SALOME_PROFILE_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/salome_profile" CACHE PATH "Install path: SALOME SALOME specific data")
-SET(SALOME_SALOME_PROFILE_INSTALL_DOC_GUI "${SALOME_INSTALL_DOC}/gui/${PROJECT_NAME_UC}" CACHE PATH "Install path: SALOME SALOME gui documentation")
-SET(SALOME_SALOME_PROFILE_HTML_STATIC_PATH "${SALOME_SALOME_PROFILE_INSTALL_DOC_GUI}/_static" CACHE PATH "Install path: SALOME SALOME html static data")
+# Specific to SALOME-7.7.0:
+SET(SALOME_SALOME-7.7.0_PROFILE_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/salome-7.7.0_profile" CACHE PATH "Install path: SALOME SALOME-7.7.0 specific data")
+SET(SALOME_SALOME-7.7.0_PROFILE_INSTALL_DOC_GUI "${SALOME_INSTALL_DOC}/gui/${PROJECT_NAME_UC}" CACHE PATH "Install path: SALOME SALOME-7.7.0 gui documentation")
+SET(SALOME_SALOME-7.7.0_PROFILE_HTML_STATIC_PATH "${SALOME_SALOME-7.7.0_PROFILE_INSTALL_DOC_GUI}/_static" CACHE PATH "Install path: SALOME SALOME-7.7.0 html static data")
 
 MARK_AS_ADVANCED(SALOME_INSTALL_SCRIPT_PYTHON)
 
@@ -116,4 +116,4 @@ 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})
+SALOME_INSTALL_SCRIPTS("${_salome_context_BASHRC}" $ENV{SALOME-7.7.0_PROFILE_ROOT_DIR})

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index c8a2d79a625742fdaa50ba799e814fa26756b972..1e13d1151c9abe619dc42f0b117d458f8f275956 100644 (file)
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -25,7 +25,7 @@ SALOME_GENERATE_ENVIRONMENT_SCRIPT(_cmd env_script "${SPHINX_EXECUTABLE}" "${_cm
 ADD_CUSTOM_TARGET(html_docs COMMAND ${_cmd})
 
 INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build ${PROJECT_BINARY_DIR} --target html_docs)")
-INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ DESTINATION ${SALOME_SALOME_PROFILE_INSTALL_DOC_GUI})
+INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ DESTINATION ${SALOME_SALOME-7.7.0_PROFILE_INSTALL_DOC_GUI})
 
 SET(make_clean_files html doctrees)
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${make_clean_files}")

diff --git a/doc/README b/doc/README
index 141459c205ad6e6532adba6cb072c508fac66fa8..da4b551d9dafe5b56627a51f7f102c7c3eaef866 100644 (file)
--- a/doc/README
+++ b/doc/README
@@ -1 +1 @@
-This directory contains the sources of SALOME's documentation
+This directory contains the sources of SALOME-7.7.0's documentation

diff --git a/doc/conf.py.in b/doc/conf.py.in
index db93f5fd00513f02bbea2512d4fff6d351d9120f..c0fc22c6ea41c719bc1d55d00ee998e5fef82dfc 100644 (file)
--- a/doc/conf.py.in
+++ b/doc/conf.py.in
@@ -35,7 +35,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = 'salome'
+project = 'salome-7.7.0'
 copyright = '2010-2015 CEA/DEN, EDF R&D, OPEN CASCADE, ASTEK INDUSTRIE'
 
 # The version info for the project you're documenting, acts as replacement for
@@ -43,9 +43,9 @@ copyright = '2010-2015 CEA/DEN, EDF R&D, OPEN CASCADE, ASTEK INDUSTRIE'
 # built documents.
 #
 # The short X.Y version.
-version = '@SALOMESALOME_MAJOR_VERSION@.@SALOMESALOME_MINOR_VERSION@'
+version = '@SALOMESALOME-7.7.0_MAJOR_VERSION@.@SALOMESALOME-7.7.0_MINOR_VERSION@'
 # The full version, including alpha/beta/rc tags.
-release = '@SALOMESALOME_VERSION@'
+release = '@SALOMESALOME-7.7.0_VERSION@'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -113,7 +113,7 @@ html_theme = 'default'
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['@SALOME_SALOME_PROFILE_INSTALL_DOC_GUI@/_static']
+html_static_path = ['@SALOME_SALOME-7.7.0_PROFILE_INSTALL_DOC_GUI@/_static']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
@@ -151,7 +151,7 @@ html_use_modindex = False
 #html_file_suffix = ''
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'salomedoc'
+htmlhelp_basename = 'salome-7.7.0doc'
 
 
 # Options for LaTeX output
@@ -166,7 +166,7 @@ latex_font_size = '10pt'
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, document class [howto/manual]).
 latex_documents = [
-  ('index', 'salome.tex', 'SALOME User Documentation', 'A. Ribes', 'manual')
+  ('index', 'salome-7.7.0.tex', 'SALOME-7.7.0 User Documentation', 'A. Ribes', 'manual')
 ]
 
 # The name of an image file (relative to this directory) to place at the top of

diff --git a/doc/index.rst b/doc/index.rst
index 30c0efa90517fca14b2fc0c3a58b08a8f2d3ba7a..49130ca1317c62388fae86e755b0a62471f5ebe1 100644 (file)
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -1,6 +1,6 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-SALOME's documentation 
+SALOME-7.7.0's documentation 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 Outline

diff --git a/doc/intro.rst b/doc/intro.rst
index 2b0692e31a64acd33aa1189330905711bacc7362..e33e1bab5ac15efb74b257dda6c5d802014f0d6f 100644 (file)
--- a/doc/intro.rst
+++ b/doc/intro.rst
@@ -1,4 +1,4 @@
 Introduction
 ==========================================
 
-Welcome to SALOME's documentation!
+Welcome to SALOME-7.7.0's documentation!

diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
index b1797a93cce27bda3b1eae1c46808adc377e508e..4f4e76540f22921e777edf30cde49905c586ea06 100644 (file)
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@@ -18,7 +18,7 @@
 #
 
 # --- resources ---
-SET(SALOME_PROFILE_RESOURCES_FILES
+SET(SALOME-7.7.0_PROFILE_RESOURCES_FILES
   app_icon.png
   splash.png
   about.png
@@ -27,10 +27,10 @@ SET(SALOME_PROFILE_RESOURCES_FILES
 )
 
 # --- rules ---
-INSTALL(FILES ${SALOME_PROFILE_RESOURCES_FILES} DESTINATION ${SALOME_SALOME_PROFILE_INSTALL_RES_DATA})
+INSTALL(FILES ${SALOME-7.7.0_PROFILE_RESOURCES_FILES} DESTINATION ${SALOME_SALOME-7.7.0_PROFILE_INSTALL_RES_DATA})
 
 # --- config ---
-SALOME_CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/SalomeApp.xml.in ${CMAKE_CURRENT_BINARY_DIR}/SalomeApp.xml INSTALL ${SALOME_SALOME_PROFILE_INSTALL_RES_DATA})
+SALOME_CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/SalomeApp.xml.in ${CMAKE_CURRENT_BINARY_DIR}/SalomeApp.xml INSTALL ${SALOME_SALOME-7.7.0_PROFILE_INSTALL_RES_DATA})
 
 # --- sub-directories ---
 ADD_SUBDIRECTORY( doc )

diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in
index e3831b612ed48d1f178b283d089184ab9926f950..fd8c163cdd92c9b761fac77017b62d0e2829ff43 100644 (file)
--- a/resources/SalomeApp.xml.in
+++ b/resources/SalomeApp.xml.in
@@ -16,7 +16,7 @@
     <parameter name="standalone" value=""/>
   </section>
   <section name="splash">
-    <parameter name="image" value="%SALOME_PROFILE_ROOT_DIR%/share/salome/resources/salome_profile/splash.png"/>
+    <parameter name="image" value="%SALOME-7.7.0_PROFILE_ROOT_DIR%/share/salome/resources/salome-7.7.0_profile/splash.png"/>
     <parameter name="text_colors" value="#ffffff|#000000"/>
     <parameter name="show_percents" value="yes"/>
     <parameter name="show_progress" value="yes"/>
@@ -24,6 +24,6 @@
     <parameter name="font" value="Xirod,12,normal"/>
   </section>
   <section name="resources">
-    <parameter name="LightApp" value="%SALOME_PROFILE_ROOT_DIR%/share/salome/resources/salome_profile"/>
+    <parameter name="LightApp" value="%SALOME-7.7.0_PROFILE_ROOT_DIR%/share/salome/resources/salome-7.7.0_profile"/>
   </section>
 </document>

diff --git a/resources/about.png b/resources/about.png
index df7481dcaa29ed021a5e39caf623596a8a45ef62..50d854d99bd241ec3a4e6ba2e09b949907f957e2 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..21894ff68f1a9a15ab0c051996b9d237f5e93914 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..ece826139c311232813afca8c3184947e0f7718b 100644 (file)
--- a/resources/doc/CMakeLists.txt
+++ b/resources/doc/CMakeLists.txt
@@ -24,4 +24,4 @@ SET(_bin_DOCUMENTS
    sample.pdf
 )
 
-INSTALL(FILES ${_bin_DOCUMENTS} DESTINATION ${SALOME_SALOME_PROFILE_INSTALL_DOC_GUI})
+INSTALL(FILES ${_bin_DOCUMENTS} DESTINATION ${SALOME_SALOME-7.7.0_PROFILE_INSTALL_DOC_GUI})

diff --git a/resources/doc/README b/resources/doc/README
index babce17d1b9b478065ba698c7f3121c74e2b006e..66fd6edc261beb44b2f52a73b475fd8d3428efef 100644 (file)
--- a/resources/doc/README
+++ b/resources/doc/README
@@ -1 +1 @@
-This directory contains binaries of SALOME's documentation
+This directory contains binaries of SALOME-7.7.0's documentation

diff --git a/resources/splash.png b/resources/splash.png
index df7481dcaa29ed021a5e39caf623596a8a45ef62..50d854d99bd241ec3a4e6ba2e09b949907f957e2 100644 (file)
Binary files a/resources/splash.png and b/resources/splash.png differ

diff --git a/src/resources/CMakeLists.txt b/src/resources/CMakeLists.txt
index 812fddcebd1b44d726dea8ac3ffe42651ca178f0..72a86569ef748076c03aa1bc6ccf2efa6734b2e5 100644 (file)
--- a/src/resources/CMakeLists.txt
+++ b/src/resources/CMakeLists.txt
@@ -31,4 +31,4 @@ SET(_ts_RESOURCES
 
 # --- rules ---
 
-QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_SALOME_PROFILE_INSTALL_RES_DATA}")
+QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_SALOME-7.7.0_PROFILE_INSTALL_RES_DATA}")

diff --git a/src/resources/LightApp_msg_en.ts b/src/resources/LightApp_msg_en.ts
index 403510a774744d21b5a81ad73365e67c78ebeefb..48072b0a0558e5594f210a417ef1c6ef2629a4a0 100644 (file)
--- a/src/resources/LightApp_msg_en.ts
+++ b/src/resources/LightApp_msg_en.ts
@@ -9,15 +9,15 @@
     </message>
     <message>
         <source>ABOUT_CAPTION</source>
-        <translation>About SALOME</translation>
+        <translation>About SALOME-7.7.0</translation>
     </message>
     <message>
         <source>APP_NAME</source>
-        <translation>SALOME </translation>
+        <translation>SALOME-7.7.0 </translation>
     </message>
     <message>
         <source>APP_VERSION</source>
-        <translation>master</translation>
+        <translation>V7.7.1</translation>
     </message>
     <message>
         <source>ABOUT_LICENSE</source>
@@ -25,11 +25,11 @@
     </message>
     <message>
         <source>ABOUT_VERSION</source>
-        <translation>Version master</translation>
+        <translation>Version 7.7.1</translation>
     </message>
     <message>
         <source>ABOUT_TITLE</source>
-        <translation>SALOME</translation>
+        <translation>SALOME-7.7.0</translation>
     </message>
 </context>
 </TS>

diff --git a/src/resources/LightApp_msg_fr.ts b/src/resources/LightApp_msg_fr.ts
index e9a98d942c86314768fee7dc8ec4504a44cf57ad..539cdef91851ab8fb498e2ab36a51b60388183ab 100644 (file)
--- a/src/resources/LightApp_msg_fr.ts
+++ b/src/resources/LightApp_msg_fr.ts
@@ -9,15 +9,15 @@
     </message>
     <message>
         <source>ABOUT_CAPTION</source>
-        <translation>A propos de SALOME</translation>
+        <translation>A propos de SALOME-7.7.0</translation>
     </message>
     <message>
         <source>APP_NAME</source>
-        <translation>SALOME </translation>
+        <translation>SALOME-7.7.0 </translation>
     </message>
     <message>
         <source>APP_VERSION</source>
-        <translation>master</translation>
+        <translation>V7.7.1</translation>
     </message>
     <message>
         <source>ABOUT_LICENSE</source>
@@ -25,11 +25,11 @@
     </message>
     <message>
         <source>ABOUT_VERSION</source>
-        <translation>Version master</translation>
+        <translation>Version 7.7.1</translation>
     </message>
     <message>
         <source>ABOUT_TITLE</source>
-        <translation>SALOME</translation>
+        <translation>SALOME-7.7.0</translation>
     </message>
 </context>
 </TS>

diff --git a/src/resources/LightApp_msg_ja.ts b/src/resources/LightApp_msg_ja.ts
index 6732141f8354690bfb171dbd463b948d374ed01e..c071ae6648867b8ebaa602b2d25e61196704b71b 100644 (file)
--- a/src/resources/LightApp_msg_ja.ts
+++ b/src/resources/LightApp_msg_ja.ts
@@ -9,15 +9,15 @@
     </message>
     <message>
       <source>ABOUT_CAPTION</source>
-      <translation>About SALOME</translation>
+      <translation>About SALOME-7.7.0</translation>
     </message>
     <message>
       <source>APP_NAME</source>
-      <translation>SALOME </translation>
+      <translation>SALOME-7.7.0 </translation>
     </message>
     <message>
       <source>APP_VERSION</source>
-      <translation>master</translation>
+      <translation>V7.7.1</translation>
     </message>
     <message>
       <source>ABOUT_LICENSE</source>
@@ -25,11 +25,11 @@
     </message>
     <message>
       <source>ABOUT_VERSION</source>
-      <translation>Version master</translation>
+      <translation>Version 7.7.1</translation>
     </message>
     <message>
       <source>ABOUT_TITLE</source>
-      <translation>SALOME</translation>
+      <translation>SALOME-7.7.0</translation>
     </message>
   </context>
 </TS>

diff --git a/src/salomeContext.py b/src/salomeContext.py
index 545e9297925ce39ced1960ed9736ebc1813463b5..7a89e9666250300eeacf871ac046996629bb54e8 100755 (executable)
--- a/src/salomeContext.py
+++ b/src/salomeContext.py
@@ -38,17 +38,20 @@ Usage: salome [command] [options] [--config=<file,folder,...>]
 
 Commands:
 =========
-    start           Starts a SALOME session (through virtual application)
-    context         Initializes SALOME context.
-    shell           Initializes SALOME context, and executes scripts passed
-                    as command arguments
-    connect         Connects a Python console to the active SALOME session
-    kill <port(s)>  Terminate SALOME session running on given ports for current user
-                    Port numbers must be separated by blank characters
-    killall         Kill *all* SALOME running sessions for current user
+    start           Start a new SALOME instance.
+    context         Initialize SALOME context. Current environment is extended.
+    shell           Initialize SALOME context, attached to the last created SALOME
+                    instance if any, and executes scripts passed as command arguments.
+                    User works in a Shell terminal; SALOME environment is set but
+                    application is not started.
+    connect         Connect a Python console to the active SALOME instance.
+    kill <port(s)>  Terminate SALOME instances running on given ports for current user.
+                    Port numbers must be separated by blank characters.
+    killall         Terminate *all* SALOME running instances for current user.
+                    Do not start a new one.
     test            Run SALOME tests.
-    info            Display some information about SALOME
-    help            Show this message
+    info            Display some information about SALOME.
+    help            Show this message.
 
 If no command is given, default to start.
 
@@ -336,7 +339,7 @@ class SalomeContext:
     # Initialize SALOME environment
     sys.argv = ['runSalome'] + args
     import setenv
-    setenv.main(True)
+    setenv.main(True, exeName="salome start")
 
     import runSalome
     runSalome.runSalome()

diff --git a/src/tests/README b/src/tests/README
index 4976f7ef3d31f631879b08de451de73ff70dede9..ee43de02c7bd33925e82030dd3840f7e6aa289a1 100644 (file)
--- a/src/tests/README
+++ b/src/tests/README
@@ -1 +1 @@
-This directory contains the tests of SALOME
+This directory contains the tests of SALOME-7.7.0