Changeset 27405 for gs2-extensions/parallel-building

Timestamp:

2013-05-23T13:48:10+12:00 (11 years ago)

Author:

jmt12

Message:

Now that I can get the Perl version, make the cascade make script smart enough to look up the appropriate location for conditional installs (don't install if already installed)

Location:

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

Files:

• IPCRUN.sh (modified) (1 diff)
• PROCDAEMON.sh (modified) (1 diff)
• SORTKEY.sh (modified) (1 diff)

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

@@ -9 +9 @@
 
 prefix=$GEXTPARALLELBUILDING_INSTALLED
+perlversion=$(perl-version.pl)
 
 opt_run_untar $force_untar $auto_untar $package $version
-opt_run_perl_configure $force_config $auto_config $package $version $prefix
+opt_run_perl_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
 # edit these source files
-if [[ ! -e "$GEXTPARALLELBUILDING_INSTALLED/share/perl/5.12.4/IPC/Run.pm" ]]
+if [[ ! -e "$prefix/lib/perl/$perlversion/IPC/Run.pm" ]]
 then
   opt_run_make $compile   $package $version

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

@@ -9 +9 @@
 
 prefix=$GEXTPARALLELBUILDING_INSTALLED
+perlversion=$(perl-version.pl)
 
 opt_run_untar $force_untar $auto_untar $package $version
-opt_run_perl_configure $force_config $auto_config $package $version $prefix
+opt_run_perl_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
 # edit these source files
-if [[ ! -e "$GEXTPARALLELBUILDING_INSTALLED/share/perl/5.12.4/Proc/Daemon.pm" ]]
+if [[ ! -e "$prefix/lib/perl/$perlversion/Proc/Daemon.pm" ]]
 then
   opt_run_make $compile   $package $version

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

@@ -12 +12 @@
 
 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"
+opt_run_perl_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
 # edit these source files
-if [[ ! -e "$GEXTPARALLELBUILDING_INSTALLED/lib/perl/$perlversion/Sort/Key.pm" ]]
+if [[ ! -e "$prefix/lib/perl/$perlversion/Sort/Key.pm" ]]
 then
   opt_run_make $compile   $package $version