[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.3, Tue Dec 23 17:56:32 2003 UTC revision 1.15, Tue Aug 10 16:24:07 2004 UTC
# Line 102  Line 102 
102    
103  our $fig_disk = $ENV{FIG_HOME};  our $fig_disk = $ENV{FIG_HOME};
104  our $env_name = $ENV{FIGCONFIG_ENV};  our $env_name = $ENV{FIGCONFIG_ENV};
105    our $env_dir = "$ENV{FIGCONFIG_ENV_DIR}";
106  our $env_bin = "$ENV{FIGCONFIG_ENV_DIR}/bin";  our $env_bin = "$ENV{FIGCONFIG_ENV_DIR}/bin";
107  our $env_lib = "$ENV{FIGCONFIG_ENV_DIR}/lib";  our $env_lib = "$ENV{FIGCONFIG_ENV_DIR}/lib";
108  #  #
# Line 111  Line 112 
112  #our $release_bin = "$ENV{FIGCONFIG_RELEASE_DIR}/bin/$ENV{FIGCONFIG_ENV}";  #our $release_bin = "$ENV{FIGCONFIG_RELEASE_DIR}/bin/$ENV{FIGCONFIG_ENV}";
113  #our $release_lib = "$ENV{FIGCONFIG_RELEASE_DIR}/lib/$ENV{FIGCONFIG_ENV}";  #our $release_lib = "$ENV{FIGCONFIG_RELEASE_DIR}/lib/$ENV{FIGCONFIG_ENV}";
114    
115  our $release_bin = "$fig_disk/dist/releases/current/bin/$ENV{FIGCONFIG_ENV}";  our $release_bin = "$fig_disk/dist/releases/current/$ENV{FIGCONFIG_ENV}/bin";
116  our $release_lib = "$fig_disk/dist/releases/current/lib/$ENV{FIGCONFIG_ENV}";  our $release_lib = "$fig_disk/dist/releases/current/$ENV{FIGCONFIG_ENV}/lib";
117    
118  our $fig_bin = "$fig_disk/FIG/bin";  our $fig_bin = "$fig_disk/FIG/bin";
119    
# Line 135  Line 136 
136      chomp $hostname;      chomp $hostname;
137    
138      push(@$Config, ["fig_disk", $fig_disk, 1]);      push(@$Config, ["fig_disk", $fig_disk, 1]);
139      push(@$Config, ["blastmast", "$fig_disk/BLASTMAT", 1]);      push(@$Config, ["blastmat", "$fig_disk/BLASTMAT", 1]);
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]);
# Line 145  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
161        # is used by HHTP.pm to write common page start.  It would make the most
162        # sense to derive the above 2 values from these.  -- GJO
163        #
164    
165        push(@$Config, ["temp_base", "$sandbox/FIG-Tmp/", 1]);
166        push(@$Config, ["cgi_base", "$sandbox/FIG/", 1]);
167  }  }
168    
169  sub compute_environment  sub compute_environment
# Line 178  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 213  Line 235 
235    
236  sub find_in_path  sub find_in_path
237  {  {
238      my($file) = @_;      my($file, @extra) = @_;
239      my(@path) = split(":", $ENV{PATH});      my(@path) = split(":", $ENV{PATH});
240    
241      for my $p (@path)      for my $p (@path, @extra)
242      {      {
243          my $x = "$p/$file";          my $x = "$p/$file";
244          if (-x $x)          if (-x $x)
# Line 237  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          if ($python = find_in_path("pythonw"))          #
269            # We'd like to use the MacPython that is installed
270            # as pythonw.
271            #
272            if ($python = find_in_path("pythonw", "/usr/local/bin"))
273          {          {
274                $OtherConfig->{python_require_poundbang_env} = 1;
275              return $python;              return $python;
276          }          }
277    
278          #          #
279          # Didn't find it in the path; we require the          # Otherwise, we can live with the regular python.
280          # MacPython build, and that installs into          # Fall thru to the generic case.
         # /usr/local/bin/pythonw by default.  
281          #          #
   
         return "/usr/local/bin/pythonw";  
282      }      }
     else  
     {  
283          #          #
284          # Non-mac, just look in the env dir or the path.          # Non-mac, just look in the env dir or the path.
285          #          #
# Line 262  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    
300          return find_in_path("python");          return find_in_path("python");
301      }      }
 }  
302    
303  #  #
304  # Find the name of the perl executable we are to use.  # Find the name of the perl executable we are to use.
# Line 305  Line 336 
336  if [ -n "\$$name" ] ; then  if [ -n "\$$name" ] ; then
337      DELIM=:      DELIM=:
338  fi  fi
339  $name=\${$name}\${DELIM}$value  $name=$value\${DELIM}\${$name}
340  export $name  export $name
341  END  END
342          }          }
# Line 333  Line 364 
364    
365              print $fh <<END;              print $fh <<END;
366  if (\$?$name) then  if (\$?$name) then
367      setenv $name \${$name}:$value      setenv $name $value:\${$name}
368  else  else
369      setenv $name $value      setenv $name $value
370  endif  endif
# Line 423  Line 454 
454    
455  }  }
456    
457    sub finalize_server_scripts
458    {
459        #
460        # After any environment-specific stuff, call start_services and stop_services.
461        #
462    
463        open(F, ">>$start_servers") or die "Cannot write $start_servers: $!";
464        print F "\n$fig_bin/start_services\n";
465        close(F);
466        chmod(0775, $start_servers);
467    
468        open(F, ">>$stop_servers") or die "Cannot write $stop_servers: $!";
469        print F "\n$fig_bin/stop_services\n";
470        close(F);
471        chmod(0775, $stop_servers);
472    
473    }
474    
475  sub write_config_pm  sub write_config_pm
476  {  {
477      my($fh, $config) = @_;      my($fh, $config) = @_;
# Line 507  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 515  Line 565 
565    
566      my $python = find_python();      my $python = find_python();
567    
568        if ($OtherConfig->{python_require_poundbang_env})
569        {
570            print $fh "#!/usr/bin/env $python\n";
571        }
572        else
573        {
574      print $fh "#!$python\n";      print $fh "#!$python\n";
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 533  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 548  Line 620 
620  configure_python();  configure_python();
621  configure_environment_specific();  configure_environment_specific();
622    
623    finalize_server_scripts();
624    
625  #  #
626  # Write the shell startup to the figdisk.  # Write the shell startup to the figdisk.
627  #  #

Legend:
Removed from v.1.3  
changed lines
  Added in v.1.15

MCS Webmaster
ViewVC Help
Powered by ViewVC 1.0.3