X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=config_files%2FKERNEL_BIN.sh;h=01dc47af22aaa41560c190a20aa8c16f64581d3b;hb=057fa157d84d9c9c857071957f4068532fa28269;hp=664c8590f278e0c82e9ec87a6fe6ba9ccb49ffa0;hpb=68511c4566478925d532a8efccbcb51ba4905e42;p=tools%2Finstall.git

diff --git a/config_files/KERNEL_BIN.sh b/config_files/KERNEL_BIN.sh
index 664c859..01dc47a 100755
--- a/config_files/KERNEL_BIN.sh
+++ b/config_files/KERNEL_BIN.sh
@@ -5,7 +5,7 @@ if [ -n "${KERNEL_ROOT_DIR}" ]; then
     check_lib_version VERSION ${KERNEL_ROOT_DIR}/bin/salome
     if [ "$?" -eq "0" ]; then
 	ver=`cat ${KERNEL_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
-	if [ "$ver" = "2.2.2" ]; then
+	if [ "$ver" = "2.2.8" ]; then
 	    return 0
 	fi
     fi
@@ -17,9 +17,13 @@ print_env(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export KERNEL_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
-export PATH=\${KERNEL_ROOT_DIR}/bin/salome:\${PATH}
-export LD_LIBRARY_PATH=\${KERNEL_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${KERNEL_ROOT_DIR}/bin/salome:\${KERNEL_ROOT_DIR}/lib/salome:\${KERNEL_ROOT_DIR}/lib/python2.2/site-packages/salome:\${KERNEL_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
+if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+    export PATH=\${KERNEL_ROOT_DIR}/bin/salome:\${PATH}
+    export LD_LIBRARY_PATH=\${KERNEL_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${KERNEL_ROOT_DIR}/bin/salome:\${KERNEL_ROOT_DIR}/lib/salome:\${KERNEL_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+  fi
+fi
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -33,9 +37,13 @@ if [ $? -eq 0 ] ; then
     cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export KERNEL_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
-export PATH=\${KERNEL_ROOT_DIR}/bin/salome:\${PATH}
-export LD_LIBRARY_PATH=\${KERNEL_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${KERNEL_ROOT_DIR}/bin/salome:\${KERNEL_ROOT_DIR}/lib/salome:\${KERNEL_ROOT_DIR}/lib/python2.2/site-packages/salome:\${KERNEL_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
+if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+    export PATH=\${KERNEL_ROOT_DIR}/bin/salome:\${PATH}
+    export LD_LIBRARY_PATH=\${KERNEL_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${KERNEL_ROOT_DIR}/bin/salome:\${KERNEL_ROOT_DIR}/lib/salome:\${KERNEL_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+  fi
+fi
 ##
 EOF
     make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
@@ -59,9 +67,9 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/KERNELbinariesV2.2.2.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/KERNELbinariesV2.2.8.tar.gz -C ${INSTALL_ROOT}
 
-# The next two symbolic links are created only for Red Hat 9
+# The next two symbolic links are created only for Red Hat 9 and Scientific Linux 3.0.5
 if [ -f /lib/libcrypto.so.0.9.7a ]; then
     ln -sf /lib/libcrypto.so.0.9.7a ${PRODUCT_DIR}/lib/salome/libcrypto.so.2
 fi
@@ -69,6 +77,10 @@ if [ -f /lib/libssl.so.0.9.7a ]; then
     ln -sf /lib/libssl.so.0.9.7a ${PRODUCT_DIR}/lib/salome/libssl.so.2
 fi
 
+# modify all *.la files
+export KERNEL_ROOT_DIR=${PRODUCT_DIR}
+modif_la_files ${PRODUCT_DIR}/lib/salome
+
 print_env
 }
 
@@ -83,7 +95,7 @@ export SOURCE_DIR=$3;
 export INSTALL_ROOT=$4;
 export PRODUCT_SEQUENCE=$5;
 if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="KernelBin" ; fi
-export PRODUCT="KERNEL_2.2.2"
+export PRODUCT="KERNEL_2.2.8"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh