NPAL19776(installation of Salome without gui in install wisard is not good): correct...

diff --git a/config_files/build.csh b/config_files/build.csh
index 080ee1c6ed06e4027a676b08d29f71a828404bac..377631a31f595f509f990010af3432deafe3654e 100755 (executable)
--- a/config_files/build.csh
+++ b/config_files/build.csh
@@ -17,7 +17,7 @@
 
 set is_build_configure=0
 set is_configure=0
-set med_with_gui=1
+set inst_with_gui=1
 set is_delete=0
 set verbose_level=2
 set params=""
@@ -39,7 +39,7 @@ while ( ${%1} > 0 )
     else if ( "$1" == "-c" ) then
        set is_configure=1
     else if ( "$1" == "-w" ) then
-       set med_with_gui=0
+       set inst_with_gui=0
     else if ( "$1" == "-d" ) then
        set is_delete=1
     else if ( "$1" == "-o" ) then
@@ -92,9 +92,9 @@ echo "            This option forces configure (-c) key to be set. Default is of
 echo ""
 echo "-c          Perform configure command for all given modules. Default is off."
 echo ""
-echo "-w          Add --without-gui key to build_configure and configure"
-echo "            commands for MED module to build its sources without GUI."
-echo "            By default MED sources are built with GUI."
+echo "-w          Add --without-gui key to build_configure and configure commands"
+echo "            to build SALOME module sources without GUI."
+echo "            By default sources are built with GUI."
 echo ""
 echo "-d          Delete build directories before calling configure, to enforce full rebuild"
 echo "            (and reinstall if -i or -p option is used) of module."
@@ -248,7 +248,7 @@ foreach module (${modules})
            #########################################################
            # call build_configure
            #########################################################
-           if ( $med_with_gui == 0 && "${module}" == "MED" ) then
+           if ( $inst_with_gui == 0 ) then
                set add_keys="--without-gui"
            endif
            cd ${module_src}
@@ -328,7 +328,7 @@ foreach module (${modules})
        if ( ! -e ${module_src}/configure ) then
            echo "\!\!\! Warning \!\!\! Can not find configure script in ${module_src}."
        else
-           if ( $med_with_gui == 0 && "${module}" == "MED" ) then
+           if ( $inst_with_gui == 0 ) then
                set add_keys="--without-gui"
            endif
            if (  "${module}" == "MED" && ($?METISDIR)  && ($?SCOTCHDIR) ) then

diff --git a/config_files/build.sh b/config_files/build.sh
index ae695bd4876b824c064e60fca4d6df27881085ca..75339c306b5c711b0bf117225561d77303271e57 100755 (executable)
--- a/config_files/build.sh
+++ b/config_files/build.sh
@@ -38,9 +38,9 @@ usage(){
     echo ""
     echo "-c          Perform configure command for all given modules. Default is off."
     echo ""
-    echo "-w          Add --without-gui key to build_configure and configure"
-    echo "            commands for MED module to build its sources without GUI."
-    echo "            By default MED sources are built with GUI."
+    echo "-w          Add --without-gui key to build_configure and configure commands"
+    echo "            to build SALOME module sources without GUI."
+    echo "            By default sources are built with GUI."
     echo ""
     echo "-d          Delete build directories before calling configure, to enforce full"
     echo "            rebuild (and reinstall if -i or -p option is used) of module."
@@ -83,7 +83,7 @@ usage(){
 
 is_build_configure=0
 is_configure=0
-med_with_gui=1
+inst_with_gui=1
 is_delete=0
 verbose_level=2
 params=""
@@ -102,7 +102,7 @@ while getopts ":hbcwdoitv:p:" option ; do
         h ) usage ;;
         b ) is_build_configure=1 ; is_configure=1 ;;
         c ) is_configure=1 ;;
-        w ) med_with_gui=0 ;;
+        w ) inst_with_gui=0 ;;
         d ) is_delete=1 ;;
         o ) optim="--enable-production=yes --disable-debug" ;;
         i ) is_install=1 ;;
@@ -255,7 +255,7 @@ for module in ${modules}; do
                #########################################################
                 # call build_configure
                #########################################################
-               if [ $med_with_gui -eq 0 ] && [ ${module} == "MED" ] ; then
+               if [ $inst_with_gui -eq 0 ] ; then
                    add_keys="--without-gui"
                fi
                cd ${module_src}
@@ -337,7 +337,7 @@ for module in ${modules}; do
                echo '!!! Warning !!! Can not find configure script in '${module_src}'.'
                echo
            else
-               if [ $med_with_gui -eq 0 ] && [ "${module}" == "MED" ] ; then
+               if [ $inst_with_gui -eq 0 ] ; then
                    add_keys="--without-gui"
                fi
                if [  "${module}" == "MED" ] && [ "${METISDIR}" != "" ] && [ "${SCOTCHDIR}" != "" ] ; then