Update name SALOME_PROFILE

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a0dfcbf171f176e352c511e36e8f0e8eb27df72..ab6fa02e5e31ec7ced8eaee1cfa9d67dfccdd3f4 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-7.8.0-BR_Profile C CXX)
+PROJECT(Salome_SALOME_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-7.8.0-BR documentation" ON)
+OPTION(SALOME_BUILD_DOC "Generate SALOME SALOME 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-7.8.0-BR:
-SET(SALOME_SALOME-7.8.0-BR_PROFILE_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/salome-7.8.0-br_profile" CACHE PATH "Install path: SALOME SALOME-7.8.0-BR specific data")
-SET(SALOME_SALOME-7.8.0-BR_PROFILE_INSTALL_DOC_GUI "${SALOME_INSTALL_DOC}/gui/${PROJECT_NAME_UC}" CACHE PATH "Install path: SALOME SALOME-7.8.0-BR gui documentation")
-SET(SALOME_SALOME-7.8.0-BR_PROFILE_HTML_STATIC_PATH "${SALOME_SALOME-7.8.0-BR_PROFILE_INSTALL_DOC_GUI}/_static" CACHE PATH "Install path: SALOME SALOME-7.8.0-BR html static data")
+# 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")
 
 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-7.8.0-BR_PROFILE_ROOT_DIR})
+SALOME_INSTALL_SCRIPTS("${_salome_context_BASHRC}" $ENV{SALOME_PROFILE_ROOT_DIR})

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 537f278ba52be2d70c4074d1c4e81a90ab9ff9f8..c8a2d79a625742fdaa50ba799e814fa26756b972 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-7.8.0-BR_PROFILE_INSTALL_DOC_GUI})
+INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ DESTINATION ${SALOME_SALOME_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 43bc749a1c67f8322d5b6ade2f6735dae79daf4c..141459c205ad6e6532adba6cb072c508fac66fa8 100644 (file)
--- a/doc/README
+++ b/doc/README
@@ -1 +1 @@
-This directory contains the sources of SALOME-7.8.0-BR's documentation
+This directory contains the sources of SALOME's documentation

diff --git a/doc/conf.py.in b/doc/conf.py.in
index b06fda6aae804efc9326ecfd7c4c8b84e2fbdb92..db93f5fd00513f02bbea2512d4fff6d351d9120f 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-7.8.0-br'
+project = 'salome'
 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-7.8.0-BR_MAJOR_VERSION@.@SALOMESALOME-7.8.0-BR_MINOR_VERSION@'
+version = '@SALOMESALOME_MAJOR_VERSION@.@SALOMESALOME_MINOR_VERSION@'
 # The full version, including alpha/beta/rc tags.
-release = '@SALOMESALOME-7.8.0-BR_VERSION@'
+release = '@SALOMESALOME_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-7.8.0-BR_PROFILE_INSTALL_DOC_GUI@/_static']
+html_static_path = ['@SALOME_SALOME_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 = 'salome-7.8.0-brdoc'
+htmlhelp_basename = 'salomedoc'
 
 
 # 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-7.8.0-br.tex', 'SALOME-7.8.0-BR User Documentation', 'A. Ribes', 'manual')
+  ('index', 'salome.tex', 'SALOME 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 022cadd750c7e38a573752be567cf00cf071cd9d..30c0efa90517fca14b2fc0c3a58b08a8f2d3ba7a 100644 (file)
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -1,6 +1,6 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-SALOME-7.8.0-BR's documentation 
+SALOME's documentation 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 Outline

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

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

diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in
index 8ad3c734af9596fee97c268f92faf627c5615871..e3831b612ed48d1f178b283d089184ab9926f950 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-7.8.0-BR_PROFILE_ROOT_DIR%/share/salome/resources/salome-7.8.0-br_profile/splash.png"/>
+    <parameter name="image" value="%SALOME_PROFILE_ROOT_DIR%/share/salome/resources/salome_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-7.8.0-BR_PROFILE_ROOT_DIR%/share/salome/resources/salome-7.8.0-br_profile"/>
+    <parameter name="LightApp" value="%SALOME_PROFILE_ROOT_DIR%/share/salome/resources/salome_profile"/>
   </section>
 </document>

diff --git a/resources/about.png b/resources/about.png
index aa5889d82d230b171d372e91bc26c588966a4add..90d6d527805c76f0b8cf88bfcd726f063a76f2cc 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 fdc445410b39575814a6cf2e12673b5b02303ebb..33971d224ee0b70bd212c2e5eeea6129bcf228da 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 2f24b8341f670647aace6022623790830107b0ca..5852f682334781121ad73efe71a024f2f1ef567d 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-7.8.0-BR_PROFILE_INSTALL_DOC_GUI})
+INSTALL(FILES ${_bin_DOCUMENTS} DESTINATION ${SALOME_SALOME_PROFILE_INSTALL_DOC_GUI})

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

diff --git a/resources/splash.png b/resources/splash.png
index aa5889d82d230b171d372e91bc26c588966a4add..90d6d527805c76f0b8cf88bfcd726f063a76f2cc 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 59a9e1065ddb6862623829bf5756cdab01f5b5ee..812fddcebd1b44d726dea8ac3ffe42651ca178f0 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-7.8.0-BR_PROFILE_INSTALL_RES_DATA}")
+QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_SALOME_PROFILE_INSTALL_RES_DATA}")

diff --git a/src/resources/LightApp_msg_en.ts b/src/resources/LightApp_msg_en.ts
index 36f2dc8a6b504b925378f1cf1ffd4c9d24e0d5cd..b5586171b4168c554bf3157a06ae814b0eb373cb 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-7.8.0-BR</translation>
+        <translation>About SALOME</translation>
     </message>
     <message>
         <source>APP_NAME</source>
-        <translation>SALOME-7.8.0-BR </translation>
+        <translation>SALOME SALOME</translation>
     </message>
     <message>
         <source>APP_VERSION</source>
-        <translation>V1.0</translation>
+        <translation>V7.8.0alpha</translation>
     </message>
     <message>
         <source>ABOUT_LICENSE</source>
@@ -25,11 +25,11 @@
     </message>
     <message>
         <source>ABOUT_VERSION</source>
-        <translation>Version 1.0</translation>
+        <translation>Version 7.8.0alpha</translation>
     </message>
     <message>
         <source>ABOUT_TITLE</source>
-        <translation>SALOME-7.8.0-BR</translation>
+        <translation>SALOME</translation>
     </message>
 </context>
 </TS>

diff --git a/src/resources/LightApp_msg_fr.ts b/src/resources/LightApp_msg_fr.ts
index d1aceb55bbf15e961db4fec2b5c8d53627cb956d..cbdac3f0f355f19f70aa0ad9d9d5db32b21eb928 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-7.8.0-BR</translation>
+        <translation>A propos de SALOME</translation>
     </message>
     <message>
         <source>APP_NAME</source>
-        <translation>SALOME-7.8.0-BR </translation>
+        <translation>SALOME SALOME</translation>
     </message>
     <message>
         <source>APP_VERSION</source>
-        <translation>V1.0</translation>
+        <translation>V7.8.0alpha</translation>
     </message>
     <message>
         <source>ABOUT_LICENSE</source>
@@ -25,11 +25,11 @@
     </message>
     <message>
         <source>ABOUT_VERSION</source>
-        <translation>Version 1.0</translation>
+        <translation>Version 7.8.0alpha</translation>
     </message>
     <message>
         <source>ABOUT_TITLE</source>
-        <translation>SALOME-7.8.0-BR</translation>
+        <translation>SALOME</translation>
     </message>
 </context>
 </TS>

diff --git a/src/resources/LightApp_msg_ja.ts b/src/resources/LightApp_msg_ja.ts
index 60fa05b2eff375d63be3a24771264f12ba92e5b0..594165e65491e93089ac639ef9ab058a5b2231b2 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-7.8.0-BR</translation>
+      <translation>About SALOME</translation>
     </message>
     <message>
       <source>APP_NAME</source>
-      <translation>SALOME-7.8.0-BR </translation>
+      <translation>SALOME SALOME</translation>
     </message>
     <message>
       <source>APP_VERSION</source>
-      <translation>V1.0</translation>
+      <translation>V7.8.0alpha</translation>
     </message>
     <message>
       <source>ABOUT_LICENSE</source>
@@ -25,11 +25,11 @@
     </message>
     <message>
       <source>ABOUT_VERSION</source>
-      <translation>Version 1.0</translation>
+      <translation>Version 7.8.0alpha</translation>
     </message>
     <message>
       <source>ABOUT_TITLE</source>
-      <translation>SALOME-7.8.0-BR</translation>
+      <translation>SALOME</translation>
     </message>
   </context>
 </TS>

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