{"thread":{"id":"23085","subject":"[PATCHv2] instaweb: use minified gitweb.js if available","startedAt":"2010-03-19T19:16:04Z","lastAt":"2010-03-19T19:16:04Z","messageCount":1,"participants":["Mark Rada"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"137258","messageId":"4BA3CD74.4050603@mailservices.uwaterloo.ca","threadId":"23085","inReplyTo":null,"subject":"[PATCHv2] instaweb: use minified gitweb.js if available","fromName":"Mark Rada","fromEmail":"marada@uwaterloo.ca","sentAt":"2010-03-19T19:16:04Z","receivedAt":"2010-03-19T19:16:04Z","isPatch":false,"sender":{"key":"marada@uwaterloo.ca","avatar":"https://avatars.githubusercontent.com/u/38430?v=4"},"body":"Makes git-instaweb use gitweb.min.js if it was generated.\n\nSigned-off-by: Mark Rada <marada@uwaterloo.ca>\n\n---\n\nChanges since v1:\n\t- Updates name of javascript file instaweb creates\n\t  instead of changing the the copy of gitweb.cgi\n\t  that embeds.\n\n\n Makefile        |   11 ++++++-----\n git-instaweb.sh |    3 ++-\n 2 files changed, 8 insertions(+), 6 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex 7c616f8..f80b25e 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -1551,12 +1551,12 @@ gitweb:\n \t$(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) all\n \n ifdef JSMIN\n-OTHER_PROGRAMS += gitweb/gitweb.cgi   gitweb/gitweb.min.js\n-gitweb/gitweb.cgi: gitweb/gitweb.perl gitweb/gitweb.min.js\n+GITWEB_JS=gitweb/gitweb.min.js\n else\n-OTHER_PROGRAMS += gitweb/gitweb.cgi\n-gitweb/gitweb.cgi: gitweb/gitweb.perl\n+GITWEB_JS=gitweb/gitweb.js\n endif\n+OTHER_PROGRAMS += gitweb/gitweb.cgi $(GITWEB_JS)\n+gitweb/gitweb.cgi: gitweb/gitweb.perl $(GITWEB_PROGRAMS)\n \t$(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) $(patsubst gitweb/%,%,$@)\n \n ifdef JSMIN\n@@ -1574,8 +1574,9 @@ git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css gitweb/gitweb.\n \t    -e '/@@GITWEB_CGI@@/d' \\\n \t    -e '/@@GITWEB_CSS@@/r gitweb/gitweb.css' \\\n \t    -e '/@@GITWEB_CSS@@/d' \\\n-\t    -e '/@@GITWEB_JS@@/r gitweb/gitweb.js' \\\n+\t    -e '/@@GITWEB_JS@@/r $(GITWEB_JS)' \\\n \t    -e '/@@GITWEB_JS@@/d' \\\n+\t    -e 's|@@GITWEB_JS_NAME@@|$(GITWEB_JS)|' \\\n \t    -e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \\\n \t    $@.sh > $@+ && \\\n \tchmod +x $@+ && \\\ndiff --git a/git-instaweb.sh b/git-instaweb.sh\nindex 6a65f25..b2fb7f0 100755\n--- a/git-instaweb.sh\n+++ b/git-instaweb.sh\n@@ -397,12 +397,13 @@ EOFGITWEB\n gitweb_js () {\n \tcat > \"$1\" <<\\EOFGITWEB\n @@GITWEB_JS@@\n+\n EOFGITWEB\n }\n \n gitweb_cgi \"$GIT_DIR/gitweb/gitweb.cgi\"\n gitweb_css \"$GIT_DIR/gitweb/gitweb.css\"\n-gitweb_js  \"$GIT_DIR/gitweb/gitweb.js\"\n+gitweb_js  \"$GIT_DIR/@@GITWEB_JS_NAME@@\"\n \n case \"$httpd\" in\n *lighttpd*)\n-- \n1.7.0.2.279.gf1ba1c\n"}]}