Changeset 30306 for gs2-extensions/parallel-building/trunk/src/bin/script/GDBMServer.pl

Timestamp:

2015-10-12T11:24:21+13:00 (9 years ago)

Author:

jmt12

Message:

Making the setup of CPAN path more robust based on the better control I now have over where CPAN packages are installed (in the OS-specific install directory)

File:

• gs2-extensions/parallel-building/trunk/src/bin/script/GDBMServer.pl (modified) (1 diff)

gs2-extensions/parallel-building/trunk/src/bin/script/GDBMServer.pl

@@ -19 +19 @@
   unshift (@INC, "$ENV{'GSDLHOME'}/perllib/classify");
 
+  my $ext_prefix;
+  my @extensions;
   if (defined $ENV{'GSDLEXTS'})
   {
-    my @extensions = split(/:/,$ENV{'GSDLEXTS'});
-    foreach my $e (@extensions)
-    {
-      my $ext_prefix = "$ENV{'GSDLHOME'}/ext/$e";
-      unshift (@INC, "$ext_prefix/perllib");
-      unshift (@INC, "$ext_prefix/perllib/cpan");
-      unshift (@INC, "$ext_prefix/perllib/plugins");
-      unshift (@INC, "$ext_prefix/perllib/classify");
-    }
-  }
-  if (defined $ENV{'GSDL3EXTS'})
-  {
-    my @extensions = split(/:/,$ENV{'GSDL3EXTS'});
-    foreach my $e (@extensions)
-    {
-      my $ext_prefix = "$ENV{'GSDL3SRCHOME'}/ext/$e";
-      unshift (@INC, "$ext_prefix/perllib");
-      unshift (@INC, "$ext_prefix/perllib/cpan");
-      unshift (@INC, "$ext_prefix/perllib/plugins");
-      unshift (@INC, "$ext_prefix/perllib/classify");
-    }
-  }
-
-  # Manually installed CPAN package in GEXT*INSTALL
-  unshift (@INC, $ENV{'GEXTPARALLELBUILDING_INSTALLED'} . "/share/perl5");
+      $ext_prefix = $ENV{'GSDLHOME'};
+      @extensions = split(/:/, $ENV{'GSDLEXTS'});
+  }
+  elsif (defined $ENV{'GSDL3EXTS'})
+  {
+      $ext_prefix = $ENV{'GSDL3SRCHOME'};
+      @extensions = split(/:/, $ENV{'GSDL3EXTS'});
+  }
+  foreach my $e (@extensions)
+  {
+      my $perllib_path = $ext_prefix . '/ext/' . $e . '/perllib';
+      unshift (@INC, $perllib_path);
+      unshift (@INC, $perllib_path . '/cpan');
+      unshift (@INC, $perllib_path . '/plugins');
+      unshift (@INC, $perllib_path . '/plugouts');
+      unshift (@INC, $perllib_path . '/classify');
+  }
+
+  # Installed CPAN packages for GEXT*INSTALL
+  my $perl_version = `perl-version.pl`;
+  my $perl_path = sprintf("%s/lib/perl/%s", $ENV{'GEXTPARALLELBUILDING_INSTALLED'}, $perl_version);
+  ###rint STDERR "[DEBUG] CPAN Path: $perl_path\n";
+  unshift (@INC, $perl_path);
 }