Rework BC gem to build properly and copy its contents (no symlink)

enebo · Mar 12, 2013 · 7b244f9 · 7b244f9
1 parent 7a3009f
commit 7b244f9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/gems/bouncy-castle-java/.gitignore b/gems/bouncy-castle-java/.gitignore
@@ -0,0 +1,3 @@
+lib
+pkg
+*.gem
diff --git a/gems/bouncy-castle-java/Rakefile b/gems/bouncy-castle-java/Rakefile
@@ -2,9 +2,16 @@ require 'rubygems'
 
 version = '1.5.0147'
 
-directory 'pkg'
+directory 'lib'
+
+task :gem => 'lib' do
+  # Because this gem is almost entirely sourced from JRuby proper,
+  # we copy pieces into it.
+
+  cp '../../lib/ruby/shared/bouncy-castle-java.rb', 'lib'
+  cp '../../build_lib/bcprov-jdk15on-147.jar', 'lib'
+  cp '../../build_lib/bcpkix-jdk15on-147.jar', 'lib'
 
-task :gem => 'pkg' do
   spec = Gem::Specification.new do |s|
     s.name = 'bouncy-castle-java'
     s.version = version
@@ -16,10 +23,9 @@ task :gem => 'pkg' do
     s.description = 'Gem redistribution of "Legion of the Bouncy Castle Java cryptography APIs" jars at http://www.bouncycastle.org/java.html'
     s.platform = Gem::Platform::RUBY
     s.require_path = 'lib'
-    s.files = ['README', 'LICENSE.html'] + Dir.glob("lib/**/bc*.jar")
+    s.files = ['README', 'LICENSE.html', 'lib/bcprov-jdk15on-147.jar', 'lib/bcpkix-jdk15on-147.jar', 'lib/bouncy-castle-java.rb']
   end
   filename = Gem::Builder.new(spec).build
-  mv filename, "pkg/#{filename}"
 end
 
 task :default => :gem
diff --git a/gems/bouncy-castle-java/lib b/gems/bouncy-castle-java/lib
-Original file line number
+Diff line change
@@ -0,0 +1,3 @@
+    lib
+    pkg
+    *.gem