X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=config_files%2Fgcc-common.sh;h=c6124b3a0689e0435c66877ef3b0ccb84e56490b;hb=daaab6173e21ffe42ceb455b59062d38e657e7f9;hp=af4d79479593fd548c55a0029ff5bdd55f9fadce;hpb=d6206d142266cadb8b01a6f504662cb5446e6c15;p=tools%2Finstall.git

diff --git a/config_files/gcc-common.sh b/config_files/gcc-common.sh
index af4d794..c6124b3 100755
--- a/config_files/gcc-common.sh
+++ b/config_files/gcc-common.sh
@@ -6,7 +6,7 @@
 #  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 #  Project   : SALOME
 #  Module    : Installation Wizard
-#  Copyright : 2002-2007 CEA
+#  Copyright : 2002-2008 CEA
 #
 #  This script is the part of the SALOME installation procedure.
 #
@@ -20,7 +20,8 @@ GCC_VERSION_MIN=`echo $GCC_VERSION | awk -F[.-] '{if(NF>1) print $2; else print
 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(){
+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}'`
@@ -30,20 +31,6 @@ fi
 return 1
 }
 
-print_env(){
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export GCC_ROOT=\${INSTALL_ROOT}/${PRODUCT}
-export CXX=\${GCC_ROOT}/bin/g++
-export CC=\${GCC_ROOT}/bin/gcc
-export PATH=\${GCC_ROOT}/bin:\${PATH}
-export LD_LIBRARY_PATH=\${GCC_ROOT}/lib:\${LD_LIBRARY_PATH}
-##
-EOF
-(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
-}
-
 # looks for the native product and collects it's environment (used by make_env())
 try_native(){
 gcc_root="`where_gcc $GCC_VERSION`"
@@ -64,14 +51,14 @@ if [ -n "${gcc_root}" ] ; then
 	ld_library_path=`sort_path ${tmp}`
 	cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
-export GCC_ROOT=${gcc_root}
-export CXX=\${GCC_ROOT}/bin/g++
-export CC=\${GCC_ROOT}/bin/gcc
-export PATH=${path}
-export LD_LIBRARY_PATH=${ld_library_path}
+#export GCC_ROOT=${gcc_root}
+#export CXX=\${GCC_ROOT}/bin/g++
+#export CC=\${GCC_ROOT}/bin/gcc
+#export PATH=${path}
+#export LD_LIBRARY_PATH=${ld_library_path}
 ##
 EOF
-	make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+	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 
 ######################################################################################
@@ -86,30 +73,19 @@ return 1
 }
 
 try_preinstalled(){
-try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
-return $?
-}
-
-install_source()
-{
-echo "The installation of gcc $GCC_VERSION from sources is not provided! Use native gcc."
-return 1
-}
-
-install_binary()
-{
-echo "It impossible to install gcc $GCC_VERSION from binaries, try install from sources."
-return 1
+#echo "It is impossible to install gcc from binaries or sources! So native gcc will be used."
+try_native
 }
 
 export PROCEDURE=$1;
 export INSTALL_WORK=$2;
 export SOURCE_DIR=$3;
-export INSTALL_ROOT=$4;
+export INST_ROOT=$4;
 export PRODUCT_SEQUENCE=$5;
-if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="gcc" ; fi
+export PRODUCT_TYPE=$6;
+export INSTALL_PRODUCTS=$7;
 export PRODUCT="gcc-$GCC_VERSION"
-export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
+export PRODUCT_DIR=${INST_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
 $PROCEDURE