{"thread":{"id":"27293","subject":"[PATCHv4 00/02] Simplify handling of gitweb dependencies and targets in main Makefile","startedAt":"2011-05-07T12:45:19Z","lastAt":"2011-05-08T18:53:30Z","messageCount":4,"participants":["Jakub Narebski","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"167319","messageId":"1304772321-22687-1-git-send-email-jnareb@gmail.com","threadId":"27293","inReplyTo":null,"subject":"[PATCHv4 00/02] Simplify handling of gitweb dependencies and targets in main Makefile","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2011-05-07T12:45:19Z","receivedAt":"2011-05-07T12:45:19Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"On Thu, 5 May 2011, Junio C Hamano wrote in:\n\"Re: What's cooking in git.git (May 2011, #02; Wed, 4)\"\nhttp://article.gmane.org/gmane.comp.version-control.git/172842\n\n> Jakub Narebski writes:\n>>>\n>>> Rerolled. Waiting for comments.\n>>\n>> Should I extract first two commits i.e.\n>>\n>> - Remove gitweb/gitweb.cgi and other legacy targets from main Makefile\n>> - git-instaweb: Simplify build dependency on gitweb\n>>\n>> into a separate patch series? Even though their existence was\n>> ...\n>> I think this cleanup is worthy on its own.\n> \n> Sounds like a good idea. Thanks.\n\nAnd here it is. I'm sorry for the delay.\n\nShortlog:\n~~~~~~~~~\nJakub Narebski (2):\n git-instaweb: Simplify build dependency on gitweb\n Remove gitweb/gitweb.cgi and other legacy targets from main Makefile\n\nDiffstat:\n~~~~~~~~~\n Makefile | 28 +---------------------------\n 1 files changed, 1 insertions(+), 27 deletions(-)\n\n-- \n1.7.5\n"},{"id":"167320","messageId":"1304772321-22687-2-git-send-email-jnareb@gmail.com","threadId":"27293","inReplyTo":"1304772321-22687-1-git-send-email-jnareb@gmail.com","subject":"[PATCH 01/02] git-instaweb: Simplify build dependency on gitweb","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2011-05-07T12:45:20Z","receivedAt":"2011-05-07T12:45:20Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Since c0cb4ed (git-instaweb: Configure it to work with new gitweb\nstructure, 2010-05-28) git-instaweb does not re-create gitweb.cgi\netc., but makes use of installed gitweb. Therefore simplify\ngit-instaweb dependency on gitweb subsystem in main Makefile from\n'gitweb/gitweb.cgi gitweb/static/gitweb.css gitweb/static/gitweb.js'\nto simply 'gitweb'.\n\nThis is preparation for splitting gitweb.perl script, and for\nsplitting gitweb.js (to be reassembled / combined on build). This way\nwe don't have to duplicate parts of gitweb/Makefile in main\nMakefile... it is also more correct description of git-instaweb\ndependency.\n\nReported-by: Junio C Hamano \nSigned-off-by: Jakub Narebski \n---\nThis patch is part of 'jn/gitweb-js' (a76424e) in 'pu', and was sent\nto git mailing list as part of the following series:\n\n [PATCHv3 00/13] gitweb: Change timezone in dates using JavaScript\n http://thread.gmane.org/gmane.comp.version-control.git/172384\n\nI think this simplification of git-instaweb dependencies is worth on\nits own, even if gitweb.js won't be generated file.\n\nP.S. Now that it is standalone, Reported-by makes little sense, though...\n\n Makefile | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex cbc3fce..8960cee 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -1773,7 +1773,7 @@ gitweb/static/gitweb.min.css: gitweb/static/gitweb.css\n endif # CSSMIN\n \n \n-git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/static/gitweb.css gitweb/static/gitweb.js\n+git-instaweb: git-instaweb.sh gitweb\n \t$(QUIET_GEN)$(RM) $@ $@+ && \\\n \tsed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \\\n \t -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \\\n-- \n1.7.3\n"},{"id":"167321","messageId":"1304772321-22687-3-git-send-email-jnareb@gmail.com","threadId":"27293","inReplyTo":"1304772321-22687-1-git-send-email-jnareb@gmail.com","subject":"[PATCH 02/02] Remove gitweb/gitweb.cgi and other legacy targets from main Makefile","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2011-05-07T12:45:21Z","receivedAt":"2011-05-07T12:45:21Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Now that there is gitweb/Makefile, let's leave only \"gitweb\" and\n\"install-gitweb\" targets in main Makefile. Those targets just\ndelegate to gitweb's Makefile.\n\nRequested-by: Junio C Hamano \nSigned-off-by: Jakub Narebski \n---\nThis patch is part of 'jn/gitweb-js' (a76424e) in 'pu', and was sent\nto git mailing list as part of the following series:\n\n [PATCHv3 00/13] gitweb: Change timezone in dates using JavaScript\n http://thread.gmane.org/gmane.comp.version-control.git/172384\n\nI think this simplification (straighforward deletion of duplicated\ncode) is worth on its own.\n\n Makefile | 26 --------------------------\n 1 files changed, 0 insertions(+), 26 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex 8960cee..d0c577b 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -1747,32 +1747,6 @@ $(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl\n gitweb:\n \t$(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) all\n \n-ifdef JSMIN\n-GITWEB_PROGRAMS += gitweb/static/gitweb.min.js\n-GITWEB_JS = gitweb/static/gitweb.min.js\n-else\n-GITWEB_JS = gitweb/static/gitweb.js\n-endif\n-ifdef CSSMIN\n-GITWEB_PROGRAMS += gitweb/static/gitweb.min.css\n-GITWEB_CSS = gitweb/static/gitweb.min.css\n-else\n-GITWEB_CSS = gitweb/static/gitweb.css\n-endif\n-OTHER_PROGRAMS += gitweb/gitweb.cgi $(GITWEB_PROGRAMS)\n-gitweb/gitweb.cgi: gitweb/gitweb.perl $(GITWEB_PROGRAMS)\n-\t$(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) $(patsubst gitweb/%,%,$@)\n-\n-ifdef JSMIN\n-gitweb/static/gitweb.min.js: gitweb/static/gitweb.js\n-\t$(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) $(patsubst gitweb/%,%,$@)\n-endif # JSMIN\n-ifdef CSSMIN\n-gitweb/static/gitweb.min.css: gitweb/static/gitweb.css\n-\t$(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) $(patsubst gitweb/%,%,$@)\n-endif # CSSMIN\n-\n-\n git-instaweb: git-instaweb.sh gitweb\n \t$(QUIET_GEN)$(RM) $@ $@+ && \\\n \tsed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \\\n-- \n1.7.3\n"},{"id":"167440","messageId":"7vtyd5rplh.fsf@alter.siamese.dyndns.org","threadId":"27293","inReplyTo":"1304772321-22687-3-git-send-email-jnareb@gmail.com","subject":"Re: [PATCH 02/02] Remove gitweb/gitweb.cgi and other legacy targets from main Makefile","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-05-08T18:53:30Z","receivedAt":"2011-05-08T18:53:30Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks, queued.\n"}]}