Changeset 1239

Show
Ignore:
Timestamp:
01/09/08 15:14:13 (9 months ago)
Author:
e.@brainspl.at
Message:

missed merb.rake

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/tasks/merb.rake

    r1084 r1239  
    11def install_merb_script 
    2   script_filepath = MERB_ROOT / 'script/merb' 
     2  script_filepath = Merb.root / 'script/merb' 
    33  FileUtils.rm script_filepath if File.exist? script_filepath 
    44  tmpl = "#!/usr/bin/env ruby\nrequire File.expand_path(File.dirname(__FILE__)+'/../framework/merb/server')\nMerb::Server.run\n" 
    …… 
    1212  desc "freeze the merb framework into merb for portability" 
    1313  task :freeze do 
    14     FileUtils.rm_rf MERB_ROOT / 'framework' 
    15     FileUtils.cp_r MERB_FRAMEWORK_ROOT, (MERB_ROOT / 'framework') 
     14    FileUtils.rm_rf Merb.root / 'framework' 
     15    FileUtils.cp_r Merb::framework_root, (Merb.root / 'framework') 
    1616    install_merb_script 
    1717     
    …… 
    2121  desc "unfreeze this app from the framework and use system gem." 
    2222  task :unfreeze do 
    23     FileUtils.rm_rf MERB_ROOT / 'framework' 
    24     FileUtils.rm MERB_ROOT / 'script/merb' 
     23    FileUtils.rm_rf Merb.root / 'framework' 
     24    FileUtils.rm Merb.root / 'script/merb' 
    2525     
    2626    puts "  Removed: " 
    27     puts "   - #{MERB_ROOT / 'framework'} (recursive) " 
    28     puts "   - #{MERB_ROOT / 'script/merb'}" 
     27    puts "   - #{Merb.root / 'framework'} (recursive) " 
     28    puts "   - #{Merb.root / 'script/merb'}" 
    2929  end 
    3030   
    3131  desc "freeze the merb framework from svn, use REVISION=# to freeze a specific revision" 
    3232  task :freeze_from_svn do 
    33     install_path = MERB_ROOT / 'framework' 
     33    install_path = Merb.root / 'framework' 
    3434    revision = ENV['REVISION'] || 'HEAD' 
    3535    puts "  Removing old framework" if File.exist? install_path 
    …… 
    4949  require 'rubygems'  
    5050  require 'merb'  
    51   Merb::Server.config[:environment] = ENV['MERB_ENV'] if ENV['MERB_ENV']  
    52   MERB_ENV  = Merb::Server.config[:environment].nil? ? 'development' : Merb::Server.config[:environment]  
    53   load MERB_ROOT+'/config/merb_init.rb'  
     51  Merb::Config[:environment] = ENV['Merb.environment'] if ENV['Merb.environment']  
     52  Merb.environment  = Merb::Config[:environment].nil? ? 'development' : Merb::Config[:environment]  
     53  load Merb.root+'/config/merb_init.rb'  
    5454end