From cc359250421a7443ead7b19d8398cbb8489a6858 Mon Sep 17 00:00:00 2001 From: caremoli Date: Mon, 28 Jan 2008 14:24:15 +0000 Subject: [PATCH] CCAR: move BatchLight classes from Batch to Launcher (dependency loop) --- src/Batch/Batch_Date.cxx | 2 +- src/Batch/Batch_PyVersatile.cxx | 6 +-- src/Batch/Makefile.am | 37 +++++-------------- .../BatchLight_BatchManager.cxx | 0 .../BatchLight_BatchManager.hxx | 0 .../BatchLight_BatchManager_PBS.cxx | 0 .../BatchLight_BatchManager_PBS.hxx | 0 .../BatchLight_BatchManager_SLURM.cxx | 0 .../BatchLight_BatchManager_SLURM.hxx | 0 src/{Batch => Launcher}/BatchLight_Job.cxx | 0 src/{Batch => Launcher}/BatchLight_Job.hxx | 0 src/Launcher/Makefile.am | 12 +++++- src/{Batch => Launcher}/MpiImpl.cxx | 0 src/{Batch => Launcher}/MpiImpl.hxx | 0 14 files changed, 24 insertions(+), 33 deletions(-) rename src/{Batch => Launcher}/BatchLight_BatchManager.cxx (100%) rename src/{Batch => Launcher}/BatchLight_BatchManager.hxx (100%) rename src/{Batch => Launcher}/BatchLight_BatchManager_PBS.cxx (100%) rename src/{Batch => Launcher}/BatchLight_BatchManager_PBS.hxx (100%) rename src/{Batch => Launcher}/BatchLight_BatchManager_SLURM.cxx (100%) rename src/{Batch => Launcher}/BatchLight_BatchManager_SLURM.hxx (100%) rename src/{Batch => Launcher}/BatchLight_Job.cxx (100%) rename src/{Batch => Launcher}/BatchLight_Job.hxx (100%) rename src/{Batch => Launcher}/MpiImpl.cxx (100%) rename src/{Batch => Launcher}/MpiImpl.hxx (100%) diff --git a/src/Batch/Batch_Date.cxx b/src/Batch/Batch_Date.cxx index 0ec1166ef..a657696ac 100644 --- a/src/Batch/Batch_Date.cxx +++ b/src/Batch/Batch_Date.cxx @@ -60,7 +60,7 @@ namespace Batch { _sec = p_tm->tm_sec; } else { - char c; +// char c; // istringstream ist(s); // ist >> _day >> c // >> _month >> c diff --git a/src/Batch/Batch_PyVersatile.cxx b/src/Batch/Batch_PyVersatile.cxx index 395634bbf..f38132ca2 100644 --- a/src/Batch/Batch_PyVersatile.cxx +++ b/src/Batch/Batch_PyVersatile.cxx @@ -27,12 +27,12 @@ * */ -#include #include #include "Batch_TypeMismatchException.hxx" #include "Batch_ListIsFullException.hxx" #include "Batch_InvalidArgumentException.hxx" #include "Batch_PyVersatile.hxx" +#include namespace Batch { @@ -93,7 +93,7 @@ namespace Batch { if (_maxsize != 1) { // une liste obj = PyList_New(0); for(Versatile::const_iterator it=begin(); it!=end(); it++) { - char ch[2] = {0, 0}; +// char ch[2] = {0, 0}; string st; Couple cp; // PyObject * tuple; @@ -137,7 +137,7 @@ namespace Batch { } } else { // un scalaire - char ch[2] = {0, 0}; +// char ch[2] = {0, 0}; string st; Couple cp; // PyObject * tuple; diff --git a/src/Batch/Makefile.am b/src/Batch/Makefile.am index 44cd7ad59..0ec62e54c 100644 --- a/src/Batch/Makefile.am +++ b/src/Batch/Makefile.am @@ -59,12 +59,7 @@ LIB_INCLUDES = \ Batch_PyVersatile.hxx \ Batch_RunTimeException.hxx \ Batch_StringType.hxx \ - Batch_TypeMismatchException.hxx \ - BatchLight_BatchManager.hxx \ - BatchLight_BatchManager_PBS.hxx \ - BatchLight_BatchManager_SLURM.hxx \ - BatchLight_Job.hxx \ - MpiImpl.hxx + Batch_TypeMismatchException.hxx LIB_SRC = \ @@ -96,18 +91,14 @@ LIB_SRC = \ Batch_PyVersatile.cxx \ Batch_RunTimeException.cxx \ Batch_StringType.cxx \ - Batch_TypeMismatchException.cxx \ - BatchLight_BatchManager.cxx \ - BatchLight_BatchManager_SLURM.cxx \ - BatchLight_BatchManager_PBS.cxx \ - BatchLight_Job.cxx \ - MpiImpl.cxx + Batch_TypeMismatchException.cxx LIB_CPPFLAGS = \ - @PYTHON_INCLUDES@ \ + ${PYTHON_INCLUDES} \ -I$(srcdir)/../Basics \ - -I$(srcdir)/../SALOMELocalTrace + -I$(srcdir)/../SALOMELocalTrace \ + -I$(top_builddir)/salome_adm/unix LIB_LIBADD = \ ../SALOMELocalTrace/libSALOMELocalTrace.la \ @@ -193,8 +184,8 @@ LIB_SRC += \ Batch_JobInfo_LSF.cxx \ Batch_Job_LSF.cxx -LIB_CPPFLAGS += @LSF_INCLUDES@ -LIB_LIBADD += @LSF_LIBDIR@ @LSF_LIBS@ +LIB_CPPFLAGS += ${LSF_INCLUDES} +LIB_LIBADD += ${LSF_LIBDIR} ${LSF_LIBS} endif @@ -209,16 +200,6 @@ salomeinclude_HEADERS = $(LIB_INCLUDES) # lib_LTLIBRARIES = libSalomeBatch.la libSalomeBatch_la_SOURCES = $(LIB_SRC) -libSalomeBatch_la_CPPFLAGS = \ - ${PYTHON_INCLUDES} \ - -I$(srcdir)/../Basics \ - -I$(srcdir)/../SALOMELocalTrace \ - -I$(srcdir)/../Utils \ - -I$(top_builddir)/salome_adm/unix \ - -I$(top_builddir)/idl \ - ${CORBA_CXXFLAGS} ${CORBA_INCLUDES} $(LIB_CPPFLAGS) - +libSalomeBatch_la_CPPFLAGS = ${LIB_CPPFLAGS} libSalomeBatch_la_LDFLAGS = -no-undefined -version-info=0:0:0 -libSalomeBatch_la_LIBADD = \ - ../Utils/libOpUtil.la \ - $(LIB_LIBADD) +libSalomeBatch_la_LIBADD = $(LIB_LIBADD) diff --git a/src/Batch/BatchLight_BatchManager.cxx b/src/Launcher/BatchLight_BatchManager.cxx similarity index 100% rename from src/Batch/BatchLight_BatchManager.cxx rename to src/Launcher/BatchLight_BatchManager.cxx diff --git a/src/Batch/BatchLight_BatchManager.hxx b/src/Launcher/BatchLight_BatchManager.hxx similarity index 100% rename from src/Batch/BatchLight_BatchManager.hxx rename to src/Launcher/BatchLight_BatchManager.hxx diff --git a/src/Batch/BatchLight_BatchManager_PBS.cxx b/src/Launcher/BatchLight_BatchManager_PBS.cxx similarity index 100% rename from src/Batch/BatchLight_BatchManager_PBS.cxx rename to src/Launcher/BatchLight_BatchManager_PBS.cxx diff --git a/src/Batch/BatchLight_BatchManager_PBS.hxx b/src/Launcher/BatchLight_BatchManager_PBS.hxx similarity index 100% rename from src/Batch/BatchLight_BatchManager_PBS.hxx rename to src/Launcher/BatchLight_BatchManager_PBS.hxx diff --git a/src/Batch/BatchLight_BatchManager_SLURM.cxx b/src/Launcher/BatchLight_BatchManager_SLURM.cxx similarity index 100% rename from src/Batch/BatchLight_BatchManager_SLURM.cxx rename to src/Launcher/BatchLight_BatchManager_SLURM.cxx diff --git a/src/Batch/BatchLight_BatchManager_SLURM.hxx b/src/Launcher/BatchLight_BatchManager_SLURM.hxx similarity index 100% rename from src/Batch/BatchLight_BatchManager_SLURM.hxx rename to src/Launcher/BatchLight_BatchManager_SLURM.hxx diff --git a/src/Batch/BatchLight_Job.cxx b/src/Launcher/BatchLight_Job.cxx similarity index 100% rename from src/Batch/BatchLight_Job.cxx rename to src/Launcher/BatchLight_Job.cxx diff --git a/src/Batch/BatchLight_Job.hxx b/src/Launcher/BatchLight_Job.hxx similarity index 100% rename from src/Batch/BatchLight_Job.hxx rename to src/Launcher/BatchLight_Job.hxx diff --git a/src/Launcher/Makefile.am b/src/Launcher/Makefile.am index 9c441ebc1..b0323d754 100644 --- a/src/Launcher/Makefile.am +++ b/src/Launcher/Makefile.am @@ -36,6 +36,11 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am # # header files salomeinclude_HEADERS = \ + BatchLight_BatchManager.hxx \ + BatchLight_BatchManager_PBS.hxx \ + BatchLight_BatchManager_SLURM.hxx \ + BatchLight_Job.hxx \ + MpiImpl.hxx \ SALOME_Launcher.hxx # Scripts to be installed @@ -93,7 +98,12 @@ COMMON_LIBS =\ # lib_LTLIBRARIES = libSalomeLauncher.la libSalomeLauncher_la_SOURCES=\ - SALOME_Launcher.cxx + SALOME_Launcher.cxx \ + BatchLight_BatchManager.cxx \ + BatchLight_BatchManager_SLURM.cxx \ + BatchLight_BatchManager_PBS.cxx \ + BatchLight_Job.cxx \ + MpiImpl.cxx libSalomeLauncher_la_CPPFLAGS =\ $(COMMON_CPPFLAGS) diff --git a/src/Batch/MpiImpl.cxx b/src/Launcher/MpiImpl.cxx similarity index 100% rename from src/Batch/MpiImpl.cxx rename to src/Launcher/MpiImpl.cxx diff --git a/src/Batch/MpiImpl.hxx b/src/Launcher/MpiImpl.hxx similarity index 100% rename from src/Batch/MpiImpl.hxx rename to src/Launcher/MpiImpl.hxx -- 2.39.2