Commit 55c36952c0ecd55ce2d4bf69292d62eed0c738c3
1 parent
eb014246
Exists in
master
and in
22 other branches
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
| ... | ... | @@ -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
| ... | ... | @@ -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 | ... | ... |