Download as
Browse Code »

Commit c3956065f490912c5f5e0aa6b8e28ad93c3be9ab

Authored by Rafael Martins
1 parent d8111782
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

Remove unnecessary calls (solr:download is run by solr:start)

Showing 4 changed files with 5 additions and 7 deletions   Show diff stats
HACKING
  Diff comments   View file @c395606
... ... @@ -40,8 +40,7 @@ commands and make sure you understand what you are doing):
40 40 cp config/database.yml.sqlite3 config/database.yml
41 41 # create tmp directory if it doesn't exist
42 42 mkdir tmp
43   - # download and start Solr
44   - rake solr:download
  43 + # start Solr
45 44 rake solr:start
46 45 # create the development database
47 46 rake db:schema:load
... ...
INSTALL
  Diff comments   View file @c395606
... ... @@ -117,9 +117,6 @@ $ cd current
117 117  
118 118 Copy config/solr.yml.dist to config/solr.yml. You will
119 119 probably not need to customize this configuration, but have a look at it.
120   -Then you'll need to download Solr into noosfero:
121   -
122   -$ rake solr:download
123 120  
124 121 Create the mongrel configuration file:
125 122  
... ...
lib/tasks/package.rake
  Diff comments   View file @c395606
... ... @@ -8,18 +8,20 @@ task :package => 'package:clobber' do
8 8 puts "** The `package` task only works from within #{Noosfero::PROJECT}'s git repository."
9 9 fail
10 10 end
  11 +
11 12 begin
12 13 sh 'test -f vendor/plugins/acts_as_solr_reloaded/solr/start.jar'
13 14 rescue
14 15 puts "** The `package` task needs Solr installed within #{Noosfero::PROJECT}. Run 'rake solr:download'."
15 16 fail
16 17 end
  18 +
17 19 release = "#{Noosfero::PROJECT}-#{Noosfero::VERSION}"
18 20 target = "pkg/#{release}"
19 21 mkdir_p target
20 22 sh "git archive HEAD | (cd #{target} && tar x)"
21 23  
22   - #solr inclusion
  24 + # solr inclusion
23 25 cp_r "vendor/plugins/acts_as_solr_reloaded/solr", "#{target}/vendor/plugins/acts_as_solr_reloaded", :verbose => true
24 26 rm_r "#{target}/vendor/plugins/acts_as_solr_reloaded/solr/work"
25 27 mkdir_p "#{target}/vendor/plugins/acts_as_solr_reloaded/solr/work"
... ...
script/development
  Diff comments   View file @c395606
... ... @@ -6,12 +6,12 @@ stop() {
6 6 ./script/delayed_job stop
7 7 ./script/feed-updater stop
8 8 rake -s solr:stop
  9 + exit
9 10 }
10 11  
11 12 start() {
12 13 ./script/feed-updater start
13 14 ./script/delayed_job start
14   - rake -s solr:download
15 15 rake -s solr:start
16 16 trap stop INT TERM
17 17 ./script/server $@
... ...