From: barate <barate>
Date: Wed, 16 Jan 2013 17:24:51 +0000 (+0000)
Subject: Adapt to file renaming in libbatch
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4912197ab061a76003b9ff60ad22114bb45e1d7b;p=modules%2Fkernel.git

Adapt to file renaming in libbatch
---

diff --git a/salome_adm/cmake_files/FindLIBBATCH.cmake b/salome_adm/cmake_files/FindLIBBATCH.cmake
index aee305de4..809075722 100644
--- 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 4e6788745..bd2dd2b99 100644
--- 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 04adb68bf..63f0a53dd 100644
--- 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 4b74fca15..29538c893 100644
--- 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 9ade1bfd2..af7b36b07 100644
--- 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 d011d9ecd..1a2fb230c 100644
--- 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 0bfa86887..0b00b6fb3 100644
--- 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 5696a1b7d..1d82c9d45 100644
--- 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 22170aeef..29bb65431 100644
--- 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 297dca4c4..a377a76b3 100644
--- 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