Changeset 27303 for main/trunk/greenstone2/perllib/IncrementalBuildUtils.pm

Timestamp:

2013-05-06T15:23:45+12:00 (11 years ago)

Author:

jmt12

Message:

Replacing hardcoded additions to INC and PATH environment variables with conditional ones - this allows us to use the order of values in these variables for precedence, thus allows better support for extensions that override classifiers, plugins etc. ENV and PATH functions already exists in util, but augmentINC() is a new function

File:

• main/trunk/greenstone2/perllib/IncrementalBuildUtils.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/IncrementalBuildUtils.pm

@@ -42 +42 @@
     die "GSDLHOME not set\n" unless defined $ENV{'GSDLHOME'};
     die "GSDLOS not set\n" unless defined $ENV{'GSDLOS'};
-    unshift (@INC, "$ENV{'GSDLHOME'}/perllib");
-    unshift (@INC, "$ENV{'GSDLHOME'}/perllib/cpan");
-    unshift (@INC, "$ENV{'GSDLHOME'}/perllib/plugins");
-    unshift (@INC, "$ENV{'GSDLHOME'}/perllib/classify");
+
+    # - ensure we only add perllib paths to INC if they weren't already there
+    # as otherwise we lose the ability to use order in INC as a guide for
+    # inheritence/overriding [jmt12]
+    my $gsdl_perllib_path = $ENV{'GSDLHOME'} . '/perllib';
+    my $found_path = 0;
+    foreach my $inc_path (@INC)
+    {
+      if ($inc_path eq $gsdl_perllib_path)
+      {
+        $found_path = 1;
+        last;
+      }
+    }
+    if (!$found_path)
+    {
+      unshift (@INC, $gsdl_perllib_path);
+      unshift (@INC, $gsdl_perllib_path . '/cpan');
+      unshift (@INC, $gsdl_perllib_path . '/plugins');
+      unshift (@INC, $gsdl_perllib_path . '/classify');
+    }
 }
 
@@ -65 +82 @@
   $path_separator = ";";
 }
-$ENV{'PATH'} = &util::filename_cat($ENV{'GSDLHOME'}, "bin", $ENV{'GSDLOS'}) . $path_separator . &util::filename_cat($ENV{'GSDLHOME'}, "bin", "script") . $path_separator.$ENV{'PATH'};
+# - once again we need to ensure we aren't duplicating paths on the environment
+# otherwise things like extension executables won't be correctly used in
+# preference to main Greenstone ones [jmt12]
+my @env_path = split($path_separator, $ENV{'PATH'});
+my $os_binary_path = &util::filename_cat($ENV{'GSDLHOME'}, 'bin', $ENV{'GSDLOS'});
+my $script_path = &util::filename_cat($ENV{'GSDLHOME'}, 'bin', 'script');
+my $found_os_bin = 0;
+foreach my $path (@env_path)
+{
+  if ($path eq $os_binary_path)
+  {
+    $found_os_bin = 1;
+    last;
+  }
+}
+if (!$found_os_bin)
+{
+  $ENV{'PATH'} = $os_binary_path . $path_separator . $script_path . $path_separator . $ENV{'PATH'};
+}
+
 
 # /**