From 9e4b655de2f1d1799ef6b6c4a6b81b755517db8c Mon Sep 17 00:00:00 2001 From: inv Date: Tue, 3 Apr 2012 11:59:04 +0000 Subject: [PATCH] SALOME 6.5.0 preparation: scotch 5.1.11 -> 5.1.12, for metis add support of metis 5x (for 5.0.2) --- config_CentOS_5.5_64bit.xml | 6 +- config_Debian_4.0.xml | 6 +- config_Debian_4.0_64bit.xml | 6 +- config_Debian_5.0_64bit.xml | 6 +- config_Debian_6.0_64bit.xml | 6 +- config_Mandriva_2008.0.xml | 6 +- config_Mandriva_2008.0_64bit.xml | 6 +- config_Mandriva_2010.0.xml | 6 +- config_Mandriva_2010.0_64bit.xml | 6 +- config_Red_Hat_Enterprise_WS_4_64bit.xml | 6 +- config_Scientific_SL_5.1_64bit.xml | 6 +- config_files/{scotch-5.1.11.sh => metis.sh} | 62 +++++++++++---------- config_files/{metis-4.0.sh => scotch.sh} | 37 +++++++----- 13 files changed, 88 insertions(+), 77 deletions(-) rename config_files/{scotch-5.1.11.sh => metis.sh} (71%) rename config_files/{metis-4.0.sh => scotch.sh} (77%) diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml index ecfc5e6..25a3deb 100755 --- a/config_CentOS_5.5_64bit.xml +++ b/config_CentOS_5.5_64bit.xml @@ -552,16 +552,16 @@ version="4.0" disable="false" installdiskspace="2856,2184,7064" - script="metis-4.0.sh"/> + script="metis.sh"/> + script="scotch.sh"/> + script="metis.sh"/> + script="scotch.sh"/> + script="metis.sh"/> + script="scotch.sh"/> + script="metis.sh"/> + script="scotch.sh"/> + script="metis.sh"/> + script="scotch.sh"/> + script="metis.sh"/> + script="scotch.sh"/> + script="metis.sh"/> + script="scotch.sh"/> + script="metis.sh"/> + script="scotch.sh"/> + script="metis.sh"/> + script="scotch.sh"/> + script="metis.sh"/> + script="scotch.sh"/> + script="metis.sh"/> + script="scotch.sh"/> ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < Make.inc/Makefile.inc.x86_64_pc_linux2.prof - ln -sf Make.inc/Makefile.inc.x86_64_pc_linux2.prof Makefile.inc -else - ln -sf Make.inc/Makefile.inc.i686_pc_linux2.prof Makefile.inc -fi + # make config + check_job ${PRODUCT_DIR}/MAKE_CONFIG.LOG make config shared=1 prefix=${PRODUCT_DIR} -sed -e "s%gmake%make%" Makefile.inc > _Makefile.inc -mv -f _Makefile.inc Makefile.inc -chmod a+x Makefile.inc + # make + check_job ${PRODUCT_DIR}/MAKE.LOG make -chmod +w ./Makefile -sed -i 's/\/usr\/local/\$\(PRODUCT_DIR\)/g' ./Makefile + # make install + check_job ${PRODUCT_DIR}/MAKE_INSTALL.LOG make install +else + # for version 4 -# make -check_job ${PRODUCT_DIR}/MAKE.LOG make + # patch for 64bit platforms + if test `uname -m` = "x86_64" ; then + sed -i "s%COPTIONS[[:space:]]*=[[:space:]]*\(.*\)%COPTIONS = -fPIC \1%g" Makefile.in + fi -# make install -check_job ${PRODUCT_DIR}/INSTALL.LOG make install + # make + check_job ${PRODUCT_DIR}/MAKE.LOG make -# install -#cd ${PRODUCT_SRC_DIR} -#cp -rf bin doc grf tgt ${PRODUCT_DIR} + # install + cp -rf Doc Graphs libmetis.a pmetis kmetis oemetis onmetis partdmesh partnmesh mesh2dual mesh2nodal graphchk ${PRODUCT_DIR} + ( mkdir -p ${PRODUCT_DIR}/Lib && cp Lib/*.h ${PRODUCT_DIR}/Lib ) +fi cd ${PRODUCT_DIR}; @@ -125,12 +131,10 @@ export INST_ROOT=$4; export PRODUCT_SEQUENCE=$5; export PRODUCT_TYPE=$6; export INSTALL_PRODUCTS=$7; -SRC_DIR=$8; -REMOVE_SRC_TMP=$9; shift -BIN_DIR=$9; +REMOVE_SRC_TMP=$8; test $# == 10 && shift && SINGLE_DIR=$9 -export PRODUCT="scotch-5.1.11" +export PRODUCT="metis-${METIS_VERSION}" export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC diff --git a/config_files/metis-4.0.sh b/config_files/scotch.sh similarity index 77% rename from config_files/metis-4.0.sh rename to config_files/scotch.sh index 8c5dccb..31be940 100755 --- a/config_files/metis-4.0.sh +++ b/config_files/scotch.sh @@ -1,17 +1,22 @@ #!/bin/bash -noprofile #################################################################################### -# File : metis-4.0.sh +# File : scotch.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-2008 CEA +# Copyright : 2002-2012 CEA # # This script is the part of the SALOME installation procedure. # #################################################################################### +# +# scotch version +# +SCOTCH_VERSION=5.1.12 + check_version(){ # No way to check version! return 0 @@ -21,7 +26,7 @@ print_env_bin() { cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < Makefile.in.new - mv Makefile.in.new Makefile.in + # create Makefile for Linux 64bit platforms + sed -e "s%CFLAGS\([[:space:]]*\)=\([[:space:]]*\)\(.*\)%CFLAGS\1=\2-fPIC -pg \3%g" \ + Make.inc/Makefile.inc.x86-64_pc_linux2 > Make.inc/Makefile.inc.x86-64_pc_linux2.prof + ln -sf Make.inc/Makefile.inc.x86-64_pc_linux2.prof Makefile.inc +else + ln -sf Make.inc/Makefile.inc.i686_pc_linux2.prof Makefile.inc fi # make -check_job ${PRODUCT_DIR}/MAKE.LOG make +check_job ${PRODUCT_DIR}/MAKE.LOG make prefix=${PRODUCT_DIR} -# install -cp -rf Doc Graphs libmetis.a pmetis kmetis oemetis onmetis partdmesh partnmesh mesh2dual mesh2nodal graphchk ${PRODUCT_DIR} -( mkdir -p ${PRODUCT_DIR}/Lib && cp Lib/*.h ${PRODUCT_DIR}/Lib ) +# make install +check_job ${PRODUCT_DIR}/INSTALL.LOG make prefix=${PRODUCT_DIR} install cd ${PRODUCT_DIR}; @@ -110,12 +119,10 @@ export INST_ROOT=$4; export PRODUCT_SEQUENCE=$5; export PRODUCT_TYPE=$6; export INSTALL_PRODUCTS=$7; -SRC_DIR=$8; -REMOVE_SRC_TMP=$9; shift -BIN_DIR=$9; +REMOVE_SRC_TMP=$8; test $# == 10 && shift && SINGLE_DIR=$9 -export PRODUCT="metis-4.0" +export PRODUCT="scotch-${SCOTCH_VERSION}" export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC -- 2.39.2