From 59158bf5eb6ad677bddb39b5039884227eff2193 Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 13 Dec 2013 12:49:38 +0000 Subject: [PATCH] SALOME 7.3.0 preparation --- config_files/ATOMGEN.sh | 2 +- config_files/ATOMIC.sh | 2 +- config_files/ATOMSOLV.sh | 2 +- config_files/BLSURFPLUGIN.sh | 4 +- config_files/CALCULATOR.sh | 2 +- config_files/COMPONENT.sh | 2 +- config_files/DOCUMENTATION.sh | 2 +- config_files/GEOM.sh | 4 +- config_files/GHS3DPLUGIN.sh | 4 +- config_files/GHS3DPRLPLUGIN.sh | 4 +- config_files/GUI.sh | 2 +- config_files/HELLO.sh | 2 +- config_files/HEXABLOCK.sh | 4 +- config_files/HEXABLOCKPLUGIN.sh | 4 +- config_files/HOMARD.sh | 6 +- config_files/HexoticPLUGIN.sh | 4 +- config_files/JOBMANAGER.sh | 2 +- config_files/KERNEL.sh | 2 +- config_files/LIGHT.sh | 2 +- config_files/MED.sh | 4 +- config_files/NETGENPLUGIN.sh | 4 +- config_files/PARAVIS.sh | 2 +- config_files/PYCALCULATOR.sh | 2 +- config_files/PYHELLO.sh | 2 +- config_files/PYLIGHT.sh | 2 +- config_files/RANDOMIZER.sh | 2 +- config_files/SIERPINSKY.sh | 2 +- config_files/SMESH.sh | 4 +- config_files/YACS.sh | 4 +- config_files/build.csh | 462 -------------------------------- 30 files changed, 40 insertions(+), 506 deletions(-) delete mode 100755 config_files/build.csh diff --git a/config_files/ATOMGEN.sh b/config_files/ATOMGEN.sh index d4d9ef5..3751c9e 100755 --- a/config_files/ATOMGEN.sh +++ b/config_files/ATOMGEN.sh @@ -88,7 +88,7 @@ fi CUR_DIR=`pwd` cd ${INST_ROOT} -check_jb ./build.sh -o -b -d -v 0 -p ${INST_ROOT} ATOMGEN +check_jb ./build.sh -d -p ${INST_ROOT} ATOMGEN cd ${CUR_DIR} diff --git a/config_files/ATOMIC.sh b/config_files/ATOMIC.sh index a60dffd..16954c0 100755 --- a/config_files/ATOMIC.sh +++ b/config_files/ATOMIC.sh @@ -88,7 +88,7 @@ fi CUR_DIR=`pwd` cd ${INST_ROOT} -check_jb ./build.sh -o -b -d -v 0 -p ${INST_ROOT} ATOMIC +check_jb ./build.sh -d -p ${INST_ROOT} ATOMIC cd ${CUR_DIR} diff --git a/config_files/ATOMSOLV.sh b/config_files/ATOMSOLV.sh index 644004b..039a5df 100755 --- a/config_files/ATOMSOLV.sh +++ b/config_files/ATOMSOLV.sh @@ -88,7 +88,7 @@ fi CUR_DIR=`pwd` cd ${INST_ROOT} -check_jb ./build.sh -o -b -d -v 0 -p ${INST_ROOT} ATOMSOLV +check_jb ./build.sh -d -p ${INST_ROOT} ATOMSOLV cd ${CUR_DIR} diff --git a/config_files/BLSURFPLUGIN.sh b/config_files/BLSURFPLUGIN.sh index 529d4e3..090b4a6 100755 --- a/config_files/BLSURFPLUGIN.sh +++ b/config_files/BLSURFPLUGIN.sh @@ -90,9 +90,9 @@ fi CUR_DIR=`pwd` cd ${INST_ROOT} if [ "${INST_WITH_GUI}" = "FALSE" ] ; then - check_jb ./build.sh -o -b -w -d -v 0 -p ${INST_ROOT} BLSURFPLUGIN + check_jb ./build.sh -d -p ${INST_ROOT} -DSALOME_BUILD_GUI=OFF BLSURFPLUGIN else - check_jb ./build.sh -o -b -d -v 0 -p ${INST_ROOT} BLSURFPLUGIN + check_jb ./build.sh -d -p ${INST_ROOT} BLSURFPLUGIN fi cd ${CUR_DIR} diff --git a/config_files/CALCULATOR.sh b/config_files/CALCULATOR.sh index 2945af1..a121f6b 100755 --- a/config_files/CALCULATOR.sh +++ b/config_files/CALCULATOR.sh @@ -88,7 +88,7 @@ fi CUR_DIR=`pwd` cd ${INST_ROOT} -check_jb ./build.sh -o -b -d -v 0 -p ${INST_ROOT} CALCULATOR +check_jb ./build.sh -d -p ${INST_ROOT} CALCULATOR cd ${CUR_DIR} diff --git a/config_files/COMPONENT.sh b/config_files/COMPONENT.sh index 8e8775d..71d6bfa 100755 --- a/config_files/COMPONENT.sh +++ b/config_files/COMPONENT.sh @@ -88,7 +88,7 @@ fi CUR_DIR=`pwd` cd ${INST_ROOT} -check_jb ./build.sh -o -b -d -v 0 -p ${INST_ROOT} COMPONENT +check_jb ./build.sh -d -p ${INST_ROOT} COMPONENT cd ${CUR_DIR} diff --git a/config_files/DOCUMENTATION.sh b/config_files/DOCUMENTATION.sh index 44df1ec..dc3a661 100755 --- a/config_files/DOCUMENTATION.sh +++ b/config_files/DOCUMENTATION.sh @@ -69,7 +69,7 @@ fi CUR_DIR=`pwd` cd ${INST_ROOT} -check_jb ./build.sh -o -b -d -v 0 -p ${INST_ROOT} DOCUMENTATION +check_jb ./build.sh -d -p ${INST_ROOT} DOCUMENTATION cd ${CUR_DIR} diff --git a/config_files/GEOM.sh b/config_files/GEOM.sh index f1bf210..3a26e32 100755 --- a/config_files/GEOM.sh +++ b/config_files/GEOM.sh @@ -89,9 +89,9 @@ fi CUR_DIR=`pwd` cd ${INST_ROOT} if [ ${INST_WITH_GUI} = "FALSE" ] ; then - check_jb ./build.sh -o -b -w -d -v 0 -p ${INST_ROOT} GEOM + check_jb ./build.sh -d -p ${INST_ROOT} -DSALOME_BUILD_GUI=OFF GEOM else - check_jb ./build.sh -o -b -d -v 0 -p ${INST_ROOT} GEOM + check_jb ./build.sh -d -p ${INST_ROOT} GEOM fi cd ${CUR_DIR} diff --git a/config_files/GHS3DPLUGIN.sh b/config_files/GHS3DPLUGIN.sh index 719700f..7657600 100755 --- a/config_files/GHS3DPLUGIN.sh +++ b/config_files/GHS3DPLUGIN.sh @@ -89,9 +89,9 @@ fi CUR_DIR=`pwd` cd ${INST_ROOT} if [ ${INST_WITH_GUI} = "FALSE" ] ; then - check_jb ./build.sh -o -b -w -d -v 0 -p ${INST_ROOT} GHS3DPLUGIN + check_jb ./build.sh -d -p ${INST_ROOT} -DSALOME_BUILD_GUI=OFF GHS3DPLUGIN else - check_jb ./build.sh -o -b -d -v 0 -p ${INST_ROOT} GHS3DPLUGIN + check_jb ./build.sh -d -p ${INST_ROOT} GHS3DPLUGIN fi cd ${CUR_DIR} diff --git a/config_files/GHS3DPRLPLUGIN.sh b/config_files/GHS3DPRLPLUGIN.sh index 34aeacb..b351cf4 100755 --- a/config_files/GHS3DPRLPLUGIN.sh +++ b/config_files/GHS3DPRLPLUGIN.sh @@ -88,9 +88,9 @@ fi CUR_DIR=`pwd` cd ${INST_ROOT} if [ ${INST_WITH_GUI} = "FALSE" ] ; then - check_jb ./build.sh -o -b -w -d -v 0 -p ${INST_ROOT} GHS3DPRLPLUGIN + check_jb ./build.sh -d -p ${INST_ROOT} -DSALOME_BUILD_GUI=OFF GHS3DPRLPLUGIN else - check_jb ./build.sh -o -b -d -v 0 -p ${INST_ROOT} GHS3DPRLPLUGIN + check_jb ./build.sh -d -p ${INST_ROOT} GHS3DPRLPLUGIN fi cd ${CUR_DIR} diff --git a/config_files/GUI.sh b/config_files/GUI.sh index 995b261..c5f17ee 100755 --- a/config_files/GUI.sh +++ b/config_files/GUI.sh @@ -89,7 +89,7 @@ fi CUR_DIR=`pwd` cd ${INST_ROOT} -check_jb ./build.sh -o -b -d -v 0 -p ${INST_ROOT} GUI +check_jb ./build.sh -d -p ${INST_ROOT} GUI cd ${CUR_DIR} diff --git a/config_files/HELLO.sh b/config_files/HELLO.sh index e2ab3c4..006c92a 100755 --- a/config_files/HELLO.sh +++ b/config_files/HELLO.sh @@ -87,7 +87,7 @@ fi CUR_DIR=`pwd` cd ${INST_ROOT} -check_jb ./build.sh -o -b -d -v 0 -p ${INST_ROOT} HELLO +check_jb ./build.sh -d -p ${INST_ROOT} HELLO cd ${CUR_DIR} diff --git a/config_files/HEXABLOCK.sh b/config_files/HEXABLOCK.sh index ae667ba..e2fbe05 100755 --- a/config_files/HEXABLOCK.sh +++ b/config_files/HEXABLOCK.sh @@ -88,9 +88,9 @@ fi CUR_DIR=`pwd` cd ${INST_ROOT} if [ "${INST_WITH_GUI}" = "FALSE" ] ; then - check_jb ./build.sh -o -b -w -d -v 0 -p ${INST_ROOT} HEXABLOCK + check_jb ./build.sh -d -p ${INST_ROOT} -DSALOME_BUILD_GUI=OFF HEXABLOCK else - check_jb ./build.sh -o -b -d -v 0 -p ${INST_ROOT} HEXABLOCK + check_jb ./build.sh -d -p ${INST_ROOT} HEXABLOCK fi cd ${CUR_DIR} diff --git a/config_files/HEXABLOCKPLUGIN.sh b/config_files/HEXABLOCKPLUGIN.sh index 530a1ac..bd4f3af 100755 --- a/config_files/HEXABLOCKPLUGIN.sh +++ b/config_files/HEXABLOCKPLUGIN.sh @@ -89,9 +89,9 @@ fi CUR_DIR=`pwd` cd ${INST_ROOT} if [ "${INST_WITH_GUI}" = "FALSE" ] ; then - check_jb ./build.sh -o -b -w -d -v 0 -p ${INST_ROOT} HEXABLOCKPLUGIN + check_jb ./build.sh -d -p ${INST_ROOT} -DSALOME_BUILD_GUI=OFF HEXABLOCKPLUGIN else - check_jb ./build.sh -o -b -d -v 0 -p ${INST_ROOT} HEXABLOCKPLUGIN + check_jb ./build.sh -d -p ${INST_ROOT} HEXABLOCKPLUGIN fi cd ${CUR_DIR} diff --git a/config_files/HOMARD.sh b/config_files/HOMARD.sh index 5c45a9f..16cf0ff 100755 --- a/config_files/HOMARD.sh +++ b/config_files/HOMARD.sh @@ -88,11 +88,7 @@ fi CUR_DIR=`pwd` cd ${INST_ROOT} -if [ "${INST_WITH_GUI}" = "FALSE" ] ; then - check_jb ./build.sh -o -b -w -d -v 0 -p ${INST_ROOT} HOMARD -else - check_jb ./build.sh -o -b -d -v 0 -p ${INST_ROOT} HOMARD -fi +check_jb ./build.sh -d -p ${INST_ROOT} HOMARD cd ${CUR_DIR} diff --git a/config_files/HexoticPLUGIN.sh b/config_files/HexoticPLUGIN.sh index ebc0540..33e50b5 100755 --- a/config_files/HexoticPLUGIN.sh +++ b/config_files/HexoticPLUGIN.sh @@ -88,9 +88,9 @@ fi CUR_DIR=`pwd` cd ${INST_ROOT} if [ ${INST_WITH_GUI} = "FALSE" ] ; then - check_jb ./build.sh -o -b -w -d -v 0 -p ${INST_ROOT} HexoticPLUGIN + check_jb ./build.sh -d -p ${INST_ROOT} -DSALOME_BUILD_GUI=OFF HexoticPLUGIN else - check_jb ./build.sh -o -b -d -v 0 -p ${INST_ROOT} HexoticPLUGIN + check_jb ./build.sh -d -p ${INST_ROOT} HexoticPLUGIN fi cd ${CUR_DIR} diff --git a/config_files/JOBMANAGER.sh b/config_files/JOBMANAGER.sh index fe3e0f2..52b421b 100755 --- a/config_files/JOBMANAGER.sh +++ b/config_files/JOBMANAGER.sh @@ -82,7 +82,7 @@ fi CUR_DIR=`pwd` cd ${INST_ROOT} -check_jb ./build.sh -o -b -d -v 0 -p ${INST_ROOT} JOBMANAGER +check_jb ./build.sh -d -p ${INST_ROOT} JOBMANAGER cd ${CUR_DIR} diff --git a/config_files/KERNEL.sh b/config_files/KERNEL.sh index c57e746..82fbe2a 100755 --- a/config_files/KERNEL.sh +++ b/config_files/KERNEL.sh @@ -88,7 +88,7 @@ fi CUR_DIR=`pwd` cd ${INST_ROOT} -check_jb ./build.sh -o -b -d -v 0 -p ${INST_ROOT} KERNEL +check_jb ./build.sh -d -p ${INST_ROOT} KERNEL # create environment for the built binaries cd ${CUR_DIR} diff --git a/config_files/LIGHT.sh b/config_files/LIGHT.sh index 8c37a7d..d400d8b 100755 --- a/config_files/LIGHT.sh +++ b/config_files/LIGHT.sh @@ -85,7 +85,7 @@ fi CUR_DIR=`pwd` cd ${INST_ROOT} -check_jb ./build.sh -o -b -d -v 0 -p ${INST_ROOT} LIGHT +check_jb ./build.sh -d -p ${INST_ROOT} LIGHT cd ${CUR_DIR} diff --git a/config_files/MED.sh b/config_files/MED.sh index 82ade62..80921c1 100755 --- a/config_files/MED.sh +++ b/config_files/MED.sh @@ -90,9 +90,9 @@ fi CUR_DIR=`pwd` cd ${INST_ROOT} if [ ${INST_WITH_GUI} = "FALSE" ] ; then - check_jb ./build.sh -o -b -w -d -v 0 -p ${INST_ROOT} MED + check_jb ./build.sh -d -p ${INST_ROOT} -DSALOME_BUILD_GUI=OFF MED else - check_jb ./build.sh -o -b -d -v 0 -p ${INST_ROOT} MED + check_jb ./build.sh -d -p ${INST_ROOT} MED fi cd ${CUR_DIR} diff --git a/config_files/NETGENPLUGIN.sh b/config_files/NETGENPLUGIN.sh index f200fe9..4e2a37b 100755 --- a/config_files/NETGENPLUGIN.sh +++ b/config_files/NETGENPLUGIN.sh @@ -89,9 +89,9 @@ fi CUR_DIR=`pwd` cd ${INST_ROOT} if [ ${INST_WITH_GUI} = "FALSE" ] ; then - check_jb ./build.sh -o -b -w -d -v 0 -p ${INST_ROOT} NETGENPLUGIN + check_jb ./build.sh -d -p ${INST_ROOT} -DSALOME_BUILD_GUI=OFF NETGENPLUGIN else - check_jb ./build.sh -o -b -d -v 0 -p ${INST_ROOT} NETGENPLUGIN + check_jb ./build.sh -d -p ${INST_ROOT} NETGENPLUGIN fi cd ${CUR_DIR} diff --git a/config_files/PARAVIS.sh b/config_files/PARAVIS.sh index 362ead0..32fe356 100755 --- a/config_files/PARAVIS.sh +++ b/config_files/PARAVIS.sh @@ -90,7 +90,7 @@ fi CUR_DIR=`pwd` cd ${INST_ROOT} -check_jb ./build.sh -o -b -d -v 0 -p ${INST_ROOT} PARAVIS +check_jb ./build.sh -d -p ${INST_ROOT} PARAVIS cd ${CUR_DIR} diff --git a/config_files/PYCALCULATOR.sh b/config_files/PYCALCULATOR.sh index 1687806..83ec1df 100755 --- a/config_files/PYCALCULATOR.sh +++ b/config_files/PYCALCULATOR.sh @@ -88,7 +88,7 @@ fi CUR_DIR=`pwd` cd ${INST_ROOT} -check_jb ./build.sh -o -b -d -v 0 -p ${INST_ROOT} PYCALCULATOR +check_jb ./build.sh -d -p ${INST_ROOT} PYCALCULATOR cd ${CUR_DIR} diff --git a/config_files/PYHELLO.sh b/config_files/PYHELLO.sh index ef2f8eb..aab25b5 100755 --- a/config_files/PYHELLO.sh +++ b/config_files/PYHELLO.sh @@ -86,7 +86,7 @@ fi CUR_DIR=`pwd` cd ${INST_ROOT} -check_jb ./build.sh -o -b -d -v 0 -p ${INST_ROOT} PYHELLO +check_jb ./build.sh -d -p ${INST_ROOT} PYHELLO cd ${CUR_DIR} diff --git a/config_files/PYLIGHT.sh b/config_files/PYLIGHT.sh index efe2b26..1c6bac0 100755 --- a/config_files/PYLIGHT.sh +++ b/config_files/PYLIGHT.sh @@ -86,7 +86,7 @@ fi CUR_DIR=`pwd` cd ${INST_ROOT} -check_jb ./build.sh -o -b -d -v 0 -p ${INST_ROOT} PYLIGHT +check_jb ./build.sh -d -p ${INST_ROOT} PYLIGHT cd ${CUR_DIR} diff --git a/config_files/RANDOMIZER.sh b/config_files/RANDOMIZER.sh index 4f9957c..a296ce2 100755 --- a/config_files/RANDOMIZER.sh +++ b/config_files/RANDOMIZER.sh @@ -87,7 +87,7 @@ fi CUR_DIR=`pwd` cd ${INST_ROOT} -check_jb ./build.sh -o -b -d -v 0 -p ${INST_ROOT} RANDOMIZER +check_jb ./build.sh -d -p ${INST_ROOT} RANDOMIZER cd ${CUR_DIR} diff --git a/config_files/SIERPINSKY.sh b/config_files/SIERPINSKY.sh index b97f039..b37f3b0 100755 --- a/config_files/SIERPINSKY.sh +++ b/config_files/SIERPINSKY.sh @@ -87,7 +87,7 @@ fi CUR_DIR=`pwd` cd ${INST_ROOT} -check_jb ./build.sh -o -b -d -v 0 -p ${INST_ROOT} SIERPINSKY +check_jb ./build.sh -d -p ${INST_ROOT} SIERPINSKY cd ${CUR_DIR} diff --git a/config_files/SMESH.sh b/config_files/SMESH.sh index 76286fc..e53379e 100755 --- a/config_files/SMESH.sh +++ b/config_files/SMESH.sh @@ -89,9 +89,9 @@ fi CUR_DIR=`pwd` cd ${INST_ROOT} if [ ${INST_WITH_GUI} = "FALSE" ] ; then - check_jb ./build.sh -o -b -w -d -v 0 -p ${INST_ROOT} SMESH + check_jb ./build.sh -d -p ${INST_ROOT} -DSALOME_BUILD_GUI=OFF SMESH else - check_jb ./build.sh -o -b -d -v 0 -p ${INST_ROOT} SMESH + check_jb ./build.sh -d -p ${INST_ROOT} SMESH fi cd ${CUR_DIR} diff --git a/config_files/YACS.sh b/config_files/YACS.sh index cffa98d..5e32c33 100755 --- a/config_files/YACS.sh +++ b/config_files/YACS.sh @@ -88,9 +88,9 @@ fi CUR_DIR=`pwd` cd ${INST_ROOT} if [ "${INST_WITH_GUI}" = "FALSE" ] ; then - check_jb ./build.sh -o -b -w -d -v 0 -p ${INST_ROOT} YACS + check_jb ./build.sh -d -p ${INST_ROOT} -DSALOME_BUILD_GUI=OFF YACS else - check_jb ./build.sh -o -b -d -v 0 -p ${INST_ROOT} YACS + check_jb ./build.sh -d -p ${INST_ROOT} YACS fi cd ${CUR_DIR} diff --git a/config_files/build.csh b/config_files/build.csh deleted file mode 100755 index 2a3536d..0000000 --- a/config_files/build.csh +++ /dev/null @@ -1,462 +0,0 @@ -#!/bin/csh -f - -#################################################################################### -# File : build.csh -# Created : Thu Jan 27 09:50:55 2005 -# Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) -# Project : SALOME -# Module : Installation Wizard -# Copyright : 2002-2013 CEA -# -# This script is the part of the SALOME installation procedure. -# -# This script can be used to build and install SALOME modules from sources. -# Try build.csh -h for more details about usage. -# -#################################################################################### - -set is_build_configure=0 -set is_configure=0 -set inst_with_gui=1 -set is_delete=0 -set verbose_level=2 -set params="" -set modules=(KERNEL GUI GEOM MED SMESH PARAVIS YACS NETGENPLUGIN GHS3DPLUGIN BLSURFPLUGIN HexoticPLUGIN GHS3DPRLPLUGIN COMPONENT CALCULATOR HELLO PYHELLO LIGHT PYLIGHT HEXABLOCK HEXABLOCKPLUGIN ATOMIC ATOMGEN ATOMSOLV HOMARD JOBMANAGER) -set optim="" -set is_install=1 -set is_help=0 -set is_tui=0 -set prefix="" -set def_install_dir="/INSTALL" -set b_params="" - -######################################################### -# parse parameters -######################################################### -while ( ${%1} > 0 ) - if ( "$1" == "-b" ) then - set is_build_configure=1 - set is_configure=1 - else if ( "$1" == "-c" ) then - set is_configure=1 - else if ( "$1" == "-w" ) then - set inst_with_gui=0 - else if ( "$1" == "-d" ) then - set is_delete=1 - else if ( "$1" == "-o" ) then - set optim="--enable-production=yes --disable-debug" - else if ( "$1" == "-v" ) then - shift - set verbose_level=$1 - else if ( "$1" == "-p" ) then - shift - set is_install=1 - set prefix=$1 - else if ( "$1" == "-h" ) then - set is_help=1 - else if ( "$1" == "-t" ) then - set is_tui=1 - else - set ckt=`echo ${modules} | grep -E "\<$1\>"` - if ( "$ckt" != "" ) then - set params="$params $1" - else - set b_params="$b_params $1" - echo "\!\!\! Warning \!\!\! Unknown module: $1." - endif - endif - shift -end - -######################################################### -# if -h option is given - print help info and exit -######################################################### -if ( $is_help == 1 ) then -echo "" -echo "" -echo "Description:" -echo " Builds given SALOME modules by performing make and make install commands" -echo "" -echo "Usage:" -echo " build.csh [