Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

RUBY-482 There can be only one...

  • Loading branch information...
commit 8dce7fbcb063048a61cf38a4d5e2f4352063efa6 1 parent dee6ad8
@brandonblack brandonblack authored
View
10 Rakefile
@@ -17,10 +17,6 @@ Rake::ExtensionTask.new('cbson') do |ext|
ext.lib_dir = "lib/bson_ext"
end
-#Rake::JavaExtensionTask.new('jbson') do |ext| # not yet functional
-# ext.ext_dir = 'ext/src/org/jbson'
-#end
-
desc "Compiles and tests MongoDB Ruby driver w/ C extensions."
task :c do
Rake::Task['compile:cbson'].invoke
@@ -186,7 +182,7 @@ namespace :gem do
`rm mongo-*.gem`
`rm bson-*.gem`
end
-
+
desc "Uninstall the optional c extensions"
task :uninstall_extensions do
`gem uninstall bson_ext`
@@ -202,12 +198,11 @@ end
# Deployment
VERSION_FILES = %w(lib/bson/version.rb lib/mongo/version.rb ext/cbson/version.h)
-GEMSPECS = %w(bson.gemspec bson.java.gemspec bson_ext.gemspec mongo.gemspec)
+GEMSPECS = %w(bson.gemspec bson_ext.gemspec mongo.gemspec)
def gem_list(version)
files = []
files << "bson-#{version}.gem"
- files << "bson-#{version}-java.gem"
files << "bson_ext-#{version}.gem"
files << "mongo-#{version}.gem"
return files
@@ -269,7 +264,6 @@ namespace :deploy do
`rm *.gem`
`gem build mongo.gemspec`
`gem build bson.gemspec`
- `gem build bson.java.gemspec`
`gem build bson_ext.gemspec`
puts `ls *.gem`
end
View
15 bson.gemspec
@@ -3,26 +3,27 @@ require 'bson/version'
Gem::Specification.new do |s|
s.name = 'bson'
-
s.version = BSON::VERSION
-
- s.platform = Gem::Platform::RUBY
s.summary = 'Ruby implementation of BSON'
s.description = 'A Ruby BSON implementation for MongoDB. For more information about Mongo, see http://www.mongodb.org. For more information on BSON, see http://www.bsonspec.org.'
- s.rubyforge_project = 'nowarning'
+ s.rubyforge_project = 'nowarning'
s.require_paths = ['lib']
s.files = ['LICENSE.txt']
s.files += ['lib/bson.rb'] + Dir['lib/bson/**/*.rb']
s.files += ['bin/b2json', 'bin/j2bson']
+ if RUBY_PLATFORM =~ /java/
+ s.files += ['ext/java/jar/jbson.jar', 'ext/java/jar/mongo-2.6.5.jar']
+ s.platform = Gem::Platform::JAVA
+ else
+ s.platform = Gem::Platform::RUBY
+ end
s.test_files = Dir['test/bson/*.rb', 'test/support/hash_with_indifferent_access.rb']
-
s.executables = ['b2json', 'j2bson']
s.has_rdoc = true
-
- s.authors = ['Jim Menard', 'Mike Dirolf', 'Kyle Banker']
+ s.authors = ['Tyler Brock', 'Gary Murakami', 'Emily Stolfo', 'Brandon Black']
s.email = 'mongodb-dev@googlegroups.com'
s.homepage = 'http://www.mongodb.org'
end
View
29 bson.java.gemspec
@@ -1,29 +0,0 @@
-$:.unshift(File.join(File.dirname(__FILE__), 'lib'))
-require 'bson/version'
-
-Gem::Specification.new do |s|
- s.name = 'bson'
-
- s.version = BSON::VERSION
-
- s.platform = Gem::Platform::Java
- s.summary = 'Ruby implementation of BSON'
- s.description = 'A Ruby BSON implementation for MongoDB. For more information about Mongo, see http://www.mongodb.org. For more information on BSON, see http://www.bsonspec.org.'
- s.rubyforge_project = 'nowarning'
-
- s.require_paths = ['lib']
-
- s.files = ['LICENSE.txt']
- s.files += ['lib/bson.rb'] + Dir['lib/bson/**/*.rb']
- s.files += ['bin/b2json', 'bin/j2bson']
- s.files += ['ext/java/jar/jbson.jar', 'ext/java/jar/mongo-2.6.5.jar']
- s.test_files = Dir['test/bson/*.rb']
-
- s.executables = ['b2json', 'j2bson']
-
- s.has_rdoc = true
-
- s.authors = ['Jim Menard', 'Mike Dirolf', 'Kyle Banker']
- s.email = 'mongodb-dev@googlegroups.com'
- s.homepage = 'http://www.mongodb.org'
-end
View
2  bson_ext.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
s.has_rdoc = false
s.extensions << 'ext/cbson/extconf.rb'
- s.authors = ['Mike Dirolf', 'Kyle Banker', 'Tyler Brock', 'Gary Murakami']
+ s.authors = ['Tyler Brock', 'Gary Murakami', 'Emily Stolfo', 'Brandon Black']
s.email = 'mongodb-dev@googlegroups.com'
s.homepage = 'http://www.mongodb.org'
s.add_dependency('bson', "~> #{BSON::VERSION}")
View
2  mongo.gemspec
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
s.rdoc_options = ['--main', 'README.md', '--inline-source']
s.extra_rdoc_files = ['README.md']
- s.authors = ['Jim Menard', 'Mike Dirolf', 'Kyle Banker', 'Tyler Brock']
+ s.authors = ['Tyler Brock', 'Gary Murakami', 'Emily Stolfo', 'Brandon Black']
s.email = 'mongodb-dev@googlegroups.com'
s.homepage = 'http://www.mongodb.org'
Please sign in to comment.
Something went wrong with that request. Please try again.