From 9f099fa8a0866b863f7960fd1d7decb94695c9ea Mon Sep 17 00:00:00 2001 From: maintenance team Date: Wed, 18 Nov 2009 13:30:49 +0000 Subject: [PATCH] Update version ghs3d and blsurf --- config_Debian_3.1.xml | 28 +++++- config_Debian_4.0.xml | 28 +++++- config_Debian_4.0_64bit.xml | 30 +++++- config_Mandriva_2006.0.xml | 28 +++++- config_Mandriva_2006.0_64bit.xml | 28 +++++- config_Mandriva_2008.0.xml | 28 +++++- config_Mandriva_2008.0_64bit.xml | 28 +++++- config_files/{blsurf-2.7.12.sh => DISTENE.sh} | 25 ++--- config_files/ghs3d-4.0.sh | 94 ------------------- 9 files changed, 182 insertions(+), 135 deletions(-) rename config_files/{blsurf-2.7.12.sh => DISTENE.sh} (83%) delete mode 100755 config_files/ghs3d-4.0.sh diff --git a/config_Debian_3.1.xml b/config_Debian_3.1.xml index 8962911..e7f3e82 100755 --- a/config_Debian_3.1.xml +++ b/config_Debian_3.1.xml @@ -99,6 +99,16 @@ installdiskspace="232,120,2583" script="GHS3DPLUGIN.sh"/> + + + @@ -520,12 +530,21 @@ installdiskspace="5615,51450,17231" script="netgen-4.5.sh"/> + + + @@ -534,7 +553,7 @@ description="An automatic composite surface mesh generator"> @@ -672,7 +691,7 @@ Doxygen Graphviz docutils - TetMesh-GHS3D + DISTENE KERNEL GUI GEOM @@ -689,6 +708,7 @@ Doxygen Graphviz docutils + DISTENE KERNEL GUI GEOM @@ -705,7 +725,7 @@ Doxygen Graphviz docutils - BLSurf + DISTENE KERNEL GUI GEOM diff --git a/config_Debian_4.0.xml b/config_Debian_4.0.xml index 7c25d19..5a12d59 100755 --- a/config_Debian_4.0.xml +++ b/config_Debian_4.0.xml @@ -99,6 +99,16 @@ installdiskspace="232,120,2583" script="GHS3DPLUGIN.sh"/> + + + @@ -520,12 +530,21 @@ installdiskspace="5615,51450,17231" script="netgen-4.5.sh"/> + + + @@ -534,7 +553,7 @@ description="An automatic composite surface mesh generator"> @@ -672,7 +691,7 @@ Doxygen Graphviz docutils - TetMesh-GHS3D + DISTENE KERNEL GUI GEOM @@ -689,6 +708,7 @@ Doxygen Graphviz docutils + DISTENE KERNEL GUI GEOM @@ -705,7 +725,7 @@ Doxygen Graphviz docutils - BLSurf + DISTENE KERNEL GUI GEOM diff --git a/config_Debian_4.0_64bit.xml b/config_Debian_4.0_64bit.xml index 00f0a1e..960565c 100755 --- a/config_Debian_4.0_64bit.xml +++ b/config_Debian_4.0_64bit.xml @@ -99,6 +99,16 @@ installdiskspace="232,120,2583" script="GHS3DPLUGIN.sh"/> + + + @@ -520,12 +530,21 @@ installdiskspace="5615,51450,17231" script="netgen-4.5.sh"/> + + + @@ -534,7 +553,7 @@ description="An automatic composite surface mesh generator"> @@ -672,7 +691,7 @@ Doxygen Graphviz docutils - TetMesh-GHS3D + DISTENE KERNEL GUI GEOM @@ -689,6 +708,7 @@ Doxygen Graphviz docutils + DISTENE KERNEL GUI GEOM @@ -705,7 +725,7 @@ Doxygen Graphviz docutils - BLSurf + DISTENE KERNEL GUI GEOM @@ -942,7 +962,7 @@ OpenCascade - + Python Swig diff --git a/config_Mandriva_2006.0.xml b/config_Mandriva_2006.0.xml index c444d57..54583a3 100755 --- a/config_Mandriva_2006.0.xml +++ b/config_Mandriva_2006.0.xml @@ -99,6 +99,16 @@ installdiskspace="232,120,2583" script="GHS3DPLUGIN.sh"/> + + + @@ -520,12 +530,21 @@ installdiskspace="5615,51450,17231" script="netgen-4.5.sh"/> + + + @@ -534,7 +553,7 @@ description="An automatic composite surface mesh generator"> @@ -672,7 +691,7 @@ Doxygen Graphviz docutils - TetMesh-GHS3D + DISTENE KERNEL GUI GEOM @@ -689,6 +708,7 @@ Doxygen Graphviz docutils + DISTENE KERNEL GUI GEOM @@ -705,7 +725,7 @@ Doxygen Graphviz docutils - BLSurf + DISTENE KERNEL GUI GEOM diff --git a/config_Mandriva_2006.0_64bit.xml b/config_Mandriva_2006.0_64bit.xml index aa880a6..31823be 100755 --- a/config_Mandriva_2006.0_64bit.xml +++ b/config_Mandriva_2006.0_64bit.xml @@ -99,6 +99,16 @@ installdiskspace="232,120,2583" script="GHS3DPLUGIN.sh"/> + + + @@ -520,12 +530,21 @@ installdiskspace="5615,51450,17231" script="netgen-4.5.sh"/> + + + @@ -534,7 +553,7 @@ description="An automatic composite surface mesh generator"> @@ -672,7 +691,7 @@ Doxygen Graphviz docutils - TetMesh-GHS3D + DISTENE KERNEL GUI GEOM @@ -689,6 +708,7 @@ Doxygen Graphviz docutils + DISTENE KERNEL GUI GEOM @@ -705,7 +725,7 @@ Doxygen Graphviz docutils - BLSurf + DISTENE KERNEL GUI GEOM diff --git a/config_Mandriva_2008.0.xml b/config_Mandriva_2008.0.xml index 973529c..13a574e 100755 --- a/config_Mandriva_2008.0.xml +++ b/config_Mandriva_2008.0.xml @@ -99,6 +99,16 @@ installdiskspace="232,120,2583" script="GHS3DPLUGIN.sh"/> + + + @@ -520,12 +530,21 @@ installdiskspace="5615,51450,17231" script="netgen-4.5.sh"/> + + + @@ -534,7 +553,7 @@ description="An automatic composite surface mesh generator"> @@ -672,7 +691,7 @@ Doxygen Graphviz docutils - TetMesh-GHS3D + DISTENE KERNEL GUI GEOM @@ -689,6 +708,7 @@ Doxygen Graphviz docutils + DISTENE KERNEL GUI GEOM @@ -705,7 +725,7 @@ Doxygen Graphviz docutils - BLSurf + DISTENE KERNEL GUI GEOM diff --git a/config_Mandriva_2008.0_64bit.xml b/config_Mandriva_2008.0_64bit.xml index d8a843e..33e3aba 100755 --- a/config_Mandriva_2008.0_64bit.xml +++ b/config_Mandriva_2008.0_64bit.xml @@ -99,6 +99,16 @@ installdiskspace="232,120,2583" script="GHS3DPLUGIN.sh"/> + + + @@ -520,12 +530,21 @@ installdiskspace="5615,51450,17231" script="netgen-4.5.sh"/> + + + @@ -534,7 +553,7 @@ description="An automatic composite surface mesh generator"> @@ -672,7 +691,7 @@ Doxygen Graphviz docutils - TetMesh-GHS3D + DISTENE KERNEL GUI GEOM @@ -689,6 +708,7 @@ Doxygen Graphviz docutils + DISTENE KERNEL GUI GEOM @@ -705,7 +725,7 @@ Doxygen Graphviz docutils - BLSurf + DISTENE KERNEL GUI GEOM diff --git a/config_files/blsurf-2.7.12.sh b/config_files/DISTENE.sh similarity index 83% rename from config_files/blsurf-2.7.12.sh rename to config_files/DISTENE.sh index 46b5fc5..1abc0ab 100755 --- a/config_files/blsurf-2.7.12.sh +++ b/config_files/DISTENE.sh @@ -1,7 +1,7 @@ #!/bin/bash -noprofile #################################################################################### -# File : blsurf-2.7.12.sh +# File : DISTENE.sh # Created : Thu Dec 18 12:01:00 2002 # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME @@ -13,9 +13,10 @@ #################################################################################### # -# BLSurf version +# ghs3d &blsurf versions # -BLSURF_VERSION=2.7.12 +GHS3D_VERSION=4.1 +BLSURF_VERSION=2.8 check_version(){ # No way to check version! @@ -24,17 +25,17 @@ return 0 print_env_bin() { -if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then - LIB_PREFIX=64 -elif [ -d ${PRODUCT_DIR}/lib ] ; then - LIB_PREFIX="" +if [ `uname -m` = "x86_64" ] ; then + LIB_PREFIX="_64" else - LIB_PREFIX=64 + LIB_PREFIX="" fi cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <