From 0b4a6db5fa40b97146c9f9559734fe5b19b3c444 Mon Sep 17 00:00:00 2001 From: inv Date: Tue, 22 Mar 2011 09:25:11 +0000 Subject: [PATCH] Update for Salome 6.3.0 --- config_Debian_4.0.xml | 21 ---- config_Debian_4.0_64bit.xml | 21 ---- config_Debian_5.0_64bit.xml | 21 ---- config_Debian_6.0_64bit.xml | 21 ---- config_Mandriva_2008.0.xml | 21 ---- config_Mandriva_2008.0_64bit.xml | 21 ---- config_Mandriva_2010.0.xml | 21 ---- config_Mandriva_2010.0_64bit.xml | 21 ---- config_Red_Hat_Enterprise_WS_4_64bit.xml | 21 ---- config_Scientific_SL_5.1_64bit.xml | 21 ---- config_files/MULTIPR.sh | 143 ----------------------- config_files/build.csh | 2 +- config_files/build.sh | 2 +- config_files/netgen-4.9.13.sh | 4 +- 14 files changed, 4 insertions(+), 357 deletions(-) delete mode 100755 config_files/MULTIPR.sh diff --git a/config_Debian_4.0.xml b/config_Debian_4.0.xml index ad19166..1fa3cb2 100755 --- a/config_Debian_4.0.xml +++ b/config_Debian_4.0.xml @@ -255,15 +255,6 @@ installdiskspace="208,221,2958" script="FILTER.sh"/> - - - @@ -946,18 +937,6 @@ GUI MED - - boost - OpenCascade - Python - Qt - Hdf - Med - OmniORB - KERNEL - GUI - MED - OpenCascade Python diff --git a/config_Debian_4.0_64bit.xml b/config_Debian_4.0_64bit.xml index cd96300..8879714 100755 --- a/config_Debian_4.0_64bit.xml +++ b/config_Debian_4.0_64bit.xml @@ -255,15 +255,6 @@ installdiskspace="208,221,2958" script="FILTER.sh"/> - - - @@ -946,18 +937,6 @@ GUI MED - - boost - OpenCascade - Python - Qt - Hdf - Med - OmniORB - KERNEL - GUI - MED - OpenCascade Python diff --git a/config_Debian_5.0_64bit.xml b/config_Debian_5.0_64bit.xml index c70f465..40d1ccb 100755 --- a/config_Debian_5.0_64bit.xml +++ b/config_Debian_5.0_64bit.xml @@ -255,15 +255,6 @@ installdiskspace="208,221,2958" script="FILTER.sh"/> - - - @@ -946,18 +937,6 @@ GUI MED - - boost - OpenCascade - Python - Qt - Hdf - Med - OmniORB - KERNEL - GUI - MED - OpenCascade Python diff --git a/config_Debian_6.0_64bit.xml b/config_Debian_6.0_64bit.xml index 12a7077..6028705 100755 --- a/config_Debian_6.0_64bit.xml +++ b/config_Debian_6.0_64bit.xml @@ -255,15 +255,6 @@ installdiskspace="208,221,2958" script="FILTER.sh"/> - - - @@ -946,18 +937,6 @@ GUI MED - - boost - OpenCascade - Python - Qt - Hdf - Med - OmniORB - KERNEL - GUI - MED - OpenCascade Python diff --git a/config_Mandriva_2008.0.xml b/config_Mandriva_2008.0.xml index baa5957..a73d223 100755 --- a/config_Mandriva_2008.0.xml +++ b/config_Mandriva_2008.0.xml @@ -255,15 +255,6 @@ installdiskspace="208,221,2958" script="FILTER.sh"/> - - - @@ -946,18 +937,6 @@ GUI MED - - boost - OpenCascade - Python - Qt - Hdf - Med - OmniORB - KERNEL - GUI - MED - OpenCascade Python diff --git a/config_Mandriva_2008.0_64bit.xml b/config_Mandriva_2008.0_64bit.xml index 32ae60b..47ca0cd 100755 --- a/config_Mandriva_2008.0_64bit.xml +++ b/config_Mandriva_2008.0_64bit.xml @@ -255,15 +255,6 @@ installdiskspace="208,221,2958" script="FILTER.sh"/> - - - @@ -946,18 +937,6 @@ GUI MED - - boost - OpenCascade - Python - Qt - Hdf - Med - OmniORB - KERNEL - GUI - MED - OpenCascade Python diff --git a/config_Mandriva_2010.0.xml b/config_Mandriva_2010.0.xml index 14e530a..8bea61f 100755 --- a/config_Mandriva_2010.0.xml +++ b/config_Mandriva_2010.0.xml @@ -255,15 +255,6 @@ installdiskspace="208,221,2958" script="FILTER.sh"/> - - - @@ -946,18 +937,6 @@ GUI MED - - boost - OpenCascade - Python - Qt - Hdf - Med - OmniORB - KERNEL - GUI - MED - OpenCascade Python diff --git a/config_Mandriva_2010.0_64bit.xml b/config_Mandriva_2010.0_64bit.xml index 8bf6b5f..c295d69 100755 --- a/config_Mandriva_2010.0_64bit.xml +++ b/config_Mandriva_2010.0_64bit.xml @@ -255,15 +255,6 @@ installdiskspace="208,221,2958" script="FILTER.sh"/> - - - @@ -946,18 +937,6 @@ GUI MED - - boost - OpenCascade - Python - Qt - Hdf - Med - OmniORB - KERNEL - GUI - MED - OpenCascade Python diff --git a/config_Red_Hat_Enterprise_WS_4_64bit.xml b/config_Red_Hat_Enterprise_WS_4_64bit.xml index 0a4709d..5601032 100755 --- a/config_Red_Hat_Enterprise_WS_4_64bit.xml +++ b/config_Red_Hat_Enterprise_WS_4_64bit.xml @@ -255,15 +255,6 @@ installdiskspace="208,221,2958" script="FILTER.sh"/> - - - @@ -946,18 +937,6 @@ GUI MED - - boost - OpenCascade - Python - Qt - Hdf - Med - OmniORB - KERNEL - GUI - MED - OpenCascade Python diff --git a/config_Scientific_SL_5.1_64bit.xml b/config_Scientific_SL_5.1_64bit.xml index c882426..f1c4664 100755 --- a/config_Scientific_SL_5.1_64bit.xml +++ b/config_Scientific_SL_5.1_64bit.xml @@ -255,15 +255,6 @@ installdiskspace="208,221,2958" script="FILTER.sh"/> - - - @@ -946,18 +937,6 @@ GUI MED - - boost - OpenCascade - Python - Qt - Hdf - Med - OmniORB - KERNEL - GUI - MED - OpenCascade Python diff --git a/config_files/MULTIPR.sh b/config_files/MULTIPR.sh deleted file mode 100755 index eeec798..0000000 --- a/config_files/MULTIPR.sh +++ /dev/null @@ -1,143 +0,0 @@ -#!/bin/bash -noprofile - -#################################################################################### -# File : MULTIPR.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 -# -# This script is the part of the SALOME installation procedure. -# -#################################################################################### - -check_version(){ -if [ -n "${MULTIPR_ROOT_DIR}" ]; then - check_lib_version VERSION ${MULTIPR_ROOT_DIR}/bin/salome - if [ "$?" -eq "0" ]; then - ver=`cat ${MULTIPR_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` - if [ "$ver" = "${SALOME_VERSION}" ]; then - return 0 - fi - fi -elif [ -n "${MULTIPR_SRC_DIR}" ]; then - check_salome_src_version MULTIPR_SRC_DIR - if [ $? -eq 0 ] ; then return 0 ; fi - return 1 -fi -return 1 -} - -print_env_bin(){ -cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <> ${PRODUCT_DIR}/CONFIGURE.LOG else - check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure ${NETGEN_CONFIGURE_OPTIONS} CXXFLAGS=-O2 + ./configure ${NETGEN_CONFIGURE_OPTIONS} CXXFLAGS=-O2 >> ${PRODUCT_DIR}/CONFIGURE.LOG fi # compile -- 2.39.2