Changeset 27450 for gs2-extensions/parallel-building/trunk

Timestamp:

2013-05-24T15:33:26+12:00 (11 years ago)

Author:

jmt12

Message:

Moved opt_modulebuild_* functions into a library, and altered the cascade file for Module::Build to use them instead as otherwise I can't seem to get the extension's perl path on the INC

Location:

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

Files:

• DATETIME.sh (modified) (1 diff)
• MODULEBUILD.sh (modified) (3 diffs)

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

@@ -7 +7 @@
 
 source ../cascade-make/lib/cascade-lib.bash GEXTPARALLELBUILDING ../.. $*
-
-# One day these functions should live in their own library
-opt_modulebuild_configure()
-{
-  local force_config=$1; shift
-  local auto_config=$1; shift
-  local package=$1; shift
-  local version=$1; shift
-  local prefix=$1; shift
-  local perlversion=$1; shift
-
-  local buildfile_path="$package$version/Build"
-  if [ -e $buildfile_path ] ; then
-    force_config=0
-  fi
-
-  if [ $force_config = "1" ] ; then
-    echo "[pushd $package$version]"
-    ( cd $package$version ; \
-      perl -I "$prefix/lib/perl/$perlversion" Build.PL --install_base "$prefix" --install_path lib="$prefix/lib/perl/$perlversion" --install_path arch="$prefix/lib/perl/$perlversion" $@)
-    if [ $? != 0 ] ; then
-        echo "      Error encountered running *configure* stage of $progname"
-        exit 1
-    fi
-    echo "[popd]"
-  else
-    if [ $auto_config = "1" ] ; then
-      echo "Found top-level for ${progname%.*} => no need to run perl configure"
-    fi
-  fi
-}
-
-
-opt_modulebuild_make()
-{
-  local type=$1; shift
-  local package=$1; shift
-  local version=$1; shift
-  local opt_target=""
-
-  if [ ! -z "$1" ] ; then
-    opt_target=$1; shift
-  fi
-
-  if [ $type = "1" ] ; then
-    ( cd $package$version ; \
-      ./Build $opt_target $@)
-
-    if [ $? != 0 ] ; then
-        echo "      Error encountered running *Build $target* stage of $progname"
-        exit 1
-    fi
-  fi
-}
+source ../cascade-make/lib/cascade-lib-modulebuild.bash GEXTPARALLELBUILDING $*
 
 prefix=$GEXTPARALLELBUILDING_INSTALLED

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

@@ -7 +7 @@
 
 source ../cascade-make/lib/cascade-lib.bash GEXTPARALLELBUILDING ../.. $*
+source ../cascade-make/lib/cascade-lib-modulebuild.bash GEXTPARALLELBUILDING $*
 
 prefix=$GEXTPARALLELBUILDING_INSTALLED
@@ -12 +13 @@
 
 opt_run_untar $force_untar $auto_untar $package $version
-opt_run_perl_configure $force_config $auto_config $package $version $prefix INSTALLSITEARCH="$prefix/lib/perl/$perlversion" INSTALLSITELIB="$prefix/lib/perl/$perlversion"
+opt_modulebuild_configure $force_config $auto_config $package $version $prefix INSTALLSITEARCH="$prefix/lib/perl/$perlversion" INSTALLSITELIB="$prefix/lib/perl/$perlversion"
 
 # We only compile if necessary, as compilation is quite slow and we don't
@@ -18 +19 @@
 if [[ ! -e "$prefix/lib/perl/$perlversion/Module/Build.pm" ]]
 then
-  opt_run_make $compile   $package $version
+  opt_modulebuild_make $compile   $package $version
   echo "opt_run_make $install $package $version \"install\""
-  opt_run_make $install   $package $version "install"
+  opt_modulebuild_make $install   $package $version "install"
 else
   echo "Module::Build Perl module already compiled => no need to recompile"
 fi
 
-opt_run_make $clean     $package $version "clean"
-opt_run_make $distclean $package $version "distclean"
+opt_modulebuild_make $clean     $package $version "clean"
+opt_modulebuild_make $distclean $package $version "distclean"
 
 opt_run_tarclean $tarclean $package $version