CCAR: small modifications on LSF Batch class and on --pinter arg

diff --git a/bin/runSalome.py b/bin/runSalome.py
index f20b507944fefc072e52db5d699c029baa45c428..bdad9dcfd32aff7d1b14e160ce5d10e7cfce8100 100755 (executable)
--- a/bin/runSalome.py
+++ b/bin/runSalome.py
@@ -387,6 +387,11 @@ def startSalome(args, modules_list, modules_root_dir):
     init_time = os.times()
 
     if verbose(): print "startSalome ", args
+
+    # set PYTHONINSPECT variable
+    if args['pinter']:
+        os.environ["PYTHONINSPECT"]="1"
+        import readline
     
     #
     # Initialisation ORB et Naming Service
@@ -594,9 +599,6 @@ def startSalome(args, modules_list, modules_root_dir):
             anInterp=InterpServer(args)
             anInterp.run()
 
-    # set PYTHONINSPECT variable
-    if args['pinter']:
-        os.environ["PYTHONINSPECT"]="1"
         
     return clt
 

diff --git a/salome_adm/unix/config_files/check_lsf.m4 b/salome_adm/unix/config_files/check_lsf.m4
index a4faddb3c2bb9f193ad8971c95f4a301f720b3b6..7f140f7cd9f9438afbdf5331290a37e03332e0e7 100755 (executable)
--- a/salome_adm/unix/config_files/check_lsf.m4
+++ b/salome_adm/unix/config_files/check_lsf.m4
@@ -49,7 +49,7 @@ AC_DEFUN([CHECK_LSF],
    else
      LSF_LDFLAGS="-L${LSF_LIBDIR}"
    fi
-   LSF_LIBS=""
+   LSF_LIBS="-lbat -llsf"
    saved_LDFLAGS=${LDFLAGS}
    saved_LIBS=${LIBS}
    LDFLAGS="${LDFLAGS} ${LSF_LDFLAGS}"

diff --git a/src/Batch/Batch_JobInfo_LSF.cxx b/src/Batch/Batch_JobInfo_LSF.cxx
index 0e4715af78696314154f2cf4f47bae022c55fd26..2ae986cd0c0ce4b1972ce43b92b8ae874d3bbeb5 100644 (file)
--- a/src/Batch/Batch_JobInfo_LSF.cxx
+++ b/src/Batch/Batch_JobInfo_LSF.cxx
@@ -84,7 +84,7 @@ namespace Batch {
     _param[TEXT]             = jobInfo.numReasons ? lsb_pendreason(jobInfo.numReasons,
                                                                   jobInfo.reasonTb, 
                                                                   p_jInfoHead,
-                                                                  p_ld) : "";
+                                                                  p_ld,0) : "";
     // _param[TMPDIR]           = jobInfo.;
     _param[USEDCPUTIME]      = static_cast<long>(jobInfo.cpuTime);
     // _param[USEDDISKSIZE]     = jobInfo.;

diff --git a/src/Batch/Makefile.am b/src/Batch/Makefile.am
index 0ec62e54ca7a89bcb3d29740748703279f173f86..6db79ed43a25704dca48ae125fe5e5f8786a9e4b 100644 (file)
--- a/src/Batch/Makefile.am
+++ b/src/Batch/Makefile.am
@@ -185,7 +185,7 @@ LIB_SRC += \
        Batch_Job_LSF.cxx
 
 LIB_CPPFLAGS += ${LSF_INCLUDES}
-LIB_LIBADD   += ${LSF_LIBDIR} ${LSF_LIBS}
+LIB_LIBADD   += ${LSF_LDFLAGS} ${LSF_LIBS}
 endif
 
 

diff --git a/src/Launcher/BatchLight_BatchManager_PBS.cxx b/src/Launcher/BatchLight_BatchManager_PBS.cxx
index eec063a02ba05d25b7c896872a4f3614898d42fd..2312f73e4646060352785a6aa35704952deefb03 100644 (file)
--- a/src/Launcher/BatchLight_BatchManager_PBS.cxx
+++ b/src/Launcher/BatchLight_BatchManager_PBS.cxx
@@ -199,7 +199,10 @@ namespace BatchLight {
     // -----------------------------------------------
     // Code for rank 0 : launch runAppli and a container
     // RunAppli
-    tempOutputFile << "  ./runAppli --terminal --modules=" ;
+    if(_params.modulesList.size()>0)
+      tempOutputFile << "  ./runAppli --terminal --modules=" ;
+    else
+      tempOutputFile << "  ./runAppli --terminal ";
     for ( int i = 0 ; i < _params.modulesList.size() ; i++ ) {
       tempOutputFile << _params.modulesList[i] ;
       if ( i != _params.modulesList.size()-1 )

diff --git a/src/NOTIFICATION_SWIG/Makefile.am b/src/NOTIFICATION_SWIG/Makefile.am
index e043680f40b8dc86a04adc97dd96c9532b7ccc00..d171e39a5ffca51020ad29af04eb597a92b30aed 100644 (file)
--- a/src/NOTIFICATION_SWIG/Makefile.am
+++ b/src/NOTIFICATION_SWIG/Makefile.am
@@ -56,8 +56,6 @@ _libNOTIFICATION_la_CPPFLAGS =\
 _libNOTIFICATION_la_LDFLAGS  = -module
 _libNOTIFICATION_la_LIBADD   = ../Notification/libSalomeNotification.la
 
-#      @PYTHON_LIBS@
-
 swig_wrap.cpp : $(SWIG_SOURCES)
        $(SWIG) $(SWIG_FLAGS) -o $@ $<