From 69527591e0a71acc5638675090ed3d55432a885c Mon Sep 17 00:00:00 2001
From: Jordan Sissel <jls@semicomplete.com>
Date: Wed, 23 Mar 2011 16:31:37 -0700
Subject: [PATCH] - Packaging as a jar seems to be working now.

---
 Rakefile | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/Rakefile b/Rakefile
index 1446718bd..c8fa6287a 100755
--- a/Rakefile
+++ b/Rakefile
@@ -18,23 +18,22 @@ task :compile => "lib/logstash/config/grammar.rb" do |t|
   #
   #     org/jruby/util/JavaNameMangler.java:105:in `mangleFilenameForClasspath'
   #     org/jruby/util/JavaNameMangler.java:32:in `mangleFilenameForClasspath'
-  require 'jruby/jrubyc'
-  #args = [ "-p", "net.logstash" ]
-  args = ["-d", "build"]
-  args += Dir.glob("**/*.rb")
-  status = JRuby::Compiler::compile_argv(args)
-  if (status != 0)
-    puts "Compilation FAILED: #{status} error(s) encountered"
-    exit status
-  end
-
-  #mkdir_p "build"
-  #sh "rm -rf lib/net"
-  #Dir.chdir("lib") do
-    #args = Dir.glob("**/*.rb")
-    ##sh "jrubyc", "-d", "../build" *args
-    #sh "jrubyc", *args
+  #require 'jruby/jrubyc'
+  ##args = [ "-p", "net.logstash" ]
+  #args = ["-d", "build"]
+  #args += Dir.glob("**/*.rb")
+  #status = JRuby::Compiler::compile_argv(args)
+  #if (status != 0)
+    #puts "Compilation FAILED: #{status} error(s) encountered"
+    #exit status
   #end
+
+  mkdir_p "build"
+  sh "rm -rf lib/net"
+  Dir.chdir("lib") do
+    args = Dir.glob("**/*.rb")
+    sh "jrubyc", "-t", "../build", *args
+  end
 end
 
 VERSIONS = {
@@ -45,7 +44,7 @@ VERSIONS = {
 
 namespace :vendor do
   file "vendor/jar" do |t|
-    mkdir_p mkdir(t.name)
+    mkdir_p t.name
   end
 
   # Download jruby.jar
@@ -119,10 +118,9 @@ namespace :package do
         end
       end
 
-      # We compile stuff to lib/net/logstash/...
-      Dir.glob("lib/**/*.class").each do |file|
-        target = File.join("build-jar", file.gsub("lib/", ""))
-        #target = File.join("build-jar", file)
+      # We compile stuff to build/...
+      Dir.glob("build/**/*.class").each do |file|
+        target = File.join("build-jar", file.gsub("build/", ""))
         mkdir_p File.dirname(target)
         puts "=> Copying #{file} => #{target}"
         File.copy(file, target)