From 72dca3f5a8c03470fb2cd67e14bed8af9c802187 Mon Sep 17 00:00:00 2001
From: akl <akl@opencascade.com>
Date: Wed, 21 May 2008 08:48:49 +0000
Subject: [PATCH] NPAL19776(installation of Salome without gui in install
 wisard is not good): modify to support 'installation without GUI' mechanism.

---
 config_files/BLSURFPLUGIN.sh   | 14 ++++++++++++--
 config_files/GEOM.sh           | 14 ++++++++++++--
 config_files/GHS3DPLUGIN.sh    | 14 ++++++++++++--
 config_files/GHS3DPRLPLUGIN.sh | 14 ++++++++++++--
 config_files/HexoticPLUGIN.sh  | 14 ++++++++++++--
 config_files/KERNEL.sh         |  1 +
 config_files/MED.sh            |  6 +++---
 config_files/NETGENPLUGIN.sh   | 14 ++++++++++++--
 config_files/SMESH.sh          | 14 ++++++++++++--
 config_files/YACS.sh           | 14 ++++++++++++--
 10 files changed, 100 insertions(+), 19 deletions(-)

diff --git a/config_files/BLSURFPLUGIN.sh b/config_files/BLSURFPLUGIN.sh
index 99dd7a5..6ba9b9d 100755
--- a/config_files/BLSURFPLUGIN.sh
+++ b/config_files/BLSURFPLUGIN.sh
@@ -98,7 +98,11 @@ fi
 
 CUR_DIR=`pwd`
 cd ${INSTALL_ROOT}
-check_jb build.sh -o -b -d -v 0 -p $INSTALL_ROOT BLSURFPLUGIN
+if [ $INST_WITH_GUI == "FALSE" ] ; then
+    check_jb build.sh -o -b -w -d -v 0 -p $INSTALL_ROOT BLSURFPLUGIN
+else
+    check_jb build.sh -o -b -d -v 0 -p $INSTALL_ROOT BLSURFPLUGIN
+fi
 
 cd $CUR_DIR
 
@@ -120,7 +124,11 @@ source ${INSTALL_WORK}/$SHRC
 # create a module directory
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-check_jb tar xfz ${SOURCE_DIR}/BLSURFPLUGINbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
+if [ $INST_WITH_GUI == "FALSE" ] ; then
+    check_jb tar xfz ${SOURCE_DIR}/BLSURFPLUGINWOGUIbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
+else
+    check_jb tar xfz ${SOURCE_DIR}/BLSURFPLUGINbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
+fi
 check_jb tar xfz ${SRC_DIR}/BLSURFPLUGINsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
@@ -142,6 +150,8 @@ SRC_DIR=$8;
 shift
 REMOVE_SRC_TMP=$8;
 shift
+INST_WITH_GUI=$9;
+shift
 SINGLE_DIR=$9;
 export PRODUCT="BLSURFPLUGIN_${VERSION}"
 export PRODUCT_SRC="BLSURFPLUGIN_SRC_${VERSION}"
diff --git a/config_files/GEOM.sh b/config_files/GEOM.sh
index 016ff17..c0c291c 100755
--- a/config_files/GEOM.sh
+++ b/config_files/GEOM.sh
@@ -97,7 +97,11 @@ fi
 
 CUR_DIR=`pwd`
 cd ${INSTALL_ROOT}
-check_jb build.sh -o -b -d -v 0 -p $INSTALL_ROOT GEOM
+if [ $INST_WITH_GUI == "FALSE" ] ; then
+    check_jb build.sh -o -b -w -d -v 0 -p $INSTALL_ROOT GEOM
+else
+    check_jb build.sh -o -b -d -v 0 -p $INSTALL_ROOT GEOM
+fi
 
 cd $CUR_DIR
 
@@ -119,7 +123,11 @@ source ${INSTALL_WORK}/$SHRC
 # create a module directory
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-check_jb tar xfz ${SOURCE_DIR}/GEOMbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
+if [ $INST_WITH_GUI == "FALSE" ] ; then
+    check_jb tar xfz ${SOURCE_DIR}/GEOMWOGUIbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
+else
+    check_jb tar xfz ${SOURCE_DIR}/GEOMbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
+fi
 check_jb tar xfz ${SRC_DIR}/GEOMsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
@@ -141,6 +149,8 @@ SRC_DIR=$8;
 shift
 REMOVE_SRC_TMP=$8;
 shift
+INST_WITH_GUI=$9;
+shift
 SINGLE_DIR=$9;
 export PRODUCT="GEOM_${VERSION}"
 export PRODUCT_SRC="GEOM_SRC_${VERSION}"
diff --git a/config_files/GHS3DPLUGIN.sh b/config_files/GHS3DPLUGIN.sh
index 0b6d9dd..65be4be 100755
--- a/config_files/GHS3DPLUGIN.sh
+++ b/config_files/GHS3DPLUGIN.sh
@@ -99,7 +99,11 @@ fi
 
 CUR_DIR=`pwd`
 cd ${INSTALL_ROOT}
-check_jb build.sh -o -b -d -v 0 -p $INSTALL_ROOT GHS3DPLUGIN
+if [ $INST_WITH_GUI == "FALSE" ] ; then
+    check_jb build.sh -o -b -w -d -v 0 -p $INSTALL_ROOT GHS3DPLUGIN
+else
+    check_jb build.sh -o -b -d -v 0 -p $INSTALL_ROOT GHS3DPLUGIN
+fi
 
 cd $CUR_DIR
 
@@ -121,7 +125,11 @@ source ${INSTALL_WORK}/$SHRC
 # create a module directory
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-check_jb tar xfz ${SOURCE_DIR}/GHS3DPLUGINbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
+if [ $INST_WITH_GUI == "FALSE" ] ; then
+    check_jb tar xfz ${SOURCE_DIR}/GHS3DPLUGINWOGUIbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
+else
+    check_jb tar xfz ${SOURCE_DIR}/GHS3DPLUGINbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
+fi
 check_jb tar xfz ${SRC_DIR}/GHS3DPLUGINsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
@@ -143,6 +151,8 @@ SRC_DIR=$8;
 shift
 REMOVE_SRC_TMP=$8;
 shift
+INST_WITH_GUI=$9;
+shift
 SINGLE_DIR=$9;
 export PRODUCT="GHS3DPLUGIN_${VERSION}"
 export PRODUCT_SRC="GHS3DPLUGIN_SRC_${VERSION}"
diff --git a/config_files/GHS3DPRLPLUGIN.sh b/config_files/GHS3DPRLPLUGIN.sh
index d261976..945db65 100755
--- a/config_files/GHS3DPRLPLUGIN.sh
+++ b/config_files/GHS3DPRLPLUGIN.sh
@@ -95,7 +95,11 @@ fi
 
 CUR_DIR=`pwd`
 cd ${INSTALL_ROOT}
-check_jb build.sh -o -b -d -v 0 -p $INSTALL_ROOT GHS3DPRLPLUGIN
+if [ $INST_WITH_GUI == "FALSE" ] ; then
+    check_jb build.sh -o -b -w -d -v 0 -p $INSTALL_ROOT GHS3DPRLPLUGIN
+else
+    check_jb build.sh -o -b -d -v 0 -p $INSTALL_ROOT GHS3DPRLPLUGIN
+fi
 
 cd $CUR_DIR
 
@@ -117,7 +121,11 @@ source ${INSTALL_WORK}/$SHRC
 # create a module directory
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-check_jb tar xfz ${SOURCE_DIR}/GHS3DPRLPLUGINbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
+if [ $INST_WITH_GUI == "FALSE" ] ; then
+    check_jb tar xfz ${SOURCE_DIR}/GHS3DPRLPLUGINWOGUIbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
+else
+    check_jb tar xfz ${SOURCE_DIR}/GHS3DPRLPLUGINbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
+fi
 check_jb tar xfz ${SRC_DIR}/GHS3DPRLPLUGINsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
@@ -139,6 +147,8 @@ SRC_DIR=$8;
 shift
 REMOVE_SRC_TMP=$8;
 shift
+INST_WITH_GUI=$9;
+shift
 SINGLE_DIR=$9;
 export PRODUCT="GHS3DPRLPLUGIN_${VERSION}"
 export PRODUCT_SRC="GHS3DPRLPLUGIN_SRC_${VERSION}"
diff --git a/config_files/HexoticPLUGIN.sh b/config_files/HexoticPLUGIN.sh
index e84fea3..226f474 100755
--- a/config_files/HexoticPLUGIN.sh
+++ b/config_files/HexoticPLUGIN.sh
@@ -95,7 +95,11 @@ fi
 
 CUR_DIR=`pwd`
 cd ${INSTALL_ROOT}
-check_jb build.sh -o -b -d -v 0 -p $INSTALL_ROOT HexoticPLUGIN
+if [ $INST_WITH_GUI == "FALSE" ] ; then
+    check_jb build.sh -o -b -w -d -v 0 -p $INSTALL_ROOT HexoticPLUGIN
+else
+    check_jb build.sh -o -b -d -v 0 -p $INSTALL_ROOT HexoticPLUGIN
+fi
 
 cd $CUR_DIR
 
@@ -117,7 +121,11 @@ source ${INSTALL_WORK}/$SHRC
 # create a module directory
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-check_jb tar xfz ${SOURCE_DIR}/HexoticPLUGINbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
+if [ $INST_WITH_GUI == "FALSE" ] ; then
+    check_jb tar xfz ${SOURCE_DIR}/HexoticPLUGINWOGUIbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
+else
+    check_jb tar xfz ${SOURCE_DIR}/HexoticPLUGINbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
+fi
 check_jb tar xfz ${SRC_DIR}/HexoticPLUGINsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
@@ -139,6 +147,8 @@ SRC_DIR=$8;
 shift
 REMOVE_SRC_TMP=$8;
 shift
+INST_WITH_GUI=$9;
+shift
 SINGLE_DIR=$9;
 export PRODUCT="HexoticPLUGIN_${VERSION}"
 export PRODUCT_SRC="HexoticPLUGIN_SRC_${VERSION}"
diff --git a/config_files/KERNEL.sh b/config_files/KERNEL.sh
index cb5d205..d16048a 100755
--- a/config_files/KERNEL.sh
+++ b/config_files/KERNEL.sh
@@ -164,6 +164,7 @@ SRC_DIR=$8;
 shift
 REMOVE_SRC_TMP=$8;
 shift
+shift
 SINGLE_DIR=$9;
 export PRODUCT="KERNEL_${VERSION}"
 export PRODUCT_SRC="KERNEL_SRC_${VERSION}"
diff --git a/config_files/MED.sh b/config_files/MED.sh
index 1615e74..2ecb361 100755
--- a/config_files/MED.sh
+++ b/config_files/MED.sh
@@ -97,7 +97,7 @@ fi
 
 CUR_DIR=`pwd`
 cd ${INSTALL_ROOT}
-if [ $MED_WITH_GUI == "FALSE" ] ; then
+if [ $INST_WITH_GUI == "FALSE" ] ; then
     check_jb build.sh -o -b -w -d -v 0 -p $INSTALL_ROOT MED
 else
     check_jb build.sh -o -b -d -v 0 -p $INSTALL_ROOT MED
@@ -123,7 +123,7 @@ source ${INSTALL_WORK}/$SHRC
 # create a module directory
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-if [ $MED_WITH_GUI == "FALSE" ] ; then
+if [ $INST_WITH_GUI == "FALSE" ] ; then
     check_jb tar xfz ${SOURCE_DIR}/MEDWOGUIbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
 else
     check_jb tar xfz ${SOURCE_DIR}/MEDbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
@@ -149,7 +149,7 @@ SRC_DIR=$8;
 shift
 REMOVE_SRC_TMP=$8;
 shift
-MED_WITH_GUI=$9;
+INST_WITH_GUI=$9;
 shift
 SINGLE_DIR=$9;
 export PRODUCT="MED_${VERSION}"
diff --git a/config_files/NETGENPLUGIN.sh b/config_files/NETGENPLUGIN.sh
index 0f16361..3356584 100755
--- a/config_files/NETGENPLUGIN.sh
+++ b/config_files/NETGENPLUGIN.sh
@@ -97,7 +97,11 @@ fi
 
 CUR_DIR=`pwd`
 cd ${INSTALL_ROOT}
-check_jb build.sh -o -b -d -v 0 -p $INSTALL_ROOT NETGENPLUGIN
+if [ $INST_WITH_GUI == "FALSE" ] ; then
+    check_jb build.sh -o -b -w -d -v 0 -p $INSTALL_ROOT NETGENPLUGIN
+else
+    check_jb build.sh -o -b -d -v 0 -p $INSTALL_ROOT NETGENPLUGIN
+fi
 
 cd $CUR_DIR
 
@@ -119,7 +123,11 @@ source ${INSTALL_WORK}/$SHRC
 # create a module directory
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-check_jb tar xfz ${SOURCE_DIR}/NETGENPLUGINbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
+if [ $INST_WITH_GUI == "FALSE" ] ; then
+    check_jb tar xfz ${SOURCE_DIR}/NETGENPLUGINWOGUIbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
+else
+    check_jb tar xfz ${SOURCE_DIR}/NETGENPLUGINbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
+fi
 check_jb tar xfz ${SRC_DIR}/NETGENPLUGINsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
@@ -141,6 +149,8 @@ SRC_DIR=$8;
 shift
 REMOVE_SRC_TMP=$8;
 shift
+INST_WITH_GUI=$9;
+shift
 SINGLE_DIR=$9;
 export PRODUCT="NETGENPLUGIN_${VERSION}"
 export PRODUCT_SRC="NETGENPLUGIN_SRC_${VERSION}"
diff --git a/config_files/SMESH.sh b/config_files/SMESH.sh
index daf3be4..670b137 100755
--- a/config_files/SMESH.sh
+++ b/config_files/SMESH.sh
@@ -97,7 +97,11 @@ fi
 
 CUR_DIR=`pwd`
 cd ${INSTALL_ROOT}
-check_jb build.sh -o -b -d -v 0 -p $INSTALL_ROOT SMESH
+if [ $INST_WITH_GUI == "FALSE" ] ; then
+    check_jb build.sh -o -b -w -d -v 0 -p $INSTALL_ROOT SMESH
+else
+    check_jb build.sh -o -b -d -v 0 -p $INSTALL_ROOT SMESH
+fi
 
 cd $CUR_DIR
 
@@ -119,7 +123,11 @@ source ${INSTALL_WORK}/$SHRC
 # create a module directory
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-check_jb tar xfz ${SOURCE_DIR}/SMESHbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
+if [ $INST_WITH_GUI == "FALSE" ] ; then
+    check_jb tar xfz ${SOURCE_DIR}/SMESHWOGUIbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
+else
+    check_jb tar xfz ${SOURCE_DIR}/SMESHbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
+fi
 check_jb tar xfz ${SRC_DIR}/SMESHsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
@@ -141,6 +149,8 @@ SRC_DIR=$8;
 shift
 REMOVE_SRC_TMP=$8;
 shift
+INST_WITH_GUI=$9;
+shift
 SINGLE_DIR=$9;
 export PRODUCT="SMESH_${VERSION}"
 export PRODUCT_SRC="SMESH_SRC_${VERSION}"
diff --git a/config_files/YACS.sh b/config_files/YACS.sh
index d2fabeb..5423d4b 100755
--- a/config_files/YACS.sh
+++ b/config_files/YACS.sh
@@ -95,7 +95,11 @@ fi
 
 CUR_DIR=`pwd`
 cd ${INSTALL_ROOT}
-check_jb build.sh -o -b -d -v 0 -p $INSTALL_ROOT YACS
+if [ $INST_WITH_GUI == "FALSE" ] ; then
+    check_jb build.sh -o -b -w -d -v 0 -p $INSTALL_ROOT YACS
+else
+    check_jb build.sh -o -b -d -v 0 -p $INSTALL_ROOT YACS
+fi
 
 cd $CUR_DIR
 
@@ -117,7 +121,11 @@ source ${INSTALL_WORK}/$SHRC
 # create a module directory
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-check_jb tar xfz ${SOURCE_DIR}/YACSbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
+if [ $INST_WITH_GUI == "FALSE" ] ; then
+    check_jb tar xfz ${SOURCE_DIR}/YACSWOGUIbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
+else
+    check_jb tar xfz ${SOURCE_DIR}/YACSbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
+fi
 check_jb tar xfz ${SRC_DIR}/YACSsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
@@ -139,6 +147,8 @@ SRC_DIR=$8;
 shift
 REMOVE_SRC_TMP=$8;
 shift
+INST_WITH_GUI=$9;
+shift
 SINGLE_DIR=$9;
 export PRODUCT="YACS_${VERSION}"
 export PRODUCT_SRC="YACS_SRC_${VERSION}"
-- 
2.39.2