[Bio] / FigCommon / bootstrap.pl Repository:
ViewVC logotype

Diff of /FigCommon/bootstrap.pl

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.11, Thu Jun 3 18:25:21 2004 UTC revision 1.16, Mon Oct 18 21:51:53 2004 UTC
# Line 196  Line 196 
196    
197      push(@$Env, ["LD_LIBRARY_PATH", "${env_lib}", 1]);      push(@$Env, ["LD_LIBRARY_PATH", "${env_lib}", 1]);
198    
199      push(@$Env, ["PERL5LIB", join(":", grep({ $_ ne "." } @INC)), 1]);      my @perllib = grep({ $_ ne "." } @INC, "$fig_disk/config", $release_lib,
200                          "$release_lib/FigKernelPackages");
201    
202        push(@$Env, ["PERL5LIB", join(":", @perllib), 1]);
203  }  }
204    
205  sub configure_python  sub configure_python
# Line 284  Line 287 
287      $python = "$ENV{FIGCONFIG_ENV_DIR}/bin/python";      $python = "$ENV{FIGCONFIG_ENV_DIR}/bin/python";
288      if (-x $python)      if (-x $python)
289      {      {
290            #
291            # The mac doesn't seem to like the long #! lines, so we'll use poundbang env.
292            #
293            if ($ENV{FIGCONFIG_ENV} =~ /^mac/)
294            {
295                $OtherConfig->{python_require_poundbang_env} = 1;
296            }
297          return $python;          return $python;
298      }      }
299    
# Line 574  Line 584 
584      # Append the perl path to the environment, for use later with CallPerl.      # Append the perl path to the environment, for use later with CallPerl.
585      #      #
586    
587      my $perlpath = join(":", @INC, "$fig_disk/config");      my $perlpath = join(":", @INC, "$fig_disk/config", $release_lib, "$release_lib/FigKernelPackages");
588      print $fh <<END;      print $fh <<END;
589  if os.getenv("PERL5LIB", "") != "":  if os.getenv("PERL5LIB", "") != "":
590      _delim = ":"      _delim = ":"
# Line 651  Line 661 
661    
662  require FigCommon::SwitchRelease;  require FigCommon::SwitchRelease;
663    
664    #
665    # We need to tweak the current path and PERL5LIB environment to get bootstrapping to
666    # work correctly.
667    #
668    
669    $ENV{PATH} = "$ENV{FIGCONFIG_ENVDIR}/bin:$ENV{PATH}";
670    
671    $ENV{PERL5LIB} = (map { $_->[1] } grep { $_->[0] eq "PERL5LIB"} $@Env)[0];
672    
673  &FigCommon::SwitchRelease::switch_to_release($fig_disk, $ENV{FIGCONFIG_ENV}, $ENV{FIGCONFIG_RELEASE});  &FigCommon::SwitchRelease::switch_to_release($fig_disk, $ENV{FIGCONFIG_ENV}, $ENV{FIGCONFIG_RELEASE});

Legend:
Removed from v.1.11  
changed lines
  Added in v.1.16

MCS Webmaster
ViewVC Help
Powered by ViewVC 1.0.3