improving common.sh functions performance

diff --git a/config_files/HappyDoc-r2_1.sh b/config_files/HappyDoc-r2_1.sh
index 2fc19ce50df64abf9a8f79ac03659754718536eb..c0bed7c7b049791f313635dc4803c1cd189e4395 100755 (executable)
--- a/config_files/HappyDoc-r2_1.sh
+++ b/config_files/HappyDoc-r2_1.sh
@@ -81,6 +81,7 @@ check_job ${PRODUCT_DIR}/INSTALL.LOG python setup.py install --prefix=${PRODUCT_
 #EOF
 #fi
 
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
 rm -fr ${PRODUCT_WORK}
 print_env
 }

diff --git a/config_files/Numeric-23.7.sh b/config_files/Numeric-23.7.sh
index 1aec479a200c549d0131cf7d59df002686e8aada..d632fa218bf40bb0f93da6ef1acafcdef3f49ef6 100755 (executable)
--- a/config_files/Numeric-23.7.sh
+++ b/config_files/Numeric-23.7.sh
@@ -84,6 +84,7 @@ fi
 
 check_job ${PRODUCT_DIR}/INSTALL.LOG python setup.py install --prefix=${PRODUCT_DIR}
 
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
 rm -fr ${PRODUCT_WORK}
 print_env
 }

diff --git a/config_files/PyQt-3.13.sh b/config_files/PyQt-3.13.sh
index 1080c502a4f01616321510bf68780ed2cdfaaf03..ab9f7fc309cb7c76f27d2157cfb039fdda72d8a2 100755 (executable)
--- a/config_files/PyQt-3.13.sh
+++ b/config_files/PyQt-3.13.sh
@@ -94,6 +94,7 @@ EOF
 check_job ${PRODUCT_DIR}/MAKE.LOG make
 check_job ${PRODUCT_DIR}/INSTALL.LOG make install
 
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
 rm -fr ${PRODUCT_WORK}
 print_env
 }

diff --git a/config_files/SWIG-1.3.24.sh b/config_files/SWIG-1.3.24.sh
index 74ffa6fc18a94cbc81ca5bcfd74667bed032a5b4..566ae77c9d8407dee70c66100ab219644eb45b34 100755 (executable)
--- a/config_files/SWIG-1.3.24.sh
+++ b/config_files/SWIG-1.3.24.sh
@@ -69,6 +69,7 @@ EOF
 check_job ${PRODUCT_DIR}/MAKE.LOG make
 check_job ${PRODUCT_DIR}/INSTALL.LOG make install 
 
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
 rm -fr ${PRODUCT_WORK}
 print_env
 }

diff --git a/config_files/VTK-4.2.6.sh b/config_files/VTK-4.2.6.sh
index 5d62b0e8375ab3965ef7c4908aed85bdf4de02a2..ccc4baa9e8a8224bfca3aad4792a4813656ba778 100755 (executable)
--- a/config_files/VTK-4.2.6.sh
+++ b/config_files/VTK-4.2.6.sh
@@ -142,6 +142,7 @@ rm -fr ${PRODUCT_WORK} ${INSTALL_WORK}/cmake-1.6.6
 cd ${PRODUCT_DIR}/lib/python${python_version}/site-packages/vtk_python
 ln -sf ../../../vtk/*Python*.so .
 
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
 rm -fr ${PRODUCT_WORK}
 print_env
 }

diff --git a/config_files/graphviz-2.2.1.sh b/config_files/graphviz-2.2.1.sh
index a3e75507b562a4aac2f687c7af8c8f7379212488..f4f1a5cdd1f2a553bacfd1c18cd4c03d9a9eba61 100755 (executable)
--- a/config_files/graphviz-2.2.1.sh
+++ b/config_files/graphviz-2.2.1.sh
@@ -65,6 +65,7 @@ EOF
 check_job ${PRODUCT_DIR}/MAKE.LOG make
 check_job ${PRODUCT_DIR}/INSTALL.LOG make install
 
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
 rm -fr ${PRODUCT_WORK}
 print_env
 }

diff --git a/config_files/hdf5-1.6.3.sh b/config_files/hdf5-1.6.3.sh
index cc0fd2ab081c1ff3b182b487508a8b1348dd8c44..bd56c8e8d5dc77cd2ad2d069534033240884879c 100755 (executable)
--- a/config_files/hdf5-1.6.3.sh
+++ b/config_files/hdf5-1.6.3.sh
@@ -76,6 +76,7 @@ EOF
 check_job ${PRODUCT_DIR}/MAKE.LOG make 
 check_job ${PRODUCT_DIR}/INSTALL.LOG make install
 
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
 rm -fr ${PRODUCT_WORK}
 print_env
 }

diff --git a/config_files/med-2.2.2.sh b/config_files/med-2.2.2.sh
index aaf13ee92709424a20fc144cbdbc0859f67e4221..85cf5b736b54970a530ef237255a14cc34e62b43 100755 (executable)
--- a/config_files/med-2.2.2.sh
+++ b/config_files/med-2.2.2.sh
@@ -73,6 +73,7 @@ EOF
 check_job ${PRODUCT_DIR}/MAKE.LOG make
 check_job ${PRODUCT_DIR}/INSTALL.LOG make install
 
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
 rm -fr ${PRODUCT_WORK}
 
 ### modify libmed.la libmedC.la files to correct direct path to hdf5 library

diff --git a/config_files/netgen-4.3.sh b/config_files/netgen-4.3.sh
new file mode 100755 (executable)
index 0000000..2df6bd4
--- /dev/null
+++ b/config_files/netgen-4.3.sh
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+check_version()
+{
+# check existance of netgen
+# unfortunarely we can't find anything about netgen version
+if [ -n "$NETGENROOT" ]; then
+  return 0
+fi
+return 1
+}
+
+print_env()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export NETGENHOME=\${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}"
+}
+
+# looks for the native product and collects it's environment (used by make_env())
+try_native(){
+check_version
+if [ $? -eq 0 ] ; then
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export NETGENHOME=\${NETGENROOT}
+##
+EOF
+    make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+    return 0
+fi
+return 1;
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+return $?
+}
+
+install_source()
+{
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+makedir ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/netgen-4.3.tar.gz -C ${INSTALL_WORK}
+
+export MACHINE=LINUX
+
+for directory in csg general geom2d gprim interface linalg meshing opti stlgeom ; do
+    cd ${PRODUCT_WORK}/libsrc/${directory}
+    check_job ${PRODUCT_DIR}/MAKE.LOG make
+done
+
+mkdir -p ${PRODUCT_DIR}/lib/LINUX
+cp -f ${PRODUCT_WORK}/lib/LINUX/* ${PRODUCT_DIR}/lib/LINUX
+mkdir -p ${PRODUCT_DIR}/include
+cp -f ${PRODUCT_WORK}/libsrc/interface/nglib.h ${PRODUCT_DIR}/include
+
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
+rm -fr ${PRODUCT_WORK}
+print_env
+}
+
+install_binary()
+{
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+check_jb tar xfz ${SOURCE_DIR}/netgen-4.3.tar.gz -C ${INSTALL_ROOT}
+
+print_env
+}
+
+export PROCEDURE=$1;
+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="netgen" ; fi
+export PRODUCT="netgen-4.3"
+export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+source ./common.sh
+$PROCEDURE 

diff --git a/config_files/netgen-4.4.sh b/config_files/netgen-4.4.sh
index 8c7c8043dce05463e262e2926a1d1752bb3d7918..7758e58998d1d667031704667293c6aa69ab3bde 100755 (executable)
--- a/config_files/netgen-4.4.sh
+++ b/config_files/netgen-4.4.sh
@@ -62,6 +62,7 @@ cp -f ${PRODUCT_WORK}/lib/LINUX/* ${PRODUCT_DIR}/lib/LINUX
 mkdir -p ${PRODUCT_DIR}/include
 cp -f ${PRODUCT_WORK}/libsrc/interface/nglib.h ${PRODUCT_DIR}/include
 
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
 rm -fr ${PRODUCT_WORK}
 print_env
 }

diff --git a/config_files/netgen4.3.sh b/config_files/netgen4.3.sh
deleted file mode 100755 (executable)
index 9387512..0000000
--- a/config_files/netgen4.3.sh
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/sh
-
-check_version()
-{
-# check existance of netgen
-# unfortunarely we can't find anything about netgen version
-if [ -n "$NETGENROOT" ]; then
-  return 0
-fi
-return 1
-}
-
-print_env()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export NETGENHOME=\${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}"
-}
-
-# looks for the native product and collects it's environment (used by make_env())
-try_native(){
-check_version
-if [ $? -eq 0 ] ; then
-    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export NETGENHOME=\${NETGENROOT}
-##
-EOF
-    make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
-    return 0
-fi
-return 1;
-}
-
-try_preinstalled(){
-try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
-return $?
-}
-
-install_source()
-{
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
-source ${INSTALL_WORK}/$SHRC
-
-makedir ${PRODUCT_DIR}
-
-check_jb tar xfz ${SOURCE_DIR}/netgen4.3.tar.gz -C ${INSTALL_WORK}
-
-export MACHINE=LINUX
-
-for directory in csg general geom2d gprim interface linalg meshing opti stlgeom ; do
-    cd ${PRODUCT_WORK}/libsrc/${directory}
-    check_job ${PRODUCT_DIR}/MAKE.LOG make
-done
-
-mkdir -p ${PRODUCT_DIR}/lib/LINUX
-cp -f ${PRODUCT_WORK}/lib/LINUX/* ${PRODUCT_DIR}/lib/LINUX
-mkdir -p ${PRODUCT_DIR}/include
-cp -f ${PRODUCT_WORK}/libsrc/interface/nglib.h ${PRODUCT_DIR}/include
-
-rm -fr ${PRODUCT_WORK}
-print_env
-}
-
-install_binary()
-{
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
-source ${INSTALL_WORK}/$SHRC
-
-check_jb tar xfz ${SOURCE_DIR}/netgen4.3.tar.gz -C ${INSTALL_ROOT}
-
-print_env
-}
-
-export PROCEDURE=$1;
-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="netgen" ; fi
-export PRODUCT="netgen4.3"
-export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
-export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
-source ./common.sh
-$PROCEDURE 

diff --git a/config_files/omniORB-4.0.5.sh b/config_files/omniORB-4.0.5.sh
index a1b4a01b80194c916443e2d1a26754392382cd81..e5f02233bb5e1a6e50f78842b2bebfdb80f4d8e4 100755 (executable)
--- a/config_files/omniORB-4.0.5.sh
+++ b/config_files/omniORB-4.0.5.sh
@@ -131,6 +131,7 @@ EOF
 check_job ${PRODUCT_DIR}/MAKE_OMNINOTIFY.LOG make
 check_job ${PRODUCT_DIR}/INSTALL_OMNINOTIFY.LOG make install
 
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
 rm -fr ${PRODUCT_WORK}
 print_env
 }

diff --git a/config_files/qwt-4.2.0.sh b/config_files/qwt-4.2.0.sh
index 11dd7cd1472ba9da4ffd422f44a0e3aa22678db1..6ceebaf323ba6a0368438ce7789883447c378371 100755 (executable)
--- a/config_files/qwt-4.2.0.sh
+++ b/config_files/qwt-4.2.0.sh
@@ -66,6 +66,7 @@ EOF
 check_job ${PRODUCT_DIR}/MAKE.LOG make 
 cp -rf include lib ${PRODUCT_DIR}
 
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
 rm -rf ${PRODUCT_WORK}
 
 print_env

diff --git a/config_files/sip-4.1.sh b/config_files/sip-4.1.sh
index ef074b9b904493340944a7c7c423128d6231ac08..4d07206f4659ee751e4c3f1926770287b5b7ca88 100755 (executable)
--- a/config_files/sip-4.1.sh
+++ b/config_files/sip-4.1.sh
@@ -82,6 +82,7 @@ EOF
 check_job ${PRODUCT_DIR}/MAKE.LOG make
 check_job ${PRODUCT_DIR}/INSTALL.LOG make install
 
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
 rm -fr ${PRODUCT_WORK}
 print_env
 }