[PATCH] Add ignore and clean rules for gitweb.min.js

Mark Rada· Mar 19, 2010, 20:09 UTC · lore

Signed-off-by: Mark Rada <marada@uwaterloo.ca>

---
 .gitignore |    1 +
 Makefile   |    3 +++
 2 files changed, 4 insertions(+), 0 deletions(-)

Show changes to 2 files +4 −0

.gitignore, Makefile

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

Junio C Hamano· Mar 19, 2010, 21:06 UTC · re: Mark Rada · lore

Re: [PATCH] Add ignore and clean rules for gitweb.min.js

Mark Rada <marada@uwaterloo.ca> writes:

> Signed-off-by: Mark Rada <marada@uwaterloo.ca>

Thanks; one question and a comment.

Show 17 quoted lines

> ---
>  .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?

Show 13 quoted lines

> 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).

patchAdd ignore and clean rules for gitweb.min.js