X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=config_files%2FPython-2.4.4.sh;h=a1547e5995300bff5d43b1d30cd647021083c6a7;hb=e1e2d6c328052bd0bbc49af76336395e28c7310d;hp=d19e0c781e34d898b18ab07a55d8e1820c5d49b8;hpb=1919b56394f6784c15dc412ab0fada9cc7244f63;p=tools%2Finstall.git

diff --git a/config_files/Python-2.4.4.sh b/config_files/Python-2.4.4.sh
index d19e0c7..a1547e5 100755
--- a/config_files/Python-2.4.4.sh
+++ b/config_files/Python-2.4.4.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.
 #
@@ -38,7 +38,7 @@ if [ -n "\${PYTHONPATH}" ] ; then
  export PYNATIVE=\${PYTHONPATH}
  export PYTHONPATH=""
 fi
-export PYTHONHOME=\${INSTALL_ROOT}/${PRODUCT}
+export PYTHONHOME=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PATH=\${PYTHONHOME}/bin:\${PATH}
 export LD_LIBRARY_PATH=\${PYTHONHOME}/lib:\${LD_LIBRARY_PATH}
 export PYTHON_VERSION=\`python -c "import sys; print sys.version[:3]"\`
@@ -47,7 +47,7 @@ export PYTHONPATH=\${PYTHONHOME}/lib/python\${PYTHON_VERSION}:\${PYNATIVE}
 ##
 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()
@@ -57,23 +57,24 @@ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
 # nothing to do
 ##
 EOF
-(test -w ${PRODUCT_DIR}_SRC && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_DIR}_SRC)
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
+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_DIR}_SRC ${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
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
 source ${INSTALL_WORK}/$SHRC
 
 if test `uname -m` = "x86_64" ; then
-    export PYTHON_LIB_PREFIX="64"
+#    export PYTHON_LIB_PREFIX="64"
+    export PYTHON_ARCHIVE_PREFIX=""
     export CFLAGS=-m64
     export CXXFLAGS=-m64
     PYTHON_CONFIGURE_OPTIONS="--with-threads --with-cxx=`which g++` --enable-shared CFLAGS=-m64 CXXFLAGS=-m64"
@@ -82,21 +83,21 @@ else
     PYTHON_CONFIGURE_OPTIONS="--with-threads --with-cxx=`which g++` --enable-shared"
 fi
 
-check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
 
 # apply patch for 64-bit platforms
-if test `uname -m` = "x86_64" ; then
-    if [ -f patches/python_patch_lib64.patch ] ; then
-	cp patches/python_patch_lib64.patch ${PRODUCT_DIR}_SRC 
-	( cd ${PRODUCT_DIR}_SRC ;                \
-	  patch -p1 < python_patch_lib64.patch ; \
-	  rm -rf aclocal.m4 ;                    \
-	  aclocal >& /dev/null ;                 \
-	  autoconf >& /dev/null ;                \
-	  aclocal >& /dev/null ;                 \
-	  autoconf >& /dev/null )
-    fi
-fi
+#if test `uname -m` = "x86_64" ; then
+#    if [ -f patches/python_patch_lib64.patch ] ; then
+#	cp patches/python_patch_lib64.patch ${PRODUCT_SRC_DIR} 
+#	( cd ${PRODUCT_SRC_DIR} ;                \
+#	  patch -p1 < python_patch_lib64.patch ; \
+#	  rm -rf aclocal.m4 ;                    \
+#	  aclocal >& /dev/null ;                 \
+#	  autoconf >& /dev/null ;                \
+#	  aclocal >& /dev/null ;                 \
+#	  autoconf >& /dev/null )
+#    fi
+#fi
 
 # to generate environment scripts
 try_preinstalled
@@ -108,8 +109,8 @@ install_source_and_build()
 install_source
 
 # build sources
-makedir ${PRODUCT_DIR}
-cd ${PRODUCT_DIR}_SRC
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+cd ${PRODUCT_SRC_DIR}
 
 check_job ${PRODUCT_DIR}/CONFIGURE.LOG \
     ./configure --prefix=${PRODUCT_DIR} $PYTHON_CONFIGURE_OPTIONS
@@ -134,16 +135,11 @@ for sc in idle pydoc smtpd.py ; do
     fi
 done
 
-if test `uname -m` = "x86_64" ; then
-    ( cd ${PRODUCT_DIR}; ln -sf lib64 lib )
-fi
-
-#du -sk ${PRODUCT_DIR}_SRC > ${PRODUCT_DIR}/size.log
 cd ${PRODUCT_DIR};
 
 # remove sources and temporary files after building
 if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
-    test -d ${PRODUCT_DIR}_SRC && rm -fr ${PRODUCT_DIR}_SRC
+    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
 fi
 
 # to generate environment scripts
@@ -152,10 +148,13 @@ try_preinstalled
 
 install_binary()
 {
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT}
+# create a product directory
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
 
 (cd ${PRODUCT_DIR}/lib/python2.4/config; ln -fs ../../libpython2.4.so.1.0 libpython2.4.so)
 
@@ -175,14 +174,16 @@ try_preinstalled
 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;
 shift
 REMOVE_SRC_TMP=$8;
+test $# == 10 && shift && SINGLE_DIR=$9
 export PRODUCT="Python-2.4.4"
-export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
+export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
 source ./common.sh
 ${PROCEDURE}