Modify installation scripts: setting TCLLIBPATH enviroment variable where necessary

diff --git a/config_files/VTK-4.2.2.sh b/config_files/VTK-4.2.2.sh
index f502ba0f3ae7c374e34eb32a905e9dd029f38f46..23d077ac5e713df0c665d052bc11565342c4951a 100755 (executable)
--- a/config_files/VTK-4.2.2.sh
+++ b/config_files/VTK-4.2.2.sh
@@ -22,6 +22,7 @@ export VTKHOME=\${INSTALL_ROOT}/${PRODUCT}
 export PATH=\${VTKHOME}/bin:\${PATH}
 export LD_LIBRARY_PATH=\${VTKHOME}/lib/vtk:\${LD_LIBRARY_PATH}
 export PYTHONPATH=\${VTKHOME}/lib/vtk:\${VTKHOME}/lib/python2.2/site-packages/vtk_python:\${PYTHONPATH}
+export TCLLIBPATH="\${VTKHOME}/lib/vtk/tcl \${TCLLIBPATH}"
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -44,6 +45,7 @@ export VTKHOME=${VTKHOME}
 export PATH=${path}
 export LD_LIBRARY_PATH=${ld_library_path}
 export PYTHONPATH=${python_path}
+export TCLLIBPATH="\${VTKHOME}/lib/vtk/tcl \${TCLLIBPATH}"
 ##
 EOF
     make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"

diff --git a/config_files/common.sh b/config_files/common.sh
index c268b4ff19900d8a5883a73f2869eb0418a3a10d..ea63d95a578658fcb9919ba768c7658ffecb1b44 100755 (executable)
--- a/config_files/common.sh
+++ b/config_files/common.sh
@@ -115,16 +115,16 @@ alias setenva 'set a="\!:1" ; set b="'\!:2'":\`printenv \$a\` ; set b=\`cleandup
 alias setenvp 'set a="\!:1" ; set b="'\!:2'":\`printenv \$a\` ; set b=\`cleandup  \$b\` ; setenv \$a \$b ; unset a, b'
 EOF
 ### !!! writing salome.csh file !!! -> set inital variables
-pre_vars="PATH LD_LIBRARY_PATH LD_RUN_PATH PYTHONPATH"
+pre_vars="PATH LD_LIBRARY_PATH LD_RUN_PATH PYTHONPATH TCLLIBPATH"
 for i in $pre_vars ; do
 cat >> ${install_work}/$CSHRC <<EOF
-#$DELIM initial settings $DELIM
+#$DELIM $i : initial settings $DELIM
 if (! (\$?${i}) ) then
   setenv $i
 endif
 EOF
 done
-### !!! writing salome.(c)sh files !!! -> dump products environment files, changing 'export' by 'setenv(a|b)' where necessary
+### !!! writing salome.(c)sh files !!! -> dump products environment files, changing 'export' by 'setenv(a|p)' where necessary
 product_sequence="$2"
 for i in $product_sequence ; do
     sed -e 's%^export\([[:blank:]]*\)PATH=\$[{]\?PATH[}]\?:\(.*\)%setenva\1PATH \2%g' -e 's%^export\([[:blank:]]*\)PATH=\(.*\):\$[{]\?PATH[}]\?%setenvp\1PATH \2%g' ${install_work}/env_${i}.sh > ${INSTALL_WORK}/_tmp1 2>/dev/null

diff --git a/config_files/tcltk8.3.3.sh b/config_files/tcltk8.3.3.sh
index 473568910a50561de57f2325dd95e12ce2f8da27..7542309efa2a5da7f45ab27dc5b727c32c124c97 100755 (executable)
--- a/config_files/tcltk8.3.3.sh
+++ b/config_files/tcltk8.3.3.sh
@@ -48,6 +48,7 @@ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
 export TCLHOME=\${INSTALL_ROOT}/${PRODUCT}
 export PATH=\${TCLHOME}/bin:\${PATH}
 export LD_LIBRARY_PATH=\${TCLHOME}/lib:\${LD_LIBRARY_PATH}
+export TCLLIBPATH="\${TCLHOME}/lib \${TCLHOME}/lib/tcl8.3 \${TCLHOME}/lib/tk8.3 \${TCLLIBPATH}"
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -71,6 +72,7 @@ if [ -n "${tclhome}" ] ; then
 export TCLHOME=${tclhome}
 export PATH=${path}
 export LD_LIBRARY_PATH=${ld_library_path}
+export TCLLIBPATH="\${TCLHOME}/lib \${TCLHOME}/lib/tcl8.3 \${TCLHOME}/lib/tk8.3 \${TCLLIBPATH}"
 ##
 EOF
     (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})