Download as
Browse Code »

Commit 55c36952c0ecd55ce2d4bf69292d62eed0c738c3

Authored by Braulio Bhavamitra
1 parent eb014246
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

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 9 fail
10 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 12 release = "#{Noosfero::PROJECT}-#{Noosfero::VERSION}"
20 13 target = "pkg/#{release}"
21 14 mkdir_p target
22 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 17 sh "cd pkg && tar czf #{release}.tar.gz #{release}"
30 18 end
31 19  
... ...
lib/tasks/release.rake
  Diff comments   View file @55c3695
... ... @@ -85,9 +85,14 @@ EOF
85 85 desc 'Build Debian packages'
86 86 task :debian_packages => :package do
87 87 target = "pkg/noosfero-#{Noosfero::VERSION}"
  88 +
  89 + # base pre-config
88 90 mkdir "#{target}/tmp"
89 91 ln_s '../../../vendor/rails', "#{target}/vendor/rails"
90 92 cp "#{target}/config/database.yml.sqlite3", "#{target}/config/database.yml"
  93 + # solr inclusion
  94 + Dir.chdir(target) { sh "rake solr:download" }
  95 +
91 96 sh "cd #{target} && dpkg-buildpackage -us -uc -b"
92 97 end
93 98  
... ...