[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.10, Thu Apr 1 12:59:40 2004 UTC revision 1.18, Mon Nov 1 20:22:16 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]);
148      push(@$Config, ["RC", "$fig_disk/FIG/ResolutionCenter", 1]);      push(@$Config, ["RC", "$fig_disk/FIG/ResolutionCenter", 1]);
149      push(@$Config, ["NR", "$fig_disk/FIG/NR", 1]);      push(@$Config, ["NR", "$fig_disk/FIG/NR", 1]);
150      push(@$Config, ["temp", "$fig_disk/FIG/Tmp", 1]);      push(@$Config, ["temp", "$fig_disk/FIG/Tmp", 1]);
151      push(@$Config, ["temp_url", "http://$hostname/FIG-Tmp", 1]);  
152      push(@$Config, ["cgi_url", "http://$hostname/FIG", 1]);      my $sandbox;
153        if ($ENV{FIGCONFIG_SANDBOX})
154        {
155            $sandbox = "/$ENV{FIGCONFIG_SANDBOX}";
156        }
157    
158        push(@$Config, ["temp_url", "http://$hostname$sandbox/FIG-Tmp", 1]);
159        push(@$Config, ["cgi_url", "http://$hostname$sandbox/FIG", 1]);
160    
161      #      #
162      # Add values for a relative base href of temp and CGI pages.  The latter      # Add values for a relative base href of temp and CGI pages.  The latter
# Line 155  Line 164 
164      # sense to derive the above 2 values from these.  -- GJO      # sense to derive the above 2 values from these.  -- GJO
165      #      #
166    
167      push(@$Config, ["temp_base", "/FIG-Tmp/", 1]);      push(@$Config, ["temp_base", "$sandbox/FIG-Tmp/", 1]);
168      push(@$Config, ["cgi_base", "/FIG/", 1]);      push(@$Config, ["cgi_base", "$sandbox/FIG/", 1]);
169  }  }
170    
171  sub compute_environment  sub compute_environment
# Line 188  Line 197 
197      push(@$Env, ["PATH", join(":", @path), 1]);      push(@$Env, ["PATH", join(":", @path), 1]);
198    
199      push(@$Env, ["LD_LIBRARY_PATH", "${env_lib}", 1]);      push(@$Env, ["LD_LIBRARY_PATH", "${env_lib}", 1]);
200    
201        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 247  Line 261 
261      #      #
262      # Special case for the mac.      # Special case for the mac.
263      #      #
264        # RDO 20040603 - don't do this any more; we want to pick up
265        # the python we ship.
266        #
267    
268      if ($ENV{FIGCONFIG_ENV} eq "mac")      if (0 && $ENV{FIGCONFIG_ENV} eq "mac")
269      {      {
270          #          #
271          # We'd like to use the MacPython that is installed          # We'd like to use the MacPython that is installed
# Line 272  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 534  Line 558 
558    
559      print $fh "use FIG_Config;\n";      print $fh "use FIG_Config;\n";
560      print $fh "\n";      print $fh "\n";
561        print $fh "#### END tool_hdr ####\n\n"
562  }  }
563    
564  sub write_tool_hdr_python  sub write_tool_hdr_python
# Line 552  Line 577 
577      }      }
578      print $fh "\n";      print $fh "\n";
579    
580      print $fh "import sys\n";      print $fh "import sys, os\n";
581    
582    
583      print $fh "sys.path.append('$OtherConfig->{python_site_path}')\n";      print $fh "sys.path.append('$OtherConfig->{python_site_path}')\n";
584    
585        #
586        # Append the perl path to the environment, for use later with CallPerl.
587        #
588    
589        my $perlpath = join(":", @INC, "$fig_disk/config", $release_lib, "$release_lib/FigKernelPackages");
590        print $fh <<END;
591    if os.getenv("PERL5LIB", "") != "":
592        _delim = ":"
593    else:
594        _delim = ""
595    os.environ["PERL5LIB"] = "$perlpath" + _delim + os.getenv("PERL5LIB", "")
596    
597    END
598    
599      print $fh "# Following block is expanded by switch_to_release to add use lib directives\n";      print $fh "# Following block is expanded by switch_to_release to add use lib directives\n";
600      print $fh "# to point at the correct locations in the release directory.\n";      print $fh "# to point at the correct locations in the release directory.\n";
601      print $fh "#BEGIN switch_to_release generated code\n";      print $fh "#BEGIN switch_to_release generated code\n";
# Line 567  Line 606 
606    
607      print $fh "import FIG_Config\n";      print $fh "import FIG_Config\n";
608      print $fh "\n";      print $fh "\n";
609        print $fh "#### END tool_hdr_py ####\n\n"
610  }  }
611    
612  setup_directories("$fig_disk/bin",  setup_directories("$fig_disk/bin",
# Line 581  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 623  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.10  
changed lines
  Added in v.1.18

MCS Webmaster
ViewVC Help
Powered by ViewVC 1.0.3