From: maintenance team Date: Mon, 29 Oct 2007 15:06:39 +0000 (+0000) Subject: Update for salome 4X X-Git-Tag: V_4_1_1~115 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=37f2a5b95696643df2a796f74d31e7371057106e;p=tools%2Finstall.git Update for salome 4X --- diff --git a/config_files/omniORB-4.0.5.sh b/config_files/omniORB-4.0.5.sh deleted file mode 100755 index 82a98a1..0000000 --- a/config_files/omniORB-4.0.5.sh +++ /dev/null @@ -1,199 +0,0 @@ -#!/bin/bash -noprofile - -#################################################################################### -# File : omniORB-4.0.5.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 -# -# This script is the part of the SALOME installation procedure. -# -#################################################################################### - -check_version() -{ -if [ -z "${OMNIORBDIR}" ]; then - #echo "OMNIORBDIR doesn't set" - return 1 -fi -python_version="`python -c 'import sys; print sys.version[:3]'`" -check_lib_version libomniORB4.so.0.5 ${OMNIORBDIR}/lib -if [ "$?" -ne "0" ]; then - return 1 -fi -check_lib_version _omnipymodule.so.2.4 ${OMNIORBDIR}/lib/python${python_version}/site-packages -if [ "$?" -ne "0" ]; then - return 1 -fi -check_lib_version libCOSNotify4.so.0.1 ${OMNIORBDIR}/lib -if [ "$?" -ne "0" ]; then - return 1 -fi -check_lib_version notifd ${OMNIORBDIR}/bin -if [ "$?" -ne "0" ]; then - return 1 -fi -return 0 -} - -print_env_bin() -{ -cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${PRODUCT_DIR}/.omniORB.cfg < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <> ${PRODUCT_DIR}/MAKE_OMNIORB.LOG <> ${PRODUCT_DIR}/MAKE_OMNIORBPY.LOG <> ${PRODUCT_DIR}/MAKE_OMNINOTIFY.LOG < _omniidl -mv -f _omniidl omniidl -chmod a+x omniidl -sed -e "s%#\!.*python%#\!/usr/bin/env python%" omniidlrun.py > _omniidlrun.py -mv -f _omniidlrun.py omniidlrun.py -chmod a+x omniidlrun.py - -#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 -fi - -# to generate environment scripts -try_preinstalled -} - -install_binary() -{ -make_env ${INSTALL_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} - -ln -sf ${PRODUCT_DIR} ${INSTALL_ROOT}/omni - -cd ${PRODUCT_DIR}/bin -sed -e "s%#\!.*python%#\!/usr/bin/env python%" omniidl > _omniidl -mv -f _omniidl omniidl -chmod a+x omniidl -sed -e "s%#\!.*python%#\!/usr/bin/env python%" omniidlrun.py > _omniidlrun.py -mv -f _omniidlrun.py omniidlrun.py -chmod a+x omniidlrun.py - -# to generate environment script for sources -try_preinstalled -} - -export PROCEDURE=$1; -export INSTALL_WORK=$2; -export SOURCE_DIR=$3; -export INSTALL_ROOT=$4; -export PRODUCT_SEQUENCE=$5; -export PRODUCT_TYPE=$6; -export INSTALL_PRODUCTS=$7; -shift -REMOVE_SRC_TMP=$8; -export PRODUCT="omniORB-4.0.5" -export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} -export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} -source ./common.sh -$PROCEDURE diff --git a/config_files/omniORB-4.0.6.sh b/config_files/omniORB-4.0.6.sh deleted file mode 100755 index 57c05bd..0000000 --- a/config_files/omniORB-4.0.6.sh +++ /dev/null @@ -1,200 +0,0 @@ -#!/bin/bash -noprofile - -#################################################################################### -# File : omniORB-4.0.6.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 -# -# This script is the part of the SALOME installation procedure. -# -#################################################################################### - -check_version() -{ -if [ -z "${OMNIORBDIR}" ]; then - #echo "OMNIORBDIR doesn't set" - return 1 -fi -python_version="`python -c 'import sys; print sys.version[:3]'`" -check_lib_version libomniORB4.so.0.6 ${OMNIORBDIR}/lib -if [ "$?" -ne "0" ]; then - return 1 -fi -check_lib_version _omnipymodule.so.2.6 ${OMNIORBDIR}/lib/python${python_version}/site-packages -if [ "$?" -ne "0" ]; then - return 1 -fi -check_lib_version libCOSNotify4.so.0.1 ${OMNIORBDIR}/lib -if [ "$?" -ne "0" ]; then - return 1 -fi -check_lib_version notifd ${OMNIORBDIR}/bin -if [ "$?" -ne "0" ]; then - return 1 -fi -return 0 -} - -print_env_bin() -{ -cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${PRODUCT_DIR}/.omniORB.cfg < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <> ${PRODUCT_DIR}/MAKE_OMNIORB.LOG <> ${PRODUCT_DIR}/MAKE_OMNIORBPY.LOG <> ${PRODUCT_DIR}/MAKE_OMNINOTIFY.LOG < _omniidl -mv -f _omniidl omniidl -chmod a+x omniidl -sed -e "s%#\!.*python%#\!/usr/bin/env python%" omniidlrun.py > _omniidlrun.py -mv -f _omniidlrun.py omniidlrun.py -chmod a+x omniidlrun.py - -#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 -fi - -# to generate environment scripts -try_preinstalled -} - -install_binary() -{ -make_env ${INSTALL_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} - -ln -sf ${PRODUCT_DIR} ${INSTALL_ROOT}/omni - -cd ${PRODUCT_DIR}/bin -sed -e "s%#\!.*python%#\!/usr/bin/env python%" omniidl > _omniidl -mv -f _omniidl omniidl -chmod a+x omniidl -sed -e "s%#\!.*python%#\!/usr/bin/env python%" omniidlrun.py > _omniidlrun.py -mv -f _omniidlrun.py omniidlrun.py -chmod a+x omniidlrun.py - -# to generate environment script for sources -try_preinstalled -} - -export PROCEDURE=$1; -export INSTALL_WORK=$2; -export SOURCE_DIR=$3; -export INSTALL_ROOT=$4; -export PRODUCT_SEQUENCE=$5; -export PRODUCT_TYPE=$6; -export INSTALL_PRODUCTS=$7; -shift -REMOVE_SRC_TMP=$8; -export PRODUCT="omniORB-4.0.6" -export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} -export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} -source ./common.sh -$PROCEDURE diff --git a/config_files/omniORB-4.0.7.sh b/config_files/omniORB-4.0.7.sh deleted file mode 100755 index d4aac1c..0000000 --- a/config_files/omniORB-4.0.7.sh +++ /dev/null @@ -1,225 +0,0 @@ -#!/bin/bash -noprofile - -#################################################################################### -# File : omniORB-4.0.7.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 -# -# This script is the part of the SALOME installation procedure. -# -#################################################################################### - -check_version() -{ -if [ -z "${OMNIORBDIR}" ]; then - #echo "OMNIORBDIR doesn't set" - return 1 -fi -python_version="`python -c 'import sys; print sys.version[:3]'`" -check_lib_version libomniORB4.so.0.6 ${OMNIORBDIR}/lib -if [ "$?" -ne "0" ]; then - return 1 -fi -check_lib_version _omnipymodule.so.2.6 ${OMNIORBDIR}/lib/python${python_version}/site-packages -if [ "$?" -ne "0" ]; then - return 1 -fi -check_lib_version libCOSNotify4.so.0.1 ${OMNIORBDIR}/lib -if [ "$?" -ne "0" ]; then - return 1 -fi -check_lib_version notifd ${OMNIORBDIR}/bin -if [ "$?" -ne "0" ]; then - return 1 -fi -return 0 -} - -print_env_bin() -{ - -if test `uname -m` = "x86_64" ; then -export OMNI_LIB_PREFIX="64" -fi - -cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${PRODUCT_DIR}/.omniORB.cfg < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <> ${PRODUCT_DIR}/MAKE_OMNIORB.LOG <> ${PRODUCT_DIR}/MAKE_OMNIORBPY.LOG <> ${PRODUCT_DIR}/MAKE_OMNINOTIFY.LOG < _omniidl -mv -f _omniidl omniidl -chmod a+x omniidl -sed -e "s%#\!.*python%#\!/usr/bin/env python%" omniidlrun.py > _omniidlrun.py -mv -f _omniidlrun.py omniidlrun.py -chmod a+x omniidlrun.py - -#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 -fi - -# to generate environment scripts -try_preinstalled -} - -install_binary() -{ -make_env ${INSTALL_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} - -ln -sf ${PRODUCT_DIR} ${INSTALL_ROOT}/omni - -cd ${PRODUCT_DIR}/bin -sed -e "s%#\!.*python%#\!/usr/bin/env python%" omniidl > _omniidl -mv -f _omniidl omniidl -chmod a+x omniidl -sed -e "s%#\!.*python%#\!/usr/bin/env python%" omniidlrun.py > _omniidlrun.py -mv -f _omniidlrun.py omniidlrun.py -chmod a+x omniidlrun.py - -# to generate environment script for sources -try_preinstalled -} - -export PROCEDURE=$1; -export INSTALL_WORK=$2; -export SOURCE_DIR=$3; -export INSTALL_ROOT=$4; -export PRODUCT_SEQUENCE=$5; -export PRODUCT_TYPE=$6; -export INSTALL_PRODUCTS=$7; -shift -REMOVE_SRC_TMP=$8; -export PRODUCT="omniORB-4.0.7" -export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} -export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} -source ./common.sh -$PROCEDURE diff --git a/config_files/omniORB-4.1.0.sh b/config_files/omniORB-4.1.0.sh new file mode 100755 index 0000000..23d1705 --- /dev/null +++ b/config_files/omniORB-4.1.0.sh @@ -0,0 +1,217 @@ +#!/bin/bash -noprofile + +#################################################################################### +# File : omniORB-4.1.0.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 +# +# This script is the part of the SALOME installation procedure. +# +#################################################################################### + +check_version() +{ +if [ -z "${OMNIORBDIR}" ]; then + #echo "OMNIORBDIR doesn't set" + return 1 +fi +python_version="`python -c 'import sys; print sys.version[:3]'`" +check_lib_version libomniORB4.so.1.0 ${OMNIORBDIR}/lib +if [ "$?" -ne "0" ]; then + return 1 +fi +check_lib_version _omnipymodule.so.3.0 ${OMNIORBDIR}/lib/python${python_version}/site-packages +if [ "$?" -ne "0" ]; then + return 1 +fi +check_lib_version libCOSNotify4.so.0.1 ${OMNIORBDIR}/lib +if [ "$?" -ne "0" ]; then + return 1 +fi +check_lib_version notifd ${OMNIORBDIR}/bin +if [ "$?" -ne "0" ]; then + return 1 +fi +return 0 +} + +print_env_bin() +{ + +if test `uname -m` = "x86_64" ; then +export OMNI_LIB_PREFIX="64" +fi + +cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${PRODUCT_DIR}/.omniORB.cfg < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < /dev/null + if [ $? == 0 ] ; then is_redhat=1 ; fi +fi + +if [ "X$is_redhat" == "X1" ] ; then + check_job ${PRODUCT_DIR}/CONFIGURE_OMNIORB.LOG ../configure --prefix=${PRODUCT_DIR} --disable-ipv6 +else + check_job ${PRODUCT_DIR}/CONFIGURE_OMNIORB.LOG ../configure --prefix=${PRODUCT_DIR} +fi + +GCC=`which gcc` +cat >> ${PRODUCT_DIR}/MAKE_OMNIORB.LOG <> ${PRODUCT_DIR}/MAKE_OMNIORBPY.LOG <> ${PRODUCT_DIR}/MAKE_OMNINOTIFY.LOG < _omniidl +mv -f _omniidl omniidl +chmod a+x omniidl +sed -e "s%#\!.*python%#\!/usr/bin/env python%" omniidlrun.py > _omniidlrun.py +mv -f _omniidlrun.py omniidlrun.py +chmod a+x omniidlrun.py + +#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 +fi + +# to generate environment scripts +try_preinstalled +} + +install_binary() +{ +make_env ${INSTALL_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} + +ln -sf ${PRODUCT_DIR} ${INSTALL_ROOT}/omni + +cd ${PRODUCT_DIR}/bin +sed -e "s%#\!.*python%#\!/usr/bin/env python%" omniidl > _omniidl +mv -f _omniidl omniidl +chmod a+x omniidl +sed -e "s%#\!.*python%#\!/usr/bin/env python%" omniidlrun.py > _omniidlrun.py +mv -f _omniidlrun.py omniidlrun.py +chmod a+x omniidlrun.py + +# to generate environment script for sources +try_preinstalled +} + +export PROCEDURE=$1; +export INSTALL_WORK=$2; +export SOURCE_DIR=$3; +export INSTALL_ROOT=$4; +export PRODUCT_SEQUENCE=$5; +export PRODUCT_TYPE=$6; +export INSTALL_PRODUCTS=$7; +shift +REMOVE_SRC_TMP=$8; +export PRODUCT="omniORB-4.1.0" +export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} +export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} +source ./common.sh +$PROCEDURE