Adapt to file renaming in libbatch

diff --git a/salome_adm/cmake_files/FindLIBBATCH.cmake b/salome_adm/cmake_files/FindLIBBATCH.cmake
index aee305de420302f686d7cbbfa1389b0bc32ad1df..8090757220f705671a8abdfabf9d9716c9ac4f5c 100644 (file)
--- a/salome_adm/cmake_files/FindLIBBATCH.cmake
+++ b/salome_adm/cmake_files/FindLIBBATCH.cmake
@@ -75,7 +75,7 @@ IF(LIBBATCH_STATUS)
   ELSE(LIBBATCH_ROOT_USER)
     SET(LIBBATCH_INCLUDE_PATHS)
   ENDIF(LIBBATCH_ROOT_USER)
-  SET(LIBBATCH_INCLUDE_TO_FIND Batch/Batch_BatchManager.hxx)
+  SET(LIBBATCH_INCLUDE_TO_FIND Batch/BatchManager.hxx)
   FIND_PATH(LIBBATCH_INCLUDE_DIR ${LIBBATCH_INCLUDE_TO_FIND} PATHS ${LIBBATCH_INCLUDE_PATHS} ${LIBBATCH_FIND_PATHS_OPTION})
   IF(LIBBATCH_INCLUDE_DIR)
     IF(LIBBATCH_ROOT_USER)

diff --git a/salome_adm/unix/config_files/check_libbatch.m4 b/salome_adm/unix/config_files/check_libbatch.m4
index 4e678874554a292b3a1f9a4fe9f10235bfb31551..bd2dd2b99062b9a47f94129c84d02195f0369a6d 100644 (file)
--- a/salome_adm/unix/config_files/check_libbatch.m4
+++ b/salome_adm/unix/config_files/check_libbatch.m4
@@ -72,7 +72,7 @@ fi
 
 CPPFLAGS_old="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $LOCAL_INCLUDES"
-AC_CHECK_HEADER(libbatch/Batch_BatchManager.hxx,
+AC_CHECK_HEADER(libbatch/BatchManager.hxx,
                                libbatch_ok="yes",
                                libbatch_ok="no")
 CPPFLAGS="$CPPFLAGS_old"

diff --git a/src/Launcher/BatchTest.cxx b/src/Launcher/BatchTest.cxx
index 04adb68bfa99d7cad434daa18e505cb87fffd89e..63f0a53dddf73046937bece8b749ec96b7a03b88 100644 (file)
--- a/src/Launcher/BatchTest.cxx
+++ b/src/Launcher/BatchTest.cxx
@@ -24,8 +24,8 @@
 #include "Launcher.hxx"
 
 #ifdef WITH_LIBBATCH
-#include <libbatch/Batch_Date.hxx>
-#include <libbatch/Batch_MpiImpl.hxx>
+#include <libbatch/Date.hxx>
+#include <libbatch/MpiImpl.hxx>
 #endif
 
 #include "utilities.h"

diff --git a/src/Launcher/Launcher.cxx b/src/Launcher/Launcher.cxx
index 4b74fca15aca3f165138b25ac2553408403dbff5..29538c893036f0c91e906e9e0ea0b2e3e01541ab 100644 (file)
--- a/src/Launcher/Launcher.cxx
+++ b/src/Launcher/Launcher.cxx
@@ -21,10 +21,10 @@
 //
 
 #ifdef WITH_LIBBATCH
-#include <libbatch/Batch_Date.hxx>
-#include <libbatch/Batch_BatchManagerCatalog.hxx>
-#include <libbatch/Batch_FactBatchManager.hxx>
-#include <libbatch/Batch_BatchManager.hxx>
+#include <libbatch/Date.hxx>
+#include <libbatch/BatchManagerCatalog.hxx>
+#include <libbatch/FactBatchManager.hxx>
+#include <libbatch/BatchManager.hxx>
 #endif
 
 #include "Basics_Utils.hxx"

diff --git a/src/Launcher/Launcher_Job.cxx b/src/Launcher/Launcher_Job.cxx
index 9ade1bfd2d450d2d3463a8996ac0278d19c96fc0..af7b36b075225fe64c458e2cd2f148eaa0ee4166 100644 (file)
--- a/src/Launcher/Launcher_Job.cxx
+++ b/src/Launcher/Launcher_Job.cxx
@@ -23,7 +23,7 @@
 #include "Launcher.hxx"
 
 #ifdef WITH_LIBBATCH
-#include <libbatch/Batch_Constants.hxx>
+#include <libbatch/Constants.hxx>
 #endif
 
 Launcher::Job::Job()

diff --git a/src/Launcher/Launcher_Job.hxx b/src/Launcher/Launcher_Job.hxx
index d011d9ecd5becf06a6c798fcdce6e8681f65065b..1a2fb230cee310d61df2d7bee26a805fb56b4cf0 100644 (file)
--- a/src/Launcher/Launcher_Job.hxx
+++ b/src/Launcher/Launcher_Job.hxx
@@ -38,10 +38,10 @@
 #include <exception>
 
 #ifdef WITH_LIBBATCH
-#include <libbatch/Batch_Job.hxx>
-#include <libbatch/Batch_Date.hxx>
-#include <libbatch/Batch_JobId.hxx>
-#include <libbatch/Batch_GenericException.hxx>
+#include <libbatch/Job.hxx>
+#include <libbatch/Date.hxx>
+#include <libbatch/JobId.hxx>
+#include <libbatch/GenericException.hxx>
 #endif
 
 #include <libxml/parser.h>

diff --git a/src/Launcher/Launcher_Job_Command.cxx b/src/Launcher/Launcher_Job_Command.cxx
index 0bfa868873c3ed75eb2985656d91f5982aa4b22f..0b00b6fb368f1ee53c7b954f915dd5e46d29b25f 100644 (file)
--- a/src/Launcher/Launcher_Job_Command.cxx
+++ b/src/Launcher/Launcher_Job_Command.cxx
@@ -23,7 +23,7 @@
 #include "Basics_DirUtils.hxx"
 
 #ifdef WITH_LIBBATCH
-#include <libbatch/Batch_Constants.hxx>
+#include <libbatch/Constants.hxx>
 #endif
 
 #ifdef WNT

diff --git a/src/Launcher/Launcher_Job_Command.hxx b/src/Launcher/Launcher_Job_Command.hxx
index 5696a1b7d9170d5e2e046d7c8063dc1bf4e4759c..1d82c9d45972a4274d713e420fe1260689160140 100644 (file)
--- a/src/Launcher/Launcher_Job_Command.hxx
+++ b/src/Launcher/Launcher_Job_Command.hxx
@@ -26,7 +26,7 @@
 #include "Launcher.hxx"
 
 #ifdef WITH_LIBBATCH
-#include <libbatch/Batch_Job.hxx>
+#include <libbatch/Job.hxx>
 #endif
 
 namespace Launcher

diff --git a/src/Launcher/Launcher_Job_SALOME.cxx b/src/Launcher/Launcher_Job_SALOME.cxx
index 22170aeefc472124b4d778f20e1977a35fba488c..29bb6543149d69d8084259e8192805e53a2e9890 100644 (file)
--- a/src/Launcher/Launcher_Job_SALOME.cxx
+++ b/src/Launcher/Launcher_Job_SALOME.cxx
@@ -23,7 +23,7 @@
 #include "Basics_DirUtils.hxx"
 
 #ifdef WITH_LIBBATCH
-#include <libbatch/Batch_Constants.hxx>
+#include <libbatch/Constants.hxx>
 #endif
 
 #ifdef WNT

diff --git a/src/Launcher/Launcher_Job_SALOME.hxx b/src/Launcher/Launcher_Job_SALOME.hxx
index 297dca4c43a334cbae97ef90950231f7f96c0f15..a377a76b3a18396f0e50a1f29d317d51085a199d 100644 (file)
--- a/src/Launcher/Launcher_Job_SALOME.hxx
+++ b/src/Launcher/Launcher_Job_SALOME.hxx
@@ -26,7 +26,7 @@
 #include "Launcher.hxx"
 
 #ifdef WITH_LIBBATCH
-#include <libbatch/Batch_Job.hxx>
+#include <libbatch/Job.hxx>
 #endif
 
 namespace Launcher