xqcoretools 0.1.5 → 0.1.6

data/bin/xqcoretools

@@ -293,6 +293,25 @@ class XQCoreTools < Thor
 		end
 	end 
 
+	def self.setChildNode(document, sibling, name, value)
+		children = sibling.parent.css(name)
+
+		if children.length == 0
+			created = Nokogiri::XML::Node.new(name, document)
+			created.inner_html = value
+
+			sibling.add_next_sibling(created)
+			
+			return created
+		else
+			children.each do |child|
+				child.inner_html = value
+			end
+
+			return children[0]
+		end
+	end
+
 	def self.setBuildOutput(platform)
 		currentPath = Dir.pwd
 		
@@ -311,37 +330,26 @@ class XQCoreTools < Thor
 				if parent.has_attribute?('Condition')
 					condition = parent.get_attribute('Condition')
 
-					config = condition[/\'\$\(Configuration\)\|.*\'\s\=\=\s\'(.*)\|/, 1]
+					regex = /\'\$\(Configuration\)\|\$\(Platform\).*\'\s\=\=\s\'(.*)\|(.*)\'/
+
+					config = condition[regex, 1]
+					target = condition[regex, 2]
 
 					if config != nil
-						binFolder = "../Binaries/#{platform}/bin/#{config}/"
-						objFolder = "../Binaries/#{platform}/obj/#{config}/"
+						binFolder = "..\\Binaries\\#{target}\\#{platform}\\bin\\#{config}"
+						objFolder = "..\\Binaries\\#{target}\\#{platform}\\obj\\#{config}"
 
 						node.inner_html = binFolder;
 
 						attachNode = node
-						sibling = node.next_sibling();
 						
-						if sibling.name != "BaseIntermediateOutputPath"
-							intermediateOutput = Nokogiri::XML::Node.new('BaseIntermediateOutputPath', document)
-							intermediateOutput.inner_html = objFolder
-							attachNode.add_next_sibling(intermediateOutput)
-							attachNode = intermediateOutput
-						end
-
-						if sibling.name != "IntermediateOutputPath"
-							intermediateOutput = Nokogiri::XML::Node.new('IntermediateOutputPath', document)
-							intermediateOutput.inner_html = objFolder
-							attachNode.add_next_sibling(intermediateOutput)
-							attachNode = intermediateOutput
-						end
+						attachNode = XQCoreTools::setChildNode(document, attachNode, 'BaseIntermediateOutputPath', objFolder)
+						attachNode = XQCoreTools::setChildNode(document, attachNode, 'IntermediateOutputPath', objFolder)
 					end
 				end
 			end
 
 			CrossPlatformCSProj::saveDocument(document, file)
-
-			puts Updated Project Files!
 		end
 	end
 
@@ -350,6 +358,8 @@ class XQCoreTools < Thor
 		XQCoreTools::setBuildOutput('Android')
 		XQCoreTools::setBuildOutput('iOS')
 		XQCoreTools::setBuildOutput('Windows')
+
+		puts 'Updated Project Files!'
 	end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xqcoretools
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors: