Changeset 24837

Timestamp:

2011-12-01T12:20:26+13:00 (12 years ago)

Author:

jmt12

Message:

Make (rather time-consuming) compilation of these libraries conditional on their compiled libraries not already existing

Location:

gs2-extensions/parallel-building/trunk/src/packages/CASCADE-MAKE

Files:

• OPENMPI.sh (modified) (1 diff)
• TINYXML.sh (modified) (2 diffs)

gs2-extensions/parallel-building/trunk/src/packages/CASCADE-MAKE/OPENMPI.sh

@@ -10 +10 @@
 prefix=$GEXTPARALLELBUILDING_INSTALLED
 
+opt_run_untar $force_untar $auto_untar $package $version
+opt_run_configure $force_config $auto_config $package $version $prefix
+
+# We only compile if necessary, as compilation is quite slow and we don't
+# edit these source files
 if [[ ! -e "$GEXTPARALLELBUILDING_INSTALLED/lib/libmpi.so.0.0.2" || ! -e "$GEXTPARALLELBUILDING_INSTALLED/bin/opal_wrapper" || ! -e "$GEXTPARALLELBUILDING_INSTALLED/bin/orterun" ]]
   then
-    opt_run_untar $force_untar $auto_untar $package $version
-    opt_run_configure $force_config $auto_config $package $version $prefix
-
     opt_run_make $compile   $package $version
-    opt_run_make $install   $package $version "install"
-    opt_run_make $clean     $package $version "clean"
-    opt_run_make $distclean $package $version "distclean"
-
-    opt_run_tarclean $tarclean $package $version
   else
     echo "Open MPI library and binaries already compiled => no need to recompile"
 fi
+
+opt_run_make $install   $package $version "install"
+opt_run_make $clean     $package $version "clean"
+opt_run_make $distclean $package $version "distclean"
+
+opt_run_tarclean $tarclean $package $version
 
 

gs2-extensions/parallel-building/trunk/src/packages/CASCADE-MAKE/TINYXML.sh

@@ -10 +10 @@
 prefix=$GEXTPARALLELBUILDING_INSTALLED
 
+opt_run_untar $force_untar $auto_untar $package $version
+opt_run_configure $force_config $auto_config $package $version $prefix
+
+# Only compile if necessary - we don't edit these source files.
 if [ ! -e "$GEXTPARALLELBUILDING_INSTALLED/lib/libtinyxml.a" ]
   then
-    opt_run_untar $force_untar $auto_untar $package $version
-    opt_run_configure $force_config $auto_config $package $version $prefix
-
     opt_run_make $compile   $package $version
-    opt_run_make $install   $package $version "install"
-    opt_run_make $clean     $package $version "clean"
-    opt_run_make $distclean $package $version "distclean"
-
-    opt_run_tarclean $tarclean $package $version
   else
     echo "TinyXML library already compiled => no need to recompile"
 fi
+
+opt_run_make $install   $package $version "install"
+opt_run_make $clean     $package $version "clean"
+opt_run_make $distclean $package $version "distclean"
+
+opt_run_tarclean $tarclean $package $version
 
 
@@ -29 +31 @@
 
 
-