[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.16, Mon Oct 18 21:51:53 2004 UTC
# Line 146  Line 146 
146      push(@$Config, ["RC", "$fig_disk/FIG/ResolutionCenter", 1]);      push(@$Config, ["RC", "$fig_disk/FIG/ResolutionCenter", 1]);
147      push(@$Config, ["NR", "$fig_disk/FIG/NR", 1]);      push(@$Config, ["NR", "$fig_disk/FIG/NR", 1]);
148      push(@$Config, ["temp", "$fig_disk/FIG/Tmp", 1]);      push(@$Config, ["temp", "$fig_disk/FIG/Tmp", 1]);
149      push(@$Config, ["temp_url", "http://$hostname/FIG-Tmp", 1]);  
150      push(@$Config, ["cgi_url", "http://$hostname/FIG", 1]);      my $sandbox;
151        if ($ENV{FIGCONFIG_SANDBOX})
152        {
153            $sandbox = "/$ENV{FIGCONFIG_SANDBOX}";
154        }
155    
156        push(@$Config, ["temp_url", "http://$hostname$sandbox/FIG-Tmp", 1]);
157        push(@$Config, ["cgi_url", "http://$hostname$sandbox/FIG", 1]);
158    
159      #      #
160      # 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 162 
162      # sense to derive the above 2 values from these.  -- GJO      # sense to derive the above 2 values from these.  -- GJO
163      #      #
164    
165      push(@$Config, ["temp_base", "/FIG-Tmp/", 1]);      push(@$Config, ["temp_base", "$sandbox/FIG-Tmp/", 1]);
166      push(@$Config, ["cgi_base", "/FIG/", 1]);      push(@$Config, ["cgi_base", "$sandbox/FIG/", 1]);
167  }  }
168    
169  sub compute_environment  sub compute_environment
# Line 188  Line 195 
195      push(@$Env, ["PATH", join(":", @path), 1]);      push(@$Env, ["PATH", join(":", @path), 1]);
196    
197      push(@$Env, ["LD_LIBRARY_PATH", "${env_lib}", 1]);      push(@$Env, ["LD_LIBRARY_PATH", "${env_lib}", 1]);
198    
199        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 247  Line 259 
259      #      #
260      # Special case for the mac.      # Special case for the mac.
261      #      #
262        # RDO 20040603 - don't do this any more; we want to pick up
263        # the python we ship.
264        #
265    
266      if ($ENV{FIGCONFIG_ENV} eq "mac")      if (0 && $ENV{FIGCONFIG_ENV} eq "mac")
267      {      {
268          #          #
269          # We'd like to use the MacPython that is installed          # We'd like to use the MacPython that is installed
# Line 272  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 534  Line 556 
556    
557      print $fh "use FIG_Config;\n";      print $fh "use FIG_Config;\n";
558      print $fh "\n";      print $fh "\n";
559        print $fh "#### END tool_hdr ####\n\n"
560  }  }
561    
562  sub write_tool_hdr_python  sub write_tool_hdr_python
# Line 552  Line 575 
575      }      }
576      print $fh "\n";      print $fh "\n";
577    
578      print $fh "import sys\n";      print $fh "import sys, os\n";
579    
580    
581      print $fh "sys.path.append('$OtherConfig->{python_site_path}')\n";      print $fh "sys.path.append('$OtherConfig->{python_site_path}')\n";
582    
583        #
584        # Append the perl path to the environment, for use later with CallPerl.
585        #
586    
587        my $perlpath = join(":", @INC, "$fig_disk/config", $release_lib, "$release_lib/FigKernelPackages");
588        print $fh <<END;
589    if os.getenv("PERL5LIB", "") != "":
590        _delim = ":"
591    else:
592        _delim = ""
593    os.environ["PERL5LIB"] = "$perlpath" + _delim + os.getenv("PERL5LIB", "")
594    
595    END
596    
597      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";
598      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";
599      print $fh "#BEGIN switch_to_release generated code\n";      print $fh "#BEGIN switch_to_release generated code\n";
# Line 567  Line 604 
604    
605      print $fh "import FIG_Config\n";      print $fh "import FIG_Config\n";
606      print $fh "\n";      print $fh "\n";
607        print $fh "#### END tool_hdr_py ####\n\n"
608  }  }
609    
610  setup_directories("$fig_disk/bin",  setup_directories("$fig_disk/bin",
# Line 623  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.10  
changed lines
  Added in v.1.16

MCS Webmaster
ViewVC Help
Powered by ViewVC 1.0.3