diff options
| author | Florian Frank <flori@ping.de> | 2011-05-11 16:52:33 +0200 |
|---|---|---|
| committer | Florian Frank <flori@ping.de> | 2011-05-11 16:52:33 +0200 |
| commit | ddbcc16d016f07aafe92873185dd95dd5d32aa12 (patch) | |
| tree | c1fa05fe6419e2f1d76ba9198b747e8f8b03363c | |
| parent | ebcfd0eb03e30c1068ba4e0beacd67ec8ca6ea27 (diff) | |
| download | json-ddbcc16d016f07aafe92873185dd95dd5d32aa12.tar.gz | |
Revert "Add the constants.rb file to the gemspec ignore list, and don't echo the stdout when detecting the ragel binaries"
This reverts commit a592f7ef0af4cf54fa5dad536cc0203d4084c781.
| -rw-r--r-- | constants.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/constants.rb b/constants.rb index c4046d6..1e15aef 100644 --- a/constants.rb +++ b/constants.rb @@ -5,7 +5,7 @@ PKG_NAME = 'json' PKG_TITLE = 'JSON Implementation for Ruby' PKG_VERSION = File.read('VERSION').chomp PKG_FILES = Dir.glob("**/**").reject { |file| - file =~ /CVS|pkg|tmp|coverage|constants|Makefile|\.nfs\.|\.iml\Z/ || + file =~ /CVS|pkg|tmp|coverage|Makefile|\.nfs\.|\.iml\Z/ || file =~ /\.(so|bundle|o|class|#{CONFIG['DLEXT']})$/ } @@ -27,5 +27,5 @@ JAVA_CLASSES = [] JRUBY_PARSER_JAR = File.expand_path("lib/json/ext/parser.jar") JRUBY_GENERATOR_JAR = File.expand_path("lib/json/ext/generator.jar") -RAGEL_CODEGEN = %w[rlcodegen rlgen-cd ragel].find { |c| `which #{c}` != "" } -RAGEL_DOTGEN = %w[rlgen-dot rlgen-cd ragel].find { |c| `which #{c}` != "" } +RAGEL_CODEGEN = %w[rlcodegen rlgen-cd ragel].find { |c| system(c, '-v') } +RAGEL_DOTGEN = %w[rlgen-dot rlgen-cd ragel].find { |c| system(c, '-v') } |