]> SALOME platform Git repositories - tools/SALOME.git/commitdiff
Salome HOME
Add profile SALOME master
authorCEA Support SALOME <support-salome@cea.fr>
Wed, 27 Jan 2016 09:16:29 +0000 (10:16 +0100)
committerCEA Support SALOME <support-salome@cea.fr>
Wed, 27 Jan 2016 09:16:29 +0000 (10:16 +0100)
20 files changed:
CMakeLists.txt
doc/CMakeLists.txt
doc/README
doc/conf.py.in
doc/index.rst
doc/intro.rst
resources/CMakeLists.txt
resources/SalomeApp.xml.in
resources/about.png
resources/app_logo.png
resources/doc/CMakeLists.txt
resources/doc/README
resources/splash.png
src/resources/CMakeLists.txt
src/resources/LightApp_msg_en.ts
src/resources/LightApp_msg_fr.ts
src/resources/LightApp_msg_ja.ts
src/salomeContext.py
src/salomeContextUtils.py
src/tests/README

index c156d1d2417bb7c64d37a7305c7b911ef417f143..d99188ecf7c4f5c6494649196b76a1ace307e468 100644 (file)
@@ -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_[Name_of_Application]_Profile C CXX)
+PROJECT(Salome_SALOME_Profile C CXX)
 
 # Ensure a proper linker behavior:
 CMAKE_POLICY(SET CMP0003 NEW)
@@ -48,8 +48,7 @@ ENDIF(EXISTS ${KERNEL_ROOT_DIR})
 # User options
 # ============
 OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON)
-OPTION(SALOME_BUILD_DOC "Generate SALOME [Name_of_Application] documentation" ON)
-OPTION(SALOME_BUILD_WITH_QT5 "Build SALOME with Qt 5" OFF)
+OPTION(SALOME_BUILD_DOC "Generate SALOME SALOME documentation" ON)
 
 IF(SALOME_BUILD_TESTS)
   ENABLE_TESTING()
@@ -83,24 +82,21 @@ ELSE(EXISTS ${GUI_ROOT_DIR})
 ENDIF(EXISTS ${GUI_ROOT_DIR})
 
 # Qt
-IF(NOT SALOME_BUILD_WITH_QT5)
+IF(NOT SALOME_GUI_BUILD_WITH_QT5)
   FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
 ELSE()
   FIND_PACKAGE(SalomeQt5 REQUIRED)
 ENDIF()
 
-#FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
-#INCLUDE(${QT_USE_FILE})
-
 # Directories
 # (default values taken from KERNEL)
 # ===========
 SET(SALOME_INSTALL_SCRIPT_PYTHON "${SALOME_INSTALL_SCRIPT_PYTHON}" CACHE PATH "Install path: SALOME Python scripts")
 
-# Specific to [NAME_OF_APPLICATION]:
-SET(SALOME_[NAME_OF_APPLICATION]_PROFILE_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/(name_of_application)_profile" CACHE PATH "Install path: SALOME [NAME_OF_APPLICATION] specific data")
-SET(SALOME_[NAME_OF_APPLICATION]_PROFILE_INSTALL_DOC_GUI "${SALOME_INSTALL_DOC}/gui/${PROJECT_NAME_UC}" CACHE PATH "Install path: SALOME [NAME_OF_APPLICATION] gui documentation")
-SET(SALOME_[NAME_OF_APPLICATION]_PROFILE_HTML_STATIC_PATH "${SALOME_[NAME_OF_APPLICATION]_PROFILE_INSTALL_DOC_GUI}/_static" CACHE PATH "Install path: SALOME [NAME_OF_APPLICATION] 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)
 
@@ -123,4 +119,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{[NAME_OF_APPLICATION]_PROFILE_ROOT_DIR})
+SALOME_INSTALL_SCRIPTS("${_salome_context_BASHRC}" $ENV{SALOME_PROFILE_ROOT_DIR})
index 471a2892b34191d92c2224b0a347d5e5680e9b0a..c8a2d79a625742fdaa50ba799e814fa26756b972 100644 (file)
@@ -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_[NAME_OF_APPLICATION]_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}")
index 843a1fac637c5d9badfd422f03fdbe99278bdfbe..141459c205ad6e6532adba6cb072c508fac66fa8 100644 (file)
@@ -1 +1 @@
-This directory contains the sources of [Name_of_Application]'s documentation
+This directory contains the sources of SALOME's documentation
index 580bdac9ca4f4ded320c72ba33dc0b13fb165c82..db93f5fd00513f02bbea2512d4fff6d351d9120f 100644 (file)
@@ -35,7 +35,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = '(name_of_application)'
+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 = '@SALOME[NAME_OF_APPLICATION]_MAJOR_VERSION@.@SALOME[NAME_OF_APPLICATION]_MINOR_VERSION@'
+version = '@SALOMESALOME_MAJOR_VERSION@.@SALOMESALOME_MINOR_VERSION@'
 # The full version, including alpha/beta/rc tags.
-release = '@SALOME[NAME_OF_APPLICATION]_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_[NAME_OF_APPLICATION]_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 = '(name_of_application)doc'
+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', '(name_of_application).tex', '[Name_of_Application] 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
index 05713b9dce63ac89cabbbd00083acf9f13be04e8..30c0efa90517fca14b2fc0c3a58b08a8f2d3ba7a 100644 (file)
@@ -1,6 +1,6 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-[Name_of_Application]'s documentation 
+SALOME's documentation 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 Outline
index 35461a67a3be5b43bb9785870a9791d62d067013..2b0692e31a64acd33aa1189330905711bacc7362 100644 (file)
@@ -1,4 +1,4 @@
 Introduction
 ==========================================
 
-Welcome to [Name_of_Application]'s documentation!
+Welcome to SALOME's documentation!
index 60582e116a6d62c345b073808e36cebe5f238100..b1797a93cce27bda3b1eae1c46808adc377e508e 100644 (file)
@@ -18,7 +18,7 @@
 #
 
 # --- resources ---
-SET([NAME_OF_APPLICATION]_PROFILE_RESOURCES_FILES
+SET(SALOME_PROFILE_RESOURCES_FILES
   app_icon.png
   splash.png
   about.png
@@ -27,10 +27,10 @@ SET([NAME_OF_APPLICATION]_PROFILE_RESOURCES_FILES
 )
 
 # --- rules ---
-INSTALL(FILES ${[NAME_OF_APPLICATION]_PROFILE_RESOURCES_FILES} DESTINATION ${SALOME_[NAME_OF_APPLICATION]_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_[NAME_OF_APPLICATION]_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 )
index fdf732553eb6a623c3a458266336dd28653e19b6..e3831b612ed48d1f178b283d089184ab9926f950 100644 (file)
     <parameter name="portkill" value="no"/>
     <parameter name="killall" value="no"/>
     <parameter name="noexcepthandler" value="no"/>
-    <parameter name="modules" value="[LIST_OF_MODULES]"/>
     <parameter name="pyModules" value=""/>
     <parameter name="embedded" value="SalomeAppEngine,study,cppContainer,registry,moduleCatalog"/>
     <parameter name="standalone" value=""/>
   </section>
   <section name="splash">
-    <parameter name="image" value="%[Name_of_Application]_PROFILE_ROOT_DIR%/share/salome/resources/(name_of_application)_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"/>
@@ -25,6 +24,6 @@
     <parameter name="font" value="Xirod,12,normal"/>
   </section>
   <section name="resources">
-    <parameter name="LightApp" value="%[Name_of_Application]_PROFILE_ROOT_DIR%/share/salome/resources/(name_of_application)_profile"/>
+    <parameter name="LightApp" value="%SALOME_PROFILE_ROOT_DIR%/share/salome/resources/salome_profile"/>
   </section>
 </document>
index dfdc7e618906cfabcfa9ce8b4ab44b4ab688ec31..6773631820df833a87fb88d34d3c8eeff7bf94f9 100644 (file)
Binary files a/resources/about.png and b/resources/about.png differ
index 362c018d7b6ccbd0111936fac3225ac55dcc098e..33971d224ee0b70bd212c2e5eeea6129bcf228da 100644 (file)
Binary files a/resources/app_logo.png and b/resources/app_logo.png differ
index 941222a65fe57b6803b7038f14d7726fe5b4561a..5852f682334781121ad73efe71a024f2f1ef567d 100644 (file)
@@ -24,4 +24,4 @@ SET(_bin_DOCUMENTS
    sample.pdf
 )
 
-INSTALL(FILES ${_bin_DOCUMENTS} DESTINATION ${SALOME_[NAME_OF_APPLICATION]_PROFILE_INSTALL_DOC_GUI})
+INSTALL(FILES ${_bin_DOCUMENTS} DESTINATION ${SALOME_SALOME_PROFILE_INSTALL_DOC_GUI})
index 4a8ab2baddd382a18fe29b0fe790865d747161ca..babce17d1b9b478065ba698c7f3121c74e2b006e 100644 (file)
@@ -1 +1 @@
-This directory contains binaries of [Name_of_Application]'s documentation
+This directory contains binaries of SALOME's documentation
index dfdc7e618906cfabcfa9ce8b4ab44b4ab688ec31..6773631820df833a87fb88d34d3c8eeff7bf94f9 100644 (file)
Binary files a/resources/splash.png and b/resources/splash.png differ
index 057638a9395dda11709c30d9dcfffe8e6128ba86..d10001d18ac351a93ca2c590ac37a4e324259047 100644 (file)
@@ -31,4 +31,4 @@ SET(_ts_RESOURCES
 
 # --- rules ---
 
-QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_[NAME_OF_APPLICATION]_PROFILE_INSTALL_RES_DATA}")
+QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_SALOME_PROFILE_INSTALL_RES_DATA}")
index 4f925315972f882299edb9281386c57469235cb5..d51a8bbdde047d319cad3133c861db7d354b02fb 100644 (file)
@@ -9,15 +9,15 @@
     </message>
     <message>
         <source>ABOUT_CAPTION</source>
-        <translation>About [Name_of_Application]</translation>
+        <translation>About SALOME</translation>
     </message>
     <message>
         <source>APP_NAME</source>
-        <translation>[Name_of_Application] [SLOGAN]</translation>
+        <translation>SALOME SALOME</translation>
     </message>
     <message>
         <source>APP_VERSION</source>
-        <translation>V[VERSION]</translation>
+        <translation>Vmaster</translation>
     </message>
     <message>
         <source>ABOUT_LICENSE</source>
     </message>
     <message>
         <source>ABOUT_VERSION</source>
-        <translation>Version [VERSION]</translation>
+        <translation>Version master</translation>
     </message>
     <message>
         <source>ABOUT_TITLE</source>
-        <translation>[Name_of_Application]</translation>
+        <translation>SALOME</translation>
     </message>
 </context>
 </TS>
index 2e12751654d8114ed3bb2f47be76c95fc156770a..a3e73e0d451d7d4715dfa9b5f331b15bbd9f7e0a 100644 (file)
@@ -9,15 +9,15 @@
     </message>
     <message>
         <source>ABOUT_CAPTION</source>
-        <translation>A propos de [Name_of_Application]</translation>
+        <translation>A propos de SALOME</translation>
     </message>
     <message>
         <source>APP_NAME</source>
-        <translation>[Name_of_Application] [SLOGAN]</translation>
+        <translation>SALOME SALOME</translation>
     </message>
     <message>
         <source>APP_VERSION</source>
-        <translation>V[VERSION]</translation>
+        <translation>Vmaster</translation>
     </message>
     <message>
         <source>ABOUT_LICENSE</source>
     </message>
     <message>
         <source>ABOUT_VERSION</source>
-        <translation>Version [VERSION]</translation>
+        <translation>Version master</translation>
     </message>
     <message>
         <source>ABOUT_TITLE</source>
-        <translation>[Name_of_Application]</translation>
+        <translation>SALOME</translation>
     </message>
 </context>
 </TS>
index f20e44cae97da3d5e7cc7bb1551db5b76b374c69..5cfc9ec04c8f9376b35a26e65c27ceed8986d45f 100644 (file)
@@ -9,15 +9,15 @@
     </message>
     <message>
       <source>ABOUT_CAPTION</source>
-      <translation>About [Name_of_Application]</translation>
+      <translation>About SALOME</translation>
     </message>
     <message>
       <source>APP_NAME</source>
-      <translation>[Name_of_Application] [SLOGAN]</translation>
+      <translation>SALOME SALOME</translation>
     </message>
     <message>
       <source>APP_VERSION</source>
-      <translation>V[VERSION]</translation>
+      <translation>Vmaster</translation>
     </message>
     <message>
       <source>ABOUT_LICENSE</source>
     </message>
     <message>
       <source>ABOUT_VERSION</source>
-      <translation>Version [VERSION]</translation>
+      <translation>Version master</translation>
     </message>
     <message>
       <source>ABOUT_TITLE</source>
-      <translation>[Name_of_Application]</translation>
+      <translation>SALOME</translation>
     </message>
   </context>
 </TS>
index 545e9297925ce39ced1960ed9736ebc1813463b5..7a89e9666250300eeacf871ac046996629bb54e8 100755 (executable)
@@ -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()
index de561cf072547f071d9a1e15c79fbf47d853f39f..eed1dd58802d0a9170aae5ebd6e02c5018544d44 100755 (executable)
@@ -270,7 +270,35 @@ def getScriptsAndArgs(args=None, searchPathList=None):
       if not currentKey or callPython:
         raise SalomeContextException("args list must follow corresponding script file in command line.")
       elt = elt.replace(argsPrefix, '')
-      scriptArgs[len(scriptArgs)-1].args = [os.path.expanduser(x) for x in elt.split(",")]
+      # Special process if some items of 'args:' list are themselves lists
+      # Note that an item can be a list, but not a list of lists...
+      # So we can have something like this:
+      # myscript.py args:['file1','file2'],val1,"done",[1,2,3],[True,False],"ok"
+      # With such a call, an elt variable contains the string representing ['file1','file2'],val1,"done",[1,2,3],[True,False],"ok" that is '[file1,file2],val1,done,[1,2,3],[True,False],ok'
+      # We have to split elt to obtain: ['[file1,file2]','val1','done','[1,2,3]','[True,False]','ok']
+      contains_list = re.findall('(\[[^\]]*\])', elt)
+      if contains_list:
+        extracted_args = []
+        x = elt.split(",")
+        # x is ['[file1', 'file2]', 'val1', 'done', '[1', '2', '3]', '[True', 'False]', 'ok']
+        list_begin_indices = [i for i in xrange(len(x)) if x[i].startswith('[')] # [0, 4, 7]
+        list_end_indices = [i for i in xrange(len(x)) if x[i].endswith(']')] # [1, 6, 8]
+        start = 0
+        for lbeg, lend in zip(list_begin_indices,list_end_indices): # [(0, 1), (4, 6), (7, 8)]
+          if lbeg > start:
+            extracted_args += x[start:lbeg]
+            pass
+          extracted_args += [','.join(x[lbeg:lend+1])]
+          start = lend+1
+          pass
+        if start < len(x):
+          extracted_args += x[start:len(x)]
+          pass
+        scriptArgs[len(scriptArgs)-1].args = extracted_args
+        pass
+      else: # a single split is enough
+        scriptArgs[len(scriptArgs)-1].args = [os.path.expanduser(x) for x in elt.split(",")]
+        pass
       currentKey = None
       callPython = False
       afterArgs = True
index eae0f58bff68dc3e314cc2e3a73d9c56f8572881..4976f7ef3d31f631879b08de451de73ff70dede9 100644 (file)
@@ -1 +1 @@
-This directory contains the tests of [Name_of_Application]
+This directory contains the tests of SALOME