* [PATCH] Make the installation target of git-gui a little less chatty
@ 2007-05-31 22:25 Alex Riesen
2007-06-01 3:02 ` Shawn O. Pearce
0 siblings, 1 reply; 5+ messages in thread
From: Alex Riesen @ 2007-05-31 22:25 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: git, Junio C Hamano
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
The patch is hand-tuned to start in git-gui, so that it can be applied
in git-gui repo.
Makefile | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index 3de0de1..1eafbf8 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,10 @@ all::
# Define V=1 to have a more verbose compile.
#
+QUIET =
+ifndef V
+ QUIET = @
+endif
GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
@$(SHELL_PATH) ./GIT-VERSION-GEN
@@ -109,12 +113,13 @@ GIT-GUI-VARS: .FORCE-GIT-GUI-VARS
all:: $(ALL_PROGRAMS) lib/tclIndex
install: all
- $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'
- $(INSTALL) git-gui '$(DESTDIR_SQ)$(gitexecdir_SQ)'
- $(foreach p,$(GITGUI_BUILT_INS), rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git-gui' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;)
- $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(libdir_SQ)'
- $(INSTALL) -m644 lib/tclIndex '$(DESTDIR_SQ)$(libdir_SQ)'
- $(foreach p,$(ALL_LIBFILES), $(INSTALL) -m644 $p '$(DESTDIR_SQ)$(libdir_SQ)' ;)
+ @echo installing git-gui
+ $(QUIET)$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'
+ $(QUIET)$(INSTALL) git-gui '$(DESTDIR_SQ)$(gitexecdir_SQ)'
+ $(QUIET)$(foreach p,$(GITGUI_BUILT_INS), rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git-gui' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;)
+ $(QUIET)$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(libdir_SQ)'
+ $(QUIET)$(INSTALL) -m644 lib/tclIndex '$(DESTDIR_SQ)$(libdir_SQ)'
+ $(QUIET)$(foreach p,$(ALL_LIBFILES), $(INSTALL) -m644 $p '$(DESTDIR_SQ)$(libdir_SQ)' ;)
dist-version:
@mkdir -p $(TARDIR)
--
1.5.2.162.gbaa1f
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] Make the installation target of git-gui a little less chatty
2007-05-31 22:25 [PATCH] Make the installation target of git-gui a little less chatty Alex Riesen
@ 2007-06-01 3:02 ` Shawn O. Pearce
2007-06-01 7:36 ` Alex Riesen
2007-06-01 23:09 ` Alex Riesen
0 siblings, 2 replies; 5+ messages in thread
From: Shawn O. Pearce @ 2007-06-01 3:02 UTC (permalink / raw)
To: Alex Riesen; +Cc: git, Junio C Hamano
Alex Riesen <raa.lkml@gmail.com> wrote:
> Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
> ---
I have the exact same reaction as Junio had to the same change in
git.git... I'll apply it if you resend according to his guidelines.
> The patch is hand-tuned to start in git-gui, so that it can be applied
> in git-gui repo.
Hand-tuning the patch isn't necessary, just making the change its
own patch is all that is required. Git has these nifty flags for
git-am like -p2 and -3 that make editing filenames in the patch
completely unnecessary. ;-)
--
Shawn.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Make the installation target of git-gui a little less chatty
2007-06-01 3:02 ` Shawn O. Pearce
@ 2007-06-01 7:36 ` Alex Riesen
2007-06-01 23:09 ` Alex Riesen
1 sibling, 0 replies; 5+ messages in thread
From: Alex Riesen @ 2007-06-01 7:36 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: git, Junio C Hamano
On 6/1/07, Shawn O. Pearce <spearce@spearce.org> wrote:
> > The patch is hand-tuned to start in git-gui, so that it can be applied
> > in git-gui repo.
>
> Hand-tuning the patch isn't necessary, just making the change its
> own patch is all that is required. Git has these nifty flags for
Good to know
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] Make the installation target of git-gui a little less chatty
2007-06-01 3:02 ` Shawn O. Pearce
2007-06-01 7:36 ` Alex Riesen
@ 2007-06-01 23:09 ` Alex Riesen
1 sibling, 0 replies; 5+ messages in thread
From: Alex Riesen @ 2007-06-01 23:09 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: git, Junio C Hamano
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
git-gui/Makefile | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/git-gui/Makefile b/git-gui/Makefile
index 3de0de1..404bff0 100644
--- a/git-gui/Makefile
+++ b/git-gui/Makefile
@@ -2,6 +2,12 @@ all::
# Define V=1 to have a more verbose compile.
#
+QUIET =
+QUIET_MSG = :
+ifndef V
+ QUIET = @
+ QUIET_MSG = echo ' '
+endif
GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
@$(SHELL_PATH) ./GIT-VERSION-GEN
@@ -109,12 +115,14 @@ GIT-GUI-VARS: .FORCE-GIT-GUI-VARS
all:: $(ALL_PROGRAMS) lib/tclIndex
install: all
- $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'
- $(INSTALL) git-gui '$(DESTDIR_SQ)$(gitexecdir_SQ)'
- $(foreach p,$(GITGUI_BUILT_INS), rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git-gui' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;)
- $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(libdir_SQ)'
- $(INSTALL) -m644 lib/tclIndex '$(DESTDIR_SQ)$(libdir_SQ)'
- $(foreach p,$(ALL_LIBFILES), $(INSTALL) -m644 $p '$(DESTDIR_SQ)$(libdir_SQ)' ;)
+ $(QUIET)$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'
+ $(QUIET)$(QUIET_MSG)INSTALL git-gui; $(INSTALL) git-gui '$(DESTDIR_SQ)$(gitexecdir_SQ)'
+ $(QUIET)$(foreach p,$(GITGUI_BUILT_INS),$(QUIET_MSG)INSTALL $p;\
+ rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && \
+ ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git-gui' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;)
+ $(QUIET)$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(libdir_SQ)'
+ $(QUIET)$(foreach p,lib/tclIndex $(ALL_LIBFILES), $(QUIET_MSG)INSTALL $p;\
+ $(INSTALL) -m644 $p '$(DESTDIR_SQ)$(libdir_SQ)' ;)
dist-version:
@mkdir -p $(TARDIR)
--
1.5.2.162.g8fc0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] Make the installation target of git-gui a little less chatty
2007-06-03 1:00 quieter installs Shawn O. Pearce
@ 2007-06-03 13:08 ` Alex Riesen
0 siblings, 0 replies; 5+ messages in thread
From: Alex Riesen @ 2007-06-03 13:08 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Shawn O. Pearce
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
Almost the same as Shawn's. Sending just for completeness.
git-gui/Makefile | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/git-gui/Makefile b/git-gui/Makefile
index 3de0de1..dfed1a1 100644
--- a/git-gui/Makefile
+++ b/git-gui/Makefile
@@ -2,6 +2,10 @@ all::
# Define V=1 to have a more verbose compile.
#
+QUIET =
+ifndef V
+ QUIET = @
+endif
GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
@$(SHELL_PATH) ./GIT-VERSION-GEN
@@ -108,13 +112,31 @@ GIT-GUI-VARS: .FORCE-GIT-GUI-VARS
all:: $(ALL_PROGRAMS) lib/tclIndex
+ifeq ($(QUIET),@)
+INST_0 = arg=
+INST_1 = &&echo " INSTALL $$mode $$arg"&&$(INSTALL) $$mode "$$arg" # space
+BSETUP_0 = arg=
+BSETUP_1 = &&echo " GIT-GUI BUILTIN $$arg"&& \
+ rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/'"$$arg" && \
+ ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git-gui' \
+ '$(DESTDIR_SQ)$(gitexecdir_SQ)/'"$$arg" # space
+else
+INST_0 = $(INSTALL) $$mode # space to separate "install" and its first arg
+INST_1 =
+BSETUP_0 = arg=
+BSETUP_1 = &&rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/'"$$arg" && \
+ ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git-gui' \
+ '$(DESTDIR_SQ)$(gitexecdir_SQ)/'"$$arg" # space
+endif
+
install: all
- $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'
- $(INSTALL) git-gui '$(DESTDIR_SQ)$(gitexecdir_SQ)'
- $(foreach p,$(GITGUI_BUILT_INS), rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git-gui' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;)
- $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(libdir_SQ)'
- $(INSTALL) -m644 lib/tclIndex '$(DESTDIR_SQ)$(libdir_SQ)'
- $(foreach p,$(ALL_LIBFILES), $(INSTALL) -m644 $p '$(DESTDIR_SQ)$(libdir_SQ)' ;)
+ $(QUIET)$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'
+ $(QUIET)mode=;$(INST_0)git-gui $(INST_1)'$(DESTDIR_SQ)$(gitexecdir_SQ)'
+ $(QUIET)$(foreach p,$(GITGUI_BUILT_INS),$(BSETUP_0)$p $(BSETUP_1) &&):
+ $(QUIET)$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(libdir_SQ)'
+ $(QUIET)mode=-m644; \
+ $(foreach p,lib/tclIndex $(ALL_LIBFILES), \
+ $(INST_0)$p $(INST_1) '$(DESTDIR_SQ)$(libdir_SQ)' &&):
dist-version:
@mkdir -p $(TARDIR)
--
1.5.2.182.ged6b
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2007-06-03 13:09 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-05-31 22:25 [PATCH] Make the installation target of git-gui a little less chatty Alex Riesen
2007-06-01 3:02 ` Shawn O. Pearce
2007-06-01 7:36 ` Alex Riesen
2007-06-01 23:09 ` Alex Riesen
-- strict thread matches above, loose matches on Subject: below --
2007-06-03 1:00 quieter installs Shawn O. Pearce
2007-06-03 13:08 ` [PATCH] Make the installation target of git-gui a little less chatty Alex Riesen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).