mtbuild 0.0.9 → 0.1.0

data/lib/mtbuild/toolchains/arm_none_eabi_gpp.rb

@@ -0,0 +1,21 @@
+module MTBuild
+  require 'mtbuild/toolchains/arm_none_eabi_gcc'
+
+  Toolchain.register_toolchain(:arm_none_eabi_gpp, 'MTBuild::ToolchainArmNoneEabiGpp')
+
+  # This ToolchainGcc subclass can build using arm-non-eabi-g++
+  class ToolchainArmNoneEabiGpp < ToolchainArmNoneEabiGcc
+
+    private
+
+    def compiler
+      return 'arm-none-eabi-g++'
+    end
+
+    def linker
+      return 'arm-none-eabi-g++'
+    end
+
+  end
+
+end

data/lib/mtbuild/toolchains/gcc.rb

@@ -1,8 +1,8 @@
 module MTBuild
+  require 'mtbuild/cleaner'
   require 'mtbuild/loaders/makefile'
   require 'mtbuild/toolchain'
   require 'mtbuild/utils'
-  require 'rake/clean'
 
   Toolchain.register_toolchain(:gcc, 'MTBuild::ToolchainGcc')
 
@@ -11,9 +11,11 @@ module MTBuild
 
     attr_accessor :cppflags, :cflags, :cxxflags, :asflags, :ldflags, :linker_script
 
-    def initialize(configuration)
+    def initialize(parent_configuration, toolchain_configuration)
       super
 
+      @tracked_folders = []
+
       begin
         toolchain_test_output=%x{#{compiler} --version 2>&1}
         toolchain_test_passed=$?.success?
@@ -23,12 +25,12 @@ module MTBuild
       fail "Toolchain component #{compiler} not found." unless toolchain_test_passed
 
       @compiler_is_LLVM_gcc = toolchain_test_output.include?'LLVM'
-      @cppflags = Utils.ensure_array(configuration.fetch(:cppflags, '')).to_a.flatten.join(' ')
-      @cflags = Utils.ensure_array(configuration.fetch(:cflags, '')).to_a.flatten.join(' ')
-      @cxxflags = Utils.ensure_array(configuration.fetch(:cxxflags, '')).to_a.flatten.join(' ')
-      @asflags = Utils.ensure_array(configuration.fetch(:asflags, '')).to_a.flatten.join(' ')
-      @ldflags = Utils.ensure_array(configuration.fetch(:ldflags, '')).to_a.flatten.join(' ')
-      @linker_script = configuration.fetch(:linker_script, '')
+      @cppflags = Utils.ensure_array(toolchain_configuration.fetch(:cppflags, '')).to_a.flatten.join(' ')
+      @cflags = Utils.ensure_array(toolchain_configuration.fetch(:cflags, '')).to_a.flatten.join(' ')
+      @cxxflags = Utils.ensure_array(toolchain_configuration.fetch(:cxxflags, '')).to_a.flatten.join(' ')
+      @asflags = Utils.ensure_array(toolchain_configuration.fetch(:asflags, '')).to_a.flatten.join(' ')
+      @ldflags = Utils.ensure_array(toolchain_configuration.fetch(:ldflags, '')).to_a.flatten.join(' ')
+      @linker_script = toolchain_configuration.fetch(:linker_script, '')
     end
 
     # Create Rake tasks for compilation
@@ -44,15 +46,17 @@ module MTBuild
 
         object_folders << output_folder unless object_folders.include?output_folder
 
-        directory output_folder
-        CLOBBER.include(output_folder)
+        unless @tracked_folders.include?output_folder
+          @tracked_folders << output_folder
+          directory output_folder
+          @parent_configuration.parent_project.add_files_to_clean(output_folder)
+        end
 
         object_file = File.join(output_folder, source_file.pathmap('%n.o'))
         dependency_file = File.join(output_folder, source_file.pathmap('%n.d'))
 
         object_files << object_file
-        CLEAN.include(object_file)
-        CLEAN.include(dependency_file)
+        @parent_configuration.parent_project.add_files_to_clean(object_file, dependency_file)
 
         file_type = get_file_type(source_file)
 
@@ -72,9 +76,14 @@ module MTBuild
     def create_static_library_tasks(objects, library_name)
       library_file = File.join(@output_folder, "lib#{library_name}#{@output_decorator}.a")
       library_folder = @output_folder
-      directory library_folder
-      CLOBBER.include(library_folder)
-      CLOBBER.include(library_file)
+
+      unless @tracked_folders.include?library_folder
+        @tracked_folders << library_folder
+        directory library_folder
+        @parent_configuration.parent_project.add_files_to_clean(library_folder)
+      end
+
+      @parent_configuration.parent_project.add_files_to_clean(library_file)
 
       file library_file => objects do |t|
         command_line = construct_archive_command(objects, t.name)
@@ -88,9 +97,14 @@ module MTBuild
       elf_file = File.join(@output_folder, "#{executable_name}#{@output_decorator}")
       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(map_file, elf_file)
 
       all_objects = objects+get_include_objects
 

data/lib/mtbuild/toolchains/gpp.rb

@@ -0,0 +1,21 @@
+module MTBuild
+  require 'mtbuild/toolchains/gcc'
+
+  Toolchain.register_toolchain(:gpp, 'MTBuild::ToolchainGpp')
+
+  # This ToolchainGcc subclass can build using g++
+  class ToolchainGpp < ToolchainGcc
+
+    private
+
+    def compiler
+      return 'g++'
+    end
+
+    def linker
+      return 'g++'
+    end
+
+  end
+
+end

data/lib/mtbuild/utils.rb

@@ -2,7 +2,6 @@ module MTBuild
 
   module Utils
 
-    require 'rake'
     require 'pathname'
 
     def self.path_difference(root, subdir)

data/lib/mtbuild/workspace.rb

@@ -3,7 +3,8 @@ module MTBuild
   # Use this class to create a workspace
   class Workspace
     require 'mtbuild/utils'
-    require 'rake/clean'
+    require 'mtbuild/build_registry'
+    require 'mtbuild/cleaner'
 
     # The workspace's name
     attr_reader :workspace_name
@@ -15,40 +16,93 @@ module MTBuild
     # The workspace's output folder
     attr_reader :output_folder
 
+    # The workspace's parent workspace
+    attr_reader :parent_workspace
+
+    # Workspace configuration defaults
+    attr_reader :configuration_defaults
+
+    # List of configuration defaults that child workspaces should take from
+    # this workspace
+    attr_reader :push_configuration_defaults
+
+    # List of default tasks to build with this workspace
+    attr_reader :default_tasks
+
     def initialize(workspace_name, workspace_folder, &configuration_block)
-      @workspace_name = workspace_name
       @workspace_folder = File.expand_path(workspace_folder)
       @output_folder = File.expand_path(File.join(@workspace_folder, MTBuild.default_output_folder))
       @projects = []
+      @workspaces = []
       @default_tasks = []
+      @configuration_defaults = {}
+      @child_workspaces = {}
+      @push_configuration_defaults = []
+      @workspace_name, @parent_workspace = MTBuild::BuildRegistry.enter_workspace(workspace_name, self)
 
-      # Only process the first workspace found.
-      # Subsequent workspaces will be ignored
-      if MTBuild::Workspace.workspace.nil?
-        MTBuild::Workspace.set_workspace(self)
+      unless @parent_workspace.nil?
+        pull_configuration_defaults(@parent_workspace, @parent_workspace.push_configuration_defaults)
+      end
 
-        configuration_block.call(self) if configuration_block
+      configuration_block.call(self) if configuration_block
 
-        @projects.each do |project|
-          require project
+      # If there's a parent workspace, use its output folder.
+      # Don't use the current workspace's output folder.
+      @output_folder = @parent_workspace.output_folder unless @parent_workspace.nil?
+
+      @workspaces.each do |workspace|
+        MTBuild::BuildRegistry.expect_workspace
+        @push_configuration_defaults = workspace[:push_cfg]
+        require workspace[:build_file]
+        last_workspace = MTBuild::BuildRegistry.reenter_workspace(self)
+        unless last_workspace.nil?
+          pull_configuration_defaults(last_workspace, workspace[:pull_cfg])
+          @default_tasks+=last_workspace.default_tasks if workspace[:pull_tasks]
         end
+      end
 
-        CLOBBER.include(@output_folder)
+      @projects.each do |project|
+        MTBuild::BuildRegistry.expect_project
+        require project
+      end
 
-        task :workspace do
-          puts "built workspace #{@workspace_name}"
-        end
+      Cleaner.global_clean_list.include(@output_folder)
 
-        task :default => @default_tasks+[:workspace]
+      # Only register default tasks and generate global clean if we're the top-level workspace.
+      if @parent_workspace.nil?
+        task :default => @default_tasks
+        Cleaner.generate_global_clean_task
       end
+
+      MTBuild::BuildRegistry.exit_workspace
+    end
+
+    # Adds a workspace subfolder
+    def add_workspace(workspace_location, pull_default_tasks: false, pull_configurations: [], push_configurations: [])
+      new_workspaces = []
+      Utils.expand_folder_list(workspace_location, @workspace_folder).each do |workspace_path|
+        if File.directory? workspace_path
+          workspace_rakefile = MTBuild::Workspace.find_build_file(workspace_path)
+          unless workspace_rakefile.nil?
+            new_workspaces << {
+                :build_file=>workspace_rakefile,
+                :pull_tasks=>pull_default_tasks,
+                :pull_cfg=>pull_configurations,
+                :push_cfg=>push_configurations
+            }
+          end
+        end
+      end
+      $stderr.puts "Could not find a valid workspace at '#{workspace_location}'. Ignored." if new_workspaces.empty?
+      @workspaces += new_workspaces
     end
 
     # Adds a project subfolder
     def add_project(project_location)
       new_projects = []
-      Utils.expand_folder_list(project_location, Rake.original_dir).each do |project_path|
+      Utils.expand_folder_list(project_location, @workspace_folder).each do |project_path|
         if File.directory? project_path
-          project_rakefile = MTBuild::Workspace.find_mtbuildfile(project_path)
+          project_rakefile = MTBuild::Workspace.find_build_file(project_path)
           new_projects << project_rakefile unless project_rakefile.nil?
         end
       end
@@ -56,14 +110,22 @@ module MTBuild
       @projects += new_projects
     end
 
-    # Adds tasks to be run by default when MTBuild is invoked with no arguments.
+    # Adds tasks to be run by default when MTBuild is invoked with no arguments. This method
+    # expects only MTBuild tasks and will namespace them according to the current workspace
+    # hierarchy.
     def add_default_tasks(default_tasks)
+      @default_tasks |= Utils.ensure_array(default_tasks).flatten.collect {|default_task| "#{@workspace_name}:#{default_task}"}
+    end
+
+    # Adds Rake tasks to be run by default when MTBuild is invoked with no arguments. This method
+    # will not namespace the tasks, so it can be used to specify plain Rake task names.
+    def add_default_rake_tasks(default_tasks)
       @default_tasks |= Utils.ensure_array(default_tasks).flatten
     end
 
     # Sets defaults for all configurations with the specified name
     def set_configuration_defaults(configuration_name, defaults_hash)
-      Workspace.set_configuration_defaults(configuration_name, defaults_hash)
+      @configuration_defaults[configuration_name] = defaults_hash
     end
 
     # Sets the build output folder location
@@ -71,45 +133,16 @@ module MTBuild
       @output_folder = File.expand_path(File.join(@workspace_folder,output_folder))
     end
 
-    @workspace = nil
-
-    # The singleton workspace instance
-    def self.workspace
-      return @workspace
-    end
-
-    # Sets the singleton workspace instance
-    def self.set_workspace(workspace)
-      @workspace = workspace
-    end
-
-    # Queries whether a workspace exists
-    def self.have_workspace?
-      return !@workspace.nil?
-    end
-
-    # Add default tasks to the singleton workspace instance
+    # Add default tasks to the last active workspace
     def self.add_default_tasks(default_tasks)
-      @workspace.add_default_tasks(default_tasks) unless @workspace.nil?
+      MTBuild::BuildRegistry.active_workspace.add_default_rake_tasks(default_tasks) unless MTBuild::BuildRegistry.active_workspace.nil?
     end
 
-    @configuration_defaults = {}
-
-    # Gets the singleton configuration defaults
-    def self.configuration_defaults
-      return @configuration_defaults
-    end
-
-    # Adds or updates defaults to the singleton configuration defaults
-    def self.set_configuration_defaults(configuration_name, defaults_hash)
-      @configuration_defaults[configuration_name] = defaults_hash
-    end
-
-    def self.find_mtbuildfile(project_path)
+    def self.find_build_file(project_path)
       Rake.application.rakefiles.each do |fn|
-        mtbuildfile = File.join(project_path, fn)
-        if File.file? mtbuildfile
-          return mtbuildfile
+        build_file = File.join(project_path, fn)
+        if File.file? build_file
+          return build_file
         end
       end
       return nil
@@ -117,6 +150,21 @@ module MTBuild
 
     include Rake::DSL
 
+    private
+
+    # pulls specific configuration defaults from a workspace
+    def pull_configuration_defaults(workspace, configurations_to_pull)
+      configurations_to_pull.each do |configuration_name|
+        if workspace.configuration_defaults.has_key?(configuration_name)
+          child_config = workspace.configuration_defaults[configuration_name]
+          my_config = @configuration_defaults.fetch(configuration_name, {})
+          @configuration_defaults[configuration_name] = MTBuild::Utils.merge_configurations(my_config, child_config)
+        else
+          $stderr.puts "Warning: workspace '#{workspace.workspace_name}' does not have a configuration named #{configuration_name} to retrieve. Ignored."
+        end
+      end
+    end
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mtbuild
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Jerry Ryle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-17 00:00:00.000000000 Z
+date: 2015-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -104,6 +104,8 @@ files:
 - lib/mtbuild/application_configuration.rb
 - lib/mtbuild/application_project.rb
 - lib/mtbuild/application_task.rb
+- lib/mtbuild/build_registry.rb
+- lib/mtbuild/cleaner.rb
 - lib/mtbuild/compiled_configuration.rb
 - lib/mtbuild/configuration.rb
 - lib/mtbuild/dsl.rb
@@ -123,7 +125,9 @@ files:
 - lib/mtbuild/test_application_task.rb
 - lib/mtbuild/toolchain.rb
 - lib/mtbuild/toolchains/arm_none_eabi_gcc.rb
+- lib/mtbuild/toolchains/arm_none_eabi_gpp.rb
 - lib/mtbuild/toolchains/gcc.rb
+- lib/mtbuild/toolchains/gpp.rb
 - lib/mtbuild/utils.rb
 - lib/mtbuild/version.rb
 - lib/mtbuild/versioner.rb
@@ -145,7 +149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.1
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="