cxxproject 0.5.48 → 0.5.59

data/lib/cxxproject/toolchain/toolchain.rb

@@ -1,38 +1,38 @@
-require 'yaml'
-
-class Hash
-  def method_missing(m, *args, &block)
-    if m.to_s =~ /(.*)=$/ # was assignment
-      self[$1] = args[0]
-    else
-      fetch(m.to_s, nil)
-    end
-  end
-  def recursive_merge(h)
-    self.merge!(h) {|key, _old, _new| if _old.class == Hash then _old.recursive_merge(_new) else _new end  } 
-  end
-
-end
-
-class Toolchain
-  attr_reader :toolchain
-  def initialize(toolchain_file)
-    @toolchain = YAML::load(File.open(toolchain_file))
-    if @toolchain.base
-      @based_on = @toolchain.base
-    else
-      @based_on = "base"
-    end
-    basechain = YAML::load(File.open(File.join(File.dirname(__FILE__),"#{@based_on}.json")))
-    @toolchain = basechain.recursive_merge(@toolchain)
-  end
-  def method_missing(m, *args, &block)  
-    if @toolchain[m.to_s]
-      self.class.send(:define_method, m) { @toolchain[m.to_s] }
-      @toolchain[m.to_s]
-    else
-      return super
-    end
-  end  
-
-end
+require 'yaml'
+
+class Hash
+  def method_missing(m, *args, &block)
+    if m.to_s =~ /(.*)=$/ # was assignment
+      self[$1] = args[0]
+    else
+      fetch(m.to_s, nil)
+    end
+  end
+  def recursive_merge(h)
+    self.merge!(h) {|key, _old, _new| if _old.class == Hash then _old.recursive_merge(_new) else _new end  } 
+  end
+
+end
+
+class Toolchain
+  attr_reader :toolchain
+  def initialize(toolchain_file)
+    @toolchain = YAML::load(File.open(toolchain_file))
+    if @toolchain.base
+      @based_on = @toolchain.base
+    else
+      @based_on = "base"
+    end
+    basechain = YAML::load(File.open(File.join(File.dirname(__FILE__),"#{@based_on}.json")))
+    @toolchain = basechain.recursive_merge(@toolchain)
+  end
+  def method_missing(m, *args, &block)  
+    if @toolchain[m.to_s]
+      self.class.send(:define_method, m) { @toolchain[m.to_s] }
+      @toolchain[m.to_s]
+    else
+      return super
+    end
+  end  
+
+end

data/lib/cxxproject/toolchain/toolchain_benchmark.rb

@@ -1,23 +1,23 @@
-$:.unshift File.dirname(__FILE__)
-require 'toolchain'
-require 'benchmark'
-
-Benchmark.bm do |x|
-
-  n = 1000
-  x.report("load Toolchain #{n}-times") do
-    n.times do
-      tc = Toolchain.new('gcc.json')
-    end
-  end
-
-  tc = Toolchain.new('gcc.json')
-  n = 1000000
-  x.report("access fields as methods #{n}-times") do
-    n.times do
-      x = tc.compiler.c.source_file_endings
-    end
-  end
-	
-end
-
+$:.unshift File.dirname(__FILE__)
+require 'toolchain'
+require 'benchmark'
+
+Benchmark.bm do |x|
+
+  n = 1000
+  x.report("load Toolchain #{n}-times") do
+    n.times do
+      tc = Toolchain.new('gcc.json')
+    end
+  end
+
+  tc = Toolchain.new('gcc.json')
+  n = 1000000
+  x.report("access fields as methods #{n}-times") do
+    n.times do
+      x = tc.compiler.c.source_file_endings
+    end
+  end
+	
+end
+

data/lib/cxxproject/torake.rb

@@ -1,216 +1,218 @@
-require 'logger'
-require 'pp'
-require 'pathname'
-require 'cxxproject/ext/rake'
-require 'cxxproject/buildingblocks/module'
-require 'cxxproject/buildingblocks/makefile'
-require 'cxxproject/buildingblocks/executable'
-require 'cxxproject/buildingblocks/source_library'
-require 'cxxproject/buildingblocks/single_source'
-require 'cxxproject/buildingblocks/binary_library'
-require 'cxxproject/buildingblocks/custom_building_block'
-require 'cxxproject/buildingblocks/command_line'
-require 'cxxproject/toolchain/colorizing_formatter'
-require 'cxxproject/eval_context'
-require 'cxxproject/utils/valgrind'
-
-module Cxxproject
-  class CxxProject2Rake
-
-    attr_accessor :base, :all_tasks
-
-    def initialize(projects, build_dir, toolchain, base='.')
-      @projects = projects
-      @base = base
-      @build_dir = build_dir
-      @toolchain = toolchain
-      @rel_projects = @projects.map { |p| File.join(@base, p) }
-
-      # TODO: this should be cleaned up somehow...
-      if Utils::OS.linux?
-        toolchain[:LINKER][:LIB_PREFIX_FLAGS] = "-Wl,--whole-archive"
-        toolchain[:LINKER][:LIB_POSTFIX_FLAGS] = "-Wl,--no-whole-archive"
-      end
-
-      Rake::application.deriveIncludes = true
-
-      initialize_logging
-      @all_tasks = instantiate_tasks
-
-      create_generic_tasks
-      create_console_colorization
-      create_multitask
-      create_bail_on_first_task
-      describe_clean_task
-      create_console_task
-    end
-
-    def create_console_task
-      require 'cxxproject/utils/console'
-    end
-
-    def initialize_logging
-      @log = Logger.new(STDOUT)
-      @log.formatter = proc { |severity, datetime, progname, msg|
-        "#{severity}: #{msg}\n"
-      }
-      # Logger loglevels: fatal, error, warn, info, debug
-      # Rake --verbose -> info
-      # Rake --trace -> debug
-      @log.level = Logger::ERROR
-      @log.level = Logger::INFO if RakeFileUtils.verbose == true
-      @log.level = Logger::DEBUG if Rake::application.options.trace
-      @log.debug "initializing for build_dir: \"#{@build_dir}\", base: \"#{@base}\""
-    end
-    def describe_clean_task
-      Rake::Task[:clean].add_description('clean')
-    end
-    def create_bail_on_first_task
-      desc 'set bail on first error'
-      task :bail_on_first_error do
-        Rake::Task.bail_on_first_error = true
-      end
-    end
-
-    def create_multitask
-      desc 'set parallelization of multitask'
-      task :multitask, :threads do |t, args|
-        arg = args.threads
-        if arg
-          Rake::application.max_parallel_tasks = arg.to_i
-        end
-      end
-    end
-
-    def create_console_colorization
-      # default is on
-      Cxxproject::ColorizingFormatter.enabled = true
-      desc 'Toggle colorization of console output (use true|t|yes|y|1|on for true ... everything else is false)'
-      task :toggle_colorize, :on_off do |t, args|
-        arg = args[:on_off] || 'false'
-        on_off = arg.match(/(true|t|yes|y|1|on)$/) != nil
-        Cxxproject::ColorizingFormatter.enabled = on_off
-      end
-    end
-
-    def create_generic_tasks
-      tasks = [:lib, :exe, :run]
-      if Cxxproject::Valgrind::available?
-        tasks << :valgrind
-      end
-      tasks << nil
-      tasks.each { |i| create_filter_task_with_namespace(i) }
-    end
-
-    def create_filter_task_with_namespace(basename)
-      if basename
-        desc "invoke #{basename} with filter"
-        namespace basename do
-          create_filter_task("#{basename}:")
-        end
-      else
-        desc 'invoke with filter'
-        create_filter_task('')
-      end
-    end
-
-    def create_filter_task(basename)
-      task :filter, :filter do |t, args|
-        filter = ".*"
-        if args[:filter]
-          filter = "#{args[:filter]}"
-        end
-        filter = Regexp.new("#{basename}#{filter}")
-        Rake::Task.tasks.each do |to_check|
-          name = to_check.name
-          if ("#{basename}:filter" != name)
-            match = filter.match(name)
-            if match
-              to_check.invoke
-            end
-          end
-        end
-      end
-    end
-
-    def instantiate_tasks
-      check_for_project_configs
-
-      if @log.debug?
-        @log.debug "project_configs:"
-        @projects.each { |c| @log.debug " *  #{c}" }
-      end
-      register_projects()
-      ALL_BUILDING_BLOCKS.values.each do |block|
-        prepare_block(block)
-      end
-      ALL_BUILDING_BLOCKS.values.inject([]) do |memo,block|
-        @log.debug "creating tasks for block: #{block.name}/taskname: #{block.get_task_name} (#{block})"
-        memo << block.convert_to_rake()
-      end
-    end
-
-    def check_for_project_configs
-      cd(@base, :verbose => false) do
-        @projects.each do |p|
-          abort "project config #{p} cannot be found!" unless File.exists?(p)
-        end
-      end
-    end
-
-    def prepare_block(block)
-      block.set_tcs(@toolchain) unless block.has_tcs?
-      block.set_output_dir(Dir.pwd + "/" + @build_dir)
-      block.complete_init()
-    end
-
-    def register_projects()
-      cd(@base,:verbose => false) do |b|
-        @projects.each_with_index do |project_file, i|
-          @log.debug "register project #{project_file}"
-          dirname = File.dirname(project_file)
-          @log.debug "dirname for project was: #{dirname}"
-          cd(dirname,:verbose => false) do | base_dir |
-            @log.debug "register project #{project_file} from within directory: #{Dir.pwd}"
-            eval_file(b, File.basename(project_file))
-          end
-        end
-      end
-    end
-    def eval_file(b, project_file)
-      loadContext = EvalContext.new
-      begin
-        loadContext.eval_project(File.read(File.basename(project_file)), project_file, Dir.pwd)
-      rescue Exception => e
-        puts "problems with #{File.join(b, project_file)} in dir: #{Dir.pwd}"
-        raise e
-      end
-      begin
-        loadContext.myblock.call()
-      rescue Exception => e
-        error_string = "error while evaluating \"#{Dir.pwd}/#{project_file}\""
-        puts error_string
-        raise e
-      end
-
-      loadContext.all_blocks.each do |block|
-        block.
-          set_project_dir(Dir.pwd).
-          set_config_files([Dir.pwd + "/" + project_file])
-        if block.respond_to?(:sources) && block.sources.instance_of?(Rake::FileList)
-          block.set_sources(block.sources.to_a)
-        end
-      end
-    end
-    def define_project_info_task
-      desc "shows your defined projects"
-      task :project_info do
-        p "ProjectBase: #{@base}"
-        ALL_BUILDING_BLOCKS.each_value do |bb|
-          pp bb
-        end
-      end
-    end
-
-  end
-end
+require 'logger'
+require 'pp'
+require 'pathname'
+require 'cxxproject/ext/rake'
+require 'cxxproject/buildingblocks/module'
+require 'cxxproject/buildingblocks/makefile'
+require 'cxxproject/buildingblocks/executable'
+require 'cxxproject/buildingblocks/source_library'
+require 'cxxproject/buildingblocks/single_source'
+require 'cxxproject/buildingblocks/binary_library'
+require 'cxxproject/buildingblocks/custom_building_block'
+require 'cxxproject/buildingblocks/command_line'
+require 'cxxproject/toolchain/colorizing_formatter'
+require 'cxxproject/eval_context'
+require 'cxxproject/utils/valgrind'
+
+module Cxxproject
+  class CxxProject2Rake
+
+    attr_accessor :base, :all_tasks
+
+    def initialize(projects, build_dir, toolchain, base='.')
+      @base = base
+      cd(@base, :verbose => false) do
+        @projects = projects.to_a
+      end
+      @build_dir = build_dir
+      @toolchain = toolchain
+      @rel_projects = @projects#.map { |p| File.join(@base, p) }
+
+      # TODO: this should be cleaned up somehow...
+      if Utils::OS.linux?
+        toolchain[:LINKER][:LIB_PREFIX_FLAGS] = "-Wl,--whole-archive"
+        toolchain[:LINKER][:LIB_POSTFIX_FLAGS] = "-Wl,--no-whole-archive"
+      end
+
+      Rake::application.deriveIncludes = true
+
+      initialize_logging
+      @all_tasks = instantiate_tasks
+
+      create_generic_tasks
+      create_console_colorization
+      create_multitask
+      create_bail_on_first_task
+      describe_clean_task
+      create_console_task
+    end
+
+    def create_console_task
+      require 'cxxproject/utils/console'
+    end
+
+    def initialize_logging
+      @log = Logger.new(STDOUT)
+      @log.formatter = proc { |severity, datetime, progname, msg|
+        "#{severity}: #{msg}\n"
+      }
+      # Logger loglevels: fatal, error, warn, info, debug
+      # Rake --verbose -> info
+      # Rake --trace -> debug
+      @log.level = Logger::ERROR
+      @log.level = Logger::INFO if RakeFileUtils.verbose == true
+      @log.level = Logger::DEBUG if Rake::application.options.trace
+      @log.debug "initializing for build_dir: \"#{@build_dir}\", base: \"#{@base}\""
+    end
+    def describe_clean_task
+      Rake::Task[:clean].add_description('clean')
+    end
+    def create_bail_on_first_task
+      desc 'set bail on first error'
+      task :bail_on_first_error do
+        Rake::Task.bail_on_first_error = true
+      end
+    end
+
+    def create_multitask
+      desc 'set parallelization of multitask'
+      task :multitask, :threads do |t, args|
+        arg = args.threads
+        if arg
+          Rake::application.max_parallel_tasks = arg.to_i
+        end
+      end
+    end
+
+    def create_console_colorization
+      # default is on
+      Cxxproject::ColorizingFormatter.enabled = true
+      desc 'Toggle colorization of console output (use true|t|yes|y|1|on for true ... everything else is false)'
+      task :toggle_colorize, :on_off do |t, args|
+        arg = args[:on_off] || 'false'
+        on_off = arg.match(/(true|t|yes|y|1|on)$/) != nil
+        Cxxproject::ColorizingFormatter.enabled = on_off
+      end
+    end
+
+    def create_generic_tasks
+      tasks = [:lib, :exe, :run]
+      if Cxxproject::Valgrind::available?
+        tasks << :valgrind
+      end
+      tasks << nil
+      tasks.each { |i| create_filter_task_with_namespace(i) }
+    end
+
+    def create_filter_task_with_namespace(basename)
+      if basename
+        desc "invoke #{basename} with filter"
+        namespace basename do
+          create_filter_task("#{basename}:")
+        end
+      else
+        desc 'invoke with filter'
+        create_filter_task('')
+      end
+    end
+
+    def create_filter_task(basename)
+      task :filter, :filter do |t, args|
+        filter = ".*"
+        if args[:filter]
+          filter = "#{args[:filter]}"
+        end
+        filter = Regexp.new("#{basename}#{filter}")
+        Rake::Task.tasks.each do |to_check|
+          name = to_check.name
+          if ("#{basename}:filter" != name)
+            match = filter.match(name)
+            if match
+              to_check.invoke
+            end
+          end
+        end
+      end
+    end
+
+    def instantiate_tasks
+      check_for_project_configs
+
+      if @log.debug?
+        @log.debug "project_configs:"
+        @projects.each { |c| @log.debug " *  #{c}" }
+      end
+      register_projects()
+      ALL_BUILDING_BLOCKS.values.each do |block|
+        prepare_block(block)
+      end
+      ALL_BUILDING_BLOCKS.values.inject([]) do |memo,block|
+        @log.debug "creating tasks for block: #{block.name}/taskname: #{block.get_task_name} (#{block})"
+        memo << block.convert_to_rake()
+      end
+    end
+
+    def check_for_project_configs
+      cd(@base, :verbose => false) do
+        @projects.each do |p|
+          abort "project config #{p} cannot be found!" unless File.exists?(p)
+        end
+      end
+    end
+
+    def prepare_block(block)
+      block.set_tcs(@toolchain) unless block.has_tcs?
+      block.set_output_dir(Dir.pwd + "/" + @build_dir)
+      block.complete_init()
+    end
+
+    def register_projects()
+      cd(@base,:verbose => false) do |b|
+        @projects.each_with_index do |project_file, i|
+          @log.debug "register project #{project_file}"
+          dirname = File.dirname(project_file)
+          @log.debug "dirname for project was: #{dirname}"
+          cd(dirname,:verbose => false) do | base_dir |
+            @log.debug "register project #{project_file} from within directory: #{Dir.pwd}"
+            eval_file(b, File.basename(project_file))
+          end
+        end
+      end
+    end
+    def eval_file(b, project_file)
+      loadContext = EvalContext.new
+      begin
+        loadContext.eval_project(File.read(File.basename(project_file)), project_file, Dir.pwd)
+      rescue Exception => e
+        puts "problems with #{File.join(b, project_file)} in dir: #{Dir.pwd}"
+        raise e
+      end
+      begin
+        loadContext.myblock.call()
+      rescue Exception => e
+        error_string = "error while evaluating \"#{Dir.pwd}/#{project_file}\""
+        puts error_string
+        raise e
+      end
+
+      loadContext.all_blocks.each do |block|
+        block.
+          set_project_dir(Dir.pwd).
+          set_config_files([Dir.pwd + "/" + project_file])
+        if block.respond_to?(:sources) && block.sources.instance_of?(Rake::FileList)
+          block.set_sources(block.sources.to_a)
+        end
+      end
+    end
+    def define_project_info_task
+      desc "shows your defined projects"
+      task :project_info do
+        p "ProjectBase: #{@base}"
+        ALL_BUILDING_BLOCKS.each_value do |bb|
+          pp bb
+        end
+      end
+    end
+
+  end
+end