Download as
Browse Code »

Commit 55c36952c0ecd55ce2d4bf69292d62eed0c738c3

Authored by Braulio Bhavamitra
1 parent eb014246
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Include solr on debian but not on source tarball

Showing 2 changed files with 5 additions and 12 deletions   Show diff stats
lib/tasks/package.rake
  Diff comments   View file @55c3695
@@ -9,23 +9,11 @@ task :package => 'package:clobber' do @@ -9,23 +9,11 @@ task :package => 'package:clobber' do
9 fail 9 fail
10 end 10 end
11 11
12 - begin  
13 - sh 'test -f vendor/plugins/acts_as_solr_reloaded/solr/start.jar'  
14 - rescue  
15 - puts "** The `package` task needs Solr installed within #{Noosfero::PROJECT}. Run 'rake solr:download'."  
16 - fail  
17 - end  
18 -  
19 release = "#{Noosfero::PROJECT}-#{Noosfero::VERSION}" 12 release = "#{Noosfero::PROJECT}-#{Noosfero::VERSION}"
20 target = "pkg/#{release}" 13 target = "pkg/#{release}"
21 mkdir_p target 14 mkdir_p target
22 sh "git archive HEAD | (cd #{target} && tar x)" 15 sh "git archive HEAD | (cd #{target} && tar x)"
23 16
24 - # solr inclusion  
25 - cp_r "vendor/plugins/acts_as_solr_reloaded/solr", "#{target}/vendor/plugins/acts_as_solr_reloaded", :verbose => true  
26 - rm_r "#{target}/vendor/plugins/acts_as_solr_reloaded/solr/work"  
27 - mkdir_p "#{target}/vendor/plugins/acts_as_solr_reloaded/solr/work"  
28 -  
29 sh "cd pkg && tar czf #{release}.tar.gz #{release}" 17 sh "cd pkg && tar czf #{release}.tar.gz #{release}"
30 end 18 end
31 19
lib/tasks/release.rake
  Diff comments   View file @55c3695
@@ -85,9 +85,14 @@ EOF @@ -85,9 +85,14 @@ EOF
85 desc 'Build Debian packages' 85 desc 'Build Debian packages'
86 task :debian_packages => :package do 86 task :debian_packages => :package do
87 target = "pkg/noosfero-#{Noosfero::VERSION}" 87 target = "pkg/noosfero-#{Noosfero::VERSION}"
  88 +
  89 + # base pre-config
88 mkdir "#{target}/tmp" 90 mkdir "#{target}/tmp"
89 ln_s '../../../vendor/rails', "#{target}/vendor/rails" 91 ln_s '../../../vendor/rails', "#{target}/vendor/rails"
90 cp "#{target}/config/database.yml.sqlite3", "#{target}/config/database.yml" 92 cp "#{target}/config/database.yml.sqlite3", "#{target}/config/database.yml"
  93 + # solr inclusion
  94 + Dir.chdir(target) { sh "rake solr:download" }
  95 +
91 sh "cd #{target} && dpkg-buildpackage -us -uc -b" 96 sh "cd #{target} && dpkg-buildpackage -us -uc -b"
92 end 97 end
93 98