[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.6, Sun Jan 11 20:09:10 2004 UTC revision 1.7, Thu Feb 12 17:04:53 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 240  Line 241 
241    
242      if ($ENV{FIGCONFIG_ENV} eq "mac")      if ($ENV{FIGCONFIG_ENV} eq "mac")
243      {      {
244          if ($python = find_in_path("pythonw"))          #
245            # We'd like to use the MacPython that is installed
246            # as pythonw.
247            #
248            if ($python = find_in_path("pythonw", "/usr/local/bin"))
249          {          {
250                $OtherConfig->{python_require_poundbang_env} = 1;
251              return $python;              return $python;
252          }          }
253    
254          #          #
255          # Didn't find it in the path; we require the          # Otherwise, we can live with the regular python.
256          # MacPython build, and that installs into          # Fall thru to the generic case.
         # /usr/local/bin/pythonw by default.  
         #  
   
         #  
         # Sigh. This requires #!/usr/bin/env to work properly  
257          #          #
         $OtherConfig->{python_require_poundbang_env} = 1;  
         return "/usr/local/bin/pythonw";  
258      }      }
     else  
     {  
259          #          #
260          # Non-mac, just look in the env dir or the path.          # Non-mac, just look in the env dir or the path.
261          #          #
# Line 271  Line 268 
268    
269          return find_in_path("python");          return find_in_path("python");
270      }      }
 }  
271    
272  #  #
273  # Find the name of the perl executable we are to use.  # Find the name of the perl executable we are to use.
# Line 427  Line 423 
423    
424  }  }
425    
426    sub finalize_server_scripts
427    {
428        #
429        # After any environment-specific stuff, call start_services and stop_services.
430        #
431    
432        open(F, ">>$start_servers") or die "Cannot write $start_servers: $!";
433        print F "\n$fig_bin/start_services\n";
434        close(F);
435        chmod(0775, $start_servers);
436    
437        open(F, ">>$stop_servers") or die "Cannot write $stop_servers: $!";
438        print F "\n$fig_bin/stop_services\n";
439        close(F);
440        chmod(0775, $stop_servers);
441    
442    }
443    
444  sub write_config_pm  sub write_config_pm
445  {  {
446      my($fh, $config) = @_;      my($fh, $config) = @_;
# Line 559  Line 573 
573  configure_python();  configure_python();
574  configure_environment_specific();  configure_environment_specific();
575    
576    finalize_server_scripts();
577    
578  #  #
579  # Write the shell startup to the figdisk.  # Write the shell startup to the figdisk.
580  #  #

Legend:
Removed from v.1.6  
changed lines
  Added in v.1.7

MCS Webmaster
ViewVC Help
Powered by ViewVC 1.0.3