Merge branch V7_6_BR

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd3e941390d56131c22ff876a25e2b554f5f3c2c..0d198198a370b7319673c2cf05e5e569112de8d1 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,8 +30,8 @@ CMAKE_POLICY(SET CMP0003 NEW)
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
 SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 5)
-SET(${PROJECT_NAME_UC}_PATCH_VERSION 1)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 6)
+SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
 SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
@@ -67,7 +67,6 @@ CMAKE_DEPENDENT_OPTION(SALOME_USE_MPI "Use MPI containers" OFF
 CMAKE_DEPENDENT_OPTION(SALOME_USE_MPI "Use MPI containers" ${SALOME_USE_MPI}
                        "NOT SALOME_LIGHT_ONLY" OFF)
 MARK_AS_ADVANCED(SALOME_LIGHT_ONLY SALOME_USE_LIBBATCH SALOME_USE_SIMAN SALOME_PACO_PARALLEL SALOME_USE_PORTMANAGER)
-SET(SALOME_LAUNCHER_ONLY OFF) # deprecated option: Build only the Launcher part
 
 # Required prerequisites
 #   Find "big" prerequisites first - they reference themselves many others
@@ -206,52 +205,47 @@ INCLUDE(CMakePackageConfigHelpers)
 # List of targets in this project we want to make visible to the rest of the world.
 # They all have to be INSTALL'd with the option "EXPORT ${PROJECT_NAME}TargetGroup"
 
-IF(SALOME_LAUNCHER_ONLY)
-  SET(_${PROJECT_NAME}_exposed_targets 
-    SALOMEBasics ResourcesManager Launcher)
-ELSE()
-  SET(_${PROJECT_NAME}_exposed_targets 
-    SALOMEBasics SALOMELocalTrace SalomeHDFPersist OpUtil)
+SET(_${PROJECT_NAME}_exposed_targets 
+  SALOMEBasics SALOMELocalTrace SalomeHDFPersist OpUtil)
     
-  # CORBA specific targets:
-  IF(NOT SALOME_LIGHT_ONLY)
+# CORBA specific targets:
+IF(NOT SALOME_LIGHT_ONLY)
+  LIST(APPEND _${PROJECT_NAME}_exposed_targets 
+    DF SalomeLoggerServer with_loggerTraceCollector SalomeNS SalomeGenericObj 
+    Registry SalomeCatalog ResourcesManager SalomeResourcesManager
+    SalomeNotification SalomeContainer SalomeSDS Launcher SalomeLauncher
+    SalomeLifeCycleCORBA SalomeDSClient TOOLSDS SalomeKernelHelpers
+    SalomeDSImpl SalomeDS SalomeCommunication SalomeDSCContainer)
+  # Temporary solution for package src\DSC on windows
+  IF(NOT WIN32)
     LIST(APPEND _${PROJECT_NAME}_exposed_targets 
-      DF SalomeLoggerServer with_loggerTraceCollector SalomeNS SalomeGenericObj 
-      Registry SalomeCatalog ResourcesManager SalomeResourcesManager
-      SalomeNotification SalomeContainer SalomeSDS Launcher SalomeLauncher
-      SalomeLifeCycleCORBA SalomeDSClient TOOLSDS SalomeKernelHelpers
-      SalomeDSImpl SalomeDS SalomeCommunication SalomeDSCContainer)
-    # Temporary solution for package src\DSC on windows
-    IF(NOT WIN32)
-      LIST(APPEND _${PROJECT_NAME}_exposed_targets 
-        CalciumC SalomeCalcium SalomeDatastream SalomePalm SalomeDSCSupervBasic 
-        SalomeDSCSuperv)
-      IF(SALOME_PACO_PARALLEL)
-        LIST(APPEND _${PROJECT_NAME}_exposed_targets SalomeParallelDSCContainer)
-      ENDIF()
+      CalciumC SalomeCalcium SalomeDatastream SalomePalm SalomeDSCSupervBasic 
+      SalomeDSCSuperv)
+    IF(SALOME_PACO_PARALLEL)
+      LIST(APPEND _${PROJECT_NAME}_exposed_targets SalomeParallelDSCContainer)
     ENDIF()
   ENDIF()
+ENDIF()
   
-  # MPI specific targets:
-  IF(SALOME_USE_MPI)
-    LIST(APPEND _${PROJECT_NAME}_exposed_targets 
-      SalomeMPIContainer SalomeTestMPIComponentEngine)
-  ENDIF()
+# MPI specific targets:
+IF(SALOME_USE_MPI)
+  LIST(APPEND _${PROJECT_NAME}_exposed_targets 
+    SalomeMPIContainer SalomeTestMPIComponentEngine)
+ENDIF()
       
-  # Test targets:
-  IF(SALOME_BUILD_TESTS)
-    LIST(APPEND _${PROJECT_NAME}_exposed_targets SALOMELocalTraceTest UnitTests)
-    IF(NOT SALOME_LIGHT_ONLY)
-      LIST(APPEND _${PROJECT_NAME}_exposed_targets 
-        SALOMETraceCollectorTest UtilsTest NamingServiceTest SalomeTestComponentEngine 
-        LifeCycleCORBATest SalomeKernelHelpersTest SALOMEDSImplTest SALOMEDSTest)
-    ENDIF()
+# Test targets:
+IF(SALOME_BUILD_TESTS)
+  LIST(APPEND _${PROJECT_NAME}_exposed_targets SALOMELocalTraceTest UnitTests)
+  IF(NOT SALOME_LIGHT_ONLY)
+    LIST(APPEND _${PROJECT_NAME}_exposed_targets 
+      SALOMETraceCollectorTest UtilsTest NamingServiceTest SalomeTestComponentEngine 
+      LifeCycleCORBATest SalomeKernelHelpersTest SALOMEDSImplTest SALOMEDSTest)
   ENDIF()
+ENDIF()
 
-  # PACO specific targets:
-  IF(SALOME_PACO_PARALLEL)
-    LIST(APPEND _${PROJECT_NAME}_exposed_targets SalomeParallelContainer)
-  ENDIF()
+# PACO specific targets:
+IF(SALOME_PACO_PARALLEL)
+  LIST(APPEND _${PROJECT_NAME}_exposed_targets SalomeParallelContainer)
 ENDIF()
              
 IF(NOT SALOME_LIGHT_ONLY)

diff --git a/bin/appli_gen.py b/bin/appli_gen.py
index 9604eecf815c4d5de9e8f924a9b9b4a3a17d6dda..b263cd3e79646495550d8c17e7f58424dd216d09 100644 (file)
--- a/bin/appli_gen.py
+++ b/bin/appli_gen.py
@@ -47,6 +47,8 @@ system_conf_tag  = "system_conf"
 modules_tag = "modules"
 module_tag  = "module"
 samples_tag = "samples"
+extra_tests_tag = "extra_tests"
+extra_test_tag = "extra_test"
 resources_tag = "resources"
 
 # --- names of attributes in XML configuration file
@@ -65,6 +67,7 @@ class xml_parser:
         self.config = {}
         self.config["modules"] = []
         self.config["guimodules"] = []
+        self.config["extra_tests"] = []
         parser = xml.sax.make_parser()
         parser.setContentHandler(self)
         parser.parse(fileName)
@@ -118,6 +121,15 @@ class xml_parser:
                 self.config["guimodules"].append(nam)
                 pass
             pass
+        # --- if we are analyzing "extra_test" element then store its "name" and "path" attributes
+        elif self.space == [appli_tag,extra_tests_tag,extra_test_tag] and \
+            nam_att in attrs.getNames() and \
+            path_att in attrs.getNames():
+            nam = attrs.getValue( nam_att )
+            path = attrs.getValue( path_att )
+            self.config["extra_tests"].append(nam)
+            self.config[nam]=path
+            pass
         pass
 
     def endElement(self, name):
@@ -195,6 +207,19 @@ def install(prefix, config_file, verbose=0):
             pass
         pass
 
+    for extra_test in _config.get("extra_tests", []):
+        if _config.has_key(extra_test):
+            print "--- add extra test ", extra_test, _config[extra_test]
+            options = params()
+            options.verbose = verbose
+            options.clear = 0
+            options.prefix = home_dir
+            options.extra_test_name = extra_test
+            options.extra_test_path = _config[extra_test]
+            virtual_salome.link_extra_test(options)
+            pass
+        pass
+
     appliskel_dir = os.path.join(home_dir, 'bin', 'salome', 'appliskel')
 
     for fn in ('envd',

diff --git a/bin/runTests.py b/bin/runTests.py
index 7384e8554b06ef24e396013291427a50b02cc136..5d3939f9ae1a1574d937f0aa8f71d599e0003327 100644 (file)
--- a/bin/runTests.py
+++ b/bin/runTests.py
@@ -70,7 +70,7 @@ __testSubDir = "bin/salome/test"
 
 # Both display process stdout&stderr to console and capture them to variables
 def __runTest(command, workdir):
-  p = subprocess.Popen(command, cwd=workdir, stdout=subprocess.PIPE, stderr=subprocess.PIPE, bufsize=1)
+  p = subprocess.Popen(command, cwd=workdir, stdout=subprocess.PIPE, stderr=subprocess.PIPE, bufsize=0)
   stdout = []
   stderr = []
 

diff --git a/bin/virtual_salome.py b/bin/virtual_salome.py
index 0a2493121c388a4789e4548efc3df1000a3d0336..db99db0365905b9333f3216bf8c40a4643e85463 100755 (executable)
--- a/bin/virtual_salome.py
+++ b/bin/virtual_salome.py
@@ -199,7 +199,7 @@ def link_module(options):
             f.write("SUBDIRS(%s)\n"%options.module_name)
     else:
         if verbose:
-            print module_bin_dir, " doesn't exist"
+            print module_test_dir, " doesn't exist"
         pass
 
     #directory idl/salome : create it and link content
@@ -340,6 +340,40 @@ def link_module(options):
             pass
         pass
 
+def link_extra_test(options):
+    global verbose
+
+    if not options.extra_test_path:
+        print "Option extra_test is mandatory"
+        return
+
+    extra_test_dir=os.path.abspath(options.extra_test_path)
+    if not os.path.exists(extra_test_dir):
+        print "Test %s does not exist" % extra_test_dir
+        return
+
+    verbose = options.verbose
+
+    home_dir = os.path.expanduser(options.prefix)
+    test_dir = os.path.join(home_dir,'bin','salome', 'test')
+
+    if options.clear:
+        rmtree(test_dir)
+        pass
+
+    #directory bin/salome/test : create it and link content
+    if os.path.exists(extra_test_dir):
+        # link <appli_path>/bin/salome/test/<extra_test> to <extra_test_path>/bin/salome/test
+        print "link %s --> %s"%(os.path.join(test_dir, options.extra_test_name), extra_test_dir)
+        symlink(extra_test_dir, os.path.join(test_dir, options.extra_test_name))
+        # register extra_test for testing in CTestTestfile.cmake
+        with open(os.path.join(test_dir, "CTestTestfile.cmake"), "ab") as f:
+            f.write("SUBDIRS(%s)\n"%options.extra_test_name)
+    else:
+        if verbose:
+            print extra_test_dir, " doesn't exist"
+        pass
+
 # -----------------------------------------------------------------------------
 
 def main():

diff --git a/doc/salome/tui/CMakeLists.txt b/doc/salome/tui/CMakeLists.txt
index 6582fa817933552803ff562c97dbcc86b43c4fdc..ee0d83a9b0179635205f15d63b067af161e8dbab 100755 (executable)
--- a/doc/salome/tui/CMakeLists.txt
+++ b/doc/salome/tui/CMakeLists.txt
@@ -23,7 +23,10 @@ SALOME_CONFIGURE_FILE(static/header.html.in static/header.html)
 ADD_CUSTOM_TARGET(dev_docs ${DOXYGEN_EXECUTABLE})
 
 INSTALL(CODE "FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/KERNEL)")
-INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/KERNEL DESTINATION ${SALOME_INSTALL_DOC}/tui)
+INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/KERNEL 
+        DESTINATION ${SALOME_INSTALL_DOC}/tui
+       PATTERN "*.md5" EXCLUDE
+       PATTERN "*.map" EXCLUDE)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/images/head.png DESTINATION ${SALOME_INSTALL_DOC}/tui/KERNEL)
 
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES KERNEL)

diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
index e2e042cd840fb7d3562ced054af451a843669b66..f62bd4e81d9c56cda33634dfded1bbc9337fb9de 100755 (executable)
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@@ -26,10 +26,8 @@ INSTALL(FILES CatalogModulePersonnel.xml_skel DESTINATION ${SALOME_KERNEL_INSTAL
 
 SALOME_CONFIGURE_FILE(CatalogResources.xml.in CatalogResources.xml INSTALL ${SALOME_KERNEL_INSTALL_RES_DATA})
 
-IF(NOT SALOME_LAUNCHER_ONLY)
-  INSTALL(FILES channel.cfg SALOMEDS_Resources DESTINATION ${SALOME_KERNEL_INSTALL_RES_DATA})
-  SALOME_CONFIGURE_FILE(KERNELCatalog.xml.in KERNELCatalog.xml INSTALL ${SALOME_KERNEL_INSTALL_RES_DATA})
-ENDIF()
+INSTALL(FILES channel.cfg SALOMEDS_Resources DESTINATION ${SALOME_KERNEL_INSTALL_RES_DATA})
+SALOME_CONFIGURE_FILE(KERNELCatalog.xml.in KERNELCatalog.xml INSTALL ${SALOME_KERNEL_INSTALL_RES_DATA})
 
 
 

diff --git a/salome_adm/cmake_files/deprecated/am2cmake.py b/salome_adm/cmake_files/deprecated/am2cmake.py
index ecacd359e30d2798e754b5d65b78e876f349cf65..9b00f75299b3260d9591facc84a6f1b1c4d60f63 100644 (file)
--- a/salome_adm/cmake_files/deprecated/am2cmake.py
+++ b/salome_adm/cmake_files/deprecated/am2cmake.py
@@ -816,10 +816,10 @@ class CMakeFile(object):
                 pass
             # --
             newlines.append("""
-            set(VERSION 7.5.1)
-            set(SHORT_VERSION 7.5)
-            set(XVERSION 0x070501)
-            set(VERSION_DEV 1)
+            set(VERSION 7.6.0)
+            set(SHORT_VERSION 7.6)
+            set(XVERSION 0x070600)
+            set(VERSION_DEV 0)
             """)
             pass
         # --

diff --git a/src/AppQuickStart/app-quickstart.py b/src/AppQuickStart/app-quickstart.py
index f04439da2880fc9606aeedd37c17998553753ba7..dce16fe6c46dcf7c6ba2eba264fb3b9c1556beb9 100755 (executable)
--- a/src/AppQuickStart/app-quickstart.py
+++ b/src/AppQuickStart/app-quickstart.py
@@ -169,7 +169,7 @@ def profileReplaceStrings( src, dst, options ) :
                 l = l.replace( '[VERSION]', options.version )
                 l = l.replace( '[SLOGAN]', options.slogan )
                 l = l.replace( '[NAME_OF_APPLICATION]', options.name.upper() )
-                l = l.replace( '<Name_of_Application>', options.name )
+                l = l.replace( '[Name_of_Application]', options.name )
                 l = l.replace( '(name_of_application)', options.name.lower() )
                 fout.write( l )
 

diff --git a/src/AppQuickStart/app-template/CMakeLists.txt b/src/AppQuickStart/app-template/CMakeLists.txt
index c857705cd591e41a4c8c476099fc7e447016faf8..c11854056de67e9b4629e22b55652a8d94b27df4 100644 (file)
--- a/src/AppQuickStart/app-template/CMakeLists.txt
+++ b/src/AppQuickStart/app-template/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_<Name_of_Application>_Profile C CXX)
+PROJECT(Salome_[Name_of_Application]_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 <Name_of_Application> documentation" ON)
+OPTION(SALOME_BUILD_DOC "Generate SALOME [Name_of_Application] documentation" ON)
 
 IF(SALOME_BUILD_TESTS)
   ENABLE_TESTING()
@@ -108,3 +108,7 @@ SET(_salome_context_API_SCRIPTS
    ${KERNEL_ROOT_DIR}/bin/salome/parseConfigFile.py
 )
 SALOME_INSTALL_SCRIPTS("${_salome_context_API_SCRIPTS}" ${SALOME_INSTALL_SCRIPT_PYTHON})
+SET(_salome_context_BASHRC
+   ${KERNEL_ROOT_DIR}/bin/salome/appliskel/.bashrc
+)
+SALOME_INSTALL_SCRIPTS("${_salome_context_BASHRC}" $ENV{[NAME_OF_APPLICATION]_PROFILE_ROOT_DIR})

diff --git a/src/AppQuickStart/app-template/doc/README b/src/AppQuickStart/app-template/doc/README
index f5406ebfa69d93ce2aba69d0a63685ab7011ca7d..843a1fac637c5d9badfd422f03fdbe99278bdfbe 100644 (file)
--- a/src/AppQuickStart/app-template/doc/README
+++ b/src/AppQuickStart/app-template/doc/README
@@ -1 +1 @@
-This directory contains the sources of <Name_of_Application>'s documentation
+This directory contains the sources of [Name_of_Application]'s documentation

diff --git a/src/AppQuickStart/app-template/doc/conf.py.in b/src/AppQuickStart/app-template/doc/conf.py.in
index c222fe4fee3381eb0a8300c89755606623274c2f..580bdac9ca4f4ded320c72ba33dc0b13fb165c82 100644 (file)
--- a/src/AppQuickStart/app-template/doc/conf.py.in
+++ b/src/AppQuickStart/app-template/doc/conf.py.in
@@ -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', '(name_of_application).tex', '[Name_of_Application] User Documentation', 'A. Ribes', 'manual')
 ]
 
 # The name of an image file (relative to this directory) to place at the top of

diff --git a/src/AppQuickStart/app-template/doc/index.rst b/src/AppQuickStart/app-template/doc/index.rst
index cb2b308ac5f6900970ad509fe38633c959c758f1..05713b9dce63ac89cabbbd00083acf9f13be04e8 100644 (file)
--- a/src/AppQuickStart/app-template/doc/index.rst
+++ b/src/AppQuickStart/app-template/doc/index.rst
@@ -1,6 +1,6 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-<Name_of_Application>'s documentation 
+[Name_of_Application]'s documentation 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 Outline

diff --git a/src/AppQuickStart/app-template/doc/intro.rst b/src/AppQuickStart/app-template/doc/intro.rst
index e2baa234e175f1a6f028df73781ce1e4e2bfc1e0..35461a67a3be5b43bb9785870a9791d62d067013 100644 (file)
--- a/src/AppQuickStart/app-template/doc/intro.rst
+++ b/src/AppQuickStart/app-template/doc/intro.rst
@@ -1,4 +1,4 @@
 Introduction
 ==========================================
 
-Welcome to <Name_of_Application>'s documentation!
+Welcome to [Name_of_Application]'s documentation!

diff --git a/src/AppQuickStart/app-template/resources/SalomeApp.xml.in b/src/AppQuickStart/app-template/resources/SalomeApp.xml.in
index 3a992ce480f09ebf9d70e69db927d5faca9e6752..fdf732553eb6a623c3a458266336dd28653e19b6 100644 (file)
--- a/src/AppQuickStart/app-template/resources/SalomeApp.xml.in
+++ b/src/AppQuickStart/app-template/resources/SalomeApp.xml.in
@@ -17,7 +17,7 @@
     <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="%[Name_of_Application]_PROFILE_ROOT_DIR%/share/salome/resources/(name_of_application)_profile/splash.png"/>
     <parameter name="text_colors" value="#ffffff|#000000"/>
     <parameter name="show_percents" value="yes"/>
     <parameter name="show_progress" value="yes"/>
@@ -25,6 +25,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="%[Name_of_Application]_PROFILE_ROOT_DIR%/share/salome/resources/(name_of_application)_profile"/>
   </section>
 </document>

diff --git a/src/AppQuickStart/app-template/resources/doc/README b/src/AppQuickStart/app-template/resources/doc/README
index 8f54bbbb47027a523b11113fc6729d439842e4c8..4a8ab2baddd382a18fe29b0fe790865d747161ca 100644 (file)
--- a/src/AppQuickStart/app-template/resources/doc/README
+++ b/src/AppQuickStart/app-template/resources/doc/README
@@ -1 +1 @@
-This directory contains binaries of <Name_of_Application>'s documentation
+This directory contains binaries of [Name_of_Application]'s documentation

diff --git a/src/AppQuickStart/app-template/src/resources/CMakeLists.txt b/src/AppQuickStart/app-template/src/resources/CMakeLists.txt
index 43685546ddcce157ac0e0b3aa5c71dd5f4752276..763c42ee4cf9edc009c6ae2023b1256acf71524f 100644 (file)
--- a/src/AppQuickStart/app-template/src/resources/CMakeLists.txt
+++ b/src/AppQuickStart/app-template/src/resources/CMakeLists.txt
@@ -26,6 +26,7 @@ SET(_ts_RESOURCES
   LightApp_images.ts
   LightApp_msg_en.ts
   LightApp_msg_fr.ts
+  LightApp_msg_ja.ts
 ) 
 
 # --- rules ---

diff --git a/src/AppQuickStart/app-template/src/resources/LightApp_msg_en.ts b/src/AppQuickStart/app-template/src/resources/LightApp_msg_en.ts
index 4f7dfa1985bd5c8534585fdc67be906f8c9805e2..4f925315972f882299edb9281386c57469235cb5 100755 (executable)
--- a/src/AppQuickStart/app-template/src/resources/LightApp_msg_en.ts
+++ b/src/AppQuickStart/app-template/src/resources/LightApp_msg_en.ts
@@ -9,11 +9,11 @@
     </message>
     <message>
         <source>ABOUT_CAPTION</source>
-        <translation>About <Name_of_Application></translation>
+        <translation>About [Name_of_Application]</translation>
     </message>
     <message>
         <source>APP_NAME</source>
-        <translation><Name_of_Application> [SLOGAN]</translation>
+        <translation>[Name_of_Application] [SLOGAN]</translation>
     </message>
     <message>
         <source>APP_VERSION</source>
@@ -29,7 +29,7 @@
     </message>
     <message>
         <source>ABOUT_TITLE</source>
-        <translation><Name_of_Application></translation>
+        <translation>[Name_of_Application]</translation>
     </message>
 </context>
 </TS>

diff --git a/src/AppQuickStart/app-template/src/resources/LightApp_msg_fr.ts b/src/AppQuickStart/app-template/src/resources/LightApp_msg_fr.ts
index ca802094db3a5e6d98927a3b0339006ea9a4d8f9..2e12751654d8114ed3bb2f47be76c95fc156770a 100755 (executable)
--- a/src/AppQuickStart/app-template/src/resources/LightApp_msg_fr.ts
+++ b/src/AppQuickStart/app-template/src/resources/LightApp_msg_fr.ts
@@ -9,11 +9,11 @@
     </message>
     <message>
         <source>ABOUT_CAPTION</source>
-        <translation>A propos de <Name_of_Application></translation>
+        <translation>A propos de [Name_of_Application]</translation>
     </message>
     <message>
         <source>APP_NAME</source>
-        <translation><Name_of_Application> [SLOGAN]</translation>
+        <translation>[Name_of_Application] [SLOGAN]</translation>
     </message>
     <message>
         <source>APP_VERSION</source>
@@ -29,7 +29,7 @@
     </message>
     <message>
         <source>ABOUT_TITLE</source>
-        <translation><Name_of_Application></translation>
+        <translation>[Name_of_Application]</translation>
     </message>
 </context>
 </TS>

diff --git a/src/AppQuickStart/app-template/src/resources/LightApp_msg_ja.ts b/src/AppQuickStart/app-template/src/resources/LightApp_msg_ja.ts
new file mode 100644 (file)
index 0000000..f20e44c
--- /dev/null
+++ b/src/AppQuickStart/app-template/src/resources/LightApp_msg_ja.ts
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="ja" sourcelanguage="en">
+  <context>
+    <name>@default</name>
+    <message>
+      <source>ABOUT_COPYRIGHT</source>
+      <translation>Copyright (C)</translation>
+    </message>
+    <message>
+      <source>ABOUT_CAPTION</source>
+      <translation>About [Name_of_Application]</translation>
+    </message>
+    <message>
+      <source>APP_NAME</source>
+      <translation>[Name_of_Application] [SLOGAN]</translation>
+    </message>
+    <message>
+      <source>APP_VERSION</source>
+      <translation>V[VERSION]</translation>
+    </message>
+    <message>
+      <source>ABOUT_LICENSE</source>
+      <translation>License description</translation>
+    </message>
+    <message>
+      <source>ABOUT_VERSION</source>
+      <translation>Version [VERSION]</translation>
+    </message>
+    <message>
+      <source>ABOUT_TITLE</source>
+      <translation>[Name_of_Application]</translation>
+    </message>
+  </context>
+</TS>

diff --git a/src/AppQuickStart/app-template/src/tests/README b/src/AppQuickStart/app-template/src/tests/README
index ef5ad8fa0ebef94c91ea842e701bfc44cb816886..eae0f58bff68dc3e314cc2e3a73d9c56f8572881 100644 (file)
--- a/src/AppQuickStart/app-template/src/tests/README
+++ b/src/AppQuickStart/app-template/src/tests/README
@@ -1 +1 @@
-This directory contains the tests of <Name_of_Application>
+This directory contains the tests of [Name_of_Application]

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0303f3840be8873f3c367e4ad55d6fa647ce253a..9a028e422ecd92467ee9f93b6b7b8450ea359e17 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -75,28 +75,24 @@ SET(SUBDIR_CPPUNIT_CORBA
 )
 SET(SUBDIR_CPPUNIT_GENERAL UnitTests)
 
-IF(SALOME_LAUNCHER_ONLY)
-  SET(SUBDIRS Basics ResourcesManager Launcher)
-ELSE()
-  SET(SUBDIRS ${SUBDIR_BASE})
-  IF(NOT SALOME_LIGHT_ONLY)
-    LIST(APPEND SUBDIRS ${SUBDIR_CORBA})
-  ENDIF()
+SET(SUBDIRS ${SUBDIR_BASE})
+IF(NOT SALOME_LIGHT_ONLY)
+  LIST(APPEND SUBDIRS ${SUBDIR_CORBA})
+ENDIF()
 
-  IF(SALOME_USE_MPI)
-    LIST(APPEND SUBDIRS ${SUBDIR_MPI})
-  ENDIF(SALOME_USE_MPI)
+IF(SALOME_USE_MPI)
+  LIST(APPEND SUBDIRS ${SUBDIR_MPI})
+ENDIF(SALOME_USE_MPI)
 
-  IF(SALOME_BUILD_TESTS)
-    LIST(APPEND SUBDIRS ${SUBDIR_CPPUNIT_BASE} ${SUBDIR_CPPUNIT_GENERAL})
-    IF(NOT SALOME_LIGHT_ONLY)
-      LIST(APPEND SUBDIRS ${SUBDIR_CPPUNIT_CORBA})
-    ENDIF()
+IF(SALOME_BUILD_TESTS)
+  LIST(APPEND SUBDIRS ${SUBDIR_CPPUNIT_BASE} ${SUBDIR_CPPUNIT_GENERAL})
+  IF(NOT SALOME_LIGHT_ONLY)
+    LIST(APPEND SUBDIRS ${SUBDIR_CPPUNIT_CORBA})
   ENDIF()
+ENDIF()
 
-  IF(SALOME_PACO_PARALLEL)
-    LIST(APPEND SUBDIRS  ${SUBDIR_PARALLEL})
-  ENDIF()
+IF(SALOME_PACO_PARALLEL)
+  LIST(APPEND SUBDIRS  ${SUBDIR_PARALLEL})
 ENDIF()
 
 # For salome test
@@ -109,4 +105,4 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/CTestTestfileInstall.cmake
 
 FOREACH(_dir ${SUBDIRS})
   ADD_SUBDIRECTORY(${_dir})
-ENDFOREACH()
\ No newline at end of file
+ENDFOREACH()

diff --git a/src/Container/Container_i.cxx b/src/Container/Container_i.cxx
index 7b733fe7baeafa5a391e706ffc5e50f0dd73bdfb..b1db972620f75a605d0d20f8a02894340800832e 100644 (file)
--- a/src/Container/Container_i.cxx
+++ b/src/Container/Container_i.cxx
@@ -1822,7 +1822,7 @@ void Engines_Container_i::clearTemporaryFiles()
   std::list<std::string>::const_iterator it;
   for ( it = _tmp_files.begin(); it != _tmp_files.end(); ++it ) {
 #ifdef WIN32
-    std::string command = "del /F ";
+    std::string command = "del /F /P";
 #else
     std::string command = "rm -rf ";
 #endif

diff --git a/src/Launcher/CMakeLists.txt b/src/Launcher/CMakeLists.txt
index 6f9ea884e0a6cc0bfcc19b8153bdf8aa560248a9..2215a729a43bf890845fb7ded26996d03d2ac936 100755 (executable)
--- a/src/Launcher/CMakeLists.txt
+++ b/src/Launcher/CMakeLists.txt
@@ -26,7 +26,6 @@ INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR}
   ${PYTHON_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
-  ${MPI_CXX_INCLUDE_PATH}
   ${LIBBATCH_INCLUDE_DIRS}
   ${PROJECT_BINARY_DIR}/salome_adm
   ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
@@ -41,7 +40,7 @@ INCLUDE_DIRECTORIES(
   ${PROJECT_BINARY_DIR}/idl
 )
 
-ADD_DEFINITIONS(${MPI_DEFINITIONS} ${LIBXML2_DEFINITIONS} ${OMNIORB_DEFINITIONS})
+ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${OMNIORB_DEFINITIONS})
 IF(SALOME_USE_LIBBATCH)
   ADD_DEFINITIONS(-DWITH_LIBBATCH)
 ENDIF(SALOME_USE_LIBBATCH)
@@ -58,7 +57,6 @@ SET(COMMON_LIBS
   SALOMEBasics
   SalomeIDLKernel
   ${LIBBATCH_LIBRARIES}
-  ${MPI_CXX_LIBRARIES}
   ${OMNIORB_LIBRARIES}
   ${LIBXML2_LIBRARIES}
   ${PYTHON_LIBRARIES}
@@ -77,43 +75,40 @@ SET(Launcher_SOURCES
 )
 
 ADD_LIBRARY(Launcher ${Launcher_SOURCES})
-TARGET_LINK_LIBRARIES(Launcher ResourcesManager ${LIBBATCH_LIBRARIES} ${MPI_CXX_LIBRARIES} ${LIBXML2_LIBS})
+TARGET_LINK_LIBRARIES(Launcher ResourcesManager ${LIBBATCH_LIBRARIES} ${LIBXML2_LIBS})
 INSTALL(TARGETS Launcher EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
 SET(TestLauncher_LIBS
   ${LIBXML2_LIBRARIES}
   ResourcesManager
   Launcher
-  OpUtil
   ${LIBBATCH_LIBRARIES}
 )
 
+# TestLauncher needs only (and must need only) libxml, libbatch, ResourceManager and Launcher libraries!
 ADD_EXECUTABLE(TestLauncher TestLauncher.cxx)
 TARGET_LINK_LIBRARIES(TestLauncher ${TestLauncher_LIBS})
 INSTALL(TARGETS TestLauncher DESTINATION ${SALOME_INSTALL_BINS})
 
-IF(NOT SALOME_LAUNCHER_ONLY)
-  ADD_LIBRARY(SalomeLauncher BatchTest.cxx SALOME_Launcher.cxx)
-  TARGET_LINK_LIBRARIES(SalomeLauncher Launcher ${COMMON_LIBS})
-  INSTALL(TARGETS SalomeLauncher EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
+ADD_LIBRARY(SalomeLauncher BatchTest.cxx SALOME_Launcher.cxx)
+TARGET_LINK_LIBRARIES(SalomeLauncher Launcher ${COMMON_LIBS})
+INSTALL(TARGETS SalomeLauncher EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
   
-  SET(SALOME_LauncherServer_LIBS
-    Launcher
-    SalomeLauncher
-    SalomeSDS
-    SALOMEBasics
-    SALOMELocalTrace
-    ${LIBBATCH_LIBRARIES}
-    ${MPI_CXX_LIBRARIES}
-    ${OMNIORB_LIBRARIES}
-    ${LIBXML2_LIBRARIES}
-    ${PYTHON_LIBRARIES}
-  )
+SET(SALOME_LauncherServer_LIBS
+  Launcher
+  SalomeLauncher
+  SalomeSDS
+  SALOMEBasics
+  SALOMELocalTrace
+  ${LIBBATCH_LIBRARIES}
+  ${OMNIORB_LIBRARIES}
+  ${LIBXML2_LIBRARIES}
+  ${PYTHON_LIBRARIES}
+)
 
-  ADD_EXECUTABLE(SALOME_LauncherServer SALOME_LauncherServer.cxx)
-  TARGET_LINK_LIBRARIES(SALOME_LauncherServer ${SALOME_LauncherServer_LIBS})
-  INSTALL(TARGETS SALOME_LauncherServer EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS})
-ENDIF()
+ADD_EXECUTABLE(SALOME_LauncherServer SALOME_LauncherServer.cxx)
+TARGET_LINK_LIBRARIES(SALOME_LauncherServer ${SALOME_LauncherServer_LIBS})
+INSTALL(TARGETS SALOME_LauncherServer EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS})
 
 SET(COMMON_HEADERS_HXX
   BatchTest.hxx
@@ -129,3 +124,4 @@ SET(COMMON_HEADERS_HXX
   SALOME_Launcher_defs.hxx
 )
 INSTALL(FILES ${COMMON_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS})
+INSTALL(FILES testLauncher.xml DESTINATION ${SALOME_KERNEL_INSTALL_RES_DATA})

diff --git a/src/Launcher/TestLauncher.cxx b/src/Launcher/TestLauncher.cxx
index 56f77655740b36f77bbe059f216ea08e56a76dbd..fe7655cd2f360f26d7340145b377fae139a26d7e 100755 (executable)
--- a/src/Launcher/TestLauncher.cxx
+++ b/src/Launcher/TestLauncher.cxx
@@ -18,14 +18,24 @@
 //
 
 #include "Launcher.hxx"
+#include <iostream>
+#include <string>
 
 int main(int argc, char** argv)
 {
+  std::string xmlfile("");
 
   try {
     Launcher_cpp *lcpp = new Launcher_cpp();
     ResourcesManager_cpp *rcpp = new ResourcesManager_cpp();
     lcpp->SetResourcesManager(rcpp);
+    if(!getenv("KERNEL_ROOT_DIR"))
+      throw ResourcesException("you must define KERNEL_ROOT_DIR environment variable!! -> cannot load testLauncher.xml");
+    xmlfile = getenv("KERNEL_ROOT_DIR");
+    xmlfile += "/share/salome/resources/kernel/testLauncher.xml";
+
+    long jobid = lcpp->createJobWithFile(xmlfile.c_str(),"localhost");
+    lcpp->launchJob(jobid);
     delete lcpp;
     delete rcpp;
     std::cout << "test OK" << std::endl;

diff --git a/src/Launcher/testLauncher.xml b/src/Launcher/testLauncher.xml
new file mode 100644 (file)
index 0000000..6dc2ca3
--- /dev/null
+++ b/src/Launcher/testLauncher.xml
@@ -0,0 +1,10 @@
+<main>
+ <machine-list>
+   <machine work-directory="/tmp/testLauncher">localhost</machine>
+ </machine-list>
+ <nb-processes>1</nb-processes>
+ <output-file>testLauncher.output</output-file>
+ <command>ls > testLauncher.output</command>
+</main>
+
+

diff --git a/src/ResourcesManager/CMakeLists.txt b/src/ResourcesManager/CMakeLists.txt
index e03e9754f33e489c0e657296daff3edd63633789..d91f687d20b26fd4c26c5f786384869c61a3821d 100755 (executable)
--- a/src/ResourcesManager/CMakeLists.txt
+++ b/src/ResourcesManager/CMakeLists.txt
@@ -49,21 +49,19 @@ SET(ResourcesManager_SOURCES
 ADD_DEFINITIONS(${OMNIORB_DEFINITIONS} ${LIBXML2_DEFINITIONS})
 
 ADD_LIBRARY(ResourcesManager ${ResourcesManager_SOURCES})
-TARGET_LINK_LIBRARIES(ResourcesManager SALOMEBasics OpUtil ${LIBXML2_LIBRARIES})
+TARGET_LINK_LIBRARIES(ResourcesManager SALOMEBasics ${LIBXML2_LIBRARIES})
 INSTALL(TARGETS ResourcesManager EXPORT ${PROJECT_NAME}TargetGroup 
     DESTINATION ${SALOME_INSTALL_LIBS})
 
-IF(NOT SALOME_LAUNCHER_ONLY)
-  SET(SalomeResourcesManager_SOURCES
-    SALOME_ResourcesManager.cxx
-    SALOME_ResourcesManager_Client.cxx
-    SALOME_ResourcesManager_Common.cxx
-  )
-  ADD_LIBRARY(SalomeResourcesManager ${SalomeResourcesManager_SOURCES})
-  TARGET_LINK_LIBRARIES(SalomeResourcesManager ResourcesManager ${COMMON_LIBS})
-  INSTALL(TARGETS SalomeResourcesManager EXPORT ${PROJECT_NAME}TargetGroup
+SET(SalomeResourcesManager_SOURCES
+  SALOME_ResourcesManager.cxx
+  SALOME_ResourcesManager_Client.cxx
+  SALOME_ResourcesManager_Common.cxx
+)
+ADD_LIBRARY(SalomeResourcesManager ${SalomeResourcesManager_SOURCES})
+TARGET_LINK_LIBRARIES(SalomeResourcesManager ResourcesManager ${COMMON_LIBS})
+INSTALL(TARGETS SalomeResourcesManager EXPORT ${PROJECT_NAME}TargetGroup
         DESTINATION ${SALOME_INSTALL_LIBS})
-ENDIF()
 
 SET(COMMON_HEADERS_HXX
   ResourcesManager.hxx

diff --git a/src/ResourcesManager/ResourcesManager.cxx b/src/ResourcesManager/ResourcesManager.cxx
index 0ddc3a8f1d7674c7df9cfd376f1fb94008107c18..ba27107b4257e04fe47893d323757728c18d95bf 100644 (file)
--- a/src/ResourcesManager/ResourcesManager.cxx
+++ b/src/ResourcesManager/ResourcesManager.cxx
@@ -39,8 +39,6 @@
 
 #include <algorithm>
 
-#include "Utils_SALOME_Exception.hxx"
-
 #define MAX_SIZE_FOR_HOSTNAME 256;
 
 using namespace std;
@@ -328,9 +326,10 @@ ResourcesManager_cpp::GetFittingResources(const resourceParams& params) throw(Re
 void
 ResourcesManager_cpp::AddResourceInCatalog(const ParserResourcesType & new_resource)
 {
-  if (new_resource.Name == DEFAULT_RESOURCE_NAME)
-    throw SALOME_Exception((string("Cannot modify default local resource \"") +
-                            DEFAULT_RESOURCE_NAME + "\"").c_str());
+  if (new_resource.Name == DEFAULT_RESOURCE_NAME){
+    std::string error("Cannot modify default local resource \"" + DEFAULT_RESOURCE_NAME + "\"");
+    throw ResourcesException(error);
+  }
   // TODO - Add minimal check
   _resourcesList[new_resource.Name] = new_resource;
 }
@@ -343,9 +342,10 @@ ResourcesManager_cpp::AddResourceInCatalog(const ParserResourcesType & new_resou
 
 void ResourcesManager_cpp::DeleteResourceInCatalog(const char * name)
 {
-  if (DEFAULT_RESOURCE_NAME == name)
-    throw SALOME_Exception((string("Cannot delete default local resource \"") +
-                            DEFAULT_RESOURCE_NAME + "\"").c_str());
+  if (DEFAULT_RESOURCE_NAME == name){
+    std::string error("Cannot delete default local resource \"" + DEFAULT_RESOURCE_NAME + "\"");
+    throw ResourcesException(error);
+  }
   MapOfParserResourcesType_it it = _resourcesList.find(name);
   if (it != _resourcesList.end())
     _resourcesList.erase(name);

diff --git a/src/ResourcesManager/ResourcesManager.hxx b/src/ResourcesManager/ResourcesManager.hxx
index 670f50d27aed8d71c501ac4539d630aca1e13202..948f20d2239424e8d1131508b5b7a18ff00d89c1 100644 (file)
--- a/src/ResourcesManager/ResourcesManager.hxx
+++ b/src/ResourcesManager/ResourcesManager.hxx
@@ -66,14 +66,6 @@ struct RESOURCESMANAGER_EXPORT resourceParams
   std::vector<std::string> resourceList;
 };
 
-class RESOURCESMANAGER_EXPORT ResourcesException
-{
-public:
-  const std::string msg;
-
-  ResourcesException(const std::string m) : msg(m) {}
-};
-
 class RESOURCESMANAGER_EXPORT ResourcesManager_cpp
   {
 

diff --git a/src/ResourcesManager/SALOME_ResourcesCatalog_Handler.cxx b/src/ResourcesManager/SALOME_ResourcesCatalog_Handler.cxx
index b35613a34ae1d8c1c1e2d11fe41b1e1884526d8e..2c138d2da2dd0ab7b4bf14d1c6fc8cb3932ddec9 100755 (executable)
--- a/src/ResourcesManager/SALOME_ResourcesCatalog_Handler.cxx
+++ b/src/ResourcesManager/SALOME_ResourcesCatalog_Handler.cxx
@@ -28,7 +28,6 @@
 //
 #include "SALOME_ResourcesCatalog_Handler.hxx"
 #include "Basics_Utils.hxx"
-#include "Utils_SALOME_Exception.hxx"
 #include <iostream>
 #include <sstream>
 #include <map>
@@ -291,7 +290,7 @@ SALOME_ResourcesCatalog_Handler::ProcessMember(xmlNodePtr member_descr, ParserRe
     {
       resource.setAccessProtocolTypeStr((const char *)protocol);
     }
-    catch (const SALOME_Exception & e)
+    catch (const ResourcesException & e)
     {
       std::cerr << "SALOME_ResourcesCatalog_Handler::ProcessMember : Warning found a machine with a bad protocol" << std::endl;
       std::cerr << "SALOME_ResourcesCatalog_Handler::ProcessMember : Warning this machine will not be added" << std::endl;
@@ -313,7 +312,7 @@ SALOME_ResourcesCatalog_Handler::ProcessMember(xmlNodePtr member_descr, ParserRe
     {
       resource.setClusterInternalProtocolStr((const char *)iprotocol);
     }
-    catch (const SALOME_Exception & e)
+    catch (const ResourcesException & e)
     {
       std::cerr << "SALOME_ResourcesCatalog_Handler::ProcessMember : Warning found a machine with a bad protocol" << std::endl;
       std::cerr << "SALOME_ResourcesCatalog_Handler::ProcessMember : Warning this machine will not be added" << std::endl;
@@ -463,7 +462,7 @@ SALOME_ResourcesCatalog_Handler::ProcessMachine(xmlNodePtr machine_descr, Parser
     {
       resource.setResourceTypeStr((const char*)type);
     }
-    catch (const SALOME_Exception & e)
+    catch (const ResourcesException & e)
     {
       cerr << "Warning, invalid type \"" << (const char*)type << "\" for resource \"" <<
               resource.Name << "\", using default value \"" << resource.getResourceTypeStr() <<
@@ -498,7 +497,7 @@ SALOME_ResourcesCatalog_Handler::ProcessMachine(xmlNodePtr machine_descr, Parser
     {
       resource.setAccessProtocolTypeStr((const char *)protocol);
     }
-    catch (const SALOME_Exception & e)
+    catch (const ResourcesException & e)
     {
       cerr << "Warning, invalid protocol \"" << (const char*)protocol << "\" for resource \"" <<
               resource.Name << "\", using default value \"" <<
@@ -514,7 +513,7 @@ SALOME_ResourcesCatalog_Handler::ProcessMachine(xmlNodePtr machine_descr, Parser
     {
       resource.setClusterInternalProtocolStr((const char *)iprotocol);
     }
-    catch (const SALOME_Exception & e)
+    catch (const ResourcesException & e)
     {
       cerr << "Warning, invalid internal protocol \"" << (const char*)iprotocol <<
               "\" for resource \"" << resource.Name << "\", using default value \"" <<
@@ -532,7 +531,7 @@ SALOME_ResourcesCatalog_Handler::ProcessMachine(xmlNodePtr machine_descr, Parser
     {
       resource.setBatchTypeStr((const char *)batch);
     }
-    catch (const SALOME_Exception & e)
+    catch (const ResourcesException & e)
     {
       cerr << "Warning, invalid batch manager \"" << (const char*)batch <<
               "\" for resource \"" << resource.Name << "\", using default value \"" <<
@@ -548,7 +547,7 @@ SALOME_ResourcesCatalog_Handler::ProcessMachine(xmlNodePtr machine_descr, Parser
     {
       resource.setMpiImplTypeStr((const char *)mpi);
     }
-    catch (const SALOME_Exception & e)
+    catch (const ResourcesException & e)
     {
       cerr << "Warning, invalid MPI implementation \"" << (const char*)mpi <<
               "\" for resource \"" << resource.Name << "\", using default value \"" <<
@@ -613,7 +612,7 @@ SALOME_ResourcesCatalog_Handler::ProcessMachine(xmlNodePtr machine_descr, Parser
     {
       resource.setCanLaunchBatchJobsStr((const char *)can_launch_batch_jobs);
     }
-    catch (const SALOME_Exception & e)
+    catch (const ResourcesException & e)
     {
       cerr << "Warning, invalid can_launch_batch_jobs parameter value \"" <<
               (const char*)can_launch_batch_jobs << "\" for resource \"" << resource.Name <<
@@ -629,7 +628,7 @@ SALOME_ResourcesCatalog_Handler::ProcessMachine(xmlNodePtr machine_descr, Parser
     {
       resource.setCanRunContainersStr((const char *)can_run_containers);
     }
-    catch (const SALOME_Exception & e)
+    catch (const ResourcesException & e)
     {
       cerr << "Warning, invalid can_run_containers parameter value \"" <<
               (const char*)can_run_containers << "\" for resource \"" << resource.Name <<

diff --git a/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.cxx b/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.cxx
index 799798c91aa759ecef7fa3a9b172657d50d74e2a..8968345283649bb5d84e82760998bf8bdc91b26c 100644 (file)
--- a/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.cxx
+++ b/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.cxx
@@ -21,7 +21,6 @@
 //
 
 #include "SALOME_ResourcesCatalog_Parser.hxx"
-#include "Utils_SALOME_Exception.hxx"
 #include <iostream>
 #include <sstream>
 
@@ -170,7 +169,7 @@ std::string ParserResourcesType::protocolToString(AccessProtocolType protocol)
   case blaunch:
     return "blaunch";
   default:
-    throw SALOME_Exception("Unknown protocol");
+    throw ResourcesException("Unknown protocol");
   }
 }
 
@@ -189,7 +188,7 @@ AccessProtocolType ParserResourcesType::stringToProtocol(const std::string & pro
   else if (protocolStr == "blaunch")
     return blaunch;
   else
-    throw SALOME_Exception((string("Unknown protocol ") + protocolStr).c_str());
+    throw ResourcesException((string("Unknown protocol ") + protocolStr).c_str());
 }
 
 ostream & operator<<(ostream &os, const ParserResourcesType &prt)
@@ -249,7 +248,7 @@ ParserResourcesType::getResourceTypeStr() const
   case single_machine:
     return "single_machine";
   default:
-    throw SALOME_Exception("Unknown resource type");
+    throw ResourcesException("Unknown resource type");
   }
 }
 
@@ -279,7 +278,7 @@ ParserResourcesType::getBatchTypeStr() const
   case coorm:
     return "coorm";
   default:
-    throw SALOME_Exception("Unknown batch type");
+    throw ResourcesException("Unknown batch type");
   }
 }
 
@@ -305,7 +304,7 @@ ParserResourcesType::getMpiImplTypeStr() const
   case prun:
     return "prun";
   default:
-    throw SALOME_Exception("Unknown MPI implementation type");
+    throw ResourcesException("Unknown MPI implementation type");
   }
 }
 
@@ -331,7 +330,7 @@ void ParserResourcesType::setResourceTypeStr(const string & resourceTypeStr)
   else if (resourceTypeStr == "single_machine")
     type = single_machine;
   else
-    throw SALOME_Exception((string("Unknown resource type ") + resourceTypeStr).c_str());
+    throw ResourcesException((string("Unknown resource type ") + resourceTypeStr).c_str());
 }
 
 void ParserResourcesType::setBatchTypeStr(const string & batchTypeStr)
@@ -357,7 +356,7 @@ void ParserResourcesType::setBatchTypeStr(const string & batchTypeStr)
   else if (batchTypeStr == "" || batchTypeStr == "none" || batchTypeStr == "ssh_batch")
     Batch = none;
   else
-    throw SALOME_Exception((string("Unknown batch type ") + batchTypeStr).c_str());
+    throw ResourcesException((string("Unknown batch type ") + batchTypeStr).c_str());
 }
 
 void ParserResourcesType::setMpiImplTypeStr(const string & mpiImplTypeStr)
@@ -379,7 +378,7 @@ void ParserResourcesType::setMpiImplTypeStr(const string & mpiImplTypeStr)
   else if (mpiImplTypeStr == "" || mpiImplTypeStr == "no mpi")
     mpi = nompi;
   else
-    throw SALOME_Exception((string("Unknown MPI implementation type ") + mpiImplTypeStr).c_str());
+    throw ResourcesException((string("Unknown MPI implementation type ") + mpiImplTypeStr).c_str());
 }
 
 void ParserResourcesType::setClusterInternalProtocolStr(const string & internalProtocolTypeStr)
@@ -394,7 +393,7 @@ void ParserResourcesType::setCanLaunchBatchJobsStr(const string & canLaunchBatch
   else if (canLaunchBatchJobsStr == "false")
     can_launch_batch_jobs = false;
   else
-    throw SALOME_Exception((string("Invalid boolean value for can_launch_batch_jobs: ") +
+    throw ResourcesException((string("Invalid boolean value for can_launch_batch_jobs: ") +
                             canLaunchBatchJobsStr).c_str());
 }
 
@@ -405,6 +404,6 @@ void ParserResourcesType::setCanRunContainersStr(const string & canRunContainers
   else if (canRunContainersStr == "false")
     can_run_containers = false;
   else
-    throw SALOME_Exception((string("Invalid boolean value for can_run_containers: ") +
+    throw ResourcesException((string("Invalid boolean value for can_run_containers: ") +
                             canRunContainersStr).c_str());
 }

diff --git a/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx b/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx
index 9688367ca0a7d3de5e33978561c9e691179677d2..9989e64ff0492b6eb3fa3b230a1f7668038ae1c9 100755 (executable)
--- a/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx
+++ b/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx
@@ -49,6 +49,14 @@ enum BatchType {none, pbs, lsf, sge, ccc, ll, slurm, vishnu, oar, coorm};
 
 enum MpiImplType {nompi, lam, mpich1, mpich2, openmpi, ompi, slurmmpi, prun};
 
+class RESOURCESMANAGER_EXPORT ResourcesException
+{
+public:
+  const std::string msg;
+
+  ResourcesException(const std::string m) : msg(m) {}
+};
+
 class RESOURCESMANAGER_EXPORT ResourceDataToSort
   {