ebngen 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d18964b0ad569c78be8e3864446b73fbcd50a217
-  data.tar.gz: a6d43d8ccee3402fd0974b0d2e6ee56d1bd4c60c
+  metadata.gz: 289fba682eff193bbcdba2b0d625bb8bcf1d924d
+  data.tar.gz: a8f9b56f7039a6dceae9451ff50f5b381ee634a8
 SHA512:
-  metadata.gz: 8eea8b1eb2b741fb6bdd2e65b169ad089a51d4f530416ed8391e2cf0ef6f341b6cb13b76cb47f2873b32394db62a2e05d836f56905976d699a5cf535b073f023
-  data.tar.gz: e0a7433011a34fc999ed1b4bdf180dfb45762573c9753c2ad780e0afbc11cb60f3c10b5688e8da947355df6690d1ce874a742cd2170cde57c64b6b58aba3b877
+  metadata.gz: 2adc6498855aeed317dfef63d4c93471eca978624a217c1e8e5622beddccb6c5f885e5868af6103711acd3654e39a9a0b688007299730e8647645680617b3fdf
+  data.tar.gz: e1f54f7610740300010192657afc15be7be2045c1e7a3def44fb0e37e2f9a680f0bd74dcc03c6e25362fe31a43be70ef97ba053b8319bdc685e5d2e60ccc0b96

data/lib/ebngen/adapter/_yml_helper.rb

@@ -3,18 +3,16 @@ require "yaml"
 
 
 module UNI_Project
+  def is_toolchain_support(tool_chain)
+    return @projects_hash.has_key?(tool_chain)
+  end
 
   def set_hash(options)
      @projects_hash = options
   end
 
-  def get_output_dir(toolchain,  path_hash, **args)
-    if args.length == 0
-      return File.join(@projects_hash[toolchain]["outdir"], toolchain)
-    elsif ! args[:dir].nil?
-      return Pathname.new(File.join(
-      @projects_hash[toolchain]["outdir"], toolchain)).relative_path_from(Pathname.new(args[:dir])).to_s
-    end
+  def get_output_dir(toolchain,  path_hash)
+    @projects_hash[toolchain]["outdir"]
   end
 
   def get_src_list(toolchain)

data/lib/ebngen/adapter/cmake.rb

@@ -18,7 +18,12 @@ module CMAKE
 	include TXT
 	include UNI_Project
 
-	def initialize(project_data, generator_variable)
+	def initialize(project_data, generator_variable, logger = nil)
+		@logger = logger 
+    	unless (logger)
+        	@logger = Logger.new(STDOUT)
+        	@logger.level = Logger::WARN
+    	end
 		set_hash(project_data)
 		@project_name = get_project_name()
 		@board = get_board()
@@ -29,6 +34,7 @@ module CMAKE
 	end
 
   	def generator(filter, project_data)
+  		return if not is_toolchain_support(Project::TOOLCHAIN)
     	create_method(Project::TOOLCHAIN)
     	send(Project::TOOLCHAIN.to_sym, project_data)
     	save_project()
@@ -41,13 +47,21 @@ module CMAKE
   		proj_path = File.join(@paths.rootdir_table['output_root'], o_path)
   		@project['sources'] = Array.new
   		sources.each do |src|
-          if src['rootdir']
-            full_path = @paths.fullpath(src['rootdir'],src['path'])
-          else
-            full_path = @paths.fullpath('default_path',src['path'])
-          end
-          ipath = File.join("$ProjDirPath$", @paths.relpath(proj_path, full_path))
-		  @project['sources'].insert(-1, ipath)
+			if file['rootdir']
+			  if file.has_key? 'path'
+			    full_path = path_mod.fullpath(file['rootdir'],file['path'])
+			  else
+			    full_path = path_mod.fullpath(file['rootdir'],file['source'])
+			  end
+			else
+			  if file.has_key? 'path'
+			    full_path = path_mod.fullpath('default_path',file['path'])
+			  else
+			    full_path = path_mod.fullpath('default_path',file['source'])
+			  end
+			end
+          	ipath = File.join("$ProjDirPath$", @paths.relpath(proj_path, full_path))
+		  	@project['sources'].insert(-1, ipath)
 		end
 
   	end
@@ -61,7 +75,7 @@ module CMAKE
   	end
 
   	def outdir()
-  		puts "#{get_output_dir(Project::TOOLCHAIN, @paths.rootdir_table)}"
+  		@logger.info "#{get_output_dir(Project::TOOLCHAIN, @paths.rootdir_table)}"
   	end
 
 	def targets()
@@ -76,7 +90,7 @@ module CMAKE
           		if methods.include?("target_#{subkey}".to_sym)
             		send("target_#{subkey}".to_sym, key, value[subkey])
           		else
-            		puts "#{key} is not processed"
+            		@logger.info "#{key} is not processed"
           		end
 			end
 		end

data/lib/ebngen/adapter/iar/ewp.rb

@@ -204,7 +204,11 @@ module EWP
     source_hash.each do |src|
       rootdir = src['rootdir']
       virtual_dir = src['virtual_dir']
-      path = src['path']
+      if src.has_key?('path')
+        path = src['path']
+      else
+        path = src['source']
+      end
       if virtual_dir
         if ! groups_existing.include?(virtual_dir)
           groups_existing.insert(-1, virtual_dir)

data/lib/ebngen/adapter/iar.rb

@@ -20,7 +20,12 @@ class Project
 	include EWD
 	include UNI_Project
 
-	def initialize(project_data, generator_variable)
+	def initialize(project_data, generator_variable, logger = nil)
+		@logger = logger 
+    	unless (logger)
+        	@logger = Logger.new(STDOUT)
+        	@logger.level = Logger::WARN
+    	end
 		set_hash(project_data)
 		@project_name = get_project_name()
 		@board = get_board()
@@ -28,7 +33,7 @@ class Project
 		@iar_project_files = {".ewp" => nil, ".dni" => nil, ".ewd" => nil, ".yml" => nil}
 		return nil if get_template(Project::TOOLCHAIN).nil?
 		get_template(Project::TOOLCHAIN).each do |template|
-			puts template
+			@logger.info template
 			ext = File.extname(template)
 			if @iar_project_files.keys.include?(ext)
 				path = @paths.fullpath("default_path",template)
@@ -45,13 +50,14 @@ class Project
 						@iar_project_files[ext] = doc
 				end
 			  #rescue
-			  #	puts "failed to open #{template}"
+			  #	@logger.info "failed to open #{template}"
 			  #end
 			end
 		end
 	end
 
   	def generator(filter, project_data)
+  		return if not is_toolchain_support(Project::TOOLCHAIN)
     	create_method( Project::TOOLCHAIN)
     	send(Project::TOOLCHAIN.to_sym, project_data)
     	save_project()
@@ -80,21 +86,36 @@ class Project
   	end
 
 	def targets()
+		convert_lut = {
+			'cx_flags' => 'cxx_flags',
+			'cc_define' => 'cc_defines',
+			'cx_define' => 'cxx_defines',
+			'as_define' => 'as_defines', 
+			'cp_define' => 'cp_defines',
+			'ar_flags' => 'ar_flags' 
+		}
 		get_targets(Project::TOOLCHAIN).each do |key, value|
 			next if value.nil?
 			#add target for ewp
 			t = new_target(key, @iar_project_files['.ewp'])
 			if t.nil?
-			  puts "missing default debug configuration in template"
+			  @logger.info "missing default debug configuration in template"
  			  return
 			end
 			#do the target settings
 			value.each_key do |subkey|
+				#for backward compatible
+				temp_op = subkey.gsub('-', '_')
+				if convert_lut.has_key? temp_op
+					target_op = convert_lut[temp_op]
+				else
+					target_op = temp_op
+				end
 				methods = self.class.instance_methods(false)
-          		if methods.include?("target_#{subkey}".to_sym)
-            		send("target_#{subkey}".to_sym, t, value[subkey])
+          		if methods.include?("target_#{target_op}".to_sym)
+            		send("target_#{target_op}".to_sym, t, value[subkey])
           		else
-            		puts "#{subkey} is not processed"
+            		@logger.info "#{subkey} is not processed try to use the tool-chain specific"
           		end
 			end
 		end
@@ -299,7 +320,12 @@ class Project_set
     # PARAMS:
     # - project_data: specific project data format for a application/library
     # - generator_variable: all dependency in hash
-	def initialize(project_data, generator_variable)
+	def initialize(project_data, generator_variable, logger = nil)
+		@logger = logger 
+    	unless (logger)
+        	@logger = Logger.new(STDOUT)
+        	@logger.level = Logger::WARN
+    	end
 		set_hash(project_data)
 		@project_name = get_project_name()
 		@board = get_board()
@@ -316,7 +342,7 @@ class Project_set
 					when ".eww"
 						@iar_project_files[ext] = doc
 					else
-						puts "#{ext} not processed"
+						@logger.info "#{ext} not processed"
 				end
 			end
 		end
@@ -330,6 +356,7 @@ class Project_set
 	end
 
 	def generator()
+		return if not is_toolchain_support(Project::TOOLCHAIN)
 		add_project_to_set()
 		save_set()
 	end
@@ -360,7 +387,7 @@ class Project_set
 		return if get_libraries(Project_set::TOOLCHAIN).nil?
 		get_libraries(Project_set::TOOLCHAIN).each do |lib|
 			if ustruct[lib].nil?
-				puts "#{lib} information is missing in all hash"
+				@logger.info "#{lib} information is missing in all hash"
 				next
 			end
 			libname = "#{@project_name}.ewp"
@@ -379,10 +406,14 @@ class Project_set
 
 	def save_set()
 		path = get_output_dir(Project_set::TOOLCHAIN, @paths.rootdir_table)
-		puts @paths.rootdir_table['output_root']
-		puts path
-		puts "#{@project_name}_#{@board}.eww"
-		save(@iar_project_files['.eww'], File.join(@paths.rootdir_table['output_root'], path, "#{@project_name}_#{@board}.eww"))
+		@logger.info  @paths.rootdir_table['output_root']
+		@logger.info path
+		@logger.info "#{@project_name}_#{@board}.eww"
+		if path.class == Hash 
+			save(@iar_project_files['.eww'], File.join(@paths.rootdir_table[path['rootdir']], path['path'], "#{@project_name}_#{@board}.eww"))
+		else
+		  save(@iar_project_files['.eww'], File.join(@paths.rootdir_table['output_root'], path, "#{@project_name}_#{@board}.eww"))
+		end
 	end
 
 end

data/lib/ebngen/generate.rb

@@ -1,41 +1,47 @@
 
 require_relative 'adapter/iar'
 require_relative 'adapter/cmake'
+require 'logger'
 
 class Generator
   attr_accessor :generator_variable
-  def initialize(options)
+  def initialize(options, logger = nil)
+    @logger = logger 
+    unless (logger)
+        @logger = Logger.new(STDOUT)
+        @logger.level = Logger::INFO
+    end
     @generator_variable = options
     if @generator_variable.class != Hash
       puts "failure options shall be a hash"
       return
     end
     if @generator_variable.has_key?('all') and @generator_variable.has_key?('paths')
-      puts "input setting is ok"
+      @logger.info "input setting is ok"
     else
-      puts "input settings is wrong"
+      @logger.info "input settings is wrong"
     end
   end
 
   def generate_projects(tool_chain, filter, project_data)
     case tool_chain.downcase
     when 'iar'
-    	IAR::Project.new(project_data, @generator_variable).generator(filter, project_data)
+    	IAR::Project.new(project_data, @generator_variable, @logger).generator(filter, project_data)
     when 'mdk'
-    	puts "mdk"
+    	@logger.info "mdk TBD"
     when 'cmake'
-    	CMAKE::Project.new(project_data, @generator_variable).generator(filter, project_data)
+    	CMAKE::Project.new(project_data, @generator_variable, @logger).generator(filter, project_data)
 	end
   end
 
   def generate_project_set(tool_chain, project_data)
     case tool_chain.downcase
     when 'iar'
-    	IAR::Project_set.new(project_data, @generator_variable).generator()
+    	 IAR::Project_set.new(project_data, @generator_variable, @logger).generator()
     when 'mdk'
-    	puts "mdk"
+    	@logger.info "mdk TBD"
     when 'armgcc'
-    	puts "armgcc"
+    	@logger.info "armgcc TBD"
 	end  
   end
 

data/lib/ebngen/translate.rb

@@ -2,6 +2,7 @@ require 'deep_merge'
 require 'rubygems'
 require 'pathname'
 require 'fileutils'
+require 'logger'
 
 module Utils_set
   def nodes_exist?(node, subnodes)
@@ -18,7 +19,12 @@ class Translator
 
   include Utils_set
 
-  def initialize(node, logger: nil)
+  def initialize(node, logger = nil)
+      @logger = logger 
+      unless (logger)
+        @logger = Logger.new(STDOUT)
+        @logger.level = Logger::INFO
+      end
       @data_in = deep_copy(node)
       @data_in_component = deep_copy(node)
       @data_out = Hash.new
@@ -61,10 +67,10 @@ class Translator
           begin
             next if struct[subnode]['configuration']['section-type'] != "application"
             if struct[addon]['configuration']['section-type'] != "component"
-              puts "WARNING #{addon} is required as component but has not a component attribute"
+              @logger.warn "WARNING #{addon} is required as component but has not a component attribute"
             end
           rescue
-            puts "error with the merge_by_add with #{subnode} add #{addon}"
+            @logger.error "error with the merge_by_add with #{subnode} add #{addon}"
           end
             deep_add_merge(struct, subnode, addon)
           end
@@ -79,6 +85,25 @@ class Translator
      #puts @data_out.to_yaml
   end
 
+  def output_path(proj, comp)
+    if @data_in[proj].has_key?('outdir')
+      board = @data_in[proj]['configuration']['board']
+      if @data_out[proj][comp]['type'] == "library"
+        if comp == 'uv4'
+          @data_out[proj][comp]['outdir'] = File.join(@data_in[proj]['outdir'], proj, "mdk")
+        else
+          @data_out[proj][comp]['outdir'] = File.join(@data_in[proj]['outdir'], proj, comp)
+        end
+      else
+        if comp == "uv4"
+          @data_out[proj][comp]['outdir'] = File.join(board, @data_in[proj]['outdir'], "mdk")
+        else
+          @data_out[proj][comp]['outdir'] = File.join(board, @data_in[proj]['outdir'], comp)
+        end
+      end
+    end
+  end
+
   private
 
   def convert_rules(proj, comp = 'iar')
@@ -111,23 +136,7 @@ class Translator
       if compiler.has_key?("group")
          @data_out[proj][comp]['group'] =  compiler['group']
       end
-
-      if @data_in[proj].has_key?('outdir')
-        board = @data_in[proj]['configuration']['board']
-        if @data_out[proj][comp]['type'] == "library"
-          if comp == 'uv4'
-            @data_out[proj][comp]['outdir'] = File.join(@data_in[proj]['outdir'], proj, "mdk")
-          else
-            @data_out[proj][comp]['outdir'] = File.join(@data_in[proj]['outdir'], proj, comp)
-          end
-        else
-          if comp == "uv4"
-            @data_out[proj][comp]['outdir'] = File.join(@data_in[proj]['outdir'], "mdk", board)
-          else
-            @data_out[proj][comp]['outdir'] = File.join(@data_in[proj]['outdir'], comp, board)
-          end
-        end
-      end
+      output_path(proj, comp)
   	  compiler['config'].each_key do |target|
           next if compiler['load-to'].nil?
           next if compiler['load-to'][target].nil?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ebngen
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Hake Huang