update to latest http-parser-java from upstream

tmm1 · Mar 17, 2011 · a299a7d · a299a7d
1 parent 2fe2394
commit a299a7d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/ext/ruby_http_parser/vendor/http-parser-java b/ext/ruby_http_parser/vendor/http-parser-java
diff --git a/http_parser.rb.gemspec b/http_parser.rb.gemspec
@@ -16,5 +16,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake-compiler', '>= 0.7.6'
   s.add_development_dependency 'rspec', '>= 2.0.1'
   s.add_development_dependency 'json', '>= 1.4.6'
-  # s.add_development_dependency 'yajl-ruby', '>= 0.8.1'
+
+  if RUBY_PLATFORM =~ /java/
+    s.add_development_dependency 'jruby-openssl'
+  else
+    s.add_development_dependency 'yajl-ruby', '>= 0.8.1'
+  end
 end
diff --git a/tasks/compile.rake b/tasks/compile.rake
@@ -10,7 +10,9 @@ Rake::GemPackageTask.new(gemspec) do |pkg|
 end
 
 if RUBY_PLATFORM =~ /java/
-  Rake::JavaExtensionTask.new("ruby_http_parser", gemspec)
+  Rake::JavaExtensionTask.new("ruby_http_parser", gemspec) do |ext|
+    ext.classpath = File.expand_path('../../ext/ruby_http_parser/vendor/http-parser-java/ext/primitives.jar', __FILE__)
+  end
 else
   Rake::ExtensionTask.new("ruby_http_parser", gemspec) do |ext|
     unless RUBY_PLATFORM =~ /mswin|mingw/