* [PATCH] Add ignore and clean rules for gitweb.min.js
@ 2010-03-19 20:09 Mark Rada
2010-03-19 21:06 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Mark Rada @ 2010-03-19 20:09 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano
Signed-off-by: Mark Rada <marada@uwaterloo.ca>
---
.gitignore | 1 +
Makefile | 3 +++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/.gitignore b/.gitignore
index 7b3acb7..3558dd2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -156,6 +156,7 @@
/git-core-*/?*
/gitk-git/gitk-wish
/gitweb/gitweb.cgi
+/gitweb/gitweb.min.js
/test-chmtime
/test-ctype
/test-date
diff --git a/Makefile b/Makefile
index f80b25e..cdf16c2 100644
--- a/Makefile
+++ b/Makefile
@@ -2078,6 +2078,9 @@ clean:
$(MAKE) -C Documentation/ clean
ifndef NO_PERL
$(RM) gitweb/gitweb.cgi
+ifdef JSMIN
+ $(RM) gitweb/gitweb.min.js
+endif #JSMIN
$(MAKE) -C perl clean
endif
ifndef NO_PYTHON
--
1.7.0.2.279.gf1ba1c
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Add ignore and clean rules for gitweb.min.js
2010-03-19 20:09 [PATCH] Add ignore and clean rules for gitweb.min.js Mark Rada
@ 2010-03-19 21:06 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2010-03-19 21:06 UTC (permalink / raw)
To: Mark Rada; +Cc: git
Mark Rada <marada@uwaterloo.ca> writes:
> Signed-off-by: Mark Rada <marada@uwaterloo.ca>
Thanks; one question and a comment.
> ---
> .gitignore | 1 +
> Makefile | 3 +++
> 2 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/.gitignore b/.gitignore
> index 7b3acb7..3558dd2 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -156,6 +156,7 @@
> /git-core-*/?*
> /gitk-git/gitk-wish
> /gitweb/gitweb.cgi
> +/gitweb/gitweb.min.js
> /test-chmtime
> /test-ctype
> /test-date
Question: should this be part of your earlier "instaweb" patch, or are
they independent?
> diff --git a/Makefile b/Makefile
> index f80b25e..cdf16c2 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -2078,6 +2078,9 @@ clean:
> $(MAKE) -C Documentation/ clean
> ifndef NO_PERL
> $(RM) gitweb/gitweb.cgi
> +ifdef JSMIN
> + $(RM) gitweb/gitweb.min.js
> +endif #JSMIN
> $(MAKE) -C perl clean
> endif
Running "make clean" in perl/ should stay in "ifndef NO_PERL", but I think
removal of both gitweb/{gitweb.cgi,gitweb.min.js} should be unconditional;
it does not hurt as $(RM) is "rm -f" (i.e. don't complain to ENOENT).
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-03-19 21:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-19 20:09 [PATCH] Add ignore and clean rules for gitweb.min.js Mark Rada
2010-03-19 21:06 ` Junio C Hamano
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).