origen_app_generators 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 95bae33d256bebe0eff06b3bc302cff13ee7727b
-  data.tar.gz: fea2484c1f4856809c5ca0a57c02882d30b4409d
+SHA256:
+  metadata.gz: 975e090af5f2395ac6a1875189204b913c936cccd0b17922a2dfe308ef6d0230
+  data.tar.gz: c09a5e52d72b11249b858af6a71413becaef6515c25ad003d2cb6806f9e60f0c
 SHA512:
-  metadata.gz: 0fb24b159af5a507c5f41917b77d6e56e47e75238c9a261cddb4870cf69078c9cbd1ea623212c27da63cdb9d7c6f9932c35dc4074dcfab8a4dd0bc3f666cf2e0
-  data.tar.gz: 0b06ca6ae29007200ea68fe670d1333a3e3eaed0307cdefbf2ca3a3bec8e2bbc567c8e566ca262e96f7d80ac6e5a25f07e2de3a64d039d2107b0f2246489990c
+  metadata.gz: 56c60abf4528a4b18503b93abe04c54f9a78f878a0a91154c595790162b7983a6bfb534a1772382b80b44fff7d70702beee81b1c0da14420bc7d41c2e6c7bfe1
+  data.tar.gz: 3711966a4d4271c23aea76b9078947dfa2688162a7a19f57f292d414166b63d45ae26989cdabb56c41b55de3a17e5d6dc384aa5ef6174c81625d6e596abc314e

data/bin/boot.rb

@@ -30,8 +30,10 @@ begin
     OrigenAppGenerators.unload_generators unless ARGV[0]
     require load_generators if File.exist?(load_generators)
 
-    OrigenAppGenerators.invoke('tmp')
+    OrigenAppGenerators.invoke('my_app')
   end
 ensure
-  FileUtils.mv "#{tmp_dir}/tmp", 'tmp' if File.exist?("#{tmp_dir}/tmp")
+  FileUtils.mv "#{tmp_dir}/my_app", 'output' if File.exist?("#{tmp_dir}/my_app")
+  puts
+  puts "Ignore the above, your new app is in: output/my_app"
 end

data/config/commands.rb

@@ -56,8 +56,8 @@ when "specs"
 ## origen -h, you can do this be assigning the required text to @application_commands
 ## before handing control back to Origen. Un-comment the example below to get started.
 else
-  @application_commands = <<-EOT
- specs        Run the specs (tests), -c will enable coverage
-  EOT
+#  @application_commands = <<-EOT
+# specs        Run the specs (tests), -c will enable coverage
+#  EOT
 
 end 

data/config/shared_commands.rb

@@ -7,9 +7,11 @@ when "app_gen:test"
   opt_parser = OptionParser.new do |opts|
     opts.banner = <<-END
 Test the generators by emulating the 'origen new' command execution and building the new
-application into the tmp directory.
+application into the output/my_app directory.
 
 Usage: origen app_gen:test [options]
+       origen app_gen:test --regression             # Test all generators
+       origen app_gen:test --inputs 0               # Test with user inputs set 0
 END
     opts.on('-d', '--debugger', 'Enable the debugger') {  options[:debugger] = true }
     opts.on('-i', '--inputs INDEX', Integer, "Apply the set of test inputs defined in #{Origen.app.namespace}::TEST_INPUTS[INDEX]") { |f| options[:inputs] = f }
@@ -21,7 +23,9 @@ END
 
   opt_parser.orig_parse! ARGV
 
-  FileUtils.rm_rf "#{Origen.root}/tmp" if File.exist?("#{Origen.root}/tmp")
+  output_dir = File.join(Origen.root, 'output')
+  FileUtils.rm_rf output_dir if File.exist?(output_dir)
+  FileUtils.mkdir_p output_dir
 
   if options[:inputs] || options[:regression]
     if options[:regression]
@@ -45,12 +49,12 @@ END
           # For some reason this command doesn't work in Travis CI, don't know why and
           # couldn't work out how to fix (looks like a Bundler-related issue)
           cmds << 'origen lint --no-correct' unless ENV['TRAVIS']
-          cmds << 'bundle exec rake new_app_tests:load_target'
+          cmds << 'bundle exec origen exec tmp/new_app_tests.rb'
           cmds << 'origen web compile --no-serve'
           cmds
         elsif op.to_s == 'load_target'
           target_load_test_required = true
-          'rake new_app_tests:load_target'
+          'origen exec tmp/new_app_tests.rb'
         else
           op
         end
@@ -69,12 +73,13 @@ END
         # The app is successfully built, now see if it works...
         unless post_build_operations.empty?
           if target_load_test_required
-            FileUtils.cp "#{Origen.root!}/lib/tasks/new_app_tests.rake", 'tmp/lib/tasks'
+            FileUtils.mkdir_p('output/my_app/tmp')
+            FileUtils.cp "#{Origen.root!}/lib/origen_app_generators/new_app_tests.rb", 'output/my_app/tmp'
           end
 
           operation_failed = false
           Bundler.with_clean_env do
-            Dir.chdir "#{Origen.root}/tmp" do
+            Dir.chdir "#{Origen.root}/output/my_app" do
               post_build_operations.each_with_index do |op, i|
                 if i == 0 && !Origen.site_config.gem_manage_bundler
                   system('bundle')

data/config/version.rb

@@ -1,6 +1,6 @@
 module OrigenAppGenerators
-  MAJOR = 1
-  MINOR = 2
+  MAJOR = 2
+  MINOR = 0
   BUGFIX = 0
   DEV = nil
 

data/lib/origen_app_generators.rb

@@ -7,6 +7,7 @@ require 'origen_app_generators/plugin'
 require 'origen_app_generators/empty_application'
 require 'origen_app_generators/empty_plugin'
 require 'origen_app_generators/new'
+require 'origen_app_generators/test_engineering/common'
 require 'origen_app_generators/test_engineering/test_block'
 require 'origen_app_generators/test_engineering/stand_alone_application'
 require 'origen_app_generators/origen_infrastructure/app_generator_plugin'
@@ -16,15 +17,16 @@ module OrigenAppGenerators
 
   TEST_INPUTS = [
     # 0 - Empty app
-    ['0', '0', :default, :default, :default],
+    ['0', '0', :default],
     # 1 - Empty plugin
     ['0', '1', :default, :default, 'A test block', 'yes', :default],
     # 2 - Stand alone test engineering app
-    ['2', '0', :default, :default, 'Falcon, Eagle', 'Falcon[ram, atd(2), comm[ram(2), osc](3)], Eagle[ram(2), atd(4)]', [:default, 'origen g example']],
+    ['2', '0', [:default]],
     # 3 - Test module
-    ['2', '1', :default, :default, 'Test module for all flash IPs', 'FLASH_512K, FLASH_1024K', 'flash', [:default, 'origen g example']],
+    # ['2', '1', 'Test module for all flash IPs', [:default, 'origen g example']],
+    ['2', '1', 'Test module for all flash IPs', :default],
     # 4 - An app generators plugin
-    ['1', '0', :default, :default, 'My application generators', :default]
+    ['1', '0', 'My application generators', :default]
   ] # END_OF_TEST_INPUTS Don't remove this comment, it is used by the app_gen:new command!
 
   # As you add new generators to this app they will be entered here, this enables the

data/lib/origen_app_generators/application.rb

@@ -33,19 +33,19 @@ module OrigenAppGenerators
         config_prod:        { source: 'config/maillist_prod.txt' },
         doc_history:        { source: 'doc/history' },
         target_default:     { source: 'target/default.rb' },
-        # target_default:     { source: 'debug.rb',          # Relative to the file being linked to
-        #                      dest:   'target/default.rb', # Relative to destination_root
-        #                      type:   :symlink },
+        # target_default:      { source: 'debug.rb',          # Relative to the file being linked to
+        #                       dest:   'target/default.rb', # Relative to destination_root
+        #                       type:   :symlink },
         environment_dir:    { dest: 'environment', type: :directory },
-        lib_module:         { source: 'lib/module.rb',
-                              dest:   "lib/#{@name}.rb" },
-        lib_tasks:          { source: 'lib/app.rake',
-                              dest:   "lib/tasks/#{@name}.rake" },
+        lib_module:         { source: 'app/lib/module.rb',
+                              dest:   "app/lib/#{@name}.rb" },
+        lib_module_dir:     { dest:   "app/lib/#{@name}", type: :directory },
+        app_blocks_dir:     { dest:   'app/blocks', type: :directory },
         spec_helper:        { source: 'spec/spec_helper.rb' },
-        web_index:          { source: 'templates/web/index.md.erb' },
-        web_basic_layout:   { source: 'templates/web/layouts/_basic.html.erb' },
-        web_navbar:         { source: 'templates/web/partials/_navbar.html.erb' },
-        web_release_notes:  { source: 'templates/web/release_notes.md.erb' },
+        web_index:          { source: 'app/templates/web/index.md.erb' },
+        web_basic_layout:   { source: 'app/templates/web/layouts/_basic.html.erb' },
+        web_navbar:         { source: 'app/templates/web/partials/_navbar.html.erb' },
+        web_release_notes:  { source: 'app/templates/web/release_notes.md.erb' },
         rakefile:           { source: 'Rakefile' },
         gemfile:            { source: 'Gemfile' },
         gitignore:          { source: '.gitignore' },
@@ -55,7 +55,7 @@ module OrigenAppGenerators
         session:            { source: 'origen_core_session',
                               dest:   '.session/origen_core',
                               copy:   true
-                            }
+                             }
       }
     end
   end

data/lib/origen_app_generators/base.rb

@@ -5,6 +5,21 @@ module OrigenAppGenerators
 
     require 'gems'
 
+    def validate_application_name
+      @name = args.first.to_s.strip
+      if @name == ''
+        puts
+        puts "You must supply a name for what you want to call your application: 'origen new my_name'"
+        puts
+        exit 1
+      elsif @name != @name.symbolize.to_s
+        puts
+        puts 'The name of your new app must be lowercased and underscored and contain no special characters'
+        puts
+        exit 1
+      end
+    end
+
     def set_source_paths
       # The base Origen generator puts the Origen core directory on the source path, in retrospect this
       # was a bad idea and makes for hard to debug errors if an app generator resolves a template from
@@ -25,7 +40,11 @@ module OrigenAppGenerators
           dir << "#{template_dir}/base"
           klass = last_class
         else
-          dir = "#{Origen.root!}/templates/app_generators/#{class_dir(klass)}"
+          dir = []
+          class_dirs(klass).each do |class_dir|
+            dir << "#{Origen.root!}/templates/app_generators/#{class_dir}"
+            dir << "#{Origen.root!}/app/templates/app_generators/#{class_dir}"
+          end
         end
         Array(dir).each do |dir|
           self.class.source_paths << dir if File.exist?(dir) && !self.class.source_paths.include?(dir)
@@ -40,7 +59,9 @@ module OrigenAppGenerators
     end
 
     def get_common_user_input
-      get_name_and_namespace
+      # Don't bother asking the user for this, their life will be easier if they just go with
+      # Origen's default namespace based on their app's name
+      @namespace = @name.to_s.camelize
     end
 
     def get_lastest_origen_version
@@ -73,6 +94,17 @@ module OrigenAppGenerators
       names.map(&:underscore).join('/')
     end
 
+    def class_dirs(klass)
+      names = klass.to_s.split('::')
+      names.shift
+      dirs = []
+      until names.empty?
+        dirs << names.map(&:underscore).join('/')
+        names.pop
+      end
+      dirs
+    end
+
     # def application_class?(klass)
     #  until klass == OrigenAppGenerators::Base
     # end
@@ -133,12 +165,6 @@ module OrigenAppGenerators
       symlink_cmds.each { |cmd| system(cmd) }
     end
 
-    # Convenience method that is equivalent to calling get_name and then get_namespace
-    def get_name_and_namespace
-      get_name
-      get_namespace
-    end
-
     # Prompts the user to confirm or enter the Ruby namespace to be used in the app.
     #
     # If @name is already defined a proposal will be generated from that, alternatively a proposal

data/lib/origen_app_generators/new.rb

@@ -28,13 +28,13 @@ module OrigenAppGenerators
 
       # **** Add require line ****
       module_declaration = /\nmodule #{Origen.app.namespace}/
-      inject_into_file "lib/#{Origen.app.name}.rb", "require '#{Origen.app.name}/#{@domain_namespace.underscore}/#{@classname.underscore}'\n",
+      inject_into_file "#{app_dir}lib/#{Origen.app.name}.rb", "require '#{Origen.app.name}/#{@domain_namespace.underscore}/#{@classname.underscore}'\n",
                        before: module_declaration
 
       # **** Add to the AVAILABLE hash ****
       if available[@domain_summary]
         existing_domain = /\s*('|")#{@domain_summary}('|") => \[\s*\n/
-        inject_into_file "lib/#{Origen.app.name}.rb", "      #{Origen.app.namespace}::#{@domain_namespace}::#{@classname},\n",
+        inject_into_file "#{app_dir}lib/#{Origen.app.name}.rb", "      #{Origen.app.namespace}::#{@domain_namespace}::#{@classname},\n",
                          after: existing_domain
       else
         new_domain = <<-END
@@ -43,7 +43,7 @@ module OrigenAppGenerators
     ],
         END
         available_hash = /AVAILABLE = {\s*\n/
-        inject_into_file "lib/#{Origen.app.name}.rb", new_domain, after: available_hash
+        inject_into_file "#{app_dir}lib/#{Origen.app.name}.rb", new_domain, after: available_hash
       end
 
       # **** Add a starter set of test inputs ****
@@ -59,11 +59,11 @@ module OrigenAppGenerators
       if @parentclass == 'Plugin'
         inputs += "    ['#{first}', '#{second}', :default, :default, 'A cool plugin', 'yes', :default]"
       else
-        inputs += "    ['#{first}', '#{second}', :default, :default, :default]"
+        inputs += "    ['#{first}', '#{second}', :default]"
       end
       inputs = ",#{inputs}" unless test_inputs.empty?
       end_of_test_inputs = /\n\s*\]\s*#\s*END_OF_TEST_INPUTS/
-      inject_into_file "lib/#{Origen.app.name}.rb", inputs, before: end_of_test_inputs
+      inject_into_file "#{app_dir}lib/#{Origen.app.name}.rb", inputs, before: end_of_test_inputs
     end
 
     # Can't compile this as contains some final ERB, so substitute instead
@@ -78,7 +78,7 @@ module OrigenAppGenerators
     # end
 
     def conclude
-      system "origen lint #{Origen.root}/lib/#{Origen.app.name}.rb"
+      system "origen lint #{Origen.root}/#{app_dir}lib/#{Origen.app.name}.rb"
       puts
       puts "New generator created at: #{filelist[:generator][:dest]}"
       puts
@@ -90,6 +90,14 @@ module OrigenAppGenerators
 
     protected
 
+    def app_dir
+      if File.exist?("#{Origen.root}/app/lib")
+        'app/'
+      else
+        ''
+      end
+    end
+
     def get_summary
       puts
       puts 'DESCRIBE YOUR NEW GENERATOR IN A FEW WORDS'
@@ -151,11 +159,11 @@ module OrigenAppGenerators
     def filelist
       @filelist ||= {
         generator:     { source: 'generator.rb',
-                         dest:   "lib/#{Origen.app.name}/#{@domain_namespace.underscore}/#{@classname.underscore}.rb" },
-        templates_dir: { dest: "templates/app_generators/#{@domain_namespace.underscore}/#{@classname.underscore}",
+                         dest:   "#{app_dir}lib/#{Origen.app.name}/#{@domain_namespace.underscore}/#{@classname.underscore}.rb" },
+        templates_dir: { dest: "#{app_dir}templates/app_generators/#{@domain_namespace.underscore}/#{@classname.underscore}",
                          type: :directory },
         # doc_info:      { source: 'info.md.erb',
-        #                 dest:   "templates/web/#{Origen.app.name}/#{@domain_namespace.underscore}/#{@classname.underscore}.md.erb" }
+        #                 dest:   "#{app_dir}templates/web/#{Origen.app.name}/#{@domain_namespace.underscore}/#{@classname.underscore}.md.erb" }
       }
     end
   end

data/lib/{tasks/new_app_tests.rake → origen_app_generators/new_app_tests.rb}

@@ -1,8 +1,4 @@
 # This file has been added by origen_app_generators to test that the target can be
 # loaded within this application, it will not be included in your final application
 # builds once your generator has been released.
-namespace :new_app_tests do
-  task :load_target do
-    Origen.app.target.load!
-  end
-end
+Origen.app.target.load!

data/lib/origen_app_generators/origen_infrastructure/app_generator_plugin.rb

@@ -77,23 +77,21 @@ module OrigenAppGenerators
           list = super  # Always pick up the parent list
           # Example of how to remove a file from the parent list
           # list.delete(:web_doc_layout)
-          list.delete(:lib_readme)
-          list.delete(:lib_readme_dev)
           list.delete(:templates_shared)
           # Example of how to add a file, in this case the file will be compiled and copied to
           # the same location in the new app
           # list[:config_shared_commands] = { source: 'config/shared_commands.rb' }
           list[:config_load_generators] = { source: 'config/load_generators.rb' }
-          list[:lib_base] = { source: 'lib/base.rb', dest: "lib/#{@name}/base.rb" }
-          list[:lib_plugin] = { source: 'lib/plugin.rb', dest: "lib/#{@name}/plugin.rb" }
-          list[:lib_application] = { source: 'lib/application.rb', dest: "lib/#{@name}/application.rb" }
+          list[:lib_base] = { source: 'app/lib/base.rb', dest: "app/lib/#{@name}/base.rb" }
+          list[:lib_plugin] = { source: 'app/lib/plugin.rb', dest: "app/lib/#{@name}/plugin.rb" }
+          list[:lib_application] = { source: 'app/lib/application.rb', dest: "app/lib/#{@name}/application.rb" }
           # Alternatively specifying a different destination, typically you would do this when
           # the final location is dynamic
           # list[:gemspec] = { source: 'gemspec.rb', dest: "#{@name}.gemspec" }
           # Example of how to create a directory
-          list[:templates_app] = { dest: 'templates/app_generators/application', type: :directory }
-          list[:templates_plugin] = { dest: 'templates/app_generators/plugin', type: :directory }
-          list[:templates_base] = { dest: 'templates/app_generators/base', type: :directory }
+          list[:templates_app] = { dest: 'app/templates/app_generators/application', type: :directory }
+          list[:templates_plugin] = { dest: 'app/templates/app_generators/plugin', type: :directory }
+          list[:templates_base] = { dest: 'app/templates/app_generators/base', type: :directory }
           # By default, directories created in this way will contain a .keep file, to inhibit this:
           # list[:pattern_dir] = { dest: "pattern", type: :directory, nokeep: true }
           # Example of how to create a symlink

data/lib/origen_app_generators/plugin.rb

@@ -1,8 +1,7 @@
 module OrigenAppGenerators
   # The base generator class that should be used by all plugin generators
   class Plugin < Application
-    def get_common_user_input
-      get_name_and_namespace
+    def get_additional_user_input
       get_summary
       get_audience unless @audience
     end
@@ -19,15 +18,13 @@ module OrigenAppGenerators
         list.delete(:web_installation)
         list.delete(:web_introduction)
         list[:gemspec] = { source: 'gemspec.rb', dest: "#{@name}.gemspec" }
-        list[:templates_shared] = { dest: 'templates/shared', type: :directory }
+        list[:templates_shared] = { dest: 'app/templates/shared', type: :directory }
         if @audience == :external
           list[:travis] = { source: '.travis.yml' }
-          list[:web_navbar] = { source: 'templates/web/partials/_navbar_external.html.erb', dest: 'templates/web/partials/_navbar.html.erb' }
+          list[:web_navbar] = { source: 'app/templates/web/partials/_navbar_external.html.erb', dest: 'app/templates/web/partials/_navbar.html.erb' }
         else
-          list[:web_navbar] = { source: 'templates/web/partials/_navbar_internal.html.erb', dest: 'templates/web/partials/_navbar.html.erb' }
+          list[:web_navbar] = { source: 'app/templates/web/partials/_navbar_internal.html.erb', dest: 'app/templates/web/partials/_navbar.html.erb' }
         end
-        list[:lib_readme] = { source: 'lib/README', dest: "lib/#{@name}/README" }
-        list[:lib_readme_dev] = { source: 'lib_dev/README', dest: "lib/#{@name}_dev/README" }
         list
       end
     end

data/lib/origen_app_generators/test_engineering/common.rb

@@ -0,0 +1,29 @@
+module OrigenAppGenerators
+  module TestEngineering
+    module Common
+      def common_filelist(list)
+        # Example of how to remove a file from the parent list
+        # list.delete(:target_debug)
+        # Example of how to add a file, in this case the file will be compiled and copied to
+        # the same location in the new app
+        list[:environment_v93k] = { source: 'environment/v93k.rb' }
+        list[:environment_j750] = { source: 'environment/j750.rb' }
+        list[:environment_uflex] = { source: 'environment/uflex.rb' }
+        # Alternatively specifying a different destination, typically you would do this when
+        # the final location is dynamic
+        # list[:gemspec] = { source: 'gemspec.rb', dest: "#{@name}.gemspec" }
+        # Example of how to create a directory
+        # list[:pattern_dir] = { dest: 'pattern', type: :directory }
+        # Example of how to create a symlink
+        list[:environment_default] = { source: 'uflex.rb',           # Relative to the file being linked to
+                                       dest:   'environment/default.rb', # Relative to destination_root
+                                       type:   :symlink }
+        # Test engineering source directories
+        list[:patterns_dir] = { dest: 'app/patterns', type: :directory }
+        list[:flows_dir]    = { dest: 'app/flows', type: :directory }
+        # Remember to return the final list
+        list
+      end
+    end
+  end
+end

data/lib/origen_app_generators/test_engineering/stand_alone_application.rb

@@ -1,8 +1,9 @@
 module OrigenAppGenerators
   module TestEngineering
-    require 'origen_app_generators/sub_block_parser'
     # Generates a generic application shell
     class StandAloneApplication < Application
+      include Common
+
       desc 'A stand alone test engineering application'
 
       # Any methods that are not protected will get invoked in the order that they are
@@ -13,13 +14,12 @@ module OrigenAppGenerators
         # The methods to get the common user input that applies to all applications will
         # get called at the start automatically, you have a chance here to ask any additional
         # questions that are specific to the type of application being generated
-        get_top_level_names
-        get_sub_block_names
       end
 
       def generate_files
-        # Calling this will build all files, directories and symlinks contained in the
-        # hash returned by the filelist method
+        @development_dependencies = [
+          ['origen_testers']
+        ]
         build_filelist
       end
 
@@ -37,122 +37,8 @@ module OrigenAppGenerators
 
       protected
 
-      def sub_block_parser
-        @sub_block_parser ||= SubBlockParser.new
-      end
-
-      def get_top_level_names
-        puts
-        puts 'NAME YOUR TOP-LEVEL DEVICE(S)'
-        puts
-        puts 'What do you want to call the top-level class that represents your device?'
-        puts 'By default it will be called TopLevel, but if you want this application to support multiple devices you should'
-        puts 'give them unique names.'
-        puts 'Separate multiple names with a comma:    Falcon, Eagle, Vulture'
-        puts
-
-        valid = false
-        until valid
-          @top_level_names = get_text(single: true, default: 'TopLevel').strip.split(',').map do |name|
-            name.strip.gsub(/\s+/, '_').camelize
-          end
-          unless @top_level_names.empty?
-            # Should we check anything here?
-            valid = true
-          end
-        end
-        @top_level_names
-      end
-
-      def get_sub_block_names
-        puts
-        puts 'DEFINE YOUR SUB-BLOCKS'
-        puts
-        puts 'What sub-blocks does this device contain?'
-        puts 'You can leave this blank, but entering some details of the sub-blocks you will want to involve in your tests'
-        puts 'will save you some manual setup of the associated models and controllers.'
-        puts 'You can specify layers of hierarchy and multiple instantiations, here are some examples:'
-        puts
-        puts '  A RAM, OSC, PLL and 2 ATDs at the top-level:    ram, osc, pll, atd(2)'
-        puts '  With 3 COMMS blocks with embedded components:   ram, osc, pll, atd(2), comms[ram(2), osc](3)'
-        if @top_level_names.size > 1
-          puts
-          puts 'If you want different modules for each of your top-level devices you can do:'
-          puts
-          puts "  #{@top_level_names[0]}[ram, atd(2)], #{@top_level_names[1]}[ram(2), atd(4)]"
-        end
-        puts
-
-        valid = false
-        until valid
-          input = get_text(single: true).strip
-          if input.empty?
-            @sub_blocks_lookup = {}
-            valid = true
-          else
-            begin
-              @sub_blocks_lookup = sub_block_parser.parse(input)
-              valid = true
-            rescue
-              valid = false
-            end
-          end
-        end
-        @sub_blocks_lookup
-      end
-
-      # Returns a hash that looks like:
-      #
-      #   {"Falcon"=>{"RAM"=>{}, "ATD"=>{:instances=>2}}, "Eagle"=>{"RAM"=>{:instances=>2}, "ATD"=>{:instances=>4}}}
-      def top_level_sub_blocks
-        blocks = {}
-        # Make sure that each top-level object has a sub blocks assignment
-        if @top_level_names.any? { |n| @sub_blocks_lookup[n] }
-          @top_level_names.each do |name|
-            if @sub_blocks_lookup[name]
-              blocks[name] = @sub_blocks_lookup[name][:children] || {}
-            else
-              blocks[name] = {}
-            end
-          end
-        # Duplicate the given sub blocks to all top-level objects if none have been specified
-        else
-          @top_level_names.each do |name|
-            blocks[name] = @sub_blocks_lookup
-          end
-        end
-        blocks
-      end
-
-      # Returns a hash with all sub-blocks at the top-level, e.g.:
-      #
-      #   {"RAM"=>{}, "ATD"=>{}, "Comms"=>{"RAM"=>{:instances=>2}, "Osc"=>{}}, "Osc"=>{}}
-      def sub_blocks
-        blocks = {}
-        top_level_sub_blocks.each do |top, attrs|
-          extract_sub_blocks(attrs) do |name, attrs|
-            if blocks[name]
-              if blocks[name] != (attrs[:children] || {})
-                Origen.log.warning "The app builder does not currently support different sub-block definitions for block #{name}"
-                Origen.log.warning 'Only the first defintion has been built'
-              end
-            else
-              blocks[name] = attrs[:children] || {}
-            end
-          end
-        end
-        blocks
-      end
-
-      def extract_sub_blocks(blocks, &block)
-        blocks.each do |name, attrs|
-          yield name, attrs
-          extract_sub_blocks(attrs[:children], &block) if attrs[:children]
-        end
-      end
-
       # Defines the filelist for the generator, the default list is inherited from the
-      # parent class (Application).
+      # parent class (Plugin).
       # The filelist can contain references to generate files, directories or symlinks in the
       # new application.
       #
@@ -160,74 +46,16 @@ module OrigenAppGenerators
       # from the parent generator, this means that your generator will automatically stay up
       # to date with the latest conventions
       #
-      # The master templates live in templates/app_generators/application, but
+      # The master templates live in templates/app_generators/plugin, but
       # DO NOT MODIFY THESE FILES DIRECTLY.
       # Either add or remove things post-generation in the modify_files method or copy the
-      # master file to the equivalent sub-directory of templates/app_generators/test_engineering/generic_stand_alone_application
+      # master file to the equivalent sub-directory of templates/app_generators/test_engineering/mpg_test_block
       # which will override the version in the master directory.
       #
       # Additional files can be added or removed from the filelist as shown below.
       def filelist
         @filelist ||= begin
-          list = super  # Always pick up the parent list
-          # Example of how to remove a file from the parent list
-          list.delete(:lib_top_level)
-          list.delete(:target_debug)
-          list.delete(:target_production)
-          list.delete(:target_default)
-          # Example of how to add a file, in this case the file will be compiled and copied to
-          # the same location in the new app
-          @top_level_names.each_with_index do |name, i|
-            list["top_level_model_#{i}"] = { source:  'lib/top_level.rb',
-                                             dest:    "lib/#{@name}/#{name.underscore}.rb",
-                                             options: { name: name, sub_blocks: top_level_sub_blocks[name] }
-                                           }
-
-            list["top_level_controller_#{i}"] = { source:  'lib/top_level_controller.rb',
-                                                  dest:    "lib/#{@name}/#{name.underscore}_controller.rb",
-                                                  options: { name: name }
-                                                }
-
-            list["target_#{name}"] = { source:  'target/top_level.rb',
-                                       dest:    "target/#{name.underscore}.rb",
-                                       options: { name: name }
-                                     }
-            if i == 0
-              list[:target_default] =  { source: "#{name.underscore}.rb", # Relative to the file being linked to
-                                         dest:   'target/default.rb',     # Relative to destination_root
-                                         type:   :symlink }
-            end
-          end
-
-          sub_blocks.each do |name, blocks|
-            list["ip_block_#{name}"] = { source:  'lib/ip_block.rb',
-                                         dest:    "lib/#{@name}/#{name.underscore}.rb",
-                                         options: { name: name, sub_blocks: blocks }
-                                       }
-
-            list["ip_block_controller_#{name}"] = { source: 'lib/ip_block_controller.rb',
-                                                    dest:   "lib/#{@name}/#{name.underscore}_controller.rb" }
-          end
-
-          list[:environment_j750] = { source: 'environment/j750.rb' }
-          list[:environment_uflex] = { source: 'environment/uflex.rb' }
-          list[:environment_v93k] = { source: 'environment/v93k.rb' }
-          list[:environment_jlink] = { source: 'environment/jlink.rb' }
-          # Alternatively specifying a different destination, typically you would do this when
-          # the final location is dynamic
-          # list[:gemspec] = { source: 'gemspec.rb', dest: "#{@name}.gemspec" }
-          # Example of how to create a directory
-          # list[:pattern_dir] = { dest: "pattern", type: :directory }
-          # Example of how to create a symlink
-          list[:environment_default] = { source: 'j750.rb',          # Relative to the file being linked to
-                                         dest:   'environment/default.rb', # Relative to destination_root
-                                         type:   :symlink }
-          # Test engineering source directories
-          list[:program_dir] = { dest: 'program', type: :directory }
-          list[:pattern_dir] = { dest: 'pattern', type: :directory }
-          # Example source files
-          list[:pattern_example] = { source: 'pattern/example.rb' }
-          # Remember to return the final list
+          list = common_filelist(super)  # Always pick up the parent list
           list
         end
       end