[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.20, Tue Jan 25 20:47:00 2005 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 336  Line 348 
348              print $fh "export $name\n";              print $fh "export $name\n";
349          }          }
350      }      }
351        print $fh "alias rtpath='source \$RTDIST/releases/\$RTCURRENT/ReleaseTools/RTPath.sh'\n";
352  }  }
353    
354  sub write_csh_init  sub write_csh_init
# Line 366  Line 379 
379          }          }
380      }      }
381    
382        #
383        # Alias for RT stuff.
384        #
385        print $fh "alias rtpath 'source \$RTDIST/releases/\$RTCURRENT/ReleaseTools/RTPath.csh'\n";
386  }  }
387    
388  sub run_script  sub run_script
# Line 574  Line 591 
591      # Append the perl path to the environment, for use later with CallPerl.      # Append the perl path to the environment, for use later with CallPerl.
592      #      #
593    
594      my $perlpath = join(":", @INC, "$fig_disk/config");      my $perlpath = join(":", @INC, "$fig_disk/config", $release_lib, "$release_lib/FigKernelPackages");
595      print $fh <<END;      print $fh <<END;
596  if os.getenv("PERL5LIB", "") != "":  if os.getenv("PERL5LIB", "") != "":
597      _delim = ":"      _delim = ":"
# Line 609  Line 626 
626  configure_std_fig_environment();  configure_std_fig_environment();
627  configure_python();  configure_python();
628  configure_environment_specific();  configure_environment_specific();
629    # configure_database();
630    
631  finalize_server_scripts();  finalize_server_scripts();
632    
# Line 651  Line 669 
669    
670  require FigCommon::SwitchRelease;  require FigCommon::SwitchRelease;
671    
672    #
673    # We need to tweak the current path and PERL5LIB environment to get bootstrapping to
674    # work correctly.
675    #
676    
677    $ENV{PATH} = "$ENV{FIGCONFIG_ENVDIR}/bin:$ENV{PATH}";
678    
679    $ENV{PERL5LIB} = (map { $_->[1] } grep { $_->[0] eq "PERL5LIB"} @$Env)[0];
680    
681  &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.20

MCS Webmaster
ViewVC Help
Powered by ViewVC 1.0.3