Changeset 109

Timestamp:

02/06/2007 00:26:58 (22 months ago)

Author:

why

Message:

• ext/hpricot_scan/hpricot_scan.java.rl: check this out! ola bini contributed a scanner that generates Java and IT WORKS.
  
• Rakefile: now producing hpricot-0.5-jruby.gem, sooo slickkkk.
  

Location:

trunk

Files:

• Rakefile (modified) (6 diffs)
• ext/hpricot_scan/hpricot_scan.java.rl (added)

trunk/Rakefile

@@ -10 +10 @@
 REV = `svn info`[/Revision: (\d+)/, 1] rescue nil
 VERS = ENV['VERSION'] || "0.4" + (REV ? ".#{REV}" : "")
-CLEAN.include ['ext/hpricot_scan/*.{bundle,so,obj,pdb,lib,def,exp}', 'ext/hpricot_scan/Makefile', 
+PKG = "#{NAME}-#{VERS}"
+BIN = "*.{bundle,jar,so,obj,pdb,lib,def,exp}"
+CLEAN.include ["ext/hpricot_scan/#{BIN}", "lib/#{BIN}", 'ext/hpricot_scan/Makefile', 
                '**/.*.sw?', '*.gem', '.config']
 RDOC_OPTS = ['--quiet', '--title', 'The Hpricot Reference', '--main', 'README', '--inline-source']
+PKG_FILES = %w(CHANGELOG COPYING README Rakefile) +
+      Dir.glob("{bin,doc,test,lib,extras}/**/*") + 
+      Dir.glob("ext/**/*.{h,java,c,rb,rl}") + 
+      %w[ext/hpricot_scan/hpricot_scan.c] # needed because it's generated later
+SPEC =
+  Gem::Specification.new do |s|
+    s.name = NAME
+    s.version = VERS
+    s.platform = Gem::Platform::RUBY
+    s.has_rdoc = true
+    s.rdoc_options += RDOC_OPTS
+    s.extra_rdoc_files = ["README", "CHANGELOG", "COPYING"]
+    s.summary = "a swift, liberal HTML parser with a fantastic library"
+    s.description = s.summary
+    s.author = "why the lucky stiff"
+    s.email = 'why@ruby-lang.org'
+    s.homepage = 'http://code.whytheluckystiff.net/hpricot/'
+    s.files = PKG_FILES
+    s.require_path = "lib"
+    s.extensions = FileList["ext/**/extconf.rb"].to_a
+    s.bindir = "bin"
+  end
 
 desc "Does a full compile, test run"
 task :default => [:compile, :test]
 
-desc "Compiles all extensions"
-task :compile => [:hpricot_scan] do
-  if Dir.glob(File.join("lib","hpricot_scan.*")).length == 0
-    STDERR.puts "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-    STDERR.puts "Gem actually failed to build.  Your system is"
-    STDERR.puts "NOT configured properly to build hpricot."
-    STDERR.puts "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-    exit(1)
-  end
-end
-task :hpricot_scan => [:ragel]
-
 desc "Packages up Hpricot."
 task :package => [:clean, :ragel]
 
 desc "Releases packages for all Hpricot packages and platforms."
-task :release => [:package, :rubygems_win32]
+task :release => [:package, :package_win32, :package_jruby]
 
 desc "Run all the tests"
@@ -49 +61 @@
 end
 
-spec =
-    Gem::Specification.new do |s|
-        s.name = NAME
-        s.version = VERS
-        s.platform = Gem::Platform::RUBY
-        s.has_rdoc = true
-        s.rdoc_options += RDOC_OPTS
-        s.extra_rdoc_files = ["README", "CHANGELOG", "COPYING"]
-        s.summary = "a swift, liberal HTML parser with a fantastic library"
-        s.description = s.summary
-        s.author = "why the lucky stiff"
-        s.email = 'why@ruby-lang.org'
-        s.homepage = 'http://code.whytheluckystiff.net/hpricot/'
-
-        s.files = %w(COPYING README Rakefile) +
-          Dir.glob("{bin,doc,test,lib,extras}/**/*") + 
-          Dir.glob("ext/**/*.{h,c,rb,rl}") + 
-          %w[ext/hpricot_scan/hpricot_scan.c] # needed because it's generated later
-        
-        s.require_path = "lib"
-        #s.autorequire = "hpricot"  # no no no this is tHe 3v1l
-        s.extensions = FileList["ext/**/extconf.rb"].to_a
-        s.bindir = "bin"
-    end
-
-Rake::GemPackageTask.new(spec) do |p|
+Rake::GemPackageTask.new(SPEC) do |p|
     p.need_tar = true
-    p.gem_spec = spec
+    p.gem_spec = SPEC
 end
 
@@ -95 +82 @@
 end
 
+desc "Compiles the Ruby extension"
+task :compile => [:hpricot_scan] do
+  if Dir.glob(File.join("lib","hpricot_scan.*")).length == 0
+    STDERR.puts "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+    STDERR.puts "Gem actually failed to build.  Your system is"
+    STDERR.puts "NOT configured properly to build hpricot."
+    STDERR.puts "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+    exit(1)
+  end
+end
+task :hpricot_scan => [:ragel]
+
 desc "Builds just the #{extension} extension"
 task extension.to_sym => ["#{ext}/Makefile", ext_so ]
@@ -109 +108 @@
 end
 
-desc "Generates the scanner code with Ragel."
+desc "Generates the C scanner code with Ragel."
 task :ragel do
   sh %{ragel ext/hpricot_scan/hpricot_scan.rl | rlcodegen -G2 -o ext/hpricot_scan/hpricot_scan.c}
 end
 
-PKG_FILES = FileList[
-  "test/**/*.{rb,html,xhtml}",
-  "lib/**/*.rb",
-  "ext/**/*.{c,rb,h,rl}",
-  "CHANGELOG", "README", "Rakefile", "COPYING",
-  "extras/**/*", "lib/hpricot_scan.so"]
-
-Win32Spec = Gem::Specification.new do |s|
-  s.name = NAME
-  s.version = VERS
-  s.platform = Gem::Platform::WIN32
-  s.has_rdoc = false
-  s.extra_rdoc_files = ["README", "CHANGELOG", "COPYING"]
-  s.summary = "a swift, liberal HTML parser with a fantastic library"
-  s.description = s.summary
-  s.author = "why the lucky stiff"
-  s.email = 'why@ruby-lang.org'
-  s.homepage = 'http://code.whytheluckystiff.net/hpricot/'
-
-  s.files = PKG_FILES
-
-  s.require_path = "lib"
-  #s.autorequire = "hpricot"  # no no no this is tHe 3v1l
-  s.extensions = []
-  s.bindir = "bin"
-end
+desc "Generates the Java scanner code with Ragel."
+task :ragel_java do
+  sh %{ragel -J ext/hpricot_scan/hpricot_scan.java.rl | rlcodegen -o  ext/hpricot_scan/HpricotScanService.java}
+end
+
+### Win32 Packages ###
+
+Win32Spec = SPEC.dup
+Win32Spec.platform = Gem::Platform::WIN32
+Win32Spec.files = PKG_FILES + ['lib/hpricot_scan.so']
+Win32Spec.extensions = []
   
-WIN32_PKG_DIR = "hpricot-" + VERS
-
+WIN32_PKG_DIR = "#{PKG}-win32"
+
+desc "Package up the Win32 distribution."
 file WIN32_PKG_DIR => [:package] do
-  sh "tar zxf pkg/#{WIN32_PKG_DIR}.tgz"
+  sh "tar zxf pkg/#{PKG}.tgz"
+  mv PKG, WIN32_PKG_DIR
 end
 
@@ -155 +141 @@
 
 desc "Build the binary RubyGems package for win32"
-task :rubygems_win32 => ["hpricot_scan_win32"] do
+task :package_win32 => ["hpricot_scan_win32"] do
   Dir.chdir("#{WIN32_PKG_DIR}") do
     Gem::Builder.new(Win32Spec).build
     verbose(true) {
-      mv Dir["*.gem"].first, "../pkg/hpricot-#{VERS}-mswin32.gem"
+      mv Dir["*.gem"].first, "../pkg/#{WIN32_PKG_DIR}.gem"
     }
   end
@@ -165 +151 @@
 
 CLEAN.include WIN32_PKG_DIR
+
+### JRuby Packages ###
+
+compile_java = proc do
+  sh %{javac -classpath $JRUBY_HOME/lib/jruby.jar HpricotScanService.java}
+  sh %{jar cf hpricot_scan.jar HpricotScanService.class}
+end
+
+desc "Compiles the JRuby extension"
+task :hpricot_scan_java => [:ragel_java] do
+  Dir.chdir("ext/hpricot_scan", &compile_java)
+end
+
+JRubySpec = SPEC.dup
+JRubySpec.platform = Gem::Platform::RUBY
+JRubySpec.files = PKG_FILES + ['lib/hpricot_scan.jar']
+JRubySpec.extensions = []
+
+JRUBY_PKG_DIR = "#{PKG}-jruby"
+
+desc "Package up the JRuby distribution."
+file JRUBY_PKG_DIR => [:ragel_java, :package] do
+  sh "tar zxf pkg/#{PKG}.tgz"
+  mv PKG, JRUBY_PKG_DIR
+end
+
+desc "Cross-compile the hpricot_scan extension for JRuby"
+file "hpricot_scan_jruby" => [JRUBY_PKG_DIR] do
+  Dir.chdir("#{JRUBY_PKG_DIR}/ext/hpricot_scan", &compile_java)
+  mv "#{JRUBY_PKG_DIR}/ext/hpricot_scan/hpricot_scan.jar", "#{JRUBY_PKG_DIR}/lib"
+end
+
+desc "Build the RubyGems package for JRuby"
+task :package_jruby => ["hpricot_scan_jruby"] do
+  Dir.chdir("#{JRUBY_PKG_DIR}") do
+    Gem::Builder.new(JRubySpec).build
+    verbose(true) {
+      mv Dir["*.gem"].first, "../pkg/#{JRUBY_PKG_DIR}.gem"
+    }
+  end
+end
+
+CLEAN.include JRUBY_PKG_DIR
 
 task :install do