cxxproject 0.6.12 → 0.6.13

data/lib/cxxproject/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: cxxproject
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.12
+  version: 0.6.13
 platform: ruby
 authors: 
 - oliver mueller
@@ -10,11 +10,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-14 00:00:00 Z
+date: 2012-07-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: colored
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -22,10 +21,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: frazzle
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -33,6 +32,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
+  prerelease: false
   version_requirements: *id002
 description: "    Some more high level building blocks for cpp projects.\n"
 email: oliver.mueller@gmail.com
@@ -43,73 +43,72 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/cxxproject/buildingblocks/binary_library.rb
-- lib/cxxproject/buildingblocks/building_block.rb
-- lib/cxxproject/buildingblocks/command_line.rb
-- lib/cxxproject/buildingblocks/custom_building_block.rb
-- lib/cxxproject/buildingblocks/executable.rb
-- lib/cxxproject/buildingblocks/has_dependencies_mixin.rb
-- lib/cxxproject/buildingblocks/has_includes_mixin.rb
-- lib/cxxproject/buildingblocks/has_libraries_mixin.rb
-- lib/cxxproject/buildingblocks/has_sources_mixin.rb
-- lib/cxxproject/buildingblocks/makefile.rb
-- lib/cxxproject/buildingblocks/module.rb
-- lib/cxxproject/buildingblocks/single_source.rb
-- lib/cxxproject/buildingblocks/source_library.rb
-- lib/cxxproject/context.rb
-- lib/cxxproject/cxxproject.rb
 - lib/cxxproject/errorparser/error_parser.rb
-- lib/cxxproject/eval_context.rb
-- lib/cxxproject/ext/file.rb
-- lib/cxxproject/ext/filelist.rb
-- lib/cxxproject/ext/hash.rb
-- lib/cxxproject/ext/progressbar.rb
-- lib/cxxproject/ext/rake.rb
-- lib/cxxproject/ext/rake_dirty.rb
-- lib/cxxproject/ext/rake_listener.rb
-- lib/cxxproject/ext/stdout.rb
-- lib/cxxproject/ext/string.rb
-- lib/cxxproject/ide_interface.rb
-- lib/cxxproject/plugin_context.rb
-- lib/cxxproject/toolchain/colorizing_formatter.rb
-- lib/cxxproject/toolchain/provider.rb
-- lib/cxxproject/toolchain/toolchain.rb
+- lib/cxxproject/utils/optional.rb
 - lib/cxxproject/utils/cleanup.rb
 - lib/cxxproject/utils/exit_helper.rb
-- lib/cxxproject/utils/graphstream.rb
-- lib/cxxproject/utils/optional.rb
-- lib/cxxproject/utils/printer.rb
+- lib/cxxproject/utils/rbcurse_progress.rb
 - lib/cxxproject/utils/process.rb
-- lib/cxxproject/utils/progress.rb
-- lib/cxxproject/utils/progress_helper.rb
+- lib/cxxproject/utils/ubigraph.rb
+- lib/cxxproject/utils/printer.rb
 - lib/cxxproject/utils/rbcurse.rb
+- lib/cxxproject/utils/progress_helper.rb
 - lib/cxxproject/utils/rbcurse_executable_ext.rb
-- lib/cxxproject/utils/rbcurse_progress.rb
-- lib/cxxproject/utils/rbcurse_tasktable.rb
-- lib/cxxproject/utils/ubigraph.rb
 - lib/cxxproject/utils/utils.rb
+- lib/cxxproject/utils/rbcurse_tasktable.rb
+- lib/cxxproject/utils/progress.rb
+- lib/cxxproject/utils/graphstream.rb
+- lib/cxxproject/toolchain/provider.rb
+- lib/cxxproject/toolchain/colorizing_formatter.rb
+- lib/cxxproject/toolchain/toolchain.rb
 - lib/cxxproject/version.rb
+- lib/cxxproject/ide_interface.rb
+- lib/cxxproject/ext/rake_listener.rb
+- lib/cxxproject/ext/filelist.rb
+- lib/cxxproject/ext/string.rb
+- 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/buildingblocks/building_block.rb
+- lib/cxxproject/buildingblocks/has_libraries_mixin.rb
+- lib/cxxproject/buildingblocks/custom_building_block.rb
+- lib/cxxproject/buildingblocks/makefile.rb
+- lib/cxxproject/buildingblocks/has_includes_mixin.rb
+- lib/cxxproject/buildingblocks/has_sources_mixin.rb
+- lib/cxxproject/buildingblocks/binary_library.rb
+- lib/cxxproject/buildingblocks/executable.rb
+- lib/cxxproject/buildingblocks/module.rb
+- lib/cxxproject/buildingblocks/single_source.rb
+- lib/cxxproject/buildingblocks/has_dependencies_mixin.rb
+- lib/cxxproject/buildingblocks/source_library.rb
+- lib/cxxproject/buildingblocks/command_line.rb
+- lib/cxxproject/cxxproject.rb
 - Rakefile.rb
-- spec/building_block_spec.rb
-- spec/cxxproject_2_rake_spec.rb
-- spec/file_ext_spec.rb
+- spec/string_spec.rb
+- spec/project_path_spec.rb
 - spec/ide_interface_spec.rb
+- spec/spec_helper.rb
 - spec/object_dependency_spec.rb
-- spec/plugin_context_spec.rb
-- spec/project_path_spec.rb
+- spec/building_block_spec.rb
 - spec/provider_spec.rb
-- spec/rake_listener_ext_spec.rb
-- spec/spec_helper.rb
-- spec/string_spec.rb
+- spec/plugin_context_spec.rb
+- spec/file_ext_spec.rb
 - spec/testdata/basic/exe12/project.rb
 - spec/testdata/basic/lib1/project.rb
 - spec/testdata/basic/lib2/project.rb
+- spec/testdata/onlyOneHeader/Rakefile.rb
+- spec/testdata/onlyOneHeader/project.rb
 - spec/testdata/multiple_levels/libs/lib1/project.rb
 - spec/testdata/multiple_levels/libs/lib2/project.rb
 - spec/testdata/multiple_levels/mainproject/basic/project.rb
-- spec/testdata/onlyOneHeader/project.rb
-- spec/testdata/onlyOneHeader/Rakefile.rb
+- spec/cxxproject_2_rake_spec.rb
 - spec/toolchain_spec.rb
+- spec/rake_listener_ext_spec.rb
 homepage: https://github.com/marcmo/cxxproject
 licenses: []
 
@@ -123,6 +122,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 1141907832559414132
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
@@ -133,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Cpp Support for Rake.

data/lib/cxxproject/eval_context.rb

@@ -1,124 +0,0 @@
-require 'cxxproject/context'
-
-module Cxxproject
-  class BinaryLibs
-    class << self
-      def [](*libs)
-        libraries = Array.new
-        libs.each do |x|
-          libraries << BinaryLibrary.new(x)
-        end
-        libraries
-      end
-    end
-  end
-
-  class EvalContext
-    include Context
-
-    attr_accessor :all_blocks
-
-    # must be called to add building blocks
-    def cxx_configuration(&block)
-      @all_blocks = []
-      block.call
-    end
-
-    def eval_project(project_text, project_file, pwd)
-      @current_project_file = project_file
-      @current_working_dir = pwd
-      instance_eval(project_text)
-    end
-
-    # specify an executable
-    # hash supports:
-    # * :sources
-    # * :includes
-    # * :dependencies
-    # * :libpath
-    # * :output_dir
-    def exe(name, hash)
-      raise "not a hash" unless hash.is_a?(Hash)
-      check_hash(hash,[:sources,:includes,:dependencies,:libpath,:output_dir])
-      bblock = Executable.new(name)
-      bblock.set_sources(hash[:sources]) if hash.has_key?(:sources)
-      bblock.set_includes(get_as_array(hash, :includes)) if hash.has_key?(:includes)
-      calc_lib_searchpath(hash).each { |sp| bblock.add_lib_element(HasLibraries::SEARCH_PATH, sp) }
-      if hash.has_key?(:dependencies)
-        bblock.set_dependencies(hash[:dependencies])
-        hash[:dependencies].each { |d| bblock.add_lib_element(HasLibraries::DEPENDENCY, d) }
-      end
-      bblock.set_output_dir(hash[:output_dir]) if hash.has_key?(:output_dir)
-      all_blocks << bblock
-    end
-
-    def calc_lib_searchpath(hash)
-      if hash.has_key?(:libpath)
-        hash[:libpath]
-      else
-        if Utils::OS.linux? || Utils::OS.mac?
-          ["/usr/local/lib","/usr/lib"]
-        elsif Utils::OS.windows?
-          ["C:/tool/cygwin/lib", "C:/Tool/cygwin/usr/local/lib"]
-        end
-      end
-    end
-
-    # specify a sourcelib
-    # hash supports:
-    # * :sources
-    # * :includes
-    # * :dependencies
-    # * :toolchain
-    # * :file_dependencies
-    # * :output_dir
-    def source_lib(name, hash)
-      raise "not a hash" unless hash.is_a?(Hash)
-      check_hash(hash,[:sources, :includes, :dependencies, :toolchain, :file_dependencies, :output_dir])
-      raise ":sources need to be defined" unless hash.has_key?(:sources)
-      bblock = SourceLibrary.new(name)
-      bblock.set_sources(hash[:sources])
-      bblock.set_includes(get_as_array(hash, :includes)) if hash.has_key?(:includes)
-      bblock.set_tcs(hash[:toolchain]) if hash.has_key?(:toolchain)
-      if hash.has_key?(:dependencies)
-        bblock.set_dependencies(hash[:dependencies])
-        hash[:dependencies].each { |d| bblock.add_lib_element(HasLibraries::DEPENDENCY, d) }
-      end
-      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
-    end
-
-    # specify some binary libs
-    # returns all binary libs as array
-    def bin_libs(*names)
-      res = []
-      mapped = names.map{|n|n.to_s}
-      mapped.each do |name|
-        res << BinaryLibrary.new(name)
-      end
-      mapped
-    end
-
-    def compile(name, hash)
-      raise "not a hash" unless hash.is_a?(Hash)
-      check_hash(hash,[:sources,:includes])
-      bblock = SingleSource.new(name)
-      bblock.set_sources(hash[:sources]) if hash.has_key?(:sources)
-      bblock.set_includes(hash[:includes]) if hash.has_key?(:includes)
-      all_blocks << bblock
-    end
-
-    def custom(name, hash)
-      raise "not a hash" unless hash.is_a?(Hash)
-      check_hash(hash,[:execute, :dependencies])
-      bblock = CustomBuildingBlock.new(name)
-      bblock.set_actions(hash[:execute]) if hash.has_key?(:execute)
-      if hash.has_key?(:dependencies)
-        bblock.set_dependencies(hash[:dependencies])
-      end
-      all_blocks << bblock
-    end
-
-  end
-end