Salome HOME
projects / tools / install.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Minor fix
[tools/install.git] / config_files / HELLO.sh
diff --git a/config_files/HELLO.sh b/config_files/HELLO.sh
index 933aa21e1cc204c2a2c79386a81cb0fa62c6ebae..e2ab3c47527202e7df554ebbd2cbe1196b769aab 100755 (executable)
--- a/config_files/HELLO.sh
+++ b/config_files/HELLO.sh
@@ -1,29 +1,27 @@
 #!/bin/bash -noprofile
 
 ####################################################################################
-#  File      : HELLO_BIN.sh
+#  File      : HELLO.sh
 #  Created   : Thu Dec 18 12:01:00 2002
 #  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 #  Project   : SALOME
 #  Module    : Installation Wizard
-#  Copyright : 2002-2007 CEA
+#  Copyright : 2002-2013 CEA
 #
 #  This script is the part of the SALOME installation procedure.
 #
 ####################################################################################
 
-VERSION="4.1.1"
-
 check_version(){
 if [ -n "${HELLO_ROOT_DIR}" ]; then
     if [ -f ${HELLO_ROOT_DIR}/bin/salome/VERSION ]; then
-       ver=`cat ${HELLO_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $NF}' | tr -d '[:space:]' ` 
-       if [ "$ver" = "${VERSION}" ]; then
+       ver=`head -n1 ${HELLO_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
+       if [ "${ver}" = "${SALOME_VERSION}" ]; then
            return 0
        fi
     fi
 elif [ -n "${HELLO_SRC_DIR}" ]; then
-  check_salome_src_version HELLO_SRC_DIR $VERSION
+  check_salome_src_version HELLO_SRC_DIR
   if [ $? -eq 0 ] ; then return 0 ; fi
   return 1
 fi
@@ -31,50 +29,45 @@ return 1
 }
 
 print_env_bin(){
-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 HELLO_ROOT_DIR=\${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+#${DELIM} ${PRODUCT_TYPE} ${DELIM}
+export HELLO_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
-  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" = "1" ] ; then
     export PATH=\${HELLO_ROOT_DIR}/bin/salome:\${PATH}
-    export LD_LIBRARY_PATH=\${HELLO_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH}
-    export PYTHONPATH=\${HELLO_ROOT_DIR}/bin/salome:\${HELLO_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${HELLO_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+    export LD_LIBRARY_PATH=\${HELLO_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${HELLO_ROOT_DIR}/bin/salome:\${HELLO_ROOT_DIR}/lib/salome:\${HELLO_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})
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
 }
 
 print_env_src(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
-#$DELIM ${PRODUCT_TYPE}_src $DELIM
-export HELLO_SRC_DIR=\${INSTALL_ROOT}/${PRODUCT_SRC}
+#${DELIM} ${PRODUCT_TYPE}_src ${DELIM}
+export HELLO_SRC_DIR=\${INST_ROOT}/${PRODUCT_SRC}
 ##
 EOF
 
 (test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
 }
 
 try_preinstalled(){
-try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-try_existing ${PRODUCT_SRC_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
 return $?
 }
 
 install_source()
 {
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-source ${INSTALL_WORK}/$SHRC
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+source ${INSTALL_WORK}/${SHRC}
 
-check_jb tar xfz ${SOURCE_DIR}/HELLOsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/HELLOsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT}
 
 # to generate environment scripts
 try_preinstalled
@@ -88,20 +81,20 @@ install_source
 # build sources
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-if [ -e ./build.sh ] ; then
-    cp -f ./build.sh ${INSTALL_ROOT}
+if [ -e ./build.sh ] && [ ! -e ${INST_ROOT}/build.sh ]; then
+    cp -f ./build.sh ${INST_ROOT}
 fi
 
 CUR_DIR=`pwd`
-cd ${INSTALL_ROOT}
-check_jb build.sh -o -b -d -v 0 -p $INSTALL_ROOT HELLO
+cd ${INST_ROOT}
+check_jb ./build.sh -o -b -d -v 0 -p ${INST_ROOT} HELLO
 
-cd $CUR_DIR
+cd ${CUR_DIR}
 
 # remove sources and temporary files after building
-if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
+if [ ${REMOVE_SRC_TMP} = "TRUE" ] ; then
     test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
-    test -d ${INSTALL_ROOT}/"HELLO_BUILD" && rm -fr ${INSTALL_ROOT}/"HELLO_BUILD"
+    test -d ${INST_ROOT}/"HELLO_BUILD" && rm -fr ${INST_ROOT}/"HELLO_BUILD"
 fi
 
 # to generate environment scripts
@@ -110,14 +103,14 @@ try_preinstalled
 
 install_binary()
 {
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-source ${INSTALL_WORK}/$SHRC
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/${SHRC}
 
 # create a module directory
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-check_jb tar xfz ${SOURCE_DIR}/HELLObinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
-check_jb tar xfz ${SRC_DIR}/HELLOsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/HELLObinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR}
+check_jb tar xfz ${SRC_DIR}/HELLOsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT}
 
 # modify all *.la files
 export HELLO_ROOT_DIR=${PRODUCT_DIR}
@@ -133,10 +126,12 @@ chmod a+x runAppli
 try_preinstalled
 }
 
+source ./common.sh
+
 export PROCEDURE=$1;
 export INSTALL_WORK=$2;
 export SOURCE_DIR=$3;
-export INSTALL_ROOT=$4;
+export INST_ROOT=$4;
 export PRODUCT_SEQUENCE=$5;
 export PRODUCT_TYPE=$6;
 export INSTALL_PRODUCTS=$7;
@@ -145,9 +140,9 @@ shift
 REMOVE_SRC_TMP=$8;
 shift
 SINGLE_DIR=$9;
-export PRODUCT="HELLO_${VERSION}"
-export PRODUCT_SRC="HELLO_SRC_${VERSION}"
-export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT_SRC}
-source ./common.sh
-$PROCEDURE 
+if [ -n "${SINGLE_DIR}" ] ; then SINGLE_DIR=${SDIR_NAME}; fi
+export PRODUCT="HELLO_${SALOME_VERSION}"
+export PRODUCT_SRC="HELLO_SRC_${SALOME_VERSION}"
+export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT_SRC}
+${PROCEDURE} 
SALOME Installation Wizard [DEPRECATED]

Copyright © 2005–2024 Open CASCADE.
All rights reserved.
Legal Information