From 55c36952c0ecd55ce2d4bf69292d62eed0c738c3 Mon Sep 17 00:00:00 2001
From: Braulio Bhavamitra <brauliobo@gmail.com>
Date: Sun, 20 May 2012 15:07:54 +0000
Subject: [PATCH] Include solr on debian but not on source tarball

---
 lib/tasks/package.rake | 12 ------------
 lib/tasks/release.rake |  5 +++++
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/lib/tasks/package.rake b/lib/tasks/package.rake
index 4ad3cbe..106906d 100644
--- a/lib/tasks/package.rake
+++ b/lib/tasks/package.rake
@@ -9,23 +9,11 @@ task :package => 'package:clobber' do
     fail
   end
 
-  begin
-    sh 'test -f vendor/plugins/acts_as_solr_reloaded/solr/start.jar'
-  rescue
-    puts "** The `package` task needs Solr installed within #{Noosfero::PROJECT}. Run 'rake solr:download'."
-    fail
-  end
-
   release = "#{Noosfero::PROJECT}-#{Noosfero::VERSION}"
   target = "pkg/#{release}"
   mkdir_p target
   sh "git archive HEAD | (cd #{target} && tar x)"
 
-  # solr inclusion
-  cp_r "vendor/plugins/acts_as_solr_reloaded/solr", "#{target}/vendor/plugins/acts_as_solr_reloaded", :verbose => true
-  rm_r "#{target}/vendor/plugins/acts_as_solr_reloaded/solr/work"
-  mkdir_p "#{target}/vendor/plugins/acts_as_solr_reloaded/solr/work"
-
   sh "cd pkg && tar czf #{release}.tar.gz #{release}"
 end
 
diff --git a/lib/tasks/release.rake b/lib/tasks/release.rake
index 871f9d4..e52df4b 100644
--- a/lib/tasks/release.rake
+++ b/lib/tasks/release.rake
@@ -85,9 +85,14 @@ EOF
   desc 'Build Debian packages'
   task :debian_packages => :package do
     target = "pkg/noosfero-#{Noosfero::VERSION}"
+
+    # base pre-config
     mkdir "#{target}/tmp"
     ln_s '../../../vendor/rails', "#{target}/vendor/rails"
     cp "#{target}/config/database.yml.sqlite3", "#{target}/config/database.yml"
+    # solr inclusion
+    Dir.chdir(target) { sh "rake solr:download" }
+
     sh "cd #{target} && dpkg-buildpackage -us -uc -b"
   end
 
--
libgit2 0.21.2