From f4efe3c808955d8bafea6d1b09b9fce8f8ed8b9b Mon Sep 17 00:00:00 2001 From: Dmitry Kunin Date: Thu, 26 Sep 2013 18:50:57 +0300 Subject: [PATCH] [tools] Not twine generates only useful files. --- tools/twine/lib/twine/formatters/abstract.rb | 2 +- tools/twine/lib/twine/formatters/android.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/twine/lib/twine/formatters/abstract.rb b/tools/twine/lib/twine/formatters/abstract.rb index 64dc36bcf0..f19c8e3506 100644 --- a/tools/twine/lib/twine/formatters/abstract.rb +++ b/tools/twine/lib/twine/formatters/abstract.rb @@ -153,7 +153,7 @@ module Twine file_name = @options[:file_name] || default_file_name Dir.foreach(path) do |item| - if File.directory?(item) + if File.directory?(path + File::SEPARATOR + item) lang = determine_language_given_path(item) if lang write_file(File.join(path, item, file_name), lang) diff --git a/tools/twine/lib/twine/formatters/android.rb b/tools/twine/lib/twine/formatters/android.rb index 4737350513..ee6fb6865d 100644 --- a/tools/twine/lib/twine/formatters/android.rb +++ b/tools/twine/lib/twine/formatters/android.rb @@ -40,7 +40,7 @@ module Twine lang = match[1] lang = LANG_CODES.fetch(lang, lang) lang.sub!('-r', '-') - return lang + return lang =~ /land|port|v\d+|sw\d+/ ? nil : lang end end end