Update for compilation JOBMANAGER from sources

diff --git a/config_files/JOBMANAGER.sh b/config_files/JOBMANAGER.sh
index 4e5d618a84fe4f9f4e01d7cbf53ba4bd0f6abf8f..c3322d0be4ff2df401462fa3752d910a5ae8ffee 100755 (executable)
--- a/config_files/JOBMANAGER.sh
+++ b/config_files/JOBMANAGER.sh
@@ -74,16 +74,22 @@ install_source
 
 # build sources
 
-cd ${PRODUCT_SRC_DIR}
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-check_job ${PRODUCT_DIR}/MAKE.LOG python ./setup.py install --prefix=${PRODUCT_DIR}
+if [ -e ./build.sh ] ; then
+    cp -f ./build.sh ${INST_ROOT}
+fi
+
+CUR_DIR=`pwd`
+cd ${INST_ROOT}
+check_jb ./build.sh -o -b -d -v 0 -p $INST_ROOT JOBMANAGER
 
-cd ${PRODUCT_DIR};
+cd $CUR_DIR
 
 # remove sources and temporary files after building
 if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
     test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
+    test -d ${INST_ROOT}/"JOBMANAGER_BUILD" && rm -fr ${INST_ROOT}/"JOBMANAGER_BUILD"
 fi
 
 # to generate environment scripts

diff --git a/config_files/build.csh b/config_files/build.csh
index 1e2b08c8bfd02663aa23bdfc06692a3ccf4935fd..a14ed1b6228477a0e98daab2ff40b07357a4af6c 100755 (executable)
--- a/config_files/build.csh
+++ b/config_files/build.csh
@@ -21,7 +21,7 @@ set inst_with_gui=1
 set is_delete=0
 set verbose_level=2
 set params=""
-set modules=(KERNEL GUI GEOM MED SMESH VISU YACS NETGENPLUGIN GHS3DPLUGIN BLSURFPLUGIN HexoticPLUGIN GHS3DPRLPLUGIN COMPONENT PYCALCULATOR CALCULATOR HELLO PYHELLO LIGHT PYLIGHT SIERPINSKY RANDOMIZER MULTIPR)
+set modules=(KERNEL GUI GEOM MED SMESH VISU YACS NETGENPLUGIN GHS3DPLUGIN BLSURFPLUGIN HexoticPLUGIN GHS3DPRLPLUGIN COMPONENT PYCALCULATOR CALCULATOR HELLO PYHELLO LIGHT PYLIGHT SIERPINSKY RANDOMIZER MULTIPR JOBMANAGER)
 set optim=""
 set is_install=1
 set is_help=0

diff --git a/config_files/build.sh b/config_files/build.sh
index db3c1d8bd3a68bfdbabf6bff46074415db588e3d..5dace5094a6b6b85e89e216bd3ff72a3a4588bd7 100755 (executable)
--- a/config_files/build.sh
+++ b/config_files/build.sh
@@ -84,7 +84,7 @@ inst_with_gui=1
 is_delete=0
 verbose_level=2
 params=""
-modules="KERNEL GUI GEOM MED SMESH VISU YACS NETGENPLUGIN GHS3DPLUGIN BLSURFPLUGIN HexoticPLUGIN GHS3DPRLPLUGIN COMPONENT PYCALCULATOR CALCULATOR HELLO PYHELLO LIGHT PYLIGHT SIERPINSKY RANDOMIZER MULTIPR"
+modules="KERNEL GUI GEOM MED SMESH VISU YACS NETGENPLUGIN GHS3DPLUGIN BLSURFPLUGIN HexoticPLUGIN GHS3DPRLPLUGIN COMPONENT PYCALCULATOR CALCULATOR HELLO PYHELLO LIGHT PYLIGHT SIERPINSKY RANDOMIZER MULTIPR JOBMANAGER"
 optim=""
 is_install=1
 is_tui=0