Download as
Browse Code »

Commit 8df4d42a5ff736a10229fb8dcf39a37a0c8f4c2d

Authored by Antonio Terceiro
1 parent 520277de
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

Support verbose build with `make V=1`

Showing 1 changed file with 21 additions and 10 deletions   Show diff stats
Makefile
  Diff comments   View file @8df4d42
... ... @@ -9,6 +9,16 @@ GENERATED += $(TARBALLS) $(RPMS)
9 9  
10 10 ARCH = $(shell uname -m)
11 11  
  12 +ifeq ("$(V)", "1")
  13 + Q :=
  14 + RPMBUILD_FLAGS :=
  15 + qecho := @true
  16 +else
  17 + Q := @
  18 + RPMBUILD_FLAGS := --quiet
  19 + qecho := @echo
  20 +endif
  21 +
12 22 all: sdist rpm
13 23  
14 24 sdist: $(TARBALLS)
... ... @@ -16,24 +26,25 @@ sdist: $(TARBALLS)
16 26 rpm: $(RPMS)
17 27  
18 28 $(TARBALLS): build/$(PROJECT)-%-$(VERSION).$(TARBALL_FORMAT): %
19   - @echo "TAR $@"
20   - @mkdir -p $$(dirname $@)
21   - @tarball=$$(readlink -f $@); (cd ./$< && git archive --prefix=$(PROJECT)-$<-$(VERSION)/ HEAD | gzip - > $$tarball) || ($(RM) $@; false)
  29 + $(qecho) "TAR\t$@"
  30 + $(Q)mkdir -p $$(dirname $@)
  31 + $(Q)tarball=$$(readlink -f $@); (cd ./$< && git archive --prefix=$(PROJECT)-$<-$(VERSION)/ HEAD | gzip - > $$tarball) || ($(RM) $@; false)
22 32  
23 33 $(RPMS): build/$(PROJECT)-%-$(VERSION)-1.$(ARCH).rpm: build/$(PROJECT)-%-$(VERSION).$(TARBALL_FORMAT)
24 34  
25 35 $(RPMS): build/$(PROJECT)-%-$(VERSION)-1.$(ARCH).rpm: rpm/%.spec
26   - @echo "RPM $@"
27   - @mkdir -p ~/rpmbuild/SOURCES
28   - @component=$$(basename $< .spec) && \
  36 + $(qecho) "RPM\t$@"
  37 + $(Q)mkdir -p ~/rpmbuild/SOURCES
  38 + $(Q)component=$$(basename $< .spec) && \
29 39 ln -f build/$(PROJECT)-$$component-$(VERSION).$(TARBALL_FORMAT) ~/rpmbuild/SOURCES/ && \
30   - rpmbuild --quiet -bb $< && \
  40 + rpmbuild -bb $(RPMBUILD_FLAGS) $< && \
31 41 ln -f ~/rpmbuild/RPMS/$(ARCH)/$(PROJECT)-$$component-$(VERSION)-1.$(ARCH).rpm $@
32 42  
33 43 %.spec: %.spec.in
34   - @echo SPEC $@
35   - @(sed -e 's/@@version@@/$(VERSION)/g' $^ > $@) || ($(RM) $@; false)
  44 + $(qecho) "SPEC\t$@"
  45 + $(Q)(sed -e 's/@@version@@/$(VERSION)/g' $^ > $@) || ($(RM) $@; false)
36 46 GENERATED += $(patsubst %.in,%,$(wildcard rpm/*.spec.in))
37 47  
38 48 clean:
39   - $(RM) $(GENERATED)
  49 + $(qecho) Cleaning
  50 + $(Q)$(RM) $(GENERATED)
... ...