mtbuild 0.0.9 → 0.1.0

data/lib/mtbuild/cleaner.rb

@@ -0,0 +1,67 @@
+module MTBuild
+
+  module Cleaner
+
+    @global_clean_list = ::Rake::FileList.new
+
+    class << self
+
+      # The list of files/folder to clean
+      attr_reader :global_clean_list
+
+      def generate_global_clean_task
+        desc "Remove intermediate and output files/folders for all projects."
+        task :clean do
+          cleanup_files(@global_clean_list)
+        end
+      end
+
+      def generate_clean_task_for_project(project_name, project_clean_list)
+        desc "Remove intermediate and output files/folders for #{project_name}."
+        task :clean do
+          cleanup_files(project_clean_list)
+        end
+      end
+
+      private
+
+      def cleanup_files(file_names)
+        file_names.each do |file_name|
+          cleanup(file_name)
+        end
+      end
+
+      def cleanup(file_name, opts={})
+        begin
+          Rake::FileUtilsExt.rm_r file_name, opts
+        rescue StandardError => ex
+          puts "Failed to remove #{file_name}: #{ex}" unless file_already_gone?(file_name)
+        end
+      end
+
+      def file_already_gone?(file_name)
+        return false if File.exist?(file_name)
+
+        path = file_name
+        prev = nil
+
+        while (path = File.dirname(path))
+          return false if cant_be_deleted?(path)
+          break if [prev, "."].include?(path)
+          prev = path
+        end
+        true
+      end
+
+      def cant_be_deleted?(path_name)
+        File.exist?(path_name) &&
+          (!File.readable?(path_name) || !File.executable?(path_name))
+      end
+
+      include Rake::DSL
+
+    end
+
+  end
+
+end

data/lib/mtbuild/compiled_configuration.rb

@@ -15,25 +15,24 @@ module MTBuild
     # A list of Rake test tasks that will execute after this configuration builds
     attr_reader :tests
 
-    def initialize(project_name, project_folder, output_folder, configuration_name, configuration)
+    def initialize(parent_project, output_folder, configuration_name, configuration)
       super
-      check_configuration(configuration)
-
-      @dependencies = configuration.fetch(:dependencies, [])
+      @dependencies = namespace_tasks(configuration.fetch(:dependencies, []))
+      @dependencies |= configuration.fetch(:rake_dependencies, [])
       @default_toolchain_config = configuration[:toolchain]
-      @default_toolchain = Toolchain.create_toolchain(@default_toolchain_config)
+      @default_toolchain = Toolchain.create_toolchain(self, @default_toolchain_config)
 
-      source_files = Utils.expand_file_list(configuration.fetch(:sources, []), configuration.fetch(:excludes, []), @project_folder)
-      @toolchains = {@default_toolchain => source_files}
+      @source_files = Utils.expand_file_list(configuration.fetch(:sources, []), configuration.fetch(:excludes, []), @project_folder)
+      @toolchains = {@default_toolchain => @source_files}
 
-      @tests = Utils.ensure_array(configuration.fetch(:tests, []))
+      @tests = namespace_tasks(Utils.ensure_array(configuration.fetch(:tests, [])))
     end
 
     # This method adds source files with their own toolchains. Use this method
     # to add any source files that need special toolchain settings.
     def add_sources(sources, excludes=[], toolchain_configuration)
       merged_configuration = Utils.merge_configurations(@default_toolchain_config, toolchain_configuration)
-      toolchain = Toolchain.create_toolchain(merged_configuration)
+      toolchain = Toolchain.create_toolchain(self, merged_configuration)
       @toolchains[toolchain] = Utils.expand_file_list(sources, excludes, @project_folder)
     end
 
@@ -51,7 +50,8 @@ module MTBuild
     private
 
     def check_configuration(configuration)
-      fail "No toolchain specified for #{@project_name}:#{@configuration_name}" if configuration.fetch(:toolchain, nil).nil?
+      super
+      fail "No toolchain specified for #{@parent_project.project_name}:#{@configuration_name}" if configuration.fetch(:toolchain, nil).nil?
     end
 
     def self.add_framework_dependencies_to_toolchain(toolchain, *dependencies)

data/lib/mtbuild/configuration.rb

@@ -8,8 +8,8 @@ module MTBuild
     # The configuration's name
     attr_reader :configuration_name
 
-    # The name of the project that owns this configuration
-    attr_reader :project_name
+    # The project that owns this configuration
+    attr_reader :parent_project
 
     # The project's folder. Relative path references are interpreted as
     # relative to this folder.
@@ -18,16 +18,16 @@ module MTBuild
     # The project's output folder. Project output goes here.
     attr_reader :output_folder
 
-    def initialize(project_name, project_folder, output_folder, configuration_name, configuration)
-      check_configuration(configuration)
-      @project_name = project_name
-      @project_folder = File.expand_path(project_folder)
+    def initialize(parent_project, output_folder, configuration_name, configuration)
+      @parent_project = parent_project
+      @project_folder = File.expand_path(@parent_project.project_folder)
       @configuration_name = configuration_name
-      @output_folder = File.expand_path(File.join(output_folder, @project_name.to_s, @configuration_name.to_s))
+      @output_folder = File.expand_path(File.join(output_folder, @configuration_name.to_s))
+      check_configuration(configuration)
 
       @versioner = nil
       @versioner_config = configuration.fetch(:versioner, nil)
-      @versioner = Versioner.create_versioner(@project_name, @project_folder, @output_folder, @configuration_name, @versioner_config) unless @versioner_config.nil?
+      @versioner = Versioner.create_versioner(@parent_project.project_name, @project_folder, @output_folder, @configuration_name, @versioner_config) unless @versioner_config.nil?
     end
 
     # Create the actual Rake tasks that will perform the configuration's work
@@ -40,6 +40,11 @@ module MTBuild
     def check_configuration(configuration)
     end
 
+    def namespace_tasks(task_list)
+      return task_list.collect {|task| "#{@parent_project.parent_workspace.workspace_name}:#{task}"} unless @parent_project.parent_workspace.nil?
+      return task_list
+    end
+
     include Rake::DSL
   end
 

data/lib/mtbuild/framework_configuration.rb

@@ -6,8 +6,8 @@ module MTBuild
   # method will create this for you.
   class FrameworkConfiguration < Configuration
 
-    def initialize(project_name, project_folder, output_folder, configuration_name, configuration, api_headers)
-      super project_name, project_folder, output_folder, configuration_name, configuration
+    def initialize(parent_project, output_folder, configuration_name, configuration, api_headers)
+      super parent_project, output_folder, configuration_name, configuration
       check_configuration(configuration)
       @api_headers = api_headers
       @configuration_headers = Utils.expand_folder_list(configuration.fetch(:configuration_headers, []), @project_folder)
@@ -17,7 +17,7 @@ module MTBuild
     # Create the actual Rake tasks that will perform the configuration's work
     def configure_tasks
       super
-      desc "Framework '#{@project_name}' with configuration '#{@configuration_name}'"
+      desc "Framework '#{@parent_project.project_name}' with configuration '#{@configuration_name}'"
       new_task = framework_task @configuration_name => @object_files do |t|
         puts "found framework #{t.name}."
       end
@@ -30,7 +30,7 @@ module MTBuild
 
     def check_configuration(configuration)
       super
-      fail "No objects specified for #{@project_name}:#{@configuration_name}" if configuration.fetch(:objects, nil).nil?
+      fail "No objects specified for #{@parent_project.project_name}:#{@configuration_name}" if configuration.fetch(:objects, nil).nil?
     end
 
   end

data/lib/mtbuild/framework_project.rb

@@ -16,9 +16,10 @@ module MTBuild
     # Adds a named FrameworkConfiguration to the project.
     def add_configuration(configuration_name, configuration)
       super
-      default_configuration = Workspace.configuration_defaults.fetch(configuration_name, {})
+      default_configuration = {}
+      default_configuration = @parent_workspace.configuration_defaults.fetch(configuration_name, {}) unless @parent_workspace.nil?
       merged_configuration = Utils.merge_configurations(default_configuration, configuration)
-      cfg = FrameworkConfiguration.new(@project_name, @project_folder, effective_output_folder, configuration_name, merged_configuration, @api_headers)
+      cfg = FrameworkConfiguration.new(self, effective_output_folder, configuration_name, merged_configuration, @api_headers)
       @configurations << cfg
       return cfg
     end

data/lib/mtbuild/loaders/makefile.rb

@@ -2,7 +2,6 @@ module MTBuild
 
   # Makefile loader to be used with the import file loader.
   class MakefileLoader
-    include Rake::DSL
 
     SPACE_MARK = "\0"
 
@@ -35,6 +34,9 @@ module MTBuild
     def respace(str)
       str.tr SPACE_MARK, ' '
     end
+
+    include Rake::DSL
+
   end
 
   # Install the handler

data/lib/mtbuild/organized_package_task.rb

@@ -82,13 +82,13 @@ module MTBuild
     end
 
     def define
-      desc "Build the package"
+      desc "Build the package for #{@name}"
       task :package
 
-      desc "Force a rebuild of the package files"
+      desc "Force a rebuild of the package files for #{@name}"
       task :repackage => [:clobber_package, :package]
 
-      desc "Remove package products"
+      desc "Remove package products for #{@name}"
       task :clobber_package do
         rm_r package_dir rescue nil
       end

data/lib/mtbuild/project.rb

@@ -2,6 +2,8 @@ module MTBuild
 
   # This is the base class for all project types.
   class Project
+    require 'mtbuild/build_registry'
+    require 'mtbuild/cleaner'
 
     # The project's name
     attr_reader :project_name
@@ -13,29 +15,44 @@ module MTBuild
     # The project's output folder. Project output goes here.
     attr_reader :output_folder
 
+    # The project's parent workspace
+    attr_reader :parent_workspace
+
+    # The project's list of things to clean
+    attr_reader :clean_list
+
     # If supplied, the configuration_block will be passed the
     # newly-constructed Project object.
     def initialize(project_name, project_folder, &configuration_block)
       @configurations = []
-      @default_tasks = []
-      @project_name = project_name
       @project_folder = File.expand_path(project_folder)
       @output_folder = File.expand_path(File.join(@project_folder, MTBuild.default_output_folder))
+      @project_name, @parent_workspace = MTBuild::BuildRegistry.enter_project(project_name, self)
+      @clean_list = Rake::FileList.new
+
       configuration_block.call(self) if configuration_block
 
       namespace @project_name do
         @configurations.each do |configuration|
-          configuration.configure_tasks()
+          configuration.configure_tasks
         end
+
+        Cleaner.generate_clean_task_for_project(@project_name, @clean_list)
       end
 
-      # If there is no active workspace, set up any registered default project tasks
-      task :default => @default_tasks unless Workspace.have_workspace?
+      #TODO: This is a strange way to do this. Should probably be moved to "application" functionality.
+      if @parent_workspace.nil? and Rake.application.lookup(:default).nil?
+        task :default do
+          puts 'Nothing to do. Use the -T flag to see the list of tasks you can build.'
+        end
+      end
+
+      MTBuild::BuildRegistry.exit_project
     end
 
-    # Add tasks to be built by default if MTBuild is invoked with no arguments
-    def add_default_tasks(default_tasks)
-      @default_tasks |= Utils.ensure_array(default_tasks).flatten
+    # Get the fully-qualified task name for a configuration
+    def task_for_configuration(config_name)
+      "#{@project_name}:#{config_name}"
     end
 
     # Set the project's output folder.
@@ -43,16 +60,20 @@ module MTBuild
       @output_folder = File.expand_path(File.join(@project_folder, output_folder))
     end
 
+    # Add files to the project's clean list.
+    def add_files_to_clean(*filenames)
+      @clean_list.include(filenames)
+      Cleaner.global_clean_list.include(filenames)
+    end
+
     # Returns the effective output folder. If a workspace exists, this will
     # return the workspace's output folder. If not, it will return the
     # project's output folder.
     def effective_output_folder
-      if Workspace.have_workspace?
-        relative_project_location = Utils::path_difference(Workspace.workspace.workspace_folder, @project_folder)
-        fail "Project folder '#{@project_folder}' must be within workspace folder '#{Workspace.workspace.workspace_folder}'." if relative_project_location.nil?
-        return File.join(Workspace.workspace.output_folder, relative_project_location)
+      if MTBuild::BuildRegistry.top_workspace.nil?
+        File.join(@output_folder, @project_name.to_s.split(':'))
       else
-        return @output_folder
+        File.join(MTBuild::BuildRegistry.top_workspace.output_folder, @project_name.to_s.split(':'))
       end
     end
 

data/lib/mtbuild/staticlibrary_configuration.rb

@@ -6,9 +6,9 @@ module MTBuild
   # method will create this for you.
   class StaticLibraryConfiguration < CompiledConfiguration
 
-    def initialize(project_name, project_folder, output_folder, configuration_name, configuration, api_headers)
+    def initialize(parent_project, output_folder, configuration_name, configuration, api_headers)
       @api_headers = api_headers
-      super project_name, project_folder, output_folder, configuration_name, configuration
+      super parent_project, output_folder, configuration_name, configuration
       @configuration_headers = Utils.expand_folder_list(configuration.fetch(:configuration_headers, []), @project_folder)
     end
 
@@ -24,10 +24,10 @@ module MTBuild
         all_object_folders |= object_folders
       end
 
-      library_files, library_folders = @default_toolchain.create_static_library_tasks(all_object_files, @project_name)
+      library_files, library_folders = @default_toolchain.create_static_library_tasks(all_object_files, @parent_project.project_name)
       dependencies = @dependencies+all_object_folders+library_folders+library_files
 
-      desc "Build library '#{@project_name}' with configuration '#{@configuration_name}'"
+      desc "Build library '#{@parent_project.project_name}' with configuration '#{@configuration_name}'"
       new_task = static_library_task @configuration_name => dependencies do |t|
         puts "built library #{t.name}."
         @tests.each do |test|

data/lib/mtbuild/staticlibrary_project.rb

@@ -19,9 +19,10 @@ module MTBuild
     # Adds a named static library configuration to the project.
     def add_configuration(configuration_name, configuration)
       super
-      default_configuration = Workspace.configuration_defaults.fetch(configuration_name, {})
+      default_configuration = {}
+      default_configuration = @parent_workspace.configuration_defaults.fetch(configuration_name, {}) unless @parent_workspace.nil?
       merged_configuration = Utils.merge_configurations(default_configuration, configuration)
-      cfg = StaticLibraryConfiguration.new(@project_name, @project_folder, effective_output_folder, configuration_name, merged_configuration, @api_headers)
+      cfg = StaticLibraryConfiguration.new(self, effective_output_folder, configuration_name, merged_configuration, @api_headers)
       @configurations << cfg
       return cfg
     end
@@ -54,7 +55,7 @@ module MTBuild
           end
         end
 
-        framework_rakefile = File.join(framework_task.package_dir_path, "Rakefile.rb")
+        framework_rakefile = File.join(framework_task.package_dir_path, "mtbuildfile.rb")
         file framework_rakefile do |f|
           fdir = File.dirname(framework_rakefile)
           mkdir_p(fdir) unless File.exist?(fdir)

data/lib/mtbuild/test_application_configuration.rb

@@ -17,10 +17,10 @@ module MTBuild
         all_object_folders |= object_folders
       end
 
-      application_binaries, application_files, application_folders = @default_toolchain.create_application_tasks(all_object_files, @project_name)
+      application_binaries, application_files, application_folders = @default_toolchain.create_application_tasks(all_object_files, @parent_project.project_name)
       dependencies = @dependencies+all_object_folders+application_folders+application_files+application_binaries
 
-      desc "Build and run test application '#{@project_name}' with configuration '#{@configuration_name}'"
+      desc "Build and run test application '#{@parent_project.project_name}' with configuration '#{@configuration_name}'"
       new_task = test_application_task @configuration_name => dependencies do |t|
         puts "built test application #{t.name}."
         sh "\"#{application_binaries.first}\""

data/lib/mtbuild/test_application_project.rb

@@ -10,9 +10,10 @@ module MTBuild
     # Adds a named test application configuration to the project.
     def add_configuration(configuration_name, configuration)
       super
-      default_configuration = Workspace.configuration_defaults.fetch(configuration_name, {})
+      default_configuration = {}
+      default_configuration = @parent_workspace.configuration_defaults.fetch(configuration_name, {}) unless @parent_workspace.nil?
       merged_configuration = Utils.merge_configurations(default_configuration, configuration)
-      cfg = TestApplicationConfiguration.new(@project_name, @project_folder, effective_output_folder, configuration_name, merged_configuration)
+      cfg = TestApplicationConfiguration.new(self, effective_output_folder, configuration_name, merged_configuration)
       @configurations << cfg
       return cfg
     end

data/lib/mtbuild/toolchain.rb

@@ -13,17 +13,21 @@ module MTBuild
     # Text to append to the name of output files
     attr_accessor :output_decorator
 
-    def initialize(configuration)
+    # parent configuration
+    attr_accessor :parent_configuration
+
+    def initialize(parent_configuration, toolchain_configuration)
       @output_folder = ''
       @project_folder = ''
       @output_decorator = ''
       @include_objects = []
       @include_paths = []
       @library_paths = []
+      @parent_configuration = parent_configuration
 
-      add_include_paths(expand_project_relative_paths(configuration.fetch(:include_paths, [])))
-      add_include_objects(expand_project_relative_paths(configuration.fetch(:include_objects, [])))
-      add_library_paths(expand_project_relative_paths(configuration.fetch(:library_paths, [])))
+      add_include_paths(expand_project_relative_paths(toolchain_configuration.fetch(:include_paths, [])))
+      add_include_objects(expand_project_relative_paths(toolchain_configuration.fetch(:include_objects, [])))
+      add_library_paths(expand_project_relative_paths(toolchain_configuration.fetch(:library_paths, [])))
     end
 
     # Retrieve a list of additional objects to link with
@@ -86,7 +90,7 @@ module MTBuild
       @registered_toolchains[toolchain_name] = toolchain_class;
     end
 
-    def self.create_toolchain(toolchain_configuration)
+    def self.create_toolchain(parent_configuration, toolchain_configuration)
       toolchain_name = toolchain_configuration.fetch(:name, nil)
       fail "error: toolchain name not specified." if toolchain_name.nil?
 
@@ -100,7 +104,7 @@ module MTBuild
       end
       toolchain_class = @registered_toolchains.fetch(toolchain_name, nil)
       fail "error: toolchain #{toolchain_name} could not be found." if toolchain_class.nil?
-      return Object::const_get(toolchain_class).new(toolchain_configuration)
+      return Object::const_get(toolchain_class).new(parent_configuration, toolchain_configuration)
     end
 
     include Rake::DSL

data/lib/mtbuild/toolchains/arm_none_eabi_gcc.rb

@@ -6,7 +6,7 @@ module MTBuild
   # This ToolchainGcc subclass can build using arm-non-eabi-gcc
   class ToolchainArmNoneEabiGcc < ToolchainGcc
 
-    def initialize(configuration)
+    def initialize(parent_configuration, toolchain_configuration)
       super
     end
 
@@ -17,9 +17,14 @@ module MTBuild
       hex_file = File.join(@output_folder, "#{executable_name}#{@output_decorator}.hex")
       map_file = File.join(@output_folder, "#{executable_name}#{@output_decorator}.map")
       executable_folder = @output_folder
-      directory executable_folder
-      CLOBBER.include(executable_folder)
-      CLOBBER.include(elf_file)
+
+      unless @tracked_folders.include?executable_folder
+        @tracked_folders << executable_folder
+        directory executable_folder
+        @parent_configuration.parent_project.add_files_to_clean(executable_folder)
+      end
+
+      @parent_configuration.parent_project.add_files_to_clean(elf_file, bin_file, hex_file, map_file)
 
       all_objects = objects+get_include_objects