topo2vol - rename compilation script

diff --git a/products/compil_scripts/topo2volmesh-1.3.0.sh b/products/compil_scripts/topo2volmesh-1.3.0.sh
deleted file mode 100755 (executable)
index 442ce81..0000000
--- a/products/compil_scripts/topo2volmesh-1.3.0.sh
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/bash
-
-echo "##########################################################################"
-echo "topo2volmesh" $VERSION
-echo "##########################################################################"
-
-CONFIGURE_FLAGS=
-if [ -n "$MPI_ROOT_DIR" ]
-then
-    echo "WARNING: setting CC and CXX environment variables and target MPI wrapper"
-    export CC=${MPI_ROOT_DIR}/bin/mpicc
-    export CXX=${MPI_ROOT_DIR}/bin/mpicxx
-    CONFIGURE_FLAGS+=" --with-MPICXX=${MPI_ROOT_DIR}/bin/mpic++"
-else
-    LINUX_DISTRIBUTION="$DIST_NAME$DIST_VERSION"
-    case $LINUX_DISTRIBUTION in
-        CO7|CO8|FD30|FD32|FD34)
-           # check whether openmpi is installed
-           x=$(yum list installed |grep openmpi)
-           if [ $? -ne 0 ]; then
-               echo "ERROR: openMPI is not installed!"
-               exit 1
-           fi
-           export CC=/usr/lib64/openmpi/bin/mpicc
-           export CXX=/usr/lib64/openmpi/bin/mpicxx
-           export PATH=$PATH:/usr/lib64/openmpi/bin
-           CONFIGURE_FLAGS+=" --with-MPICXX=/usr/lib64/openmpi/bin/mpic++"
-           ;;
-       *)
-           ;;
-    esac
-fi
-
-rm -rf $BUILD_DIR
-mkdir $BUILD_DIR
-cd $BUILD_DIR
-
-cp -r $SOURCE_DIR/* .
-
-echo
-echo "*** autoreconf -i"
-autoreconf -i
-if [ $? -ne 0 ]
-then
-    echo "ERROR on autoreconf command"
-    exit 1
-fi
-
-echo
-echo "*** configure --prefix=$PRODUCT_INSTALL $CONFIGURE_FLAGS" 
-$BUILD_DIR/configure --prefix=$PRODUCT_INSTALL $CONFIGURE_FLAGS
-if [ $? -ne 0 ]
-then
-    echo "ERROR on configure"
-    exit 2
-fi
-echo
-echo "*** make" $MAKE_OPTIONS
-make $MAKE_OPTIONS
-if [ $? -ne 0 ]
-then
-    echo "ERROR on make"
-    exit 3
-fi
-
-echo
-echo "*** make install"
-make install
-if [ $? -ne 0 ]
-then
-    echo "ERROR on make install"
-    exit 4
-fi
-
-make check
-if [ $? -ne 0 ]
-then
-    echo "ERROR on make check"
-    exit 5
-fi
-
-echo
-echo "########## END"
-

diff --git a/products/compil_scripts/topo2volmesh.sh b/products/compil_scripts/topo2volmesh.sh
new file mode 100755 (executable)
index 0000000..442ce81
--- /dev/null
+++ b/products/compil_scripts/topo2volmesh.sh
@@ -0,0 +1,84 @@
+#!/bin/bash
+
+echo "##########################################################################"
+echo "topo2volmesh" $VERSION
+echo "##########################################################################"
+
+CONFIGURE_FLAGS=
+if [ -n "$MPI_ROOT_DIR" ]
+then
+    echo "WARNING: setting CC and CXX environment variables and target MPI wrapper"
+    export CC=${MPI_ROOT_DIR}/bin/mpicc
+    export CXX=${MPI_ROOT_DIR}/bin/mpicxx
+    CONFIGURE_FLAGS+=" --with-MPICXX=${MPI_ROOT_DIR}/bin/mpic++"
+else
+    LINUX_DISTRIBUTION="$DIST_NAME$DIST_VERSION"
+    case $LINUX_DISTRIBUTION in
+        CO7|CO8|FD30|FD32|FD34)
+           # check whether openmpi is installed
+           x=$(yum list installed |grep openmpi)
+           if [ $? -ne 0 ]; then
+               echo "ERROR: openMPI is not installed!"
+               exit 1
+           fi
+           export CC=/usr/lib64/openmpi/bin/mpicc
+           export CXX=/usr/lib64/openmpi/bin/mpicxx
+           export PATH=$PATH:/usr/lib64/openmpi/bin
+           CONFIGURE_FLAGS+=" --with-MPICXX=/usr/lib64/openmpi/bin/mpic++"
+           ;;
+       *)
+           ;;
+    esac
+fi
+
+rm -rf $BUILD_DIR
+mkdir $BUILD_DIR
+cd $BUILD_DIR
+
+cp -r $SOURCE_DIR/* .
+
+echo
+echo "*** autoreconf -i"
+autoreconf -i
+if [ $? -ne 0 ]
+then
+    echo "ERROR on autoreconf command"
+    exit 1
+fi
+
+echo
+echo "*** configure --prefix=$PRODUCT_INSTALL $CONFIGURE_FLAGS" 
+$BUILD_DIR/configure --prefix=$PRODUCT_INSTALL $CONFIGURE_FLAGS
+if [ $? -ne 0 ]
+then
+    echo "ERROR on configure"
+    exit 2
+fi
+echo
+echo "*** make" $MAKE_OPTIONS
+make $MAKE_OPTIONS
+if [ $? -ne 0 ]
+then
+    echo "ERROR on make"
+    exit 3
+fi
+
+echo
+echo "*** make install"
+make install
+if [ $? -ne 0 ]
+then
+    echo "ERROR on make install"
+    exit 4
+fi
+
+make check
+if [ $? -ne 0 ]
+then
+    echo "ERROR on make check"
+    exit 5
+fi
+
+echo
+echo "########## END"
+

diff --git a/products/topo2volmesh.pyconf b/products/topo2volmesh.pyconf
index 7c0f722e27449a87a154ca08a87e2e4ae5ba790a..bf7d098fa4fb6a002b3fa7fc4460d359e8416105 100644 (file)
--- a/products/topo2volmesh.pyconf
+++ b/products/topo2volmesh.pyconf
@@ -7,7 +7,7 @@ default :
     git_info:
     {
         repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/top_ii_mesh.git"
-        repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + /top_ii_mesh.git"
+        repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "top_ii_mesh.git"
     }
     system_info :
     {