Changeset 897

Show
Ignore:
Timestamp:
11/07/07 11:26:48 (1 year ago)
Author:
dudl..@misnomer.us
Message:

Make generated Rakefile use config/boot.rb

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/app_generators/merb/templates/Rakefile

    r715 r897  
    88MERB_ENV = ENV['MERB_ENV'] if ENV['MERB_ENV'] 
    99 
    10 if File.directory?( File.join(File.dirname(__FILE__), "framework")) 
    11   $:.unshift('framework') 
    12   require File.join(File.dirname(__FILE__), "framework/merb") 
    13 else   
    14   require 'merb' 
    15 end 
     10require File.dirname(__FILE__)+'/config/boot.rb' 
    1611require MERB_FRAMEWORK_ROOT+'/tasks' 
    1712MERB_ROOT = File.dirname(__FILE__)