Changeset 160

Show
Ignore:
Timestamp:
01/19/07 18:10:39 (2 years ago)
Author:
e.@brainspl.at
Message:

added the ability to freeze merb into dist/framework so you can distribute your merb app with frameowork included. generate a new app or use your old app and run rake merb:freeze . this will create the dist/framework with merb frozen into there. It will also add script/merb as the merb binary to use to run merb without gems.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/README

    r156 r160  
     1<pre> 
    12Copyright (c) 2006 Ezra Zygmuntowicz 
    23 
    …… 
    247248    plugins 
    248249    schema 
     250</pre> 

  • trunk/lib/merb.rb

    r159 r160  
    77begin 
    88  require 'fjson' 
    9   puts "using fjson" 
    109rescue LoadError 
    1110  require 'json' 

  • trunk/lib/merb/merb_server.rb

    r142 r160  
     1require 'rubygems' 
    12require 'optparse' 
    23require 'ostruct' 
    …… 
    104105      def initialize_merb 
    105106        require 'merb' 
    106         require @@merb_opts[:merb_root]+'/dist/conf/router.rb' 
    107         require @@merb_opts[:merb_root]+'/dist/conf/merb_init.rb' 
     107        require @@merb_opts[:merb_root] / 'dist/conf/router.rb' 
     108        require @@merb_opts[:merb_root] / 'dist/conf/merb_init.rb' 
    108109      end   
    109110       
    …… 
    132133        $LOAD_PATH.unshift( File.join(@@merb_opts[:dist_root] , '/app/models') ) 
    133134        $LOAD_PATH.unshift( File.join(@@merb_opts[:dist_root] , '/lib') ) 
    134          
     135        if File.exist? File.join(@@merb_opts[:dist_root] , '/framework') 
     136          $LOAD_PATH.unshift( File.join(@@merb_opts[:dist_root] , '/framework') ) 
     137        end 
     138            
    135139        if @@merb_opts[:generate] 
    136140          require 'merb/generators/merb_app/merb_app' 

  • trunk/lib/tasks/db.rake

    r67 r160  
    1 taMERB_ROOT = Dir.pwd 
     1MERB_ROOT = Dir.pwd 
    22 
    33desc "Setup the Merb Environment by requiring merb and loading your merb_init.rb"