Update "jruby gem" stuff to include separate jruby.jar and jruby-stdl…

…ib.jar and remove bin scripts.

gem/Manifest.txt

@@ -2,107 +2,3 @@ History.txt
 Manifest.txt
 README.txt
 Rakefile
-bin/jruby
-bin/jruby.bash
-lib/jruby.rb
-lib/jruby.jar
-lib/ruby/site_ruby/1.8/builtin/core_ext/symbol.rb
-lib/ruby/site_ruby/1.8/builtin/java/ast.rb
-lib/ruby/site_ruby/1.8/builtin/java/collections.rb
-lib/ruby/site_ruby/1.8/builtin/java/exceptions.rb
-lib/ruby/site_ruby/1.8/builtin/java/interfaces.rb
-lib/ruby/site_ruby/1.8/builtin/java/regex.rb
-lib/ruby/site_ruby/1.8/builtin/javasupport/core_ext/kernel.rb
-lib/ruby/site_ruby/1.8/builtin/javasupport/core_ext/module.rb
-lib/ruby/site_ruby/1.8/builtin/javasupport/core_ext/object.rb
-lib/ruby/site_ruby/1.8/builtin/javasupport/core_ext.rb
-lib/ruby/site_ruby/1.8/builtin/javasupport/java.rb
-lib/ruby/site_ruby/1.8/builtin/javasupport/proxy/array.rb
-lib/ruby/site_ruby/1.8/builtin/javasupport/proxy/interface.rb
-lib/ruby/site_ruby/1.8/builtin/javasupport/utilities/array.rb
-lib/ruby/site_ruby/1.8/builtin/javasupport/utilities/base.rb
-lib/ruby/site_ruby/1.8/builtin/javasupport.rb
-lib/ruby/site_ruby/1.8/builtin/rdoc_jruby.rb
-lib/ruby/site_ruby/1.8/compiler/builder.rb
-lib/ruby/site_ruby/1.8/compiler/builder2.rb
-lib/ruby/site_ruby/1.8/compiler/bytecode.rb
-lib/ruby/site_ruby/1.8/compiler/signature.rb
-lib/ruby/site_ruby/1.8/duby/ast/call.rb
-lib/ruby/site_ruby/1.8/duby/ast/class.rb
-lib/ruby/site_ruby/1.8/duby/ast/flow.rb
-lib/ruby/site_ruby/1.8/duby/ast/literal.rb
-lib/ruby/site_ruby/1.8/duby/ast/local.rb
-lib/ruby/site_ruby/1.8/duby/ast/method.rb
-lib/ruby/site_ruby/1.8/duby/ast/structure.rb
-lib/ruby/site_ruby/1.8/duby/ast.rb
-lib/ruby/site_ruby/1.8/duby/c_compiler.rb
-lib/ruby/site_ruby/1.8/duby/compiler.rb
-lib/ruby/site_ruby/1.8/duby/compiler2.rb
-lib/ruby/site_ruby/1.8/duby/compiler_old.rb
-lib/ruby/site_ruby/1.8/duby/declaration.rb
-lib/ruby/site_ruby/1.8/duby/jvm_compiler.rb
-lib/ruby/site_ruby/1.8/duby/mapper.rb
-lib/ruby/site_ruby/1.8/duby/plugin/math.rb
-lib/ruby/site_ruby/1.8/duby/signature.rb
-lib/ruby/site_ruby/1.8/duby/transform.rb
-lib/ruby/site_ruby/1.8/duby/typer.rb
-lib/ruby/site_ruby/1.8/duby/typer_old.rb
-lib/ruby/site_ruby/1.8/duby.rb
-lib/ruby/site_ruby/1.8/ffi/ffi.rb
-lib/ruby/site_ruby/1.8/ffi/platform/errno.rb.ffi
-lib/ruby/site_ruby/1.8/ffi/platform/etc.rb.ffi
-lib/ruby/site_ruby/1.8/ffi/platform/fcntl.rb.ffi
-lib/ruby/site_ruby/1.8/ffi/platform/i386-darwin/errno.rb
-lib/ruby/site_ruby/1.8/ffi/platform/i386-darwin/etc.rb
-lib/ruby/site_ruby/1.8/ffi/platform/i386-darwin/fcntl.rb
-lib/ruby/site_ruby/1.8/ffi/platform/i386-darwin/platform.conf
-lib/ruby/site_ruby/1.8/ffi/platform/i386-darwin/syslog.rb
-lib/ruby/site_ruby/1.8/ffi/platform/i386-darwin/types.conf
-lib/ruby/site_ruby/1.8/ffi/platform/i386-darwin/zlib.rb
-lib/ruby/site_ruby/1.8/ffi/platform/i386-linux/etc.rb
-lib/ruby/site_ruby/1.8/ffi/platform/i386-linux/fcntl.rb
-lib/ruby/site_ruby/1.8/ffi/platform/i386-linux/platform.conf
-lib/ruby/site_ruby/1.8/ffi/platform/i386-linux/syslog.rb
-lib/ruby/site_ruby/1.8/ffi/platform/i386-linux/types.conf
-lib/ruby/site_ruby/1.8/ffi/platform/i386-linux/zlib.rb
-lib/ruby/site_ruby/1.8/ffi/platform/i386-openbsd/etc.rb
-lib/ruby/site_ruby/1.8/ffi/platform/i386-openbsd/fcntl.rb
-lib/ruby/site_ruby/1.8/ffi/platform/i386-openbsd/platform.conf
-lib/ruby/site_ruby/1.8/ffi/platform/i386-openbsd/syslog.rb
-lib/ruby/site_ruby/1.8/ffi/platform/i386-openbsd/types.conf
-lib/ruby/site_ruby/1.8/ffi/platform/i386-openbsd/zlib.rb
-lib/ruby/site_ruby/1.8/ffi/platform/i386-windows/errno.rb
-lib/ruby/site_ruby/1.8/ffi/platform/i386-windows/etc.rb
-lib/ruby/site_ruby/1.8/ffi/platform/i386-windows/fcntl.rb
-lib/ruby/site_ruby/1.8/ffi/platform/i386-windows/platform.conf
-lib/ruby/site_ruby/1.8/ffi/platform/i386-windows/syslog.rb
-lib/ruby/site_ruby/1.8/ffi/platform/i386-windows/types.conf
-lib/ruby/site_ruby/1.8/ffi/platform/i386-windows/zlib.rb
-lib/ruby/site_ruby/1.8/ffi/platform/ppc-darwin/errno.rb
-lib/ruby/site_ruby/1.8/ffi/platform/ppc-darwin/etc.rb
-lib/ruby/site_ruby/1.8/ffi/platform/ppc-darwin/fcntl.rb
-lib/ruby/site_ruby/1.8/ffi/platform/ppc-darwin/platform.conf
-lib/ruby/site_ruby/1.8/ffi/platform/ppc-darwin/syslog.rb
-lib/ruby/site_ruby/1.8/ffi/platform/ppc-darwin/types.conf
-lib/ruby/site_ruby/1.8/ffi/platform/ppc-darwin/zlib.rb
-lib/ruby/site_ruby/1.8/ffi/platform/syslog.rb.ffi
-lib/ruby/site_ruby/1.8/ffi/platform/zlib.rb.ffi
-lib/ruby/site_ruby/1.8/ffi/platform.rb
-lib/ruby/site_ruby/1.8/ffi/tools/const_generator.rb
-lib/ruby/site_ruby/1.8/ffi/tools/generator.rb
-lib/ruby/site_ruby/1.8/ffi/tools/generator_task.rb
-lib/ruby/site_ruby/1.8/ffi/tools/platform.rake
-lib/ruby/site_ruby/1.8/ffi/tools/Rakefile
-lib/ruby/site_ruby/1.8/ffi/tools/struct_generator.rb
-lib/ruby/site_ruby/1.8/ffi/tools/types_generator.rb
-lib/ruby/site_ruby/1.8/ffi.rb
-lib/ruby/site_ruby/1.8/gemconfigure.rb
-lib/ruby/site_ruby/1.8/jruby/jrubyc.rb
-lib/ruby/site_ruby/1.8/jruby/openssl/builtin.rb
-lib/ruby/site_ruby/1.8/jruby/openssl/gem.rb
-lib/ruby/site_ruby/1.8/jruby/openssl/gem_only.rb
-lib/ruby/site_ruby/1.8/jruby/openssl/stub.rb
-lib/ruby/site_ruby/1.8/jruby/vm.rb
-lib/ruby/site_ruby/1.8/rbconfig/datadir.rb
-lib/ruby/site_ruby/1.8/rubygems/defaults/jruby.rb
-lib/ruby/site_ruby/1.8/securerandom.rb

gem/Rakefile

@@ -5,16 +5,19 @@ require 'hoe'
 require 'fileutils'
 require './lib/jruby.rb'
 
-FileUtils.cp('../lib/jruby.jar', 'lib/jruby.jar')
-jruby_bin = File.read('../bin/jruby')
-File.open('bin/jruby.bash', 'w') {|file| file.write(jruby_bin)}
-FileUtils.cp('../bin/jirb', 'bin/jirb')
-FileUtils.cp('../bin/gem', 'bin/gem')
+task :default => :prepare
 
-FileUtils.mkdir_p 'lib/ruby/site_ruby'
-FileUtils.cp_r '../lib/ruby/site_ruby/1.8', 'lib/ruby/site_ruby'
+task :prepare do
+  FileUtils.cp('../lib/jruby.jar', 'lib/jruby.jar')
+  Dir.chdir('../lib/ruby/1.8') do
+    system 'jar -cvf ../../../gem/lib/jruby-stdlib.jar `find . -name \\*.rb`'
+  end
+  Dir.chdir('../lib/ruby/site_ruby/1.8') do
+    system 'jar -uvf ../../../../gem/lib/jruby-stdlib.jar `find . -name \\*.rb`'
+  end
+end
 
-Hoe.new('jruby', JRubyGem::VERSION) do |p|
+Hoe.new('jruby', JRuby::VERSION) do |p|
   p.rubyforge_name = 'jruby-extras' # if different than lowercase project name
   p.developer('Charles Oliver Nutter', 'charles.nutter@sun.com')
 end

gem/lib/jruby.rb

@@ -1,4 +1,4 @@
-class JRubyGem
-  VERSION = '0.0.1'
+module JRuby
+  VERSION = '1.2.0'
   PATH = File.dirname(__FILE__)
 end