mtbuild 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64574656119d9eadc3f2c0050475425e3d27956f
-  data.tar.gz: db30b6a8fe5aae2ce9a501ab8f873c37a117fa45
+  metadata.gz: 2421f140e27fc06f4acc05b65ceeae4ad18807a2
+  data.tar.gz: 226f8ccef5e4c26851f2a16838b51a9447dd5918
 SHA512:
-  metadata.gz: 4a0810cca6b2fcf8b6503dc6fa3357eae2496ab537432f8d280605cae1e624fd5dd23a8414cbca79e534228fc57c990d1d7713191c38e02d53f89ad26c5cea09
-  data.tar.gz: 8a016d464bf650a27026f2f6d91e20166757bedee25816db8f53d1193a0ceb8f867f2f26bfef35f3b2ed7643169b315241a1ff6cde7bd526fff7dab169c02465
+  metadata.gz: b78783ed1b5e6905891c75e31fd46b5f15b09110334d4596033967e0b4a851c27a6f66ac38a3146e5718201f1bfc14ac44c6d25cb212eed3b80afb00c0842eae
+  data.tar.gz: 68e1a5e8e8100d6a6cd1c3e68b3c453675e2be3f9e6a4423d9475ae276a80fad0c954fbf6a6238e063a980cd559a2eb8bb0f33c38c61f3b72830c8693178fca7

data/CHANGES.md

@@ -4,7 +4,7 @@
 
 ### Changes ###
 
-* Fixed issue with test configurations failing on spaces in project paths
+* Fixed spaces in project paths for test executables
 
 
 ## MTBuild 0.0.5 ##

data/lib/mtbuild.rb

@@ -7,6 +7,7 @@ require "mtbuild/dsl"
 require "mtbuild/framework_project"
 require "mtbuild/framework_task"
 require "mtbuild/mtbuild"
+require "mtbuild/mtfile_task"
 require "mtbuild/staticlibrary_project"
 require "mtbuild/staticlibrary_task"
 require "mtbuild/test_application_project"

data/lib/mtbuild/dsl.rb

@@ -41,6 +41,23 @@ module MTBuild
       return versioner_configuration
     end
 
+    # Declare an MT file task.
+    #
+    # Example:
+    #   mtfile "config.cfg" => ["config.template"] do
+    #     open("config.cfg", "w") do |outfile|
+    #       open("config.template") do |infile|
+    #         while line = infile.gets
+    #           outfile.puts line
+    #         end
+    #       end
+    #     end
+    #  end
+    #
+    def mtfile(*args, &block)
+      MTBuild::MTFileTask.define_task(*args, &block)
+    end
+
   end
 
 end

data/lib/mtbuild/loaders/makefile.rb

@@ -0,0 +1,42 @@
+module MTBuild
+
+  # Makefile loader to be used with the import file loader.
+  class MakefileLoader
+    include Rake::DSL
+
+    SPACE_MARK = "\0"
+
+    # Load the makefile dependencies in +fn+.
+    def load(fn)
+      lines = File.read fn
+      lines.gsub!(/\\ /, SPACE_MARK)
+      lines.gsub!(/#[^\n]*\n/m, "")
+      lines.gsub!(/\\\n/, ' ')
+      lines.each_line do |line|
+        return false if not process_line(line)
+      end
+      return true
+    end
+
+    private
+
+    # Process one logical line of makefile data.
+    def process_line(line)
+      file_tasks, args = line.split(':', 2)
+      return if args.nil?
+      dependents = args.split.map { |d| respace(d) }
+      dependents.each { |d| return false if not File.file?d }
+      file_tasks.scan(/\S+/) do |file_task|
+        file_task = respace(file_task)
+        file file_task => dependents
+      end
+    end
+
+    def respace(str)
+      str.tr SPACE_MARK, ' '
+    end
+  end
+
+  # Install the handler
+  Rake.application.add_loader('mf', MakefileLoader.new)
+end

data/lib/mtbuild/mtfile_task.rb

@@ -0,0 +1,51 @@
+require 'rake/task.rb'
+require 'rake/early_time'
+
+module MTBuild
+  # #########################################################################
+  # A FileTask is a task that includes time based dependencies.  If any of a
+  # FileTask's prerequisites have a timestamp that is later than the file
+  # represented by this task, then the file must be rebuilt (using the
+  # supplied actions).
+  #
+  class MTFileTask < Rake::Task
+
+    # Is this file task needed?  Yes if it doesn't exist, or if its time stamp
+    # is out of date.
+    def needed?
+      ! File.exist?(name) || out_of_date?(timestamp) || @force_needed
+    end
+
+    def force_needed()
+      @force_needed = true
+    end
+
+    # Time stamp for file task.
+    def timestamp
+      if File.exist?(name)
+        File.mtime(name.to_s)
+      else
+        Rake::EARLY
+      end
+    end
+
+    private
+
+    # Are there any prerequisites with a later time than the given time stamp?
+    def out_of_date?(stamp)
+      @prerequisites.any? { |n| application[n, @scope].timestamp > stamp}
+    end
+
+    # ----------------------------------------------------------------
+    # Task class methods.
+    #
+    class << self
+      # Apply the scope to the task name according to the rules for this kind
+      # of task.  File based tasks ignore the scope when creating the name.
+      def scope_name(scope, task_name)
+        task_name
+      end
+    end
+  end
+end
+

data/lib/mtbuild/toolchains/gcc.rb

@@ -1,8 +1,8 @@
 module MTBuild
+  require 'mtbuild/loaders/makefile'
   require 'mtbuild/toolchain'
   require 'mtbuild/utils'
   require 'rake/clean'
-  require 'rake/loaders/makefile'
 
   Toolchain.register_toolchain(:gcc, 'MTBuild::ToolchainGcc')
 
@@ -56,11 +56,14 @@ module MTBuild
 
         file_type = get_file_type(source_file)
 
-        file object_file => [source_file] do |t|
+        mtfile object_file => [source_file] do |t|
           command_line = construct_compile_command(file_type, [source_file], get_include_paths, t.name)
           sh command_line
         end
-        Rake::MakefileLoader.new.load(dependency_file) if File.file?(dependency_file)
+        # Load dependencies if the dependencies file exists and the object file is not already scheduled to be rebuilt
+        if File.file?(dependency_file) and not Rake::Task[object_file].needed?
+          Rake::Task[object_file].force_needed() if not MTBuild::MakefileLoader.new.load(dependency_file)
+        end
       end
       return object_files, object_folders
     end
@@ -155,6 +158,8 @@ module MTBuild
       return 'gcc'
     end
 
+    include MTBuild::DSL
+
   end
 
 end

data/lib/mtbuild/version.rb

@@ -1,4 +1,4 @@
 module MTBuild
   # The current MTBuild version.
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mtbuild
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Jerry Ryle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-02 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -110,7 +110,9 @@ files:
 - lib/mtbuild/framework_configuration.rb
 - lib/mtbuild/framework_project.rb
 - lib/mtbuild/framework_task.rb
+- lib/mtbuild/loaders/makefile.rb
 - lib/mtbuild/mtbuild.rb
+- lib/mtbuild/mtfile_task.rb
 - lib/mtbuild/organized_package_task.rb
 - lib/mtbuild/project.rb
 - lib/mtbuild/staticlibrary_configuration.rb