cxxproject 0.6.9 → 0.6.10

data/Rakefile.rb

@@ -25,8 +25,6 @@ begin
     end
   end
 
-
-
   begin
     require 'rdoc'
     require 'rdoc/task'

data/lib/cxxproject/context.rb

@@ -1,7 +1,6 @@
-
 module Cxxproject
   module Context
-    
+
     def check_hash(hash,allowed)
       hash.keys.map do |k|
         error_string = ["error while evaluating \"#{@current_working_dir}/#{@current_project_file}\"",

data/lib/{cxxproject.rb → cxxproject/cxxproject.rb}

@@ -3,25 +3,29 @@ require 'rubygems'
 require 'yaml'
 require 'rake/clean'
 
-require 'cxxproject/utils/optional'
 
 require 'cxxproject/ext/string'
+require 'cxxproject/ext/hash'
+
+require 'cxxproject/utils/optional'
 require 'cxxproject/utils/utils'
-require 'cxxproject/torake'
-require 'cxxproject/utils/ubigraph'
-require 'cxxproject/utils/graphstream'
+require 'cxxproject/utils/stats'
+
 require 'cxxproject/toolchain/provider'
 
-require 'cxxproject/utils/progress'
-require 'cxxproject/utils/rbcurse'
-require 'cxxproject/utils/progress'
-require 'cxxproject/utils/rbcurse'
-require 'cxxproject/utils/stats'
 require 'cxxproject/version'
 
+require 'cxxproject/plugin_context'
+
+require 'frazzle/frazzle'
+registry = Frazzle::Registry.new('cxxproject', '_', '')
+
+toolchain_plugins = registry.get_plugins('toolchain')
+toolchain_plugins.each do |toolchain_plugin|
+  registry.load_plugin(toolchain_plugin, Cxxproject::PluginContext.new(nil, nil, nil))
+end
+
 include Cxxproject::Toolchain
-CxxProject2Rake = Cxxproject::CxxProject2Rake
-BinaryLibs = Cxxproject::BinaryLibs
 
 def version_info
   Cxxproject::Version.cxxproject

data/lib/cxxproject/ext/hash.rb

@@ -0,0 +1,12 @@
+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

data/lib/cxxproject/plugin_context.rb

@@ -34,13 +34,13 @@ module Cxxproject
     # * :command
     def toolchain(name, tc)
       raise "not a tc" unless tc.is_a?(Hash)
-      check_hash(tc,Provider.default.keys)
+      check_hash(tc, Cxxproject::Toolchain::Provider.default.keys)
       check_compiler(tc[:COMPILER]) if tc[:COMPILER]
       check_linker(tc[:LINKER]) if tc[:LINKER]
       check_archiver(tc[:ARCHIVER]) if tc[:ARCHIVER]
       PluginContext::expand(tc)
-      Provider.add(name)
-      Provider.merge(Provider[name], tc)
+      Cxxproject::Toolchain::Provider.add(name)
+      Cxxproject::Toolchain::Provider.merge(Cxxproject::Toolchain::Provider[name], tc)
     end
 
     def self.expand(toolchain)
@@ -50,7 +50,7 @@ module Cxxproject
         to_expand = find_toolchain_subhash(toolchain)
         from = find_toolchain_element(toolchain,to_expand[:BASED_ON])
         to_expand.delete(:BASED_ON)
-        Cxxproject::Toolchain::Provider.merge(to_expand,from,false)
+        Cxxproject::Toolchain::Provider.merge(to_expand, from, false)
       end
       return toolchain
     end
@@ -60,7 +60,7 @@ module Cxxproject
       tc.each do |k,v|
         if k == :BASED_ON
           res = true
-        elsif v.is_a?(Hash) 
+        elsif v.is_a?(Hash)
           res = needs_expansion(v)
         end
         if res
@@ -76,7 +76,7 @@ module Cxxproject
         tc.each do |k,v|
           if(k == :BASED_ON)
             res << tc
-          elsif v.is_a?(Hash) 
+          elsif v.is_a?(Hash)
             loop.call(res,v)
           end
         end
@@ -84,7 +84,7 @@ module Cxxproject
       loop.call(res,tc)
       return res[0] if res.length > 0
     end
-   
+
 
     def self.find_toolchain_element(tc,name)
       res = []
@@ -104,21 +104,20 @@ module Cxxproject
 
     def check_compiler(hash)
       raise "not a hash" unless hash.is_a?(Hash)
-      check_hash(hash,Provider.default[:COMPILER].keys)
-      
-      check_hash(hash[:CPP],Provider.default[:COMPILER][:CPP].keys << :BASED_ON) if hash[:CPP]
-      check_hash(hash[:C],Provider.default[:COMPILER][:C].keys << :BASED_ON) if hash[:C]
-      check_hash(hash[:ASM],Provider.default[:COMPILER][:ASM].keys << :BASED_ON) if hash[:ASM]
+      check_hash(hash, Cxxproject::Toolchain::Provider.default[:COMPILER].keys)
+      check_hash(hash[:CPP], Cxxproject::Toolchain::Provider.default[:COMPILER][:CPP].keys << :BASED_ON) if hash[:CPP]
+      check_hash(hash[:C], Cxxproject::Toolchain::Provider.default[:COMPILER][:C].keys << :BASED_ON) if hash[:C]
+      check_hash(hash[:ASM], Cxxproject::Toolchain::Provider.default[:COMPILER][:ASM].keys << :BASED_ON) if hash[:ASM]
     end
 
     def check_linker(hash)
       raise "not a hash" unless hash.is_a?(Hash)
-      check_hash(hash,Provider.default[:LINKER].keys)
+      check_hash(hash, Cxxproject::Toolchain::Provider.default[:LINKER].keys)
     end
 
     def check_archiver(hash)
       raise "not a hash" unless hash.is_a?(Hash)
-      check_hash(hash,Provider.default[:ARCHIVER].keys)
+      check_hash(hash, Cxxproject::Toolchain::Provider.default[:ARCHIVER].keys)
     end
 
     # will use the content of the plugin.rb file and evaluate it

data/lib/cxxproject/toolchain/toolchain.rb

@@ -1,19 +1,5 @@
 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)
@@ -26,13 +12,13 @@ class Toolchain
     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)  
+  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
 
 end

data/lib/cxxproject/version.rb

@@ -1,7 +1,7 @@
 module Cxxproject
   class Version
     def self.cxxproject
-      '0.6.9'
+      '0.6.10'
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: cxxproject
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.9
+  version: 0.6.10
 platform: ruby
 authors: 
 - oliver mueller
@@ -10,21 +10,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-11 00:00:00 Z
+date: 2012-07-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: highline
+  name: colored
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.6.0
+        version: "0"
   type: :runtime
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: colored
+  name: frazzle
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -34,21 +34,10 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: progressbar
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id003
 description: "    Some more high level building blocks for cpp projects.\n"
 email: oliver.mueller@gmail.com
-executables: 
-- cxx
+executables: []
+
 extensions: []
 
 extra_rdoc_files: []
@@ -68,7 +57,6 @@ files:
 - lib/cxxproject/utils/rbcurse_executable_ext.rb
 - lib/cxxproject/utils/utils.rb
 - lib/cxxproject/utils/rbcurse_tasktable.rb
-- lib/cxxproject/utils/console.rb
 - lib/cxxproject/utils/progress.rb
 - lib/cxxproject/utils/graphstream.rb
 - lib/cxxproject/toolchain/provider.rb
@@ -82,11 +70,11 @@ files:
 - lib/cxxproject/ext/rake.rb
 - lib/cxxproject/ext/progressbar.rb
 - lib/cxxproject/ext/stdout.rb
+- lib/cxxproject/ext/hash.rb
 - lib/cxxproject/ext/rake_dirty.rb
 - lib/cxxproject/ext/file.rb
 - lib/cxxproject/context.rb
 - lib/cxxproject/plugin_context.rb
-- lib/cxxproject/torake.rb
 - lib/cxxproject/buildingblocks/building_block.rb
 - lib/cxxproject/buildingblocks/has_libraries_mixin.rb
 - lib/cxxproject/buildingblocks/custom_building_block.rb
@@ -101,8 +89,7 @@ files:
 - lib/cxxproject/buildingblocks/source_library.rb
 - lib/cxxproject/buildingblocks/command_line.rb
 - lib/cxxproject/eval_context.rb
-- lib/tools/project_wizard.rb
-- lib/cxxproject.rb
+- lib/cxxproject/cxxproject.rb
 - Rakefile.rb
 - spec/string_spec.rb
 - spec/project_path_spec.rb
@@ -124,9 +111,6 @@ files:
 - spec/cxxproject_2_rake_spec.rb
 - spec/toolchain_spec.rb
 - spec/rake_listener_ext_spec.rb
-- lib/tools/Rakefile.rb.template
-- lib/tools/project.rb.template
-- bin/cxx
 homepage: https://github.com/marcmo/cxxproject
 licenses: []
 
@@ -140,7 +124,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1123746913238393195
+      hash: -240781837461888490
       segments: 
       - 0
       version: "0"

data/bin/cxx

@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-$:.unshift File.join(File.dirname(__FILE__),"..","lib")
-
-require 'tools/project_wizard'
-
-if ARGV.size < 1
-	puts "usage: cxx project-dir"
-	exit 0
-end
-prepare_project(ARGV[0])

data/lib/cxxproject/torake.rb

@@ -1,257 +0,0 @@
-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/plugin_context'
-
-require 'rubygems'
-
-module Cxxproject
-
-  class CxxProject2Rake
-    attr_accessor :base_dir, :all_tasks
-
-    def initialize(projects, build_dir, toolchain_name, base_dir='.', &option_block)
-      load_toolchain_plugins
-      option_block.call if option_block
-      toolchain = Provider[toolchain_name]
-      raise "no provider with name \"#{toolchain_name}\" found" unless toolchain
-      @base_dir = base_dir
-      cd(@base_dir, :verbose => false) do
-        @projects = projects.to_a
-      end
-
-      # 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(build_dir)
-      @all_tasks = instantiate_tasks(toolchain, build_dir)
-
-      create_generic_tasks
-      create_console_colorization
-      create_multitask
-      create_dont_bail_on_first_task
-      describe_clean_task
-      create_console_task
-
-      load_nontoolchain_plugins
-    end
-
-    def find_gems
-      latest = Gem::Specification.latest_specs
-      latest.select do |gem|
-        yield(gem)
-      end
-    end
-
-    def load_toolchain_plugins
-      toolchains = find_gems do |gem|
-        Regexp.new('cxxproject_(.+)toolchain').match(gem.name)
-      end
-      load_gems(toolchains)
-    end
-
-    def load_nontoolchain_plugins
-      cxx = Regexp.new('cxxproject_(.+)')
-      no_toolchain = Regexp.new('.*toolchain.*')
-      gems_to_load = find_gems do |gem|
-        cxx.match(gem.name) && !(no_toolchain.match(gem.name))
-      end
-      load_gems(gems_to_load)
-    end
-
-    def load_gems(gems)
-      context = PluginContext.new(self, ALL_BUILDING_BLOCKS, @log)
-      gems.each do |gem|
-        load_plugin(gem, context)
-      end
-    end
-
-    def load_plugin(gem, pluginContext)
-      begin
-        path = File.join(gem.full_gem_path, 'lib', 'plugin.rb')
-        content = File.read(path)
-        pluginContext.eval_plugin(content)
-      rescue Exception => e
-        puts "problems with gem #{gem} in dir: #{path}: #{e}"
-        raise e
-      end
-    end
-
-    def create_console_task
-      require 'cxxproject/utils/console'
-    end
-
-    def initialize_logging(build_dir)
-      @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_dir: \"#{@base_dir}\""
-    end
-
-    def describe_clean_task
-      Rake::Task[:clean].add_description('clean')
-    end
-
-    def create_dont_bail_on_first_task
-      desc 'dont bail on first error'
-      task :dont_bail_on_first_error do
-        Rake::Task.bail_on_first_error = false
-      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]
-      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(toolchain, build_dir)
-      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, toolchain, build_dir)
-      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_dir, :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, toolchain, build_dir)
-      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_dir,: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
-
-      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
-        ALL_BUILDING_BLOCKS.each_value do |bb|
-          pp bb
-        end
-      end
-    end
-
-  end
-end

data/lib/cxxproject/utils/console.rb

@@ -1,6 +0,0 @@
-desc 'start a rake console'
-task :console do
-  require 'irb'
-  ARGV.clear
-  IRB.start
-end

data/lib/tools/Rakefile.rb.template

@@ -1,10 +0,0 @@
-require 'cxxproject'
-BuildDir = "BuildDir"
-
-unittest_flags = {
-  :DEFINES => ['UNIT_TEST','CPPUNIT_MAIN=main'],
-  :FLAGS => "-O0 -g3 -Wall"
-}
-toolchain = Provider.modify_cpp_compiler("<%= toolchain %>", unittest_flags)
-dependent_projects =  ['./project.rb']
-CxxProject2Rake.new(dependent_projects, BuildDir, toolchain, './')

data/lib/tools/project.rb.template

@@ -1,6 +0,0 @@
-cxx_configuration do
-  <%= building_block %> "<%= name %>",
-    :sources => FileList['**/*.cpp'],
-    :includes => ['include'],
-    :dependencies => []
-end

data/lib/tools/project_wizard.rb

@@ -1,113 +0,0 @@
-require 'rake'
-require 'erb'
-require 'rubygems'
-
-def prepare_project(dir_name)
-  begin
-    require 'highline/import'
-    
-    say "This will create a new cxx-project in directory: '#{dir_name}'"
-    if confirm("Are you sure you want to continue") then
-      building_block = choose_building_block
-      generate_makefile = confirm("Do you also whant to generate a rakefile", building_block.eql?("exe"))
-      
-      toolchain = nil
-      if generate_makefile then
-        toolchain = choose_toolchain
-        return unless toolchain
-      end
-
-      create_project(dir_name, building_block, toolchain, generate_makefile)
-      say "Completed project-setup ;-)"
-    else
-      say "Stopped project-setup!"
-    end
-    
-  rescue Interrupt
-    say "\nStopped project-setup!"
-  rescue LoadError
-    say "Please run 'gem install highline'"
-  end
-end
-
-def choose_building_block
-  res = nil
-  choose do |menu|
-    say "What building-block do you whant to create?"
-    menu.choice(:exe) { res = "exe" }
-    menu.choice(:lib) { res = "source_lib" }
-    menu.prompt = "Select a building-block: "
-  end
-  res
-end
-
-def choose_toolchain
-  res = nil
-  toolchains = []
-  toolchain_pattern = /cxxproject_(.*)toolchain/
-  Gem::Specification.find_all do |gem|
-    if gem.name =~ toolchain_pattern then
-      toolchains << $1
-    end
-  end
-  if toolchains.length > 0 then
-    choose do |menu|
-      say "What toolchain do you whant to use?"
-      toolchains.each do |toolchain|
-        menu.choice(toolchain.to_sym) { res = toolchain }
-      end
-      menu.prompt = "Select a toolchain: "
-    end
-  else
-    say "No toolchains installed!"
-    candidates = `gem list --remote "cxxproject_.*toolchain"`
-    say "You need at least one toolchain-plugin,- candidates are:\n#{candidates}"
-  end
-  res
-end
-
-def create_project(dir_name, building_block, toolchain, generate_rakefile)
-  rakefile_template = IO.read(File.join(File.dirname(__FILE__),"..","tools","Rakefile.rb.template"))
-  project_template = IO.read(File.join(File.dirname(__FILE__),"..","tools","project.rb.template"))
-  binding = create_binding("new-item", building_block, toolchain)
-  
-  if !File.directory?(dir_name) then
-    mkdir_p(dir_name, :verbose => false)
-  end
-  
-  rakefile_file = "#{dir_name}/Rakefile.rb"
-  if generate_rakefile && (!File.exists?(rakefile_file) || confirm("Override existing '#{rakefile_file}'")) then
-    write_template(rakefile_file, rakefile_template, binding)
-  end
-  
-  project_file = "#{dir_name}/project.rb"
-  if !File.exists?(project_file) || confirm("Override existing '#{project_file}'") then
-    write_template(project_file, project_template, binding)
-  end
-end
-
-def create_binding(name, building_block, toolchain)
-  return binding()
-end
-
-def write_template(file_name, template, binding)
-  say "...write: '#{file_name}'"
-  File.open(file_name, 'w') do |f|
-    f.write ERB.new(template).result(binding)
-  end
-end
-
-def confirm(question, default = true)
-  res = nil
-  while res == nil
-    confirm = ask("#{question}? ") { |q| q.default = default ? "Y/n" : "y/N" }
-    if confirm.eql?("Y/n") || confirm.downcase.eql?("yes") || confirm.downcase.eql?("y") then
-      res = true
-    elsif confirm.eql?("y/N") || confirm.downcase.eql?("no") || confirm.downcase.eql?("n") then
-      res = false
-    else
-      say "Please enter \"yes\" or \"no\"."
-    end
-  end
-  return res
-end