From: CEA Support SALOME Date: Wed, 2 Dec 2015 15:01:58 +0000 (+0100) Subject: Update for SALOME-7.7.1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1ef47c8f6d944b8b5d699b9f362530c8eb796418;p=tools%2FSALOME.git Update for SALOME-7.7.1 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index ab6fa02..84f696d 100644 --- 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 c8a2d79..1e13d11 100644 --- 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 141459c..da4b551 100644 --- 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 db93f5f..c0fc22c 100644 --- 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 30c0efa..49130ca 100644 --- 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 2b0692e..e33e1ba 100644 --- 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 b1797a9..4f4e765 100644 --- 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 e3831b6..fd8c163 100644 --- a/resources/SalomeApp.xml.in +++ b/resources/SalomeApp.xml.in @@ -16,7 +16,7 @@
- + @@ -24,6 +24,6 @@
- +
diff --git a/resources/about.png b/resources/about.png index df7481d..50d854d 100644 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 33971d2..21894ff 100644 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 5852f68..ece8261 100644 --- 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 babce17..66fd6ed 100644 --- 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 df7481d..50d854d 100644 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 812fddc..72a8656 100644 --- 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 403510a..48072b0 100644 --- a/src/resources/LightApp_msg_en.ts +++ b/src/resources/LightApp_msg_en.ts @@ -9,15 +9,15 @@ ABOUT_CAPTION - About SALOME + About SALOME-7.7.0 APP_NAME - SALOME + SALOME-7.7.0 APP_VERSION - master + V7.7.1 ABOUT_LICENSE @@ -25,11 +25,11 @@ ABOUT_VERSION - Version master + Version 7.7.1 ABOUT_TITLE - SALOME + SALOME-7.7.0 diff --git a/src/resources/LightApp_msg_fr.ts b/src/resources/LightApp_msg_fr.ts index e9a98d9..539cdef 100644 --- a/src/resources/LightApp_msg_fr.ts +++ b/src/resources/LightApp_msg_fr.ts @@ -9,15 +9,15 @@ ABOUT_CAPTION - A propos de SALOME + A propos de SALOME-7.7.0 APP_NAME - SALOME + SALOME-7.7.0 APP_VERSION - master + V7.7.1 ABOUT_LICENSE @@ -25,11 +25,11 @@ ABOUT_VERSION - Version master + Version 7.7.1 ABOUT_TITLE - SALOME + SALOME-7.7.0 diff --git a/src/resources/LightApp_msg_ja.ts b/src/resources/LightApp_msg_ja.ts index 6732141..c071ae6 100644 --- a/src/resources/LightApp_msg_ja.ts +++ b/src/resources/LightApp_msg_ja.ts @@ -9,15 +9,15 @@ ABOUT_CAPTION - About SALOME + About SALOME-7.7.0 APP_NAME - SALOME + SALOME-7.7.0 APP_VERSION - master + V7.7.1 ABOUT_LICENSE @@ -25,11 +25,11 @@ ABOUT_VERSION - Version master + Version 7.7.1 ABOUT_TITLE - SALOME + SALOME-7.7.0 diff --git a/src/salomeContext.py b/src/salomeContext.py index 545e929..7a89e96 100755 --- a/src/salomeContext.py +++ b/src/salomeContext.py @@ -38,17 +38,20 @@ Usage: salome [command] [options] [--config=] 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 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 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 4976f7e..ee43de0 100644 --- 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