[PATCHv2] instaweb: use minified gitweb.js if available
From: Mark Rada <hidden>
Date: 2016-06-15 22:48:27
Subsystem:
kernel build + files below scripts/ (unless maintained elsewhere), the rest · Maintainers:
Nathan Chancellor, Nicolas Schier, Linus Torvalds
Makes git-instaweb use gitweb.min.js if it was generated. Signed-off-by: Mark Rada <redacted> --- Changes since v1: - Updates name of javascript file instaweb creates instead of changing the the copy of gitweb.cgi that embeds. Makefile | 11 ++++++----- git-instaweb.sh | 3 ++- 2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index 7c616f8..f80b25e 100644
--- a/Makefile
+++ b/Makefile@@ -1551,12 +1551,12 @@ gitweb: $(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) all ifdef JSMIN -OTHER_PROGRAMS += gitweb/gitweb.cgi gitweb/gitweb.min.js -gitweb/gitweb.cgi: gitweb/gitweb.perl gitweb/gitweb.min.js +GITWEB_JS=gitweb/gitweb.min.js else -OTHER_PROGRAMS += gitweb/gitweb.cgi -gitweb/gitweb.cgi: gitweb/gitweb.perl +GITWEB_JS=gitweb/gitweb.js endif +OTHER_PROGRAMS += gitweb/gitweb.cgi $(GITWEB_JS) +gitweb/gitweb.cgi: gitweb/gitweb.perl $(GITWEB_PROGRAMS) $(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) $(patsubst gitweb/%,%,$@) ifdef JSMIN
@@ -1574,8 +1574,9 @@ git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css gitweb/gitweb. -e '/@@GITWEB_CGI@@/d' \ -e '/@@GITWEB_CSS@@/r gitweb/gitweb.css' \ -e '/@@GITWEB_CSS@@/d' \ - -e '/@@GITWEB_JS@@/r gitweb/gitweb.js' \ + -e '/@@GITWEB_JS@@/r $(GITWEB_JS)' \ -e '/@@GITWEB_JS@@/d' \ + -e 's|@@GITWEB_JS_NAME@@|$(GITWEB_JS)|' \ -e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \ $@.sh > $@+ && \ chmod +x $@+ && \
diff --git a/git-instaweb.sh b/git-instaweb.sh
index 6a65f25..b2fb7f0 100755
--- a/git-instaweb.sh
+++ b/git-instaweb.sh@@ -397,12 +397,13 @@ EOFGITWEB gitweb_js () { cat > "$1" <<\EOFGITWEB @@GITWEB_JS@@ + EOFGITWEB } gitweb_cgi "$GIT_DIR/gitweb/gitweb.cgi" gitweb_css "$GIT_DIR/gitweb/gitweb.css" -gitweb_js "$GIT_DIR/gitweb/gitweb.js" +gitweb_js "$GIT_DIR/@@GITWEB_JS_NAME@@" case "$httpd" in *lighttpd*)
--
1.7.0.2.279.gf1ba1c