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" = "3.2.0a1" ]; then
+ if [ "$ver" = "3.2.2" ]; then
return 0
fi
fi
}
print_env(){
+if test `uname -m` = "x86_64" ; then
+export LIB_PREFIX=64
+else
+export LIB_PREFIX=""
+fi
cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
#$DELIM ${PRODUCT_TYPE} $DELIM
export KERNEL_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
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}
+ export LD_LIBRARY_PATH=\${KERNEL_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH}
+ export PYTHONPATH=\${KERNEL_ROOT_DIR}/bin/salome:\${KERNEL_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${KERNEL_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
fi
fi
##
# looks for the native product and collects it's environment (used by make_env())
try_native(){
check_version
+if test `uname -m` = "x86_64" ; then
+export LIB_PREFIX=64
+else
+export LIB_PREFIX=""
+fi
if [ $? -eq 0 ] ; then
cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
#$DELIM ${PRODUCT_TYPE} $DELIM
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}
+ export LD_LIBRARY_PATH=\${KERNEL_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH}
+ export PYTHONPATH=\${KERNEL_ROOT_DIR}/bin/salome:\${KERNEL_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${KERNEL_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
fi
fi
##
make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
source ${INSTALL_WORK}/$SHRC
-check_jb tar xfz ${SOURCE_DIR}/KERNELbinariesV3.2.0a1.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/KERNELbinariesV3.2.2.tar.gz -C ${INSTALL_ROOT}
# 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
# modify all *.la files
export KERNEL_ROOT_DIR=${PRODUCT_DIR}
-modif_la_files ${PRODUCT_DIR}/lib/salome
+modif_la_files ${PRODUCT_DIR}
print_env
}
pickup_env()
{
make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${PRODUCT_DIR}
+if [ -d ${PRODUCT_DIR} ] ; then
+ cd ${PRODUCT_DIR}
+ version=`cat bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]'`
+ dir="${HOME}/salome_appli_$version"
+ bin/salome/createAppli.sh $dir
+ rm -rf $dir/env.d/*.sh
+ cp -f ${PRODUCT_DIR}/salome.sh $dir/env.d
+fi
}
export PROCEDURE=$1;
export INSTALL_ROOT=$4;
export PRODUCT_SEQUENCE=$5;
if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="KernelBin" ; fi
-export PRODUCT="KERNEL_3.2.0a1"
+export PRODUCT="KERNEL_3.2.2"
export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
source ./common.sh