about summary refs log tree commit homepage
path: root/Rakefile
diff options
context:
space:
mode:
authorevanweaver <evanweaver@19e92222-5c0b-0410-8929-a290d50e31e9>2007-10-22 08:36:10 +0000
committerevanweaver <evanweaver@19e92222-5c0b-0410-8929-a290d50e31e9>2007-10-22 08:36:10 +0000
commitf2ee1eb89df96f020be368cdace67444adb0a551 (patch)
tree613e71e03da15533662d098b4ddb46baa59b9532 /Rakefile
parenta71febd811f7f6dd4ee969f499f192f68dc721ba (diff)
downloadunicorn-f2ee1eb89df96f020be368cdace67444adb0a551.tar.gz
git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@734 19e92222-5c0b-0410-8929-a290d50e31e9
Diffstat (limited to 'Rakefile')
-rw-r--r--Rakefile23
1 files changed, 8 insertions, 15 deletions
diff --git a/Rakefile b/Rakefile
index 0f9f5d3..4d7e389 100644
--- a/Rakefile
+++ b/Rakefile
@@ -132,9 +132,8 @@ task :package_all => [:package] do
   sub_project("mongrel_upload_progress", :package)
   sub_project("mongrel_console", :package)
   sub_project("mongrel_cluster", :package)
-  if RUBY_PLATFORM =~ /mswin/
-    sub_project("mongrel_service", :package)
-  end
+  sub_project("mongrel_service", :package) if RUBY_PLATFORM =~ /mswin/
+  sh("rake java package") unless RUBY_PLATFORM =~ /java/
 end
 
 task :install_requirements do
@@ -150,10 +149,8 @@ task :install => [:install_requirements] do
   sub_project("mongrel_status", :install)
   sub_project("mongrel_upload_progress", :install)
   sub_project("mongrel_console", :install)
-  sub_project("mongrel_cluster", :install)
-  if RUBY_PLATFORM =~ /mswin/
-    sub_project("mongrel_service", :install)
-  end
+  sub_project("mongrel_cluster", :install)  
+  sub_project("mongrel_service", :install) if RUBY_PLATFORM =~ /mswin/
 end
 
 desc "for Mongrel and all its subprojects"
@@ -163,10 +160,8 @@ task :uninstall => [:clean] do
   sub_project("mongrel_upload_progress", :uninstall)
   sub_project("mongrel_console", :uninstall)
   sub_project("gem_plugin", :uninstall)
-  sub_project("fastthread", :uninstall)
-  if RUBY_PLATFORM =~ /mswin/
-    sub_project("mongrel_service", :install)
-  end
+  sub_project("fastthread", :uninstall)  
+  sub_project("mongrel_service", :install) if RUBY_PLATFORM =~ /mswin/
 end
 
 desc "for Mongrel and all its subprojects"
@@ -177,10 +172,8 @@ task :clean do
   sub_project("mongrel_status", :clean)
   sub_project("mongrel_upload_progress", :clean)
   sub_project("mongrel_console", :clean)
-  sub_project("mongrel_cluster", :clean)
-  if RUBY_PLATFORM =~ /mswin/
-    sub_project("mongrel_service", :clean)
-  end
+  sub_project("mongrel_cluster", :clean)
+  sub_project("mongrel_service", :clean) if RUBY_PLATFORM =~ /mswin/
 end
 
 #### Site upload tasks