Download as
Browse Code »

Commit c3f28e0016c436d780db1cf13da3061f89fc79a2

Authored by Edson Alves
1 parent 58889ba7
Exists in master and in 90 other branches 3.x, add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup, backup_not_prod, cdtc_configuration, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev-lappis, dev_env_minimal, disable_email_dev, docs, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, performance, prezento, r3, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_backup_emails, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, stable-devel, support_docs, syslog, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

Preparação dos arquivos para o empacotamento do solr.

Showing 3 changed files with 20 additions and 12 deletions   Show diff stats
.mrconfig
  Diff comments   View file @c3f28e0
... ... @@ -17,3 +17,7 @@ checkout = hg clone http://bitbucket.org/ianb/paste
17 17  
18 18 [mailman-api/paste/six]
19 19 checkout = hg clone https://bitbucket.org/gutworth/six
  20 +
  21 +[build/solr]
  22 +checkout = wget -c http://archive.apache.org/dist/lucene/solr/4.6.1/solr-4.6.1.tgz && tar vxzf solr-4.6.1.tgz && mv solr-4.6.1 solr
  23 +
... ...
Makefile
  Diff comments   View file @c3f28e0
... ... @@ -15,11 +15,13 @@ ifeq ("$(V)", "1")
15 15 qecho := @true
16 16 else
17 17 Q := @
18   - RPMBUILD_FLAGS := --quiet
  18 + RPMBUILD_FLAGS := --quiet --short-circuit
19 19 qecho := @echo
20 20 endif
21 21  
22   -all: sdist rpm
  22 +.PHONY: $(COMPONENTS)
  23 +
  24 +all: rpm
23 25  
24 26 sdist: $(TARBALLS)
25 27  
... ... @@ -27,8 +29,10 @@ rpm: $(RPMS)
27 29  
28 30 $(TARBALLS): build/$(PROJECT)-%-$(VERSION).$(TARBALL_FORMAT): %
29 31 $(qecho) "TAR\t$@"
30   - $(Q)mkdir -p $$(dirname $@)
31   - $(Q)tarball=$$(readlink -f $@); (cd ./$< && git archive --prefix=$(PROJECT)-$<-$(VERSION)/ HEAD | gzip - > $$tarball) || ($(RM) $@; false)
  32 + $(Q)cp -r $< $(PROJECT)-$<-$(VERSION)
  33 + $(Q)mkdir -p build
  34 + $(Q)tar vczf $@ $(PROJECT)-$<-$(VERSION)
  35 + $(Q)rm -rf $(PROJECT)-$<-$(VERSION)
32 36  
33 37 $(RPMS): build/$(PROJECT)-%-$(VERSION)-1.$(ARCH).rpm: build/$(PROJECT)-%-$(VERSION).$(TARBALL_FORMAT)
34 38  
... ... @@ -37,7 +41,7 @@ $(RPMS): build/$(PROJECT)-%-$(VERSION)-1.$(ARCH).rpm: rpm/%.spec
37 41 $(Q)mkdir -p ~/rpmbuild/SOURCES
38 42 $(Q)component=$$(basename $< .spec) && \
39 43 ln -f build/$(PROJECT)-$$component-$(VERSION).$(TARBALL_FORMAT) ~/rpmbuild/SOURCES/ && \
40   - rpmbuild -bb $(RPMBUILD_FLAGS) $< && \
  44 + rpmbuild -ba $(RPMBUILD_FLAGS) $< && \
41 45 ln -f ~/rpmbuild/RPMS/$(ARCH)/$(PROJECT)-$$component-$(VERSION)-1.el6.$(ARCH).rpm $@
42 46  
43 47 %.spec: %.spec.in
... ...
rpm/solr.spec.in
  Diff comments   View file @c3f28e0
... ... @@ -5,7 +5,7 @@
5 5 # Preamble
6 6  
7 7 Summary: Solr is the search platform from Apache Lucene project.
8   -Name: sofwarepublico-solr
  8 +Name: softwarepublico-solr
9 9 Version: @@version@@
10 10 Release: 1%{?dist}
11 11  
... ... @@ -32,20 +32,20 @@ SolrTM is the popular, blazing fast open source enterprise search platform from
32 32 # Esta é a seção responsável pela construção do software. Também é um
33 33 # shell script, e não tem macros associadas
34 34 %build
35   -make
36 35  
37 36 # Seção responsável pela instalação do software. Também é um shell script
38 37 %install
39   -make install
  38 +mkdir -p %{buildroot}/usr/share/solr
  39 +cp -r %{_builddir}/%{name}-%{version} %{buildroot}/usr/share/solr
  40 +
  41 +mkdir -p %{buildroot}/usr/share/solr/example/solr
  42 +cp -r %{_builddir}/%{name}-%{version}/example/webapps/solr.war %{buildroot}/usr/share/solr/example/solr/solr.war
40 43  
41 44 # Esta seção lista todos os arquivos que fazem parte do pacote: se um
42 45 # arquivo não for listado abaixo, não será inserido no pacote. A diretiva
43 46 # %doc indica um arquivo de documentação
44 47 %files
45   -%doc README
46   -/usr/local/bin/cdp
47   -/usr/local/bin/cdplay
48   -/usr/local/man/man1/cdp.1
  48 +/usr/share/solr
49 49  
50 50 # Esta seção remove os arquivos que foram criados durante o build
51 51 %clean
... ...