[PATCHv4 00/02] Simplify handling of gitweb dependencies and targets in main Makefile

[PATCHv4 00/02] Simplify handling of gitweb dependencies and targets in main Makefile

[Jakub Narebski]

On Thu, 5 May 2011, Junio C Hamano wrote in:
"Re: What's cooking in git.git (May 2011, #02; Wed, 4)"
http://article.gmane.org/gmane.comp.version-control.git/172842

> Jakub Narebski <jnareb@gmail.com> writes:
>>>
>>> Rerolled.  Waiting for comments.
>>
>> Should I extract first two commits i.e.
>>
>>    - Remove gitweb/gitweb.cgi and other legacy targets from main Makefile
>>    - git-instaweb: Simplify build dependency on gitweb
>>
>> into a separate patch series?  Even though their existence was
>> ...
>> I think this cleanup is worthy on its own.
> 
> Sounds like a good idea.  Thanks.

And here it is.  I'm sorry for the delay.

Shortlog:
~~~~~~~~~
Jakub Narebski (2):
  git-instaweb: Simplify build dependency on gitweb
  Remove gitweb/gitweb.cgi and other legacy targets from main Makefile

Diffstat:
~~~~~~~~~
 Makefile |   28 +---------------------------
 1 files changed, 1 insertions(+), 27 deletions(-)

-- 
1.7.5

[PATCH 01/02] git-instaweb: Simplify build dependency on gitweb

[Jakub Narebski]

Since c0cb4ed (git-instaweb: Configure it to work with new gitweb
structure, 2010-05-28) git-instaweb does not re-create gitweb.cgi
etc., but makes use of installed gitweb.  Therefore simplify
git-instaweb dependency on gitweb subsystem in main Makefile from
'gitweb/gitweb.cgi gitweb/static/gitweb.css gitweb/static/gitweb.js'
to simply 'gitweb'.

This is preparation for splitting gitweb.perl script, and for
splitting gitweb.js (to be reassembled / combined on build).  This way
we don't have to duplicate parts of gitweb/Makefile in main
Makefile... it is also more correct description of git-instaweb
dependency.

Reported-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
---
This patch is part of 'jn/gitweb-js' (a76424e) in 'pu', and was sent
to git mailing list as part of the following series:

  [PATCHv3 00/13] gitweb: Change timezone in dates using JavaScript
  http://thread.gmane.org/gmane.comp.version-control.git/172384

I think this simplification of git-instaweb dependencies is worth on
its own, even if gitweb.js won't be generated file.

P.S. Now that it is standalone, Reported-by makes little sense, though...

 Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index cbc3fce..8960cee 100644
--- a/Makefile
+++ b/Makefile
@@ -1773,7 +1773,7 @@ gitweb/static/gitweb.min.css: gitweb/static/gitweb.css
 endif # CSSMIN
 
 
-git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/static/gitweb.css gitweb/static/gitweb.js
+git-instaweb: git-instaweb.sh gitweb
 	$(QUIET_GEN)$(RM) $@ $@+ && \
 	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
 	    -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
-- 
1.7.3

[PATCH 02/02] Remove gitweb/gitweb.cgi and other legacy targets from main Makefile

[Jakub Narebski]

Now that there is gitweb/Makefile, let's leave only "gitweb" and
"install-gitweb" targets in main Makefile.  Those targets just
delegate to gitweb's Makefile.

Requested-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
---
This patch is part of 'jn/gitweb-js' (a76424e) in 'pu', and was sent
to git mailing list as part of the following series:

  [PATCHv3 00/13] gitweb: Change timezone in dates using JavaScript
  http://thread.gmane.org/gmane.comp.version-control.git/172384

I think this simplification (straighforward deletion of duplicated
code) is worth on its own.

 Makefile |   26 --------------------------
 1 files changed, 0 insertions(+), 26 deletions(-)

diff --git a/Makefile b/Makefile
index 8960cee..d0c577b 100644
--- a/Makefile
+++ b/Makefile
@@ -1747,32 +1747,6 @@ $(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl
 gitweb:
 	$(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) all
 
-ifdef JSMIN
-GITWEB_PROGRAMS += gitweb/static/gitweb.min.js
-GITWEB_JS = gitweb/static/gitweb.min.js
-else
-GITWEB_JS = gitweb/static/gitweb.js
-endif
-ifdef CSSMIN
-GITWEB_PROGRAMS += gitweb/static/gitweb.min.css
-GITWEB_CSS = gitweb/static/gitweb.min.css
-else
-GITWEB_CSS = gitweb/static/gitweb.css
-endif
-OTHER_PROGRAMS +=  gitweb/gitweb.cgi  $(GITWEB_PROGRAMS)
-gitweb/gitweb.cgi: gitweb/gitweb.perl $(GITWEB_PROGRAMS)
-	$(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) $(patsubst gitweb/%,%,$@)
-
-ifdef JSMIN
-gitweb/static/gitweb.min.js: gitweb/static/gitweb.js
-	$(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) $(patsubst gitweb/%,%,$@)
-endif # JSMIN
-ifdef CSSMIN
-gitweb/static/gitweb.min.css: gitweb/static/gitweb.css
-	$(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) $(patsubst gitweb/%,%,$@)
-endif # CSSMIN
-
-
 git-instaweb: git-instaweb.sh gitweb
 	$(QUIET_GEN)$(RM) $@ $@+ && \
 	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
-- 
1.7.3

Re: [PATCH 02/02] Remove gitweb/gitweb.cgi and other legacy targets from main Makefile

[Junio C Hamano]

Thanks, queued.