basechip 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/collateral/project/project.rb.erb

@@ -1,4 +1,4 @@
-# This file contains the configuration for the project 'usbhostslave', and is
+# This file contains the configuration for the project '<%= BaseChip.project %>', and is
 #   executed from within that project
 
 
@@ -12,7 +12,7 @@ default_modes
 
 # A directory needs to be set up as a landing place for installed tools and
 #   blocks not stored in the repository.
-shared_directory '/home/poulter/silicon/basechip/test/examples/soc2/shared'
+shared_directory '<%= $shared_directory %>'
 
 
 # These routines search for and execute various settings files in the base_chip/
@@ -54,17 +54,6 @@ discover_cluster_types  # Find all files in base_chip/cluster_types, add a
 configuration :default do |c|
 end
 
-block :wrapper do |b|
-  b.action :icarun do |a|
-    a.pass_regex /Finished all tests/
-  end
-end
-block :usbDevice do |b|
-  b.action :icarun do |a|
-    a.pass_regex /Finished all tests/
-  end
-end
-
 # # If discover_blocks isn't being used, you can define blocks and
 # #   configurations/actions applicable for all blocks as shown below
 # block :block_name do |b|

data/collateral/project/settings.rb.erb

@@ -1,26 +1,15 @@
 
-project :<%= BaseChip.project %> do |p|
-
-  # this routine sets up the default directory structure for finding source
-  # files according to language and purpose
-  p.default_directory_structure
-  
-  # these routines search for and install various settings in the base_chip/
-  # folder
-  p.discover_recipes
-  p.discover_tools
-  p.discover_blocks
-  p.discover_configurations
-  p.discover_actions
-  p.discover_test_lists
-  
-  # define blocks and configurations/actions applicable for all blocks
-  # p.block :block_name do |b|
-  #   Things to do
-  # end
-
-  # define defaults for any setting on any element in the data structure
-  # p.delete_on_pass true
-  # p.zip_on_fail true
+# Creating a project named :usbhostslave.
+#   The ':' means we are using a symbol
+# Within the do...end procedure, configuration of the project occurs.
+#   the procedure will execute in the context of the project
+project :<%= BaseChip.project %> do
+
+  # We could completely configure the project inside of this procedure.  We
+  #   could add blocks, configurations of those blocks, actions, test lists, and
+  #   tests.  By convention, however, we will execute the file
+  #   'base_chip/project.rb' on the project handle 'p', and put our
+  #   configuration there.  This file becomes merely a bootstrap.
+  file('base_chip/project.rb')
 
 end

data/lib/base_chip.rb

@@ -42,6 +42,8 @@ require 'base_chip/git'
 module BaseChip
   include Reporting
 
+  @shared_directory = 'foo'
+
   RANDOM_NAME_PIECES = ('0'..'9').to_a + ('a'..'z').to_a +  ('A'..'Z').to_a
   RANDOM_NAME_PIECES_SIZE = RANDOM_NAME_PIECES.size
   def self.random_string(size=10)
@@ -104,22 +106,10 @@ module BaseChip
       documentation
   } # base_chip/configurations questionable FIXME
   @@configuration_directories = 
-    @@common_directories +
-    %w{
-      rtl/verilog
-      rtl/headers
-      rtl/vhdl
-      rtl/systemc
-      gates
-      testbench/verilog
-      testbench/headers
-      testbench/classes
-      testbench/vhdl
-      testbench/systemc
-      synthesis
-      timing
-      sw
-    }
+    @@common_directories + 
+      ( %w{behavioral rtl gates testbench stimulus}.map{|function| %w{verilog classes vhdl systemc headers}.map{|language| "#{function}/#{language}"}}.flatten +
+        %w{synthesis timing sw}
+      ).map {|function| [function,"top_#{function}"] }.flatten
   @@block_directories = 
     @@configuration_directories +
     %w{

data/lib/base_chip/base.rb

@@ -33,7 +33,7 @@ module BaseChip
         attr_reader :test_list
         attr_reader :test
         attr_reader :tool
-        attr_reader :version
+        attr_reader :tool_version
         attr_reader :source_type
         attr_reader :source_language
       end

data/lib/base_chip/block.rb

@@ -27,6 +27,9 @@ module BaseChip
       if configuration = @configurations[name]
         configuration.configure
         configuration.dereference_workload(names,passive)
+      elsif configuration = @configurations[:default]
+        configuration.configure
+        configuration.dereference_workload(names.map{|n|"#{name}:#{n}"},passive)
       elsif passive
         []
       else

data/lib/base_chip/bom.rb

@@ -63,9 +63,9 @@ module BaseChip
       @hash.each do |k1,l1|
         case depth 
         when 1; hash[k1] = l1 if k1.to_s == key.to_s
-        when 2; hash[k1] = tmp = HashWithIndifferentAccess.new
+        when 2; hash[k1] = HashWithIndifferentAccess.new
           l1.each do |k2,l2| 
-            tmp[k2] = l2 if k2.to_s == key.to_s
+            hash[k1][k2] = l2 if k2.to_s == key.to_s
           end
         end
       end

data/lib/base_chip/configuration.rb

@@ -69,7 +69,8 @@ module BaseChip
           next if sc != self and stn.to_s =~ /^top/
           st.configure
           next unless st.source_languages
-          tmp = hash[stn] ||= HashWithIndifferentAccess.new
+          hash[stn] ||= HashWithIndifferentAccess.new
+          tmp = hash[stn]
           st.source_languages.each do |sln,sl|
             sl.configure
             tmp[sln] ||= []
@@ -77,6 +78,7 @@ module BaseChip
           end
         end
       end
+
       @bom = Bom.new(hash)
     end
     # @private

data/lib/base_chip/dsl.rb

@@ -21,15 +21,6 @@ class TrueClass ; include Boolean; end
 class FalseClass; include Boolean; end
 
 module BaseChip
-  # class ConfigHash < Hash
-  #   def [](key)
-  #     value = super(key)
-  #     value.configure
-  #     value
-  #   end
-  #   def each
-  #   end
-  # end
   module Dsl
     def self.included mod
       mod.extend Dsl::ClassMethods
@@ -77,13 +68,6 @@ module BaseChip
       end
 
       def define_settings_methods(name,type)
-        # if name =~ /s$/
-        #   define_method name.to_s.singularize do |index,value|
-        #     hash = (instance_variable_get("@#{name}") || HashWithIndifferentAccess.new)
-        #             instance_variable_set "@#{name}", hash
-        #     hash[index] = value
-        #   end
-        # end
         define_method name do |value=:base_chip_get_operation|
           unless value == :base_chip_get_operation
             check_type(name,value,type)
@@ -264,14 +248,6 @@ module BaseChip
         @parent = parent
       end
 
-      #   # and then the settings
-      #   @settings          = Hash.new
-      #   @children          = Hash.new
-      #   @possible_settings = Hash.new
-
-      #   (self.class.         settings).each { |n,s| s2 = s.dup; s2.parent = self;          @settings[n] = s2 }
-      #   (self.class.possible_settings).each { |n,s| s2 = s.dup; s2.parent = self; @possible_settings[n] = s2 }
-      # end
       def check_type(setting,value,types)
         return if value.nil?
         if types.is_a? Array
@@ -325,51 +301,17 @@ module BaseChip
           end
         end
       end
-      # def eat_settings_hash(h,file)
-      #   h.each do |str,v|
-      #     k = str.to_sym
-      #     if s = (@settings[k] || @possible_settings[k])
-      #       s.set(v,file)
-      #     elsif c = @children[k]
-      #       if v.is_a? Array
-      #         str = str.sub(/s$/,'_array')
-      #         k = str.to_sym
-      #         c = @children[k]
-      #       end
-      #       if c.is_a? Hash
-      #         t = self.class.child_types[k]
-      #         # FIXME fault if v is not also hash ?? Maybe support strings and arrays also ??
-      #         raise "v is a #{v.class}" unless v.is_a? Hash
-      #         v.each do |kc,vc|
-      #           tmp = (c[kc] ||= t.new(self))
-      #           tmp.name = kc
-      #           tmp.eat_settings_hash(vc,file) if vc
-      #         end
-      #       elsif c.is_a? Array
-      #         t = self.class.child_types[k]
-      #         # FIXME fault if v is not also hash ?? Maybe support strings and arrays also ??
-      #         raise "v is a #{v.class}" unless v.is_a? Array
-      #         v.each do |vc|
-      #           c << (tmp = t.new(self))
-      #           tmp.eat_settings_hash(vc,file) if vc
-      #         end
-      #       else
-      #         c.eat_settings_hash(v,file)
-      #       end
-      #     end
-      #   end
-      # end
       def find_parent_values(parent_type)
         if parent = self.send(parent_type)
           raise "parent #{parent.name} of type #{parent.class.class_string} has not yet been configured" unless parent.configured
+        else 
+          return
         end
         self.class.possible_settings.each_key do |name|
-          next unless (self.send name).nil? # PROB UNNECESSARY
-          next unless parent = (self.send parent_type)
+          next unless (self.send name).nil?
           self.send name, (parent.send name)
         end
         self.class.possible_child_types.each do |name,type|
-          next unless parent = self.send(parent_type)
           plural = name.to_s.pluralize
           next unless child_defaults = parent.send(plural)
           hash = instance_variable_or_equal(plural,HashWithIndifferentAccess.new)
@@ -387,54 +329,7 @@ module BaseChip
                 instance_variable_set "@#{name}", value
         value
       end
-      # def meaningful_settings
-      #   return @meaningful_settings if @meaningful_settings
-      #   @meaningful_settings = Hash.new
-      #   @settings.each do |n,s|
-      #     @meaningful_settings[n] = s.value if s.value_set
-      #   end
-      #   @meaningful_settings
-      # end
-      # def to_hash
-      #   h = meaningful_settings.dup
-      #   @children.each do |t,c_hash|
-      #     h[t] = h2 = Hash.new
-      #     c_hash.each{|n,c| h2[n] = c.to_hash}
-      #   end
-      #   h
-      # end
-      # def to_regex(data)
-      #   data = data.join('|') if data.respond_to? :join
-      #   /#{data}/
-      # end
-      # def print_configuration
-      #   puts configuration_hash.to_yaml
-      # end
-      # def configuration_hash
-      #   h = {         :settings => settings_to_hash(@settings         ),
-      #        :possible_settings => settings_to_hash(@possible_settings),
-      #        :children          => {}                                  }
-      #   @children.each do |type,children|
-      #     h[:children][type] = children.class.new
-      #     children.each do |name,child|
-      #       if child
-      #         h[:children][type][name] = child.configuration_hash
-      #       else
-      #         h[:children][type] << name.configuration_hash
-      #       end
-      #     end
-      #   end
-      #   h
-      # end
-      # def settings_to_hash(settings)
-      #   h = {}
-      #   @settings.each do |n,s|
-      #     if s.value_set
-      #       h[n] = s.value
-      #     end
-      #   end
-      #   h
-      # end
+
       # methods that probably shouldn't be here, common to project and block
       def find_file(file) 
         found = nil
@@ -538,56 +433,5 @@ module BaseChip
       fault "'#{full_name}' tried to inherit from #{name.inspect}, but '#{parent.full_name}.#{type_plural}[#{name.inspect}]' is nil'" unless thing
       @base_types << thing
     end
-
-    # only used in block and project
-    # def determine_dirs_to_top(dir = nil)
-    #   dir ||= @work_dir
-    #   @dirs_to_top = []
-    #   loop do
-    #     @dirs_to_top << dir
-    #     break if File.exist? dir + '/.cs_top'
-
-    #     if dir == '/'
-    #       fault "Couldn't find file '.cs_top' in any directory above #{@pwd}.\n" +
-    #             "'.cs_top' is an empty file expected to reside at the top of the checked out project.\n" +
-    #             "Go to the top of your check-out and type 'touch .cs_top'"
-    #     end
-    #     dir = File.expand_path(dir + '/../')
-    #   end
-    #   $environment['PROJECT_ROOT'] = $project_root = @project_root = dir
-    # end
-    # only used in block and project
-    # def read_settings_files(settings_files)
-    #   @settings_files = settings_files
-    #   @project_root = @project.project_root
-
-    #   # @settings_files += @supplimental_yaml if @supplimental_yaml
-    #   # @project.dirs_to_top.each do |d|
-    #   #   if File.exist? (file = d + '/settings.yaml')
-    #   #     @settings_files << file
-    #   #   end
-    #   # end
-
-    #   # print_configuration
-    #   @settings_files.each do |sf|
-    #     found = nil
-    #     sf = sf.gsub(/\$([A-Z_]+)/) { instance_variable_get "@#{$1.downcase}" }
-    #     sf = find_file sf
-    #     if h = YAML.load_file(sf)
-    #       self.eat_settings_hash(h,sf)
-    #       self.find_parent_values
-    #     end
-    #   end
-
-    #   # FIXME TODAY unless self.aliases.size > 0
-    #   # FIXME TODAY   fault "No aliases found"
-    #   # FIXME TODAY end
-
-    #   # FIXME TODAY unless self.actions.size > 0
-    #   # FIXME TODAY   fault "No action definitions were found in any of the following settings files:\n#{@settings_files.join("\n")}"
-    #   # FIXME TODAY end
-    #   
-    # end
-
   end
 end

data/lib/base_chip/generator_menu.rb

@@ -28,7 +28,7 @@ module BaseChip
       BaseChip.build_directory_structure(name,BaseChip.block_directories)
       BaseChip.erb_template "#{BaseChip::GEM_DIR}/collateral/block/block.rb.erb", "#{BaseChip.root}/#{name}/base_chip/block.rb"
       FileUtils.cd BaseChip.root
-      puts "block generation complete"
+      puts "block '#{name}' generation complete"
 
       if options.git
         system "git add ./#{name}"
@@ -39,20 +39,20 @@ module BaseChip
     end
 
     desc "Generate a configuration"
-    def configuration(name)
+    def configuration(block_name, configuration_name)
       BaseChip.load_environment
       BaseChip.find_root(dir = nil)
-      @configuration_name = name
-      BaseChip.build_directory_structure(name,BaseChip.configuration_directories)
-      BaseChip.erb_template "#{BaseChip::GEM_DIR}/collateral/configuration/configuration.rb.erb", "#{BaseChip.root}/#{name}/base_chip/configuration.rb"
+      @configuration_name = configuration_name
+      BaseChip.build_directory_structure("#{block_name}/#{configuration_name}",BaseChip.configuration_directories)
+      BaseChip.erb_template "#{BaseChip::GEM_DIR}/collateral/configuration/configuration.rb.erb", "#{BaseChip.root}/#{block_name}/#{configuration_name}/base_chip/configuration.rb"
       FileUtils.cd BaseChip.root
-      puts "configuration generation complete"
+      puts "configuration '#{block_name}:#{configuration_name}' generation complete"
 
       if options.git
-        system "git add ./#{name}"
-        system "git commit -m 'Initial automated configuration build of '#{name}' BaseChip.' ./#{name}"
+        system "git add ./#{block_name}/#{configuration_name}"
+        system "git commit -m 'Initial automated configuration build of '#{configuration_name}' BaseChip.' ./#{block_name}/#{configuration_name}"
 
-        normal "configuration '#{name}' has been created."
+        normal "configuration '#{configuration_name}' has been created."
       end
     end
 

data/lib/base_chip/install_menu.rb

@@ -49,7 +49,7 @@ module BaseChip
       tools = []
       n = name.to_sym
       BaseChip.tools.each do |tool|
-        next unless tool.name == n
+        next unless tool.name.to_s == n.to_s
         tools << tool
       end
       unless tools[0]

data/lib/base_chip/test.rb

@@ -181,9 +181,9 @@ module BaseChip
     def clean
     end
     def clobber
-      FileUtil.rm_rf directory
-      if Dir.empty? test_list.directory
-        FileUtil.rm_rf test_list.directory
+      FileUtils.rm_rf directory
+      if Dir.glob("#{test_list.directory}/*").empty?
+        FileUtils.rm_rf test_list.directory
       end
     end
 

data/lib/base_chip/test_list.rb

@@ -64,7 +64,7 @@ module BaseChip
         tests.each do |t|
           @posts.each_value do |p|
             p.blks.each do |b|
-              b.call(t)
+              b.parameters.empty? ? t.instance_exec(&b) : b.call(t)
             end
           end
         end
@@ -76,7 +76,7 @@ module BaseChip
           ditch = false
           @requirements.each_value do |m|
             m.blks.each do |b|
-              ditch = !(b.call t)
+              ditch = !(b.parameters.empty? ? t.instance_exec(&b) : b.call(t))
               break if ditch
             end
             break if ditch

data/lib/base_chip/tool.rb

@@ -35,7 +35,7 @@ module BaseChip
       end
     end
     def selected_version
-      @selected_version ||= @versions[@select_version] if @versions
+      @selected_version ||= @tool_versions[@select_version] if @tool_versions
     end
     def path(str=:crazy_default_value)
       if str == :crazy_default_value
@@ -45,7 +45,7 @@ module BaseChip
       end
     end
     def available_versions
-      versions.keys if versions
+      tool_versions.keys if tool_versions
     end
   end
 end

data/lib/base_chip/top_menu.rb

@@ -30,12 +30,14 @@ module BaseChip
 
     desc "Create a new project"
     option :git, :description=>"Set up as a git repository", :type=>:boolean, :alias=>[:g,:r,:repo]
-    def init(project_name)
-      BaseChip.project = project_name
-      BaseChip.root    = "./#{project_name}"
+    def init(project_name, shared_directory)
+      $shared_directory = shared_directory
+      BaseChip.project  = project_name
+      BaseChip.root     = "./#{project_name}"
       FileUtils.mkdir_p BaseChip.root
       BaseChip.build_directory_structure(BaseChip.root, BaseChip.project_directories)
       BaseChip.erb_template "#{BaseChip::GEM_DIR}/collateral/project/settings.rb.erb", "#{BaseChip.root}/base_chip/settings.rb"
+      BaseChip.erb_template "#{BaseChip::GEM_DIR}/collateral/project/project.rb.erb" , "#{BaseChip.root}/base_chip/project.rb"
       FileUtils.cp          "#{BaseChip::GEM_DIR}/collateral/project/gitignore"      , "#{BaseChip.root}/.gitignore"
       FileUtils.cd          BaseChip.root
 
@@ -135,6 +137,7 @@ module BaseChip
     desc  'Clean targets.  Some output remains'
     usage '<targets+> [options]'
     def clean(*args)
+      args << 'all' if args.empty?
       ready_workload(*args)
       @project.workload.each do |w|
         w.clean
@@ -144,6 +147,7 @@ module BaseChip
     desc  'Destroy all output relate to targets'
     usage '<targets+> [options]'
     def clobber(*args)
+      args << 'all' if args.empty?
       ready_workload(*args)
       @project.workload.each do |w|
         w.clobber

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: basechip
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-05 00:00:00.000000000Z
+date: 2011-10-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
-  requirement: &86666810 !ruby/object:Gem::Requirement
+  requirement: &85172180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *86666810
+  version_requirements: *85172180
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &86666550 !ruby/object:Gem::Requirement
+  requirement: &85171880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *86666550
+  version_requirements: *85171880
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &86666260 !ruby/object:Gem::Requirement
+  requirement: &85171580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *86666260
+  version_requirements: *85171580
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &86666010 !ruby/object:Gem::Requirement
+  requirement: &85171260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *86666010
+  version_requirements: *85171260
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &86665760 !ruby/object:Gem::Requirement
+  requirement: &85170940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *86665760
+  version_requirements: *85170940
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &86665510 !ruby/object:Gem::Requirement
+  requirement: &85170630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *86665510
+  version_requirements: *85170630
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &86665240 !ruby/object:Gem::Requirement
+  requirement: &85170320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *86665240
+  version_requirements: *85170320
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &86664940 !ruby/object:Gem::Requirement
+  requirement: &85170020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *86664940
+  version_requirements: *85170020
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &86664690 !ruby/object:Gem::Requirement
+  requirement: &85169710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *86664690
+  version_requirements: *85169710
 description: Define your project in terms of blocks, configurations, tests, and modes.  Install
   or Create recipes and/or plugins to define actions, compute clusters, and tools
   for simulation, synthesis, or anything else.  Run your actions, test_lists, or tests
@@ -199,7 +199,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 690690031
+      hash: -384018031
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: