[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.11, Thu Jun 3 18:25:21 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        push(@$Env, ["PERL5LIB", join(":", grep({ $_ ne "." } @INC)), 1]);
200  }  }
201    
202  sub configure_python  sub configure_python
# Line 247  Line 256 
256      #      #
257      # Special case for the mac.      # Special case for the mac.
258      #      #
259        # RDO 20040603 - don't do this any more; we want to pick up
260        # the python we ship.
261        #
262    
263      if ($ENV{FIGCONFIG_ENV} eq "mac")      if (0 && $ENV{FIGCONFIG_ENV} eq "mac")
264      {      {
265          #          #
266          # We'd like to use the MacPython that is installed          # We'd like to use the MacPython that is installed
# Line 534  Line 546 
546    
547      print $fh "use FIG_Config;\n";      print $fh "use FIG_Config;\n";
548      print $fh "\n";      print $fh "\n";
549        print $fh "#### END tool_hdr ####\n\n"
550  }  }
551    
552  sub write_tool_hdr_python  sub write_tool_hdr_python
# Line 552  Line 565 
565      }      }
566      print $fh "\n";      print $fh "\n";
567    
568      print $fh "import sys\n";      print $fh "import sys, os\n";
569    
570    
571      print $fh "sys.path.append('$OtherConfig->{python_site_path}')\n";      print $fh "sys.path.append('$OtherConfig->{python_site_path}')\n";
572    
573        #
574        # Append the perl path to the environment, for use later with CallPerl.
575        #
576    
577        my $perlpath = join(":", @INC, "$fig_disk/config");
578        print $fh <<END;
579    if os.getenv("PERL5LIB", "") != "":
580        _delim = ":"
581    else:
582        _delim = ""
583    os.environ["PERL5LIB"] = "$perlpath" + _delim + os.getenv("PERL5LIB", "")
584    
585    END
586    
587      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";
588      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";
589      print $fh "#BEGIN switch_to_release generated code\n";      print $fh "#BEGIN switch_to_release generated code\n";
# Line 567  Line 594 
594    
595      print $fh "import FIG_Config\n";      print $fh "import FIG_Config\n";
596      print $fh "\n";      print $fh "\n";
597        print $fh "#### END tool_hdr_py ####\n\n"
598  }  }
599    
600  setup_directories("$fig_disk/bin",  setup_directories("$fig_disk/bin",

Legend:
Removed from v.1.10  
changed lines
  Added in v.1.11

MCS Webmaster
ViewVC Help
Powered by ViewVC 1.0.3