add --with-onlylauncher configure option to build kernel with only Batch, ResourceMan...

diff --git a/Makefile.am b/Makefile.am
index 63730a5e5d6c1fa403bc61387c13798b0a6a5bef..d3b87e52de439a72cd361f2ce281b1fe00591c43 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,7 +30,11 @@ endif
 
 ACLOCAL_AMFLAGS = -I salome_adm/unix/config_files
 
-SUBDIRS = $(IDLDIR) salome_adm src doc bin resources
+if WITHONLYLAUNCHER
+  SUBDIRS = src resources
+else
+  SUBDIRS = $(IDLDIR) salome_adm src doc bin resources
+endif
 
 DIST_SUBDIRS=   idl salome_adm src doc bin resources
 

diff --git a/configure.ac b/configure.ac
index e487aa5329374f80f146bda99f82448a412c6794..96e62e7188df67fb57549e882acaf53c4a2c1ddd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -66,6 +66,12 @@ AC_ARG_ENABLE(corba_gen,
   esac],[corba_gen=true])
 AM_CONDITIONAL(CORBA_GEN, test x$corba_gen = xtrue)
 
+# ---- option to build only launcher, resources manager and batch classes
+AC_ARG_WITH(onlylauncher,
+           --with-onlylauncher,
+           WITHONLYLAUNCHER="yes",WITHONLYLAUNCHER="no")
+AM_CONDITIONAL(WITHONLYLAUNCHER, test x$WITHONLYLAUNCHER = xyes)
+
 # ----------------------------------------------------------------------------
 
 echo
@@ -172,6 +178,15 @@ dnl _CS_gbo We should use here a variable given from the CHECK_PYTHON
 AM_PATH_PYTHON(2.3)
 CHECK_SWIG
 
+echo
+echo ---------------------------------------------
+echo Testing libxml2
+echo ---------------------------------------------
+echo
+
+CHECK_LIBXML
+
+if test x$WITHONLYLAUNCHER = xno; then
 echo
 echo ---------------------------------------------
 echo testing HDF5
@@ -236,18 +251,14 @@ echo
 
 CHECK_BOOST
 
-echo
-echo ---------------------------------------------
-echo Testing libxml2
-echo ---------------------------------------------
-echo
-
-CHECK_LIBXML
-
 fi 
 # --- end test corba
 # ----------------------------------------------------------------------------
 
+fi 
+# --- end test ONLYLAUNCHER
+# ----------------------------------------------------------------------------
+
 echo
 echo ============================================================
 echo testing parallel products
@@ -408,10 +419,14 @@ function check_fatal_error {
 
 # --------------------------------------
 
-if test x$corba_gen = xtrue; then
-  basic_mandatory_products="cc_ok threads_ok python_ok swig_ok hdf5_ok"
+if test x$WITHONLYLAUNCHER = xno; then
+  if test x$corba_gen = xtrue; then
+    basic_mandatory_products="cc_ok threads_ok python_ok swig_ok hdf5_ok libxml_ok"
+  else
+    basic_mandatory_products="cc_ok threads_ok hdf5_ok libxml_ok"
+  fi
 else
-  basic_mandatory_products="cc_ok threads_ok hdf5_ok"
+  basic_mandatory_products="cc_ok threads_ok libxml_ok"
 fi
 
 echo --- General mandatory products - Light configuration:
@@ -419,19 +434,21 @@ summary $basic_mandatory_products
 check_fatal_error $basic_mandatory_products
 echo
 
-corba_mandatory_products="omniORB_ok omniORBpy_ok boost_ok libxml_ok"
-if test x$corba_gen = xtrue; then
-  echo --- CORBA mandatory products - default configuration:
-  summary $corba_mandatory_products
-  check_fatal_error $corba_mandatory_products
-else
-  echo --- CORBA products not required - option --disable-corba-gen
-  if test x"$WITH_BATCH" = xyes; then
-    echo --- BATCH mode mandatory products - default configuration:
-    summary "python_ok"
-    check_fatal_error "python_ok"
-  else 
+if test x$WITHONLYLAUNCHER = xno; then
+  corba_mandatory_products="omniORB_ok omniORBpy_ok boost_ok"
+  if test x$corba_gen = xtrue; then
+    echo --- CORBA mandatory products - default configuration:
+    summary $corba_mandatory_products
+    check_fatal_error $corba_mandatory_products
+  else
+    echo --- CORBA products not required - option --disable-corba-gen
+    if test x"$WITH_BATCH" = xyes; then
+      echo --- BATCH mode mandatory products - default configuration:
+      summary "python_ok"
+      check_fatal_error "python_ok"
+    else 
     echo --- Python not required - option --enable-batch=no
+    fi
   fi
 fi
 echo
@@ -454,9 +471,11 @@ echo --- Html documentation products: only required for doc production
 summary $htmldoc_products
 echo
 
+if test x$WITHONLYLAUNCHER = xno; then
 echo
 echo "Default ORB   : $DEFAULT_ORB"
 echo
+fi
 
 dnl generals files which could be included in every makefile
 
@@ -475,6 +494,7 @@ else
    AC_SUBST(SETX) SETX="set -x"
 fi
 
+if test x$WITHONLYLAUNCHER = xno; then
 echo 
 echo ---------------------------------------------
 echo copying resource files, shell scripts, and 
@@ -497,17 +517,18 @@ do
 done
 cd $ROOT_BUILDDIR
 
+AC_OUTPUT_COMMANDS([ \
+       chmod +x ./bin/*; \
+       chmod +x ./bin/salome/* \
+])
+fi
+
 echo
 echo ---------------------------------------------
 echo generating Makefiles and configure files
 echo ---------------------------------------------
 echo
 
-AC_OUTPUT_COMMANDS([ \
-       chmod +x ./bin/*; \
-       chmod +x ./bin/salome/* \
-])
-
 # This list is initiated using autoscan and must be updated manually
 # when adding a new file <filename>.in to manage. When you execute
 # autoscan, the Makefile list is generated in the output file configure.scan.
@@ -588,4 +609,3 @@ AC_OUTPUT([ \
        ./src/Utils/Makefile \
        ./src/Utils/Test/Makefile \
 ])
-

diff --git a/resources/Makefile.am b/resources/Makefile.am
index 6872021531be1f28dd479538b195754c78ca8d0c..76ad823d8d94649a2ff8729789680bf61fdf13e4 100644 (file)
--- a/resources/Makefile.am
+++ b/resources/Makefile.am
@@ -33,10 +33,15 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am
 
 DEPRECATED_FILES=
 
-dist_salomeres_DATA=\
+if WITHONLYLAUNCHER
+  dist_salomeres_DATA=\
+       CatalogResources.xml
+else
+  dist_salomeres_DATA=\
        CatalogResources.xml \
        config \
        channel.cfg \
        KERNELCatalog.xml \
        SALOMEDS_Resources \
        $(DEPRECATED_FILES)
+endif

diff --git a/src/Batch/Batch_FactBatchManager.cxx b/src/Batch/Batch_FactBatchManager.cxx
index 61d18fbd0ef5ebd8dc26825c7ec52712adb58a0a..6667814a03a1c197d66c02044b2990d1b6a5f693 100644 (file)
--- a/src/Batch/Batch_FactBatchManager.cxx
+++ b/src/Batch/Batch_FactBatchManager.cxx
@@ -28,9 +28,9 @@
 
 #include <string>
 #include <sstream>
+#include <iostream>
 #include "Batch_BatchManagerCatalog.hxx"
 #include "Batch_FactBatchManager.hxx"
-#include "utilities.h"
 using namespace std;
 
 namespace Batch {
@@ -41,7 +41,7 @@ namespace Batch {
     BatchManagerCatalog::addFactBatchManager(type.c_str(), this);
     ostringstream msg;
     msg << "FactBatchManager of type '" << type << "' inserted into catalog";
-    MESSAGE(msg.str().c_str());
+    cerr << msg.str().c_str() << endl;
   }
 
   // Destructeur

diff --git a/src/Batch/Makefile.am b/src/Batch/Makefile.am
index b936e299a68dc0fe695a528c8a82518ee28bc461..e00d64868406e93a14df51b8e434ebeabb9c33ea 100644 (file)
--- a/src/Batch/Makefile.am
+++ b/src/Batch/Makefile.am
@@ -113,15 +113,20 @@ LIB_SRC = \
 
 
 LIB_CPPFLAGS = \
-       ${PYTHON_INCLUDES} \
+       ${PYTHON_INCLUDES}
+if !WITHONLYLAUNCHER
+  LIB_CPPFLAGS += \
        -I$(srcdir)/../Basics \
        -I$(srcdir)/../SALOMELocalTrace \
-  -I$(top_builddir)/salome_adm/unix
+        -I$(top_builddir)/salome_adm/unix
+endif
 
-LIB_LIBADD   = \
+LIB_LIBADD =
+if !WITHONLYLAUNCHER
+  LIB_LIBADD   += \
        ../SALOMELocalTrace/libSALOMELocalTrace.la \
        ../Basics/libSALOMEBasics.la
-
+endif
 
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -157,7 +162,9 @@ LIB_SRC +=\
        Batch_Job_Local.cxx \
        Batch_IOMutex.cxx
 
-LIB_CPPFLAGS += -DHAVE_CONFIG_H
+if !WITHONLYLAUNCHER
+  LIB_CPPFLAGS += -DHAVE_CONFIG_H
+endif
 
 endif
 

diff --git a/src/Launcher/Makefile.am b/src/Launcher/Makefile.am
index bd61a22d8d09b86fba1771a9b69d5c7fa518b2a0..2bc48a5291a45c27c685f2033d2e943e7ad2db83 100644 (file)
--- a/src/Launcher/Makefile.am
+++ b/src/Launcher/Makefile.am
@@ -93,7 +93,11 @@ COMMON_LIBS =\
 # Libraries targets
 # ===============================================================
 #
-lib_LTLIBRARIES = libLauncher.la libSalomeLauncher.la
+if WITHONLYLAUNCHER
+  lib_LTLIBRARIES = libLauncher.la
+else
+  lib_LTLIBRARIES = libLauncher.la libSalomeLauncher.la
+endif
 libSalomeLauncher_la_SOURCES=\
        SALOME_Launcher.cxx 
 
@@ -131,7 +135,9 @@ libLauncher_la_LIBADD =\
 # Executables targets
 # ===============================================================
 #
-bin_PROGRAMS = SALOME_LauncherServer
+if !WITHONLYLAUNCHER
+  bin_PROGRAMS = SALOME_LauncherServer
+endif
 
 SALOME_LauncherServer_SOURCES =\
        SALOME_LauncherServer.cxx

diff --git a/src/Makefile.am b/src/Makefile.am
index 82efa8787d72eda06c27b4150a6b6f15394a72ed..681c55a3d48817b6434c5b7408e262ac185799ba 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -100,6 +100,10 @@ DIST_SUBDIRS = \
 # check_cppunit for example with CPPUNIT_IS_OK.
 #
 
+if WITHONLYLAUNCHER
+  SUBDIRS = Batch Batch_SWIG ResourcesManager Launcher
+else
+
 SUBDIRS = $(SUBDIR_BASE)
 
 if WITH_BATCH
@@ -127,5 +131,7 @@ else
 endif
 endif
 if WITH_PACO_PARALLEL
-SUBDIRS += $(SUBDIR_PARALLEL)
+  SUBDIRS += $(SUBDIR_PARALLEL)
 endif
+
+endif
\ No newline at end of file

diff --git a/src/ResourcesManager/Makefile.am b/src/ResourcesManager/Makefile.am
index 94db53c20789529ed3a56cbbac7b4c067b003869..ea5695722aaaf015209366cac3f90928f5022f60 100755 (executable)
--- a/src/ResourcesManager/Makefile.am
+++ b/src/ResourcesManager/Makefile.am
@@ -71,7 +71,11 @@ COMMON_LIBS =\
 # Libraries targets
 # ===============================================================
 #
-lib_LTLIBRARIES = libResourcesManager.la libSalomeResourcesManager.la
+if WITHONLYLAUNCHER
+  lib_LTLIBRARIES = libResourcesManager.la
+else
+  lib_LTLIBRARIES = libResourcesManager.la libSalomeResourcesManager.la
+endif
 libSalomeResourcesManager_la_SOURCES =\
        SALOME_ResourcesManager.cxx
 

diff --git a/src/ResourcesManager/ResourcesManager.cxx b/src/ResourcesManager/ResourcesManager.cxx
index b5226b18e62a5d01aafd639bf5d1dc6238b0d71e..ef28d75973e739556b4083a38b7381cc3d6c7737 100644 (file)
--- a/src/ResourcesManager/ResourcesManager.cxx
+++ b/src/ResourcesManager/ResourcesManager.cxx
@@ -58,10 +58,12 @@ ResourcesManager_cpp(const char *xmlFilePath) :
  */ 
 //=============================================================================
 
-ResourcesManager_cpp::ResourcesManager_cpp()
+ResourcesManager_cpp::ResourcesManager_cpp() throw(ResourcesException)
 {
   cerr << "ResourcesManager_cpp constructor" << endl;
   _isAppliSalomeDefined = (getenv("APPLI") != 0);
+  if(!getenv("KERNEL_ROOT_DIR"))
+    throw ResourcesException("you must define KERNEL_ROOT_DIR environment variable!!");
 
   if (_isAppliSalomeDefined)
     {

diff --git a/src/ResourcesManager/ResourcesManager.hxx b/src/ResourcesManager/ResourcesManager.hxx
index 2396540a3f9bb09fe210fc8ce2f608c9d3ef942c..d1f47e3b36eed002d27a848706c754ad52225c24 100644 (file)
--- a/src/ResourcesManager/ResourcesManager.hxx
+++ b/src/ResourcesManager/ResourcesManager.hxx
@@ -56,7 +56,7 @@ class ResourcesManager_cpp
   public:
 
     ResourcesManager_cpp(const char *xmlFilePath);
-    ResourcesManager_cpp();
+    ResourcesManager_cpp() throw(ResourcesException);
 
     ~ResourcesManager_cpp();