lib/bake/util.rb in bake-toolkit-1.0.22 vs lib/bake/util.rb in bake-toolkit-1.0.23

- old
+ new

@@ -4,19 +4,19 @@ require 'cxxproject/utils/printer' require 'cxxproject/utils/exit_helper' require 'cxxproject/utils/utils' def adjustFlags(orgStr, flags) - orgSplitted = Cxxproject::Utils::flagSplit(orgStr) + orgSplitted = Cxxproject::Utils::flagSplit(orgStr, false) flags.each do |f| if f.overwrite != "" - orgSplitted = Cxxproject::Utils::flagSplit(f.overwrite) + orgSplitted = Cxxproject::Utils::flagSplit(f.overwrite, false) end if f.remove != "" - rmSplitted = Cxxproject::Utils::flagSplit(f.remove) + rmSplitted = Cxxproject::Utils::flagSplit(f.remove, false) orgSplitted.delete_if {|o| rmSplitted.any? { |r| begin o.match("\\A"+r+"\\Z") rescue Exception => e Cxxproject::Printer.printError "Error: #{f.file_name}(#{f.line_number}): " + e.message @@ -24,10 +24,10 @@ end }} end if f.add != "" - Cxxproject::Utils::flagSplit(f.add).each do |a| + Cxxproject::Utils::flagSplit(f.add, false).each do |a| orgSplitted << a unless orgSplitted.any? { |o| o==a } end end end