[PATCH 01/13] git-instaweb: Simplify build dependency on gitweb
- From
Jakub Narebski <jnareb@gmail.com>
- Date
- Apr 28, 2011, 19:03 UTC
- Message-ID
- <1304017451-12283-2-git-send-email-jnareb@gmail.com>
- In-Reply-To
- <1304017451-12283-1-git-send-email-jnareb@gmail.com>
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 kind of new in this version of series. The original patch by J.H. didn't touch either Makefile or gitweb/Makefile at all...
This issue (breakage in git-instaweb generation) was reported in
Re: [PATCHv2 00/11] gitweb: Change timezone in dates using JavaScript http://thread.gmane.org/gmane.comp.version-control.git/171600/focus=171769
This patch was sent to git mailing list as
[PATCH -01/11] git-instaweb: Simplify build dependency on gitweb http://thread.gmane.org/gmane.comp.version-control.git/171600/focus=171792
and included in 'jn/gitweb-js' (a174d61).
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