[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.13, Thu Jun 3 19:45:57 2004 UTC revision 1.21, Mon Mar 7 17:23:31 2005 UTC
# Line 131  Line 131 
131    
132      my $fig = "$fig_disk/FIG";      my $fig = "$fig_disk/FIG";
133      my $data = "$fig/Data";      my $data = "$fig/Data";
134        my $sproutData = "$fig/SproutData";
135    
136      my $hostname = `hostname`;      my $hostname = `hostname`;
137      chomp $hostname;      chomp $hostname;
# Line 140  Line 141 
141      push(@$Config, ["fig", $fig, 1]);      push(@$Config, ["fig", $fig, 1]);
142      push(@$Config, ["bin", $fig_bin, 1]);      push(@$Config, ["bin", $fig_bin, 1]);
143      push(@$Config, ["ext_bin", $env_bin, 1]);      push(@$Config, ["ext_bin", $env_bin, 1]);
144        push(@$Config, ["common_runtime", $env_dir, 1]);
145        push(@$Config, ["arch", $ENV{FIGCONFIG_ENV}, 1]);
146      push(@$Config, ["data", $data, 1]);      push(@$Config, ["data", $data, 1]);
147      push(@$Config, ["global", "$data/Global", 1]);      push(@$Config, ["global", "$data/Global", 1]);
148      push(@$Config, ["organisms", "$data/Organisms", 1]);      push(@$Config, ["organisms", "$data/Organisms", 1]);
149      push(@$Config, ["RC", "$fig_disk/FIG/ResolutionCenter", 1]);      push(@$Config, ["RC", "$fig_disk/FIG/ResolutionCenter", 1]);
150      push(@$Config, ["NR", "$fig_disk/FIG/NR", 1]);      push(@$Config, ["NR", "$fig_disk/FIG/NR", 1]);
151      push(@$Config, ["temp", "$fig_disk/FIG/Tmp", 1]);      push(@$Config, ["temp", "$fig_disk/FIG/Tmp", 1]);
152        push(@$Config, ["sproutData", $sproutData, 1]);
153    
154      my $sandbox;      my $sandbox;
155      if ($ENV{FIGCONFIG_SANDBOX})      if ($ENV{FIGCONFIG_SANDBOX})
# Line 196  Line 200 
200    
201      push(@$Env, ["LD_LIBRARY_PATH", "${env_lib}", 1]);      push(@$Env, ["LD_LIBRARY_PATH", "${env_lib}", 1]);
202    
203      my @perllib = grep({ $_ ne "." } @INC, "$fig_disk/config", $release_lib);      my @perllib = grep({ $_ ne "." } @INC, "$fig_disk/config", $release_lib,
204                          "$release_lib/FigKernelPackages");
205    
206      push(@$Env, ["PERL5LIB", join(":", @perllib), 1]);      push(@$Env, ["PERL5LIB", join(":", @perllib), 1]);
207  }  }
# Line 289  Line 294 
294          #          #
295          # The mac doesn't seem to like the long #! lines, so we'll use poundbang env.          # The mac doesn't seem to like the long #! lines, so we'll use poundbang env.
296          #          #
297          if ($ENV{FIGCONFIG_ENV} eq "mac")          if ($ENV{FIGCONFIG_ENV} =~ /^mac/)
298          {          {
299              $OtherConfig->{python_require_poundbang_env} = 1;              $OtherConfig->{python_require_poundbang_env} = 1;
300          }          }
# Line 345  Line 350 
350              print $fh "export $name\n";              print $fh "export $name\n";
351          }          }
352      }      }
353        print $fh "alias rtpath='source \$RTDIST/releases/\$RTCURRENT/ReleaseTools/RTPath.sh'\n";
354  }  }
355    
356  sub write_csh_init  sub write_csh_init
# Line 375  Line 381 
381          }          }
382      }      }
383    
384        #
385        # Alias for RT stuff.
386        #
387        print $fh "alias rtpath 'source \$RTDIST/releases/\$RTCURRENT/ReleaseTools/RTPath.csh'\n";
388  }  }
389    
390  sub run_script  sub run_script
# Line 583  Line 593 
593      # Append the perl path to the environment, for use later with CallPerl.      # Append the perl path to the environment, for use later with CallPerl.
594      #      #
595    
596      my $perlpath = join(":", @INC, "$fig_disk/config", $release_lib);      my $perlpath = join(":", @INC, "$fig_disk/config", $release_lib, "$release_lib/FigKernelPackages");
597      print $fh <<END;      print $fh <<END;
598  if os.getenv("PERL5LIB", "") != "":  if os.getenv("PERL5LIB", "") != "":
599      _delim = ":"      _delim = ":"
# Line 618  Line 628 
628  configure_std_fig_environment();  configure_std_fig_environment();
629  configure_python();  configure_python();
630  configure_environment_specific();  configure_environment_specific();
631    # configure_database();
632    
633  finalize_server_scripts();  finalize_server_scripts();
634    
# Line 660  Line 671 
671    
672  require FigCommon::SwitchRelease;  require FigCommon::SwitchRelease;
673    
674    #
675    # We need to tweak the current path and PERL5LIB environment to get bootstrapping to
676    # work correctly.
677    #
678    
679    $ENV{PATH} = "$ENV{FIGCONFIG_ENVDIR}/bin:$ENV{PATH}";
680    
681    $ENV{PERL5LIB} = (map { $_->[1] } grep { $_->[0] eq "PERL5LIB"} @$Env)[0];
682    
683  &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.13  
changed lines
  Added in v.1.21

MCS Webmaster
ViewVC Help
Powered by ViewVC 1.0.3