Update copyrights 2014.

[tools/install.git] / config_files / gcc-common.sh

diff --git a/config_files/gcc-common.sh b/config_files/gcc-common.sh
index 12c6178dbdfb74e8ba573cb6d7849d2dc7571742..1022af779a14e2bf3109af56cd9bbd6222bbacc6 100755 (executable)
--- a/config_files/gcc-common.sh
+++ b/config_files/gcc-common.sh
@@ -6,26 +6,26 @@
 #  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 #  Project   : SALOME
 #  Module    : Installation Wizard
-#  Copyright : 2002-2013 CEA
+#  Copyright : 2002-2014 CEA
 #
 #  This script is the part of the SALOME installation procedure.
 #
 ####################################################################################
 
-if [ "x$GCC_VERSION" == "x" ] ; then
+if [ "x${GCC_VERSION}" = "x" ] ; then
     GCC_VERSION="3.2"
 fi
-GCC_VERSION_MAJ=`echo $GCC_VERSION | awk -F[.-] '{if(NF>0) print $1; else print 0}'`
-GCC_VERSION_MIN=`echo $GCC_VERSION | awk -F[.-] '{if(NF>1) print $2; else print 0}'`
-GCC_VERSION_REL=`echo $GCC_VERSION | awk -F[.-] '{if(NF>2) print $3; else print 0}'`
-let GCC_VERSION_ID=$GCC_VERSION_MAJ*10000+$GCC_VERSION_MIN*100+$GCC_VERSION_REL
+GCC_VERSION_MAJ=`echo ${GCC_VERSION} | awk -F[.-] '{if(NF>0) print $1; else print 0}'`
+GCC_VERSION_MIN=`echo ${GCC_VERSION} | awk -F[.-] '{if(NF>1) print $2; else print 0}'`
+GCC_VERSION_REL=`echo ${GCC_VERSION} | awk -F[.-] '{if(NF>2) print $3; else print 0}'`
+let GCC_VERSION_ID=${GCC_VERSION_MAJ}*10000+${GCC_VERSION_MIN}*100+${GCC_VERSION_REL}
 
 check_version()
 {
 # version number is calculated as: <major>*10000+<minor>*100+<release>
 # e.g. for gcc 3.2 it is equal to 30200, for gcc 3.3.2 - 30202
 gcc_ver=`gcc -dumpversion | awk -F[.-] '{v1=0;v2=0;v3=0;if(NF>0)v1=$1;if(NF>1)v2=$2;if(NF>2)v3=$3;print v1*10000+v2*100+v3}'`
-if [ $gcc_ver -eq $GCC_VERSION_ID ]  ; then
+if [ ${gcc_ver} -eq ${GCC_VERSION_ID} ]  ; then
     return 0
 fi
 return 1
@@ -33,7 +33,7 @@ return 1
 
 # looks for the native product and collects it's environment (used by make_env())
 try_native(){
-gcc_root="`where_gcc $GCC_VERSION`"
+gcc_root="`where_gcc ${GCC_VERSION}`"
 if [ -n "${gcc_root}" ] ; then
     gcc_root=`cd ${gcc_root}/..; pwd`
     # get version number: <major>, <minor> and <release>
@@ -43,14 +43,14 @@ if [ -n "${gcc_root}" ] ; then
     maj_ver=`${gcc_root}/bin/gcc -dumpversion | awk -F[.-] '{if(NF>0) print $1; else print 0}'`
     min_ver=`${gcc_root}/bin/gcc -dumpversion | awk -F[.-] '{if(NF>1) print $2; else print 0}'`
     rel_ver=`${gcc_root}/bin/gcc -dumpversion | awk -F[.-] '{if(NF>2) print $3; else print 0}'`
-    let gcc_ver=$maj_ver*10000+$min_ver*100+$rel_ver
-    if [ $gcc_ver -ge $GCC_VERSION_ID ]  ; then
+    let gcc_ver=${maj_ver}*10000+${min_ver}*100+${rel_ver}
+    if [ ${gcc_ver} -ge ${GCC_VERSION_ID} ]  ; then
        tmp="\${GCC_ROOT}/bin ${gcc_root}/bin \${PATH} ${PATH}";  
        path=`sort_path ${tmp}`
        tmp="\${GCC_ROOT}/lib ${gcc_root}/lib \${LD_LIBRARY_PATH} ${LD_LIBRARY_PATH}";  
        ld_library_path=`sort_path ${tmp}`
        cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
+#${DELIM} ${PRODUCT_TYPE} ${DELIM}
 #export GCC_ROOT=${gcc_root}
 #export CXX=\${GCC_ROOT}/bin/g++
 #export CC=\${GCC_ROOT}/bin/gcc
@@ -60,9 +60,9 @@ if [ -n "${gcc_root}" ] ; then
 EOF
        make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
 #######       THIS COULD BE USED FOR STRICT COMPARISON  ##############################
-#      if [ $maj_ver -eq 3 ] && [ $min_ver -eq 2 ] && [ $rel_ver -eq 0 ] ;  then 
+#      if [ ${maj_ver} -eq 3 ] && [ ${min_ver} -eq 2 ] && [ ${rel_ver} -eq 0 ] ;  then 
 ######################################################################################
-       if [ $maj_ver -eq $GCC_VERSION_MAJ ] && [ $min_ver -eq $GCC_VERSION_MIN ] && [ $rel_ver -ge $GCC_VERSION_REL ] ;  then 
+       if [ ${maj_ver} -eq ${GCC_VERSION_MAJ} ] && [ ${min_ver} -eq ${GCC_VERSION_MIN} ] && [ ${rel_ver} -ge ${GCC_VERSION_REL} ] ;  then 
            return 0
        else
            return 2
@@ -84,8 +84,8 @@ export INST_ROOT=$4;
 export PRODUCT_SEQUENCE=$5;
 export PRODUCT_TYPE=$6;
 export INSTALL_PRODUCTS=$7;
-export PRODUCT="gcc-$GCC_VERSION"
+export PRODUCT="gcc-${GCC_VERSION}"
 export PRODUCT_DIR=${INST_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
-$PROCEDURE 
+${PROCEDURE}