sproutcore 1.0.1046 → 1.0.1049.pre.1

data/lib/sproutcore/builders/minify.rb

@@ -5,7 +5,7 @@
 #            and contributors
 # ===========================================================================
 
-require File.expand_path(File.join(File.dirname(__FILE__), 'base'))
+require "sproutcore/builders/base"
 require 'fileutils'
 
 module SC
@@ -16,22 +16,22 @@ module SC
   # build directives such sc_static().
   #
   class Builder::Minify < Builder::Base
-    
+
     # main entry called by build tasls
     def self.build(entry, dst_path, kind)
       new(entry, kind).build(dst_path)
     end
-    
+
     def initialize(entry=nil, kind=nil)
       super(entry)
       @kind = kind
     end
-    
+
     # override this method in subclasses to actually do build
     def build(dst_path)
       send("build_#{@kind}".to_sym, dst_path)
     end
-    
+
     def build_css(dst_path)
       a = Regexp.new('^'+MANIFEST.build_root)
       if dst_path =~ a
@@ -39,13 +39,11 @@ module SC
         FileUtils.mkdir_p(File.dirname(dst_path))
         FileUtils.copy(entry.source_path, dst_path)
       else
-        yui_root = File.expand_path(File.join(LIBPATH, '..', 'vendor', 'yui-compressor'))
-        jar_path = File.join(yui_root, 'yuicompressor-2.4.2.jar')
         FileUtils.mkdir_p(File.dirname(dst_path)) # make sure loc exists...
-        filecompress = "java -jar " + jar_path + " --charset utf-8 --line-break 0 --nomunge --preserve-semi --disable-optimizations " + entry.source_path + " -o \"" + dst_path + "\" 2>&1"
+        filecompress = "java -jar " + SC.yui_jar + " --charset utf-8 --line-break 0 --nomunge --preserve-semi --disable-optimizations " + entry.source_path + " -o \"" + dst_path + "\" 2>&1"
         SC.logger.info  'Compressing CSS with YUI .... '+ dst_path
         SC.logger.debug `#{filecompress}`
-      
+
         if $?.exitstatus != 0
           _report_error(output, entry.filename, entry.source_path)
           SC.logger.fatal("!!!!YUI compressor failed, please check that your css code is valid.")
@@ -53,7 +51,7 @@ module SC
         end
       end
   	end
-    
+
     # Minify some javascript by invoking the YUI compressor.
     def build_javascript(dst_path)
       a = Regexp.new('^'+MANIFEST.build_root)
@@ -62,12 +60,10 @@ module SC
         FileUtils.mkdir_p(File.dirname(dst_path))
         FileUtils.copy(entry.source_path, dst_path)
       else
-        yui_root = File.expand_path(File.join(LIBPATH, '..', 'vendor', 'yui-compressor'))
-        jar_path = File.join(yui_root, 'yuicompressor-2.4.2.jar')
         FileUtils.mkdir_p(File.dirname(dst_path)) # make sure loc exists...
-        filecompress = "java -jar " + jar_path + " --charset utf-8 --line-break 80 " + entry.source_path + " -o \"" + dst_path + "\" 2>&1"
+        filecompress = "java -jar " + SC.yui_jar + " --charset utf-8 --line-break 80 " + entry.source_path + " -o \"" + dst_path + "\" 2>&1"
         SC.logger.info  'Compressing with YUI:  '+ dst_path + "..."
-      
+
         output = `#{filecompress}`      # It'd be nice to just read STDERR, but
                                       # I can't find a reasonable, commonly-
                                       # installed, works-on-all-OSes solution.
@@ -78,13 +74,11 @@ module SC
         end
       end
     end
-    
+
     def build_inline_javascript(dst_path)
       SC.logger.info  'Compressing inline Javascript with YUI: ' + dst_path + "..."
-      yui_root = File.expand_path(File.join(LIBPATH, '..', 'vendor', 'yui-compressor'))
-      jar_path = File.join(yui_root, 'yuicompressor-2.4.2.jar')
       FileUtils.mkdir_p(File.dirname(dst_path)) # make sure loc exists...
-      filecompress = "java -jar " + jar_path + " --charset utf-8 --line-break 80 " + entry.source_path + " -o \"" + dst_path + "\" 2>&1"
+      filecompress = "java -jar " + SC.yui_jar + " --charset utf-8 --line-break 80 " + entry.source_path + " -o \"" + dst_path + "\" 2>&1"
       SC.logger.info  'Compressing with YUI:  '+ dst_path + "..."
 
       output = `#{filecompress}`      # It'd be nice to just read STDERR, but
@@ -96,8 +90,9 @@ module SC
         SC.logger.fatal("!!!!Failed compressing ... "+ dst_path)
       end
     end
-  
-  
+
+  private
+
     def _report_error(output, input_filename, input_filepath)
       # The output might have some clues to what exactly was wrong, and it'll
       # be convenient for users if we include the subset.  So we'll read the
@@ -129,7 +124,7 @@ module SC
                       message += "        [#{line_number - 1}]  #{previous_line}"
                     end
                     message   += "   -->  [#{line_number}]  #{file_line}"
-                  
+
                     SC.logger.error message
                     outputted_line = true
                     break
@@ -142,14 +137,14 @@ module SC
               rescue => err
                 SC.logger.error "Could not read the actual line from the file:  #{err}"
               end
-            
+
               if !outputted_line
                 SC.logger.error "YUI compressor error:  #{output_line}, but couldn't read that line in the input file"
               end
             end
           end
         }
-      
+
         # If we didn't handle at least one line of output specially, then
         # just output it all.
         if !parsed_a_line
@@ -157,8 +152,8 @@ module SC
         end
       end
     end
-  
+
 
   end
-    
+
 end

data/lib/sproutcore/builders/sass.rb

@@ -5,17 +5,24 @@
 #            and contributors
 # ===========================================================================
 
-require File.expand_path(File.join(File.dirname(__FILE__), 'base'))
+require "sproutcore/builders/stylesheet"
 require 'fileutils'
 
 module SC
 
   # This build can compile a Sass stylesheet.  At this point it does no
-  # further processing than simply executing the Sass.  It would be nice to 
+  # further processing than simply executing the Sass.  It would be nice to
   # add support for sc_static and other directives at some point.
   #
-  class Builder::Sass < Builder::Base
-    
+  class Builder::Sass < Builder::Stylesheet
+    @@sass_syntax = :sass
+
+    # main entry called by build tasks
+    def self.build(entry, dst_path, sass_syntax=:sass)
+      @@sass_syntax =sass_syntax
+      new(entry).build(dst_path)
+    end
+
     def build(dst_path)
       begin
         require 'sass'
@@ -25,10 +32,13 @@ module SC
 
       begin
         content = readlines(entry.source_path)*''
-        content = ::Sass::Engine.new(content).render
-        writelines dst_path, [content]
+        load_paths = [entry.source_path[0..entry.source_path.rindex('/')]]
+        css = ::Sass::Engine.new(content, :syntax => @@sass_syntax, :load_paths => load_paths).render
+        lines = []
+        css.each_line { |l| lines << rewrite_inline_code(l) }
+        writelines dst_path, lines
       rescue Exception => e
-        
+
         # explain sass syntax error a bit more...
         if e.is_a? Sass::SyntaxError
           e_string = "#{e.class}: #{e.message}"
@@ -46,10 +56,10 @@ module SC
           raise e_string
         else
           raise e # reraise
-        end 
+        end
       end # rescue
     end # def
-    
+
   end
-  
+
 end

data/lib/sproutcore/builders/strings.rb

@@ -5,21 +5,22 @@
 #            and contributors
 # ===========================================================================
 
-require File.expand_path(File.join(File.dirname(__FILE__), 'base'))
+require "sproutcore/builders/base"
 require 'fileutils'
+require 'json'
 
 module SC
 
   # This builder is used to generate a file containing all of the loc strings
-  # for a particular manifest.  The strings file is used when generating 
+  # for a particular manifest.  The strings file is used when generating
   # HTML try to map localized strings
   class Builder::Strings < Builder::Base
-    
+
     def build(dst_path)
-      data = parse_strings_js(entry.source_path)
-      writelines dst_path, [data.to_yaml]
+      data = parse_strings_js(entry[:source_path])
+      writelines dst_path, [data.to_json]
     end
-    
+
     def parse_strings_js(source_path)
       return {} if !File.exists?(source_path)
 
@@ -35,10 +36,10 @@ module SC
         y = eval(%[<<__EOF__\n#{y}\n__EOF__]).chop
         ret[x] = y
       end
-      return ret 
+      return ret
     end
-      
-    
+
+
   end
-  
+
 end

data/lib/sproutcore/builders/stylesheet.rb

@@ -5,36 +5,52 @@
 #            and contributors
 # ===========================================================================
 
-require File.expand_path(File.join(File.dirname(__FILE__), 'base'))
+require "sproutcore/builders/base"
 require 'fileutils'
 
 module SC
 
   # This builder is used to process a single CSS stylesheet.  Converts any
-  # build tool directives (such as sc_require() and sc_resource()) into 
-  # comments.  It will also substitute any calls to sc_static() (or 
+  # build tool directives (such as sc_require() and sc_resource()) into
+  # comments.  It will also substitute any calls to sc_static() (or
   # static_url())  This builder does NOT handle combining multiple stylesheets
   # into one.  See the Builder::CombineStylesheets builder instead.
   #
   class Builder::Stylesheet < Builder::Base
-    
+
+    def readlines(src_path)
+      if File.exist?(src_path) && !File.directory?(src_path)
+        File.read(src_path)
+      else
+        ""
+      end
+    end
+
+    def writelines(dst_path, lines)
+      FileUtils.mkdir_p(File.dirname(dst_path))
+      File.open(dst_path, 'w') do |f|
+        f.write lines
+      end
+    end
+
     def build(dst_path)
-      lines = readlines(entry.source_path).map { |l| rewrite_inline_code(l) }
-      writelines dst_path, lines
+      code = rewrite_inline_code(readlines(entry[:source_path]))
+      writelines dst_path, code
     end
 
     # Rewrites any inline content such as static urls.  Subclasseses can
     # override this to rewrite any other inline content.
     #
     # The default will rewrite calls to static_url().
-    def rewrite_inline_code(line)
+    def rewrite_inline_code(code)
       # look for sc_require, require or sc_resource.  wrap in comment
-      line = line.gsub(/((sc_require|require|sc_resource)\(\s*['"].*["']\s*\)\s*\;)/, '/* \1 */')
-      line = replace_static_url(line)
+      code.gsub!(/((sc_require|require|sc_resource)\(\s*['"].*["']\s*\)\s*\;)/, '/* \1 */')
+      replace_static_url(code)
+      code
     end
-    
+
     def static_url(url=''); "url('#{url}')" ; end
-    
+
   end
-  
+
 end

data/lib/sproutcore/builders/test.rb

@@ -5,55 +5,55 @@
 #            and contributors
 # ===========================================================================
 
-require File.expand_path(File.join(File.dirname(__FILE__), 'html'))
+require "sproutcore/builders/html"
 
 module SC
 
   # Builds an HTML files.  This will setup an HtmlContext and then invokes
   # the render engines for each source before finally rendering the layout.
   class Builder::Test < Builder::Html
-    
+
     def initialize(entry)
       super(entry)
-      @layout = @target.config.test_layout || 'lib/test.rhtml'
+      @layout = @target.config[:test_layout] || 'lib/test.rhtml'
     end
-    
-    # Always include any required test targets as well when loading unit 
+
+    # Always include any required test targets as well when loading unit
     # tests.
     def expand_required_targets(target, opts = {})
       opts[:test] = true
       super(target, opts)
     end
-    
-    protected 
-    
+
+    protected
+
     def render_entry(entry)
       entry.stage!
 
-      case entry.ext
+      case entry[:ext]
       when 'js'
         render_jstest(entry)
       when 'rhtml'
         entry.target.buildfile.invoke 'render:erubis',
-          :entry    => entry, 
-          :src_path => entry.staging_path,
+          :entry    => entry,
+          :src_path => entry[:staging_path],
           :context  => self
       end
     end
-    
+
     def default_content_for_key; :body; end
-    
-    # Renders an individual test into a script tag.  Also places the test 
-    # into its own closure so that globals defined by one test will not 
+
+    # Renders an individual test into a script tag.  Also places the test
+    # into its own closure so that globals defined by one test will not
     # conflict with any others.
     def render_jstest(entry)
-      lines = readlines(entry.staging_path)
-      pathname = entry.staging_path.gsub(/^.+\/staging\//,'').gsub(/"/, '\"')
+      lines = readlines(entry[:staging_path])
+      pathname = entry[:staging_path].gsub(/^.+\/staging\//,'').gsub(/"/, '\"')
       lines.unshift %[<script type="text/javascript">\nif (typeof SC !== "undefined") {\n  SC.mode = "TEST_MODE";\n  SC.filename = "#{pathname}"; \n}\n(function() {\n]
       lines.push    %[\n})();\n</script>\n]
       @content_for_final = (@content_for_final || '') + lines.join("")
     end
-    
+
   end
-  
+
 end

data/lib/sproutcore/builders/test_index.rb

@@ -5,22 +5,22 @@
 #            and contributors
 # ===========================================================================
 
-require File.expand_path(File.join(File.dirname(__FILE__), 'base'))
+require "sproutcore/builders/base"
 
 module SC
 
   # Builds an HTML files.  This will setup an HtmlContext and then invokes
   # the render engines for each source before finally rendering the layout.
   class Builder::TestIndex < Builder::Base
-    
+
     def build(dst_path)
       require 'json'
-      items = entry.source_entries.map do |e|
-        { "filename" => e.filename.ext(''), "url" => e.url }
+      items = entry[:source_entries].map do |e|
+        { "filename" => e[:filename].ext(''), "url" => e[:url] }
       end
       writelines dst_path, [items.to_json]
     end
-    
+
   end
-  
+
 end

data/lib/sproutcore/buildfile.rb

@@ -5,19 +5,19 @@
 #            and contributors
 # ===========================================================================
 
-require File.join(File.dirname(__FILE__), 'models', 'hash_struct')
-require File.join(File.dirname(__FILE__), 'buildfile', 'cloneable')
-require File.join(File.dirname(__FILE__), 'buildfile', 'task_manager')
+require "sproutcore/models/hash_struct"
+require "sproutcore/buildfile/cloneable"
+require "sproutcore/buildfile/task_manager"
 
 module SC
 
   # A Buildfile is a special type of file that contains the configurations and
   # build tasks used for a particular project or project target.  Buildfiles
   # are based on Rake but largely use their own syntax and helper methods.
-  # 
-  # Whenever you create a project, you will often also add a Buildfile, 
+  #
+  # Whenever you create a project, you will often also add a Buildfile,
   # sc-config, or sc-config.rb file.  All of these files are laoded into the
-  # build system using this class.  The other model objects will then 
+  # build system using this class.  The other model objects will then
   # reference their buildfile to extract configuration information and to find
   # key tasks required for the build process.
   #
@@ -28,7 +28,7 @@ module SC
   #   buildfile = Buildfile.load('/path/to/buildfile')
   #
   # You can also load multiple buildfiles by calling the load!() method on
-  # an exising Buildfile object or by passing a directory with several 
+  # an exising Buildfile object or by passing a directory with several
   # buildfiles in it:
   #
   #   buildfile = Buildfile.new
@@ -51,9 +51,9 @@ module SC
   #    task :demo_task
   #  end
   #
-  # When you call define!() on a buildfile, the block is executed in the 
+  # When you call define!() on a buildfile, the block is executed in the
   # context of the buildfile object, just like a Buildfile loaded from disk.
-  # You will not usually use define!() on a buildfile in normal code, but it 
+  # You will not usually use define!() on a buildfile in normal code, but it
   # is very useful for unit testing.
   #
   # == Executing Tasks
@@ -64,7 +64,7 @@ module SC
   #
   #   buildfile.invoke :demo_task, :context => my_context
   #
-  # With the above example, the demo_task could access the "context" as a 
+  # With the above example, the demo_task could access the "context" as a
   # global constant like do:
   #
   #   task :demo_task do
@@ -87,30 +87,30 @@ module SC
   # in this call.
   #
   class Buildfile
-    
+
     # Default buildfile names.  Override with SC.env.buildfile_names
     BUILDFILE_NAMES = %w(Buildfile sc-config sc-config.rb)
-    
+
     include Cloneable
     include TaskManager
-    
+
     # The location of the buildfile represented by this object.
     attr_accessor :path
-    
+
     ################################################
     # CLASS METHODS
     #
-    
+
     # Determines if this directory has a buildfile or not...
     def self.has_buildfile?(dir_path, buildfile_names=nil)
-      buildfile_names ||= (SC.env.buildfile_names || BUILDFILE_NAMES)
+      buildfile_names ||= (SC.env[:buildfile_names] || BUILDFILE_NAMES)
       buildfile_names.each do |path|
         path = File.join(dir_path, path)
         return true if File.exist?(path) && !File.directory?(path)
       end
       return false
     end
-      
+
     # Loads the buildfile at the specified path.  This simply creates a new
     # instance and loads it.
     #
@@ -123,9 +123,9 @@ module SC
     def self.load(path)
       self.new.load!(path)
     end
-    
-    # Creates a new buildfile and then gives you an opportunity to define 
-    # its contents by executing the passed block in the context of the 
+
+    # Creates a new buildfile and then gives you an opportunity to define
+    # its contents by executing the passed block in the context of the
     # buildfile.
     #
     # === Returns
@@ -138,10 +138,10 @@ module SC
     ################################################
     # TASK METHODS
     #
-    
+
     attr_reader :current_path
-    
-    # Extend the buildfile dynamically by executing the named task.  This 
+
+    # Extend the buildfile dynamically by executing the named task.  This
     # will yield the block if given after making the buildfile the current
     # build file.
     #
@@ -152,19 +152,19 @@ module SC
     # === Returns
     #   self
     #
-    def define!(string=nil, &block)
+    def define!(string=nil, filename="(unknown Buildfile)", &block)
       context = reset_define_context :current_mode => :all
-      instance_eval(string) if string
+      instance_eval(string, filename) if string
       instance_eval(&block) if block_given?
       load_imports
       reset_define_context context
       return self
     end
-    
+
     def task_defined?(task_name)
       !!lookup(task_name)
     end
-    
+
     # Loads the contents of the passed file into the buildfile object.  The
     # contents will be executed in the context of the buildfile object.  If
     # the filename passed is nil or the file does not exist, this will simply
@@ -176,45 +176,46 @@ module SC
     #
     # === Returns
     #  self
-    
+
     def load!(filename=nil, buildfile_names=nil)
-      
+
       # If a directory is passed, look for any buildfile and load them...
       if File.directory?(filename)
-        
+
         # search directory for buildfiles and load them.
-        buildfile_names ||= (SC.env.buildfile_names || BUILDFILE_NAMES)
+        buildfile_names ||= (SC.env[:buildfile_names] || BUILDFILE_NAMES)
         buildfile_names.each do |path|
           path = File.join(filename, path)
           next unless File.exist?(path) && !File.directory?(path)
           load!(path)
         end
-        
+
       elsif File.exist?(filename)
         old_path = @current_path
         @current_path = filename
         loaded_paths << filename # save loaded paths
         SC.logger.debug "Loading buildfile at #{filename}"
-        define!(File.read(filename)) if filename && File.exist?(filename)
+        define!(File.read(filename), filename) if filename && File.exist?(filename)
         @current_path = old_path
       end
       return self
     end
-      
+
     def loaded_paths; @loaded_paths ||= []; end
-    
+
     # Executes the name task.  Unlike invoke_task, this method will execute
-    # the task even if it has already been executed before.  You can also 
+    # the task even if it has already been executed before.  You can also
     # pass a hash of additional constants that will be set on the global
     # namespace before the task is invoked.
-    # 
+    #
     # === Params
     #  task_name:: the full name of the task, including namespaces
     #  consts:: Optional hash of constant values to set on the env
-    def invoke(task_name, consts = nil)
-      consts = set_kernel_consts consts  # save  to restore
-      self[task_name.to_s].invoke 
-      set_kernel_consts consts # clear constants
+    def invoke(task_name, consts = {})
+      original, SproutCore::RakeConstants.constants = SproutCore::RakeConstants.constants, consts
+      self[task_name].invoke(consts)
+    ensure
+      SproutCore::RakeConstants.constants = original
     end
 
     # Returns true if the buildfile has the named task defined
@@ -224,7 +225,7 @@ module SC
     def has_task?(task_name)
       !self[task_name.to_s].nil?
     end
-    
+
     ################################################
     # RAKE SUPPORT
     #
@@ -259,13 +260,13 @@ module SC
     ################################################
     # CONFIG METHODS
     #
-    
+
     def current_mode
-      @define_context.current_mode
+      @define_context[:current_mode]
     end
-    
+
     def current_mode=(new_mode)
-      @define_context.current_mode = new_mode
+      @define_context[:current_mode] = new_mode
     end
 
     # Configures the buildfile for use with the specified target.  Call this
@@ -275,21 +276,21 @@ module SC
     #  self
     #
     def for_target(target)
-      @target_name = target.target_name.to_s
+      @target_name = target[:target_name].to_s
       return self
     end
-    
+
     # The namespace for this buildfile.  This should be name equal to the
     # namespace of the target that owns the buildfile, if there is one
     attr_reader :target_name
-    
+
     # The hash of configs as loaded from the files.  The configs are stored
     # by mode and then by config name.  To get a merged config, use
     # config_for().
     attr_reader :configs
-    
+
     # The hash of proxy commands
-    
+
     # Merge the passed hash of options into the config hash.  This method
     # is usually used by the config global helper
     #
@@ -307,7 +308,7 @@ module SC
         opts = config_mode; config_mode = nil
       end
       config_mode = current_mode if config_mode.nil?
-      
+
       # Normalize the config name -- :all or 'all' is OK, absolute OK.
       config_name = config_name.to_s
       if config_name != 'all' && (config_name[0..0] != '/')
@@ -317,26 +318,26 @@ module SC
           config_name = [target_name, config_name].join('/')
         end
       end
-      
+
       # Perform Merge
       mode_configs = (self.configs[config_mode.to_sym] ||= HashStruct.new)
-      config = (mode_configs[config_name.to_sym] ||= HashStruct.new)
+      config = (mode_configs[config_name.to_sym] ||= ::SC::Buildfile::Config.new)
       config.merge!(opts)
     end
-    
-    # Returns the merged config setting for the config name and mode.  If 
+
+    # Returns the merged config setting for the config name and mode.  If
     # no mode is specified the :all mode is assumed.
     #
     # This will merge config hashes in the following order (mode/name):
-    # 
+    #
     # all:all -> mode:all -> all:config -> mode:config
     #
-    # 
-    
+    #
+
     # === Params
     #  config_name:: The config name
     #  mode_name:: optional mode name
-    #  
+    #
     # === Returns
     #  merged config -- a HashStruct
     def config_for(config_name, mode_name=nil)
@@ -346,18 +347,18 @@ module SC
       # collect the hashes
       all_configs = configs[:all]
       cur_configs = configs[mode_name]
-      ret = HashStruct.new
-      
+      ret = ::SC::Buildfile::Config.new
+
       # now merge em! -- note that this assumes the merge method will handle
       # self.merge(self) & self.merge(nil) gracefully
       ret.merge!(all_configs[:all]) if all_configs
       ret.merge!(cur_configs[:all]) if cur_configs
-      ret.merge!(all_configs[config_name]) if all_configs
-      ret.merge!(cur_configs[config_name]) if cur_configs
-      
+      ret.merge!(all_configs[config_name.to_sym]) if all_configs
+      ret.merge!(cur_configs[config_name.to_sym]) if cur_configs
+
       # Done -- return result
-      return ret  
-    end      
+      return ret
+    end
 
     ################################################
     # PROJECT & TARGET METHODS
@@ -365,24 +366,24 @@ module SC
 
     # This is set if you use the project helper method in your buildfile.
     attr_accessor :project_name
-    
+
     def project_type; @project_type || :default; end
     attr_writer :project_type
-    
+
     # Returns YES if this buildfile appears to represent a project.  If you
     # use the project() helper method, it will set this
     def project?; @is_project || false; end
     def project!; @is_project = true; end
-    
+
     ################################################
     # PROXY METHODS
     #
-    
+
     # The hash of all proxies paths and their options
     attr_reader :proxies
-    
+
     # Adds a proxy to the list of proxy paths.  These are used only in server
-    # mode to proxy certain URLs.  If you call this method with the same 
+    # mode to proxy certain URLs.  If you call this method with the same
     # proxy path more than once, the options will be merged.
     #
     # === Params
@@ -393,14 +394,14 @@ module SC
     #  receiver
     #
     def add_proxy(proxy_path, opts={})
-      @proxies[proxy_path] = HashStruct.new(opts)
+      @proxies[proxy_path.to_sym] = HashStruct.new(opts)
       return self
     end
-    
+
     ################################################
     # INTERNAL SUPPORT
     #
-    
+
     def initialize
       super
       @configs = HashStruct.new
@@ -409,29 +410,29 @@ module SC
       @imported = []
       @options = HashStruct.new
     end
-    
-    # When dup'ing, rewrite the @tasks hash to use clones of the tasks 
+
+    # When dup'ing, rewrite the @tasks hash to use clones of the tasks
     # the point to the new application object.
     def dup
       ret = super
-      
+
       # Make sure the tasks themselves are cloned
       tasks = ret.instance_variable_get('@tasks')
       tasks.each do | key, task |
         tasks[key] = task.dup(ret)
       end
-      
+
       # Deep clone the config and proxy hashes as well...
       %w(@configs @proxies @options).each do |ivar|
         cloned_ivar = instance_variable_get(ivar).deep_clone
         ret.instance_variable_set(ivar, cloned_ivar)
       end
-      
+
       ret.instance_variable_set('@is_project', false) # transient - do not dup
-      
-      return ret 
+
+      return ret
     end
-    
+
     protected
 
     # Save off the old define context and replace it with the passed context
@@ -441,44 +442,49 @@ module SC
       @define_context = HashStruct.new(context || {})
       return ret
     end
-    
-    # For each key in the passed hash, this will register a global 
-    def set_kernel_consts(env = nil)
-      return env if env.nil?
-
-      # for each item in the passed environment, convert to uppercase constant
-      # and set in global namespace.  Save the old value so that it can be
-      # restored later.
-      ret = {}
-      env.each do |key, value|
-        const_key = key.to_s.upcase.to_sym
-        
-        # Save the old const value
-        ret[key] = Kernel.const_get(const_key) rescue nil
-
-        # Reset
-        Kernel.const_reset(const_key, value)
-      end
-      
-      # Also, save env.  Used mostly for logging
-      ret['TASK_ENV'] = Kernel.const_get('TASK_ENV') rescue nil
-      Kernel.const_reset('TASK_ENV', env)
-      
-      return ret
-    end
-      
+
   end
-  
+
+end
+
+module SproutCore
+ module RakeConstants
+   class << self
+     attr_accessor :constants
+   end
+
+   def const_missing(name)
+     ret = (RakeConstants.constants && RakeConstants.constants[name.to_s.downcase.to_sym]) || super
+   end
+ end
 end
 
 # Add public method to kernel to remove defined constant using private
 # method.
-module Kernel
-  def const_reset(key, value)
+class Object
+  extend SproutCore::RakeConstants
+
+  def self.const_reset(key, value)
     remove_const(key) if const_defined?(key)
     const_set key, value
   end
 end
 
-SC.require_all_libs_relative_to(__FILE__)
+# back-compat
+module Kernel
+  def self.const_reset(key, value)
+    SC.logger.warn "const_reset is deprecated. Called from #{caller[0]}"
+    Object.const_reset(key, value)
+  end
+end
+
+require "sproutcore/buildfile/build_task"
+require "sproutcore/buildfile/buildfile_dsl"
+require "sproutcore/buildfile/early_time"
+require "sproutcore/buildfile/invocation_chain"
+require "sproutcore/buildfile/namespace"
+require "sproutcore/buildfile/string_ext"
+require "sproutcore/buildfile/task"
+require "sproutcore/buildfile/task_arguments"
+require "sproutcore/buildfile/task_manager"