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

diff --git a/config_files/BLSURFPLUGIN.sh b/config_files/BLSURFPLUGIN.sh
index 99dd7a5fd243a0de31571e0f5ffe663ff1357e7f..6ba9b9d6ca26c3841e013fb3d8d6eb19ef72fb61 100755 (executable)
--- 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 016ff17c6f63c184b1cf1610330e299a8e780d6e..c0c291cd94a0cf56f157b0d434a499af51028c0c 100755 (executable)
--- 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 0b6d9dd4f0d2f9fab55c31be9624a7c8c686c474..65be4be5a311e7e149f255b20f8ae0212e660774 100755 (executable)
--- 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 d2619765ca0ea3cc5b6423ea51319b5fbe41d033..945db65b1ec4f35b06b43896029002906e30cb06 100755 (executable)
--- 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 e84fea3caf0edd6c1ca33a0dcc9ca414c0a82fcc..226f4742e442e7faba21c973ae95bc6f160f0a35 100755 (executable)
--- 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 cb5d2056e897105341f5660ee5e3ee38eb2552d6..d16048a17bb12d0be9d694f7a0a0a58f4c7a3fca 100755 (executable)
--- 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 1615e746a78601b5ad9a8fd72eff6e9ea60e5817..2ecb361d927727c5a406f9412e0d2082143e0d61 100755 (executable)
--- 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 0f16361b65e0614c7fa523e55238f342a7996397..3356584ae2f82148726b7b5e17f19908c213bb37 100755 (executable)
--- 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 daf3be49bcf98c95b70eab0abb090df9e2e7cfc1..670b1370f039682f9600e9053424726dc99feba8 100755 (executable)
--- 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 d2fabebd75ef91cfa24ca0f7c16358df58c9b5ee..5423d4b03e51eee33d1f55f415a9a9ead8d7ede1 100755 (executable)
--- 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}"