X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=config_files%2FPYHELLO_SRC.sh;h=b4380e229945b3e58edbee8b4ff4c7d87757273e;hb=53e3ff5fd2fe76b48edb73b2adae61b33697ede9;hp=b8d4bd8ef2be41006c0a8c576893ee0bd5844d95;hpb=dfad0e791df5e735eb93dad742e15505871f6080;p=tools%2Finstall.git

diff --git a/config_files/PYHELLO_SRC.sh b/config_files/PYHELLO_SRC.sh
index b8d4bd8..b4380e2 100755
--- a/config_files/PYHELLO_SRC.sh
+++ b/config_files/PYHELLO_SRC.sh
@@ -12,11 +12,13 @@
 #
 ####################################################################################
 
+VERSION="3.2.4"
+
 check_version(){
 if [ -n "${PYHELLO_SRC_DIR}" ]; then
-    if [ -f ${PYHELLO_SRC_DIR}/bin/VERSION ]; then
-	ver=`cat ${PYHELLO_SRC_DIR}/bin/VERSION | awk -F: '{print $NF}' | tr -d '[:space:]' ` 
-	if [ "$ver" = "3.2.4" ]; then
+    if [ -f ${PYHELLO_SRC_DIR}/configure.in.base ]; then
+	ver=`grep -E "^VERSION=" ${PYHELLO_SRC_DIR}/configure.in.base | awk -F= '{print $NF}' | tr -d '[:space:]' ` 
+	if [ "$ver" = "${VERSION}" ]; then
 	    return 0
 	fi
     fi
@@ -30,6 +32,7 @@ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
 export PYHELLO_SRC_DIR=\${INSTALL_ROOT}/${PRODUCT}
 ##
 EOF
+
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 }
@@ -59,11 +62,33 @@ install_source()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/PYHELLOsourcesV3.2.4.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/PYHELLOsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
 
 print_env
 }
 
+install_source_and_build()
+{
+# install sources
+install_source
+
+# build sources
+prod_bin=`echo $PRODUCT_TYPE | sed "s%src%bin%g"`
+mkdir -p ${INSTALL_ROOT}/PYHELLO_${VERSION}
+
+if [ -e ./build.sh ] ; then
+    cp -f ./build.sh ${INSTALL_ROOT}
+fi
+
+CUR_DIR=`pwd`
+cd ${INSTALL_ROOT}
+check_jb build.sh -o -b -d -v 0 -p $INSTALL_ROOT PYHELLO
+
+# create environment for the built binaries
+cd $CUR_DIR
+./PYHELLO_BIN.sh print_env $INSTALL_WORK $SOURCE_DIR $INSTALL_ROOT $PRODUCT_SEQUENCE $prod_bin
+}
+
 install_binary()
 {
 return 1
@@ -74,8 +99,8 @@ export INSTALL_WORK=$2;
 export SOURCE_DIR=$3;
 export INSTALL_ROOT=$4;
 export PRODUCT_SEQUENCE=$5;
-if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="PyHelloSrc" ; fi
-export PRODUCT="PYHELLO_SRC_3.2.4"
+if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="PYHELLOsrc" ; fi
+export PRODUCT="PYHELLO_SRC_${VERSION}"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh