Download as
Browse Code »

Commit 8df4d42a5ff736a10229fb8dcf39a37a0c8f4c2d

Authored by Antonio Terceiro
1 parent 520277de
Exists in master and in 65 other branches 3.x, add_you_are_here_breadcrumbs_label, api_for_colab, backup, backup_not_prod, cdtc_configuration, create_institution_bootstrap_modal, design_validation, dev-lappis, dev_env_minimal, disable_email_dev, docs, fix_edit_software_permission, fix_edit_software_with_another_license, fix_hover_button_whitening, fix_members_pagination, fix_models_translations, fix_software_api, fix_software_block_migration, fix_validations_and_tests, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc, margin_fix, mezuro_cookbook, organization_rating_style_changes, performance, prezento, r3, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_backup_emails, remove_secondary_email_from_user, removing_super_archives_email, review_message, scope2method, signals_community_noosfero, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_improvements, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_catalog_style_fixes, spb_minimal_env, spec_refactor, stable-4.x, stable-devel, support_docs, syslog, temp_soft_comm_refactoring, thread_dropdown, thread_page, 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
@@ -9,6 +9,16 @@ GENERATED += $(TARBALLS) $(RPMS) @@ -9,6 +9,16 @@ GENERATED += $(TARBALLS) $(RPMS)
9 9
10 ARCH = $(shell uname -m) 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 all: sdist rpm 22 all: sdist rpm
13 23
14 sdist: $(TARBALLS) 24 sdist: $(TARBALLS)
@@ -16,24 +26,25 @@ sdist: $(TARBALLS) @@ -16,24 +26,25 @@ sdist: $(TARBALLS)
16 rpm: $(RPMS) 26 rpm: $(RPMS)
17 27
18 $(TARBALLS): build/$(PROJECT)-%-$(VERSION).$(TARBALL_FORMAT): % 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 $(RPMS): build/$(PROJECT)-%-$(VERSION)-1.$(ARCH).rpm: build/$(PROJECT)-%-$(VERSION).$(TARBALL_FORMAT) 33 $(RPMS): build/$(PROJECT)-%-$(VERSION)-1.$(ARCH).rpm: build/$(PROJECT)-%-$(VERSION).$(TARBALL_FORMAT)
24 34
25 $(RPMS): build/$(PROJECT)-%-$(VERSION)-1.$(ARCH).rpm: rpm/%.spec 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 ln -f build/$(PROJECT)-$$component-$(VERSION).$(TARBALL_FORMAT) ~/rpmbuild/SOURCES/ && \ 39 ln -f build/$(PROJECT)-$$component-$(VERSION).$(TARBALL_FORMAT) ~/rpmbuild/SOURCES/ && \
30 - rpmbuild --quiet -bb $< && \ 40 + rpmbuild -bb $(RPMBUILD_FLAGS) $< && \
31 ln -f ~/rpmbuild/RPMS/$(ARCH)/$(PROJECT)-$$component-$(VERSION)-1.$(ARCH).rpm $@ 41 ln -f ~/rpmbuild/RPMS/$(ARCH)/$(PROJECT)-$$component-$(VERSION)-1.$(ARCH).rpm $@
32 42
33 %.spec: %.spec.in 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 GENERATED += $(patsubst %.in,%,$(wildcard rpm/*.spec.in)) 46 GENERATED += $(patsubst %.in,%,$(wildcard rpm/*.spec.in))
37 47
38 clean: 48 clean:
39 - $(RM) $(GENERATED) 49 + $(qecho) Cleaning
  50 + $(Q)$(RM) $(GENERATED)