[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.19, Mon Nov 1 20:26:12 2004 UTC
# Line 140  Line 140 
140      push(@$Config, ["fig", $fig, 1]);      push(@$Config, ["fig", $fig, 1]);
141      push(@$Config, ["bin", $fig_bin, 1]);      push(@$Config, ["bin", $fig_bin, 1]);
142      push(@$Config, ["ext_bin", $env_bin, 1]);      push(@$Config, ["ext_bin", $env_bin, 1]);
143        push(@$Config, ["common_runtime", $env_dir, 1]);
144        push(@$Config, ["arch", $ENV{FIGCONFIG_ENV}, 1]);
145      push(@$Config, ["data", $data, 1]);      push(@$Config, ["data", $data, 1]);
146      push(@$Config, ["global", "$data/Global", 1]);      push(@$Config, ["global", "$data/Global", 1]);
147      push(@$Config, ["organisms", "$data/Organisms", 1]);      push(@$Config, ["organisms", "$data/Organisms", 1]);
# Line 196  Line 198 
198    
199      push(@$Env, ["LD_LIBRARY_PATH", "${env_lib}", 1]);      push(@$Env, ["LD_LIBRARY_PATH", "${env_lib}", 1]);
200    
201      push(@$Env, ["PERL5LIB", join(":", grep({ $_ ne "." } @INC)), 1]);      my @perllib = grep({ $_ ne "." } @INC, "$fig_disk/config", $release_lib,
202                          "$release_lib/FigKernelPackages");
203    
204        push(@$Env, ["PERL5LIB", join(":", @perllib), 1]);
205  }  }
206    
207  sub configure_python  sub configure_python
# Line 284  Line 289 
289      $python = "$ENV{FIGCONFIG_ENV_DIR}/bin/python";      $python = "$ENV{FIGCONFIG_ENV_DIR}/bin/python";
290      if (-x $python)      if (-x $python)
291      {      {
292            #
293            # The mac doesn't seem to like the long #! lines, so we'll use poundbang env.
294            #
295            if ($ENV{FIGCONFIG_ENV} =~ /^mac/)
296            {
297                $OtherConfig->{python_require_poundbang_env} = 1;
298            }
299          return $python;          return $python;
300      }      }
301    
# Line 574  Line 586 
586      # Append the perl path to the environment, for use later with CallPerl.      # Append the perl path to the environment, for use later with CallPerl.
587      #      #
588    
589      my $perlpath = join(":", @INC, "$fig_disk/config");      my $perlpath = join(":", @INC, "$fig_disk/config", $release_lib, "$release_lib/FigKernelPackages");
590      print $fh <<END;      print $fh <<END;
591  if os.getenv("PERL5LIB", "") != "":  if os.getenv("PERL5LIB", "") != "":
592      _delim = ":"      _delim = ":"
# Line 609  Line 621 
621  configure_std_fig_environment();  configure_std_fig_environment();
622  configure_python();  configure_python();
623  configure_environment_specific();  configure_environment_specific();
624    # configure_database();
625    
626  finalize_server_scripts();  finalize_server_scripts();
627    
# Line 651  Line 664 
664    
665  require FigCommon::SwitchRelease;  require FigCommon::SwitchRelease;
666    
667    #
668    # We need to tweak the current path and PERL5LIB environment to get bootstrapping to
669    # work correctly.
670    #
671    
672    $ENV{PATH} = "$ENV{FIGCONFIG_ENVDIR}/bin:$ENV{PATH}";
673    
674    $ENV{PERL5LIB} = (map { $_->[1] } grep { $_->[0] eq "PERL5LIB"} @$Env)[0];
675    
676  &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.19

MCS Webmaster
ViewVC Help
Powered by ViewVC 1.0.3