@matheusbsbs / matheus-bagliano / commits / 573fe6d77d
Fork 0

git-gui: Quiet our installation process

Alex Riesen wanted a quieter installation process for git and its contained git-gui. His earlier patch to do this failed to work properly when V=1, and didn't really give a great indication of what the installation was doing. These rules are a little bit on the messy side, as each of our install actions is composed of at least two variables, but in the V=1 case the text is identical to what we had before, while in the non-V=1 case we use some more complex rules to show the interesting details, and hide the less interesting bits. We now can also set QUIET= (nothing) to see the rules that are used when V= (nothing), so we can debug those too if we have to. This is actually a side-effect of how we insert the @ into the rules we use for the "lists of things", like our builtins or our library files. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Shawn O. Pearce committed Jun 2, 2007 at 20:56 UTC 573fe6d77da51f7baa20800a3809b5db9296a83c
1 file changed +33 -9
Makefile
+33 -9
@@ -29,11 +29,35 @@ ifndef INSTALL
29 INSTALL = install
30 endif
31
32 +INSTALL_D0 = $(INSTALL) -d -m755 # space is required here
33 +INSTALL_D1 =
34 +INSTALL_R0 = $(INSTALL) -m644 # space is required here
35 +INSTALL_R1 =
36 +INSTALL_X0 = $(INSTALL) -m755 # space is required here
37 +INSTALL_X1 =
38 +INSTALL_L0 = rm -f # space is required here
39 +INSTALL_L1 = && ln # space is required here
40 +INSTALL_L2 =
41 +INSTALL_L3 =
42 +
43 ifndef V
33 - QUIET_GEN = @echo ' ' GEN $@;
34 - QUIET_BUILT_IN = @echo ' ' BUILTIN $@;
35 - QUIET_INDEX = @echo ' ' INDEX $(dir $@);
44 + QUIET = @
45 + QUIET_GEN = $(QUIET)echo ' ' GEN $@ &&
46 + QUIET_BUILT_IN = $(QUIET)echo ' ' BUILTIN $@ &&
47 + QUIET_INDEX = $(QUIET)echo ' ' INDEX $(dir $@) &&
48 QUIET_2DEVNULL = 2>/dev/null
49 +
50 + INSTALL_D0 = dir=
51 + INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m755 "$$dir"
52 + INSTALL_R0 = src=
53 + INSTALL_R1 = && echo ' ' INSTALL 644 `basename $$src` && $(INSTALL) -m644 $$src
54 + INSTALL_X0 = src=
55 + INSTALL_X1 = && echo ' ' INSTALL 755 `basename $$src` && $(INSTALL) -m755 $$src
56 +
57 + INSTALL_L0 = dst=
58 + INSTALL_L1 = && src=
59 + INSTALL_L2 = && dst=
60 + INSTALL_L3 = && echo ' ' 'LINK ' `basename "$$dst"` '->' `basename "$$src"` && rm -f "$$dst" && ln "$$src" "$$dst"
61 endif
62
63 TCL_PATH ?= tclsh
@@ -109,12 +133,12 @@ GIT-GUI-VARS: .FORCE-GIT-GUI-VARS
133 all:: $(ALL_PROGRAMS) lib/tclIndex
134
135 install: all
112 - $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'
113 - $(INSTALL) git-gui '$(DESTDIR_SQ)$(gitexecdir_SQ)'
114 - $(foreach p,$(GITGUI_BUILT_INS), rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git-gui' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;)
115 - $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(libdir_SQ)'
116 - $(INSTALL) -m644 lib/tclIndex '$(DESTDIR_SQ)$(libdir_SQ)'
117 - $(foreach p,$(ALL_LIBFILES), $(INSTALL) -m644 $p '$(DESTDIR_SQ)$(libdir_SQ)' ;)
136 + $(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(gitexecdir_SQ)' $(INSTALL_D1)
137 + $(QUIET)$(INSTALL_X0)git-gui $(INSTALL_X1) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
138 + $(QUIET)$(foreach p,$(GITGUI_BUILT_INS), $(INSTALL_L0)'$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' $(INSTALL_L1)'$(DESTDIR_SQ)$(gitexecdir_SQ)/git-gui' $(INSTALL_L2)'$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' $(INSTALL_L3) &&) true
139 + $(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(libdir_SQ)' $(INSTALL_D1)
140 + $(QUIET)$(INSTALL_R0)lib/tclIndex $(INSTALL_R1) '$(DESTDIR_SQ)$(libdir_SQ)'
141 + $(QUIET)$(foreach p,$(ALL_LIBFILES), $(INSTALL_R0)$p $(INSTALL_R1) '$(DESTDIR_SQ)$(libdir_SQ)' &&) true
142
143 dist-version:
144 @mkdir -p $(TARDIR)