cxx 0.1.15 → 0.1.16

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    M2JhZDYyM2Y0YzA0MTNkOGVlOWJjMjc1ZDcwMTdjYThjMjFmYTMyYw==
+  data.tar.gz: !binary |-
+    MDQwZjdlZWQ0ZmJiZWEwMzA1YThkMGEzNzUwOWMwMjVlYzkzMWRkYg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    OTIxNDZiY2RmNGU1MTFkZmI5MDhlYmRkZTJmODI2YjkxMzViODlhNTRlZjNl
+    MWExZTM5NDJlZTMwYmNjYjUxNDkxODYyNDlhMTg3Njg3N2MzOGZhOGIzZjdi
+    MjZhYTIxZDAwZjFmNzljMWMyZDk1NTRkODE5YjQxZmRjYWIxZjI=
+  data.tar.gz: !binary |-
+    Mzk2MWViZDNlMDgxMDUxNGFhZWQzMGYxYWJkMDZlZjFiZjE1YTA1NzNlM2Vj
+    MjdiNDkwYWQ5ZGQ0NjIyYzIyMTllM2RkNTE0MDUwODE1ZmQyMWNlZDdhOTBi
+    OWM2MDViZTU2OWVjOTc4NTQ5MDM1YjQ2YTAxZjEyM2I5NGZjMWI=

data/lib/cxx.rb

@@ -5,14 +5,7 @@ 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/buildingblocks/building_blocks'
 require 'cxxproject/toolchain/colorizing_formatter'
 require 'cxxproject/plugin_context'
 require 'cxx/eval_context'
@@ -24,8 +17,8 @@ module Cxx
 
     def initialize(projects, build_dir, toolchain_name, base_dir='.', &option_block)
       @build_dir = build_dir
-      option_block.call if option_block
       toolchain = Cxxproject::Toolchain::Provider[toolchain_name]
+      option_block.call(toolchain) if option_block
       raise "no provider with name \"#{toolchain_name}\" found" unless toolchain
       @base_dir = base_dir
       cd(@base_dir, :verbose => false) do
@@ -38,6 +31,7 @@ module Cxx
       @all_tasks = instantiate_tasks(toolchain, build_dir)
 
       create_generic_tasks
+      create_tag_tasks
       create_console_colorization
       create_multitask
       create_dont_bail_on_first_task
@@ -48,8 +42,11 @@ module Cxx
 
     def load_nontoolchain_plugins
       registry = Frazzle::Registry.new('cxxproject', '_', '-')
-      registry.get_all_plugins.select { |name|name.index('toolchain') == nil }.each do |plugin|
-        registry.load_plugin(plugin, Cxxproject::PluginContext.new(self, Cxxproject::ALL_BUILDING_BLOCKS, @log))
+      plugins = registry.get_all_plugins.select do |name|
+        name.index('toolchain') == nil
+      end
+      plugins.each do |plugin|
+        registry.load_plugin(plugin, Cxxproject::PluginContext.create_three_args_context(self, Cxxproject::ALL_BUILDING_BLOCKS, @log))
       end
     end
 
@@ -105,6 +102,18 @@ module Cxx
       tasks.each { |i| create_filter_task_with_namespace(i) }
     end
 
+    def create_tag_tasks
+      desc 'invoke tagged building blocks'
+      task :tag, :tag do |t, args|
+        if args[:tag]
+          current_tag = args[:tag]
+          Rake::Task::tasks.select {|t|t.tags.include?(current_tag)}.each do |task|
+            task.invoke
+          end
+        end
+      end
+    end
+
     def create_filter_task_with_namespace(basename)
       if basename
         desc "invoke #{basename} with filter"

data/lib/cxx/eval_context.rb

@@ -1,11 +1,13 @@
 require 'cxxproject'
 require 'cxxproject/context'
 require 'cxxproject/utils/utils'
+require 'cxxproject/utils/deprecated'
 
 module Cxx
   class EvalContext
     include Cxxproject
     include Cxxproject::Context
+    extend Deprecated
 
     attr_accessor :all_blocks
 
@@ -21,7 +23,7 @@ module Cxx
       instance_eval(project_text)
     end
 
-    def attatch_sources(hash,bblock)
+    def attach_sources(hash,bblock)
       if hash.has_key?(:sources)
         ss = hash[:sources]
         if ss.class == Array || ss.class == Rake::FileList
@@ -32,10 +34,17 @@ module Cxx
       end
     end
 
-    def attatch_includes(hash,bblock)
+    def attach_includes(hash,bblock)
       bblock.set_includes(get_as_array(hash, :includes)) if hash.has_key?(:includes)
     end
 
+    def attach_tags(hash, bblock)
+      bblock.tags = Set.new
+      if hash.has_key?(:tags)
+        bblock.tags = hash[:tags].to_set
+      end
+    end
+
     # specify an executable
     # hash supports:
     # * :sources
@@ -44,19 +53,44 @@ module Cxx
     # * :output_dir
     def exe(name, hash)
       raise "not a hash" unless hash.is_a?(Hash)
-      check_hash(hash,[:sources,:includes,:dependencies,:libpath,:output_dir])
+      check_hash(hash,[:sources,:includes,:dependencies,:libpath,:output_dir, :tags])
       bblock = Cxxproject::Executable.new(name)
-      attatch_sources(hash,bblock)
-      attatch_includes(hash,bblock)
+      attach_sources(hash,bblock)
+      attach_includes(hash,bblock)
+      attach_tags(hash, bblock)
       if hash.has_key?(:dependencies)
         bblock.set_dependencies(hash[:dependencies])
         hash[:dependencies].each { |d| bblock.add_lib_element(Cxxproject::HasLibraries::DEPENDENCY, d) }
       end
       bblock.set_output_dir(hash[:output_dir]) if hash.has_key?(:output_dir)
       all_blocks << bblock
+      bblock
     end
 
-    # specify a sourcelib
+    # specify an executable
+    # hash supports:
+    # * :sources
+    # * :includes
+    # * :dependencies
+    # * :output_dir
+    # * :tags
+    def shared_lib(name, hash)
+      raise "not a hash" unless hash.is_a?(Hash)
+      check_hash(hash, [:sources, :includes, :dependencies, :output_dir, :tags])
+      bblock = Cxxproject::SharedLibrary.new(name)
+      attach_sources(hash,bblock)
+      attach_includes(hash,bblock)
+      attach_tags(hash, bblock)
+      if hash.has_key?(:dependencies)
+        bblock.set_dependencies(hash[:dependencies])
+        hash[:dependencies].each { |d| bblock.add_lib_element(Cxxproject::HasLibraries::DEPENDENCY, d) }
+      end
+      bblock.set_output_dir(hash[:output_dir]) if hash.has_key?(:output_dir)
+      all_blocks << bblock
+      bblock
+    end
+
+    # specify a static library
     # hash supports:
     # * :sources
     # * :includes
@@ -64,13 +98,16 @@ module Cxx
     # * :toolchain
     # * :file_dependencies
     # * :output_dir
-    def source_lib(name, hash)
+    # * :whole_archive
+    # * :tags
+    def static_lib(name, hash)
       raise "not a hash" unless hash.is_a?(Hash)
-      check_hash(hash, [:sources, :includes, :dependencies, :toolchain, :file_dependencies, :output_dir, :whole_archive])
+      check_hash(hash, [:sources, :includes, :dependencies, :toolchain, :file_dependencies, :output_dir, :whole_archive, :tags])
       raise ":sources need to be defined" unless hash.has_key?(:sources)
-      bblock = Cxxproject::SourceLibrary.new(name, hash[:whole_archive])
-      attatch_sources(hash,bblock)
-      attatch_includes(hash,bblock)
+      bblock = Cxxproject::StaticLibrary.new(name, hash[:whole_archive])
+      attach_sources(hash,bblock)
+      attach_includes(hash,bblock)
+      attach_tags(hash, bblock)
       bblock.set_tcs(hash[:toolchain]) if hash.has_key?(:toolchain)
       if hash.has_key?(:dependencies)
         bblock.set_dependencies(hash[:dependencies])
@@ -79,14 +116,17 @@ module Cxx
       bblock.file_dependencies = hash[:file_dependencies] if hash.has_key?(:file_dependencies)
       bblock.set_output_dir(hash[:output_dir]) if hash.has_key?(:output_dir)
       all_blocks << bblock
+      bblock
     end
 
+    deprecated_alias :source_lib, :static_lib
+
     def bin_lib(name, hash=Hash.new)
       raise "not a hash" unless hash.is_a?(Hash)
       check_hash(hash, [:includes, :lib_path])
 
       bblock = Cxxproject::BinaryLibrary.new(name)
-      attatch_includes(hash,bblock)
+      attach_includes(hash,bblock)
       bblock.add_lib_element(Cxxproject::HasLibraries::SEARCH_PATH, hash[:lib_path], true) if hash.has_key?(:lib_path)
       return bblock
     end
@@ -105,8 +145,8 @@ module Cxx
       raise "not a hash" unless hash.is_a?(Hash)
       check_hash(hash,[:sources,:includes])
       bblock = Cxxproject::SingleSource.new(name)
-      attatch_sources(hash,bblock)
-      attatch_includes(hash,bblock)
+      attach_sources(hash,bblock)
+      attach_includes(hash,bblock)
       all_blocks << bblock
     end
 

data/lib/cxx/version.rb

@@ -1,4 +1,4 @@
 module Cxx
-  VERSION = '0.1.15'
+  VERSION = '0.1.16'
 end
 

data/lib/cxx/wizard/Rakefile.rb.template

@@ -1,11 +1,13 @@
 require 'cxx'
 
-unittest_flags = {
-  :DEFINES => ['UNIT_TEST','CPPUNIT_MAIN=main'],
-  :FLAGS => "-O0 -g3 -Wall"
+flags = {
+  :DEFINES => ['UNIT_TEST','EXAMPLE=main'],
+  :FLAGS => ['-O0', '-g3', '-Wall']
 }
 
-cxx(Dir['**/project.rb'], 'out', "<%= toolchain %>", './') do
-  Provider.modify_cpp_compiler("<%= toolchain %>", unittest_flags)
+cxx(Dir['**/project.rb'], 'out', "<%= toolchain %>", './') do |tc|
+  tc[:COMPILER][:C].update(flags)
+  tc[:COMPILER][:CPP].update(flags)
+  tc[:LINKER].update(flags)
+  # tc[:TARGET_OS] = :UNIX | OSX | :WINDOWS
 end
-

data/lib/cxx/wizard/project.rb.template

@@ -2,5 +2,5 @@ cxx_configuration do
   <%= building_block %> "<%= name %>",
     :sources => FileList['**/*.cpp'],
     :includes => ['include'],
-    :dependencies => []
+    :dependencies => []<%= whole_archive ? ",\n    :whole_archive => true" : "" %>
 end

data/lib/cxx/wizard/project_wizard.rb

@@ -16,7 +16,7 @@ def prepare_project(dir_name)
     end
     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
+      building_block, whole_archive = choose_building_block
       generate_makefile = confirm("Do you also whant to generate a rakefile", building_block.eql?("exe"))
 
       toolchain = nil
@@ -25,7 +25,7 @@ def prepare_project(dir_name)
         return unless toolchain
       end
 
-      create_project(dir_name, building_block, toolchain, generate_makefile)
+      create_project(dir_name, building_block, whole_archive, toolchain, generate_makefile)
       say "Completed project-setup ;-)"
     else
       say "Stopped project-setup!"
@@ -39,14 +39,18 @@ def prepare_project(dir_name)
 end
 
 def choose_building_block
-  res = nil
+  building_block = nil
+  whole_archive = 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: "
+    say 'What building-block do you whant to create?'
+    menu.choice(:exe) { building_block = 'exe' }
+    menu.choice(:lib) do
+      building_block = 'source_lib'
+      whole_archive = confirm('Is this a test-library', false)
+    end
+    menu.prompt = 'Select a building-block: '
   end
-  res
+  [building_block, whole_archive]
 end
 
 def choose_toolchain
@@ -74,10 +78,10 @@ def choose_toolchain
   res
 end
 
-def create_project(dir_name, building_block, toolchain, generate_rakefile)
+def create_project(dir_name, building_block, whole_archive, toolchain, generate_rakefile)
   rakefile_template = IO.read(File.join(File.dirname(__FILE__),"Rakefile.rb.template"))
   project_template = IO.read(File.join(File.dirname(__FILE__),"project.rb.template"))
-  binding = create_binding("new-item", building_block, toolchain)
+  binding = create_binding("new-item", building_block, whole_archive, toolchain)
 
   if !File.directory?(dir_name) then
     mkdir_p(dir_name, :verbose => false)
@@ -94,7 +98,7 @@ def create_project(dir_name, building_block, toolchain, generate_rakefile)
   end
 end
 
-def create_binding(name, building_block, toolchain)
+def create_binding(name, building_block, whole_archive, toolchain)
   return binding()
 end
 

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: cxx
 version: !ruby/object:Gem::Version
-  version: 0.1.15
-  prerelease: 
+  version: 0.1.16
 platform: ruby
 authors:
 - christian koestlin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-28 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cxxproject
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -51,34 +46,33 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/cxx
+- lib/cxx/eval_context.rb
 - lib/cxx/version.rb
+- lib/cxx/wizard/Rakefile.rb.template
 - lib/cxx/wizard/project.rb.template
 - lib/cxx/wizard/project_wizard.rb
-- lib/cxx/wizard/Rakefile.rb.template
-- lib/cxx/eval_context.rb
 - lib/cxx.rb
 homepage: 
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: defines the method cxx_configuration
 test_files: []