ebngen 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 289fba682eff193bbcdba2b0d625bb8bcf1d924d
-  data.tar.gz: a8f9b56f7039a6dceae9451ff50f5b381ee634a8
+  metadata.gz: f863cc72f12344124ff81b3aa7e3a8217fadd927
+  data.tar.gz: 7c235d27bbf94c9170da3efe3a8ba50e91165b6d
 SHA512:
-  metadata.gz: 2adc6498855aeed317dfef63d4c93471eca978624a217c1e8e5622beddccb6c5f885e5868af6103711acd3654e39a9a0b688007299730e8647645680617b3fdf
-  data.tar.gz: e1f54f7610740300010192657afc15be7be2045c1e7a3def44fb0e37e2f9a680f0bd74dcc03c6e25362fe31a43be70ef97ba053b8319bdc685e5d2e60ccc0b96
+  metadata.gz: aeb4aa02969f5521d775a51287afac98174e4b53d0cff7010ee42f25a6536f41a8be35d8289357457c792c17b4799efc0ace6188542507ac679c56a37076e652
+  data.tar.gz: 914f0738dc4e77d8419003813b4f3f4f1d7b8603b86aa429a483dade9e76a0d433ec4d806c3aa02d7acf462ee1be19a776bd938b28dea107770c1488d3f2999f

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

@@ -4,6 +4,16 @@ require 'pathname'
 
 class Hash
  def to_xml(doc)
+   return if doc.nil?
+   self.each do |key, value|
+     mynode = Nokogiri::XML::Node.new key, doc
+     doc.add_child mynode
+     value.to_xml(mynode) if value.class == Hash
+     mynode.content = value if value.class == String or value.class == Fixnum
+   end
+   return doc
+ end #end to_xml
+ def to_xml!(doc)
    return if doc.nil?
    self.each do |key, value|
      if doc.css("/#{key}").count == 0
@@ -16,7 +26,7 @@ class Hash
      mynode.content = value if value.class == String or value.class == Fixnum
    end
    return doc
- end #end to_xml
+ end #end to_xml!
 end #end Hash
 
 module EWP
@@ -28,15 +38,16 @@ module EWP
   	nset = load_node(doc, "/project/configuration")
   	#use existing one
   	nset.each do |element|
-  		if element.xpath("name").text.downcase == target.downcase
-  			return element
+  		if element.css("/name").text.downcase == target.downcase
+        puts "find existing #{element.css("/name").text.downcase}"
+        return element
   		end
   	end
   	#create new one
   	nset.each do |element|
   		#use the first available configuration
   		t = element.dup
-  		t.xpath('name').text = target
+  		t.css('/name').text = target
   			#doc.xpath("/project") << t
   		element.add_previous_sibling(t)
   		return t
@@ -84,13 +95,17 @@ module EWP
   end
 
   def create_node(doc, hash_value)
+    hash_value.to_xml!(doc)
+  end
+
+  def append_node(doc, hash_value)
     hash_value.to_xml(doc)
   end
 
   def add_specific(target_node, doc)
     doc.each do |key, value|
       checked = false
-      options = target_node.xpath("//option")
+      options = target_node.xpath(".//option")
       options.each do |option|
         if option.css('name').text == key
           value.each do |subkey, subvalue|
@@ -102,7 +117,7 @@ module EWP
               end
             elsif subvalue.class == Array
               subvalue.each do |line|
-                create_node(option, {subkey => line})
+                append_node(option, {subkey => line})
               end
             else
               puts "not supported format must be string or array"
@@ -124,7 +139,7 @@ module EWP
             create_node(option_node, {subkey => subvalue})
           elsif subvalue.class == Array
             subvalue.each do |line|
-              create_node(option_node, {subkey => line})
+              append_node(option_node, {subkey => line})
             end
           else
             puts "not supported format must be string or array"
@@ -141,7 +156,7 @@ module EWP
   def set_specific(target_node, doc)
   	doc.each do |key, value|
       checked = false
-  		options = target_node.xpath("//option")
+  		options = target_node.xpath(".//option")
   		options.each do |option|
   			if option.css('name').text == key
   				value.each do |subkey, subvalue|
@@ -153,7 +168,7 @@ module EWP
               end
             elsif subvalue.class == Array
               subvalue.each do |line|
-                create_node(node, {subkey => line})
+                append_node(node, {subkey => line})
               end
             else
               puts "not supported format must be string or array"
@@ -176,7 +191,7 @@ module EWP
             create_node(option_node, {subkey => subvalue})
           elsif subvalue.class == Array
             subvalue.each do |line|
-              create_node(option_node, {subkey => line})
+              append_node(option_node, {subkey => line})
             end
           else
             puts "not supported format must be string or array"
@@ -203,7 +218,8 @@ module EWP
     files_hash = Hash.new
     source_hash.each do |src|
       rootdir = src['rootdir']
-      virtual_dir = src['virtual_dir']
+      virtual_dir = src['virtual_dir'] if src.has_key? 'virtual_dir'
+      virtual_dir = src['virtual-dir'] if src.has_key? 'virtual-dir'
       if src.has_key?('path')
         path = src['path']
       else

data/lib/ebngen/adapter/iar.rb

@@ -81,7 +81,8 @@ class Project
   		#set project type
   	end
 
-  	def outdir()
+  	def document()
+  		project_name = get_project_name()
 
   	end
 
@@ -147,7 +148,7 @@ class Project
   				}
 		set_specific(target_node, settings)
 		settings = {'GEndianModeBE' => {
-					'state' => 1
+					'state' => '1'
 					}
 		}
 		set_specific(target_node, settings)
@@ -158,8 +159,18 @@ class Project
 	end
 
 	def target_as_defines(target_node, doc)
+		defines_array = Array.new
+		doc.each do |item|
+		  if item.class == Hash
+		  	item.each do |key, value|
+		  	  defines_array.insert(-1, "#{key}=#{value}")
+		    end
+		  else
+	      	defines_array.insert(-1, item)
+	      end
+  		end
 		settings = {'ADefines' => {
-    				'state' => doc
+    				'state' => defines_array
   					}
   				}
   		add_specific(target_node, settings)
@@ -183,8 +194,18 @@ class Project
 	end
 
 	def target_as_flags(target_node, doc)
+		flags_array = Array.new
+		doc.each do |item|
+		  if item.class == Hash
+		  	item.each do |key, value|
+		  	  flags_array.insert(-1, "#{key}=#{value}")
+		    end
+		  else
+	      	flags_array.insert(-1, item)
+	      end
+  		end
 		settings = {'AExtraOptionsV2' => {
-    				'state' => doc
+    				'state' => flags_array
   					}
   				}
   		add_specific(target_node, settings)
@@ -212,8 +233,16 @@ class Project
 	end
 
 	def target_cc_defines(target_node, doc)
+		defines_array = Array.new
+		doc.each do |item, item_value|
+		   if item_value.nil?
+	         defines_array.insert(-1, "#{item}")
+	       else
+              defines_array.insert(-1, "#{item}=#{item_value}")
+	       end
+  		end
 		settings = {'CCDefines' => {
-    				'state' => doc
+    				'state' => defines_array
   					}
   				   }
   		add_specific(target_node, settings)
@@ -238,7 +267,7 @@ class Project
 
 	def target_cc_flags(target_node, doc)
 		settings_check = { 'IExtraOptionsCheck' => {
-				'state' => 1
+				'state' => '1'
 			}
 		}
 		add_specific(target_node, settings_check)
@@ -306,7 +335,17 @@ class Project
 	end
 
 	def target_outdir(target_node, doc)
-
+=begin
+		<option>
+          <name>IlinkOutputFile</name>
+          <state>K70_pit_drivers_test.out</state>
+        </option>
+=end
+		settings = { 'IlinkOutputFile' => {
+				'state' => "#{get_project_name()}.out"
+			}
+		}
+		set_specific(target_node, settings)
 	end
 
 end

data/lib/ebngen/translate.rb

@@ -46,6 +46,8 @@ class Translator
     end
     #if has more addon
     if struct[addon]['__add__'].count != 0
+       struct[subnode] = struct[subnode].deep_merge(deep_copy(struct[addon]))
+       struct[addon]['attribute'] = 'required'       
        struct[addon]['__add__'].each do |submodule|
          deep_add_merge(struct, addon, submodule)
        end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ebngen
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Hake Huang
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-12 00:00:00.000000000 Z
+date: 2017-06-16 00:00:00.000000000 Z
 dependencies: []
 description: embedded project generator
 email: hakehuang@gmail.com