From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jakub Narebski Subject: [PATCHv7.4 1/4] gitweb: Prepare for splitting gitweb Date: Fri, 3 Dec 2010 20:25:32 +0100 Message-ID: <1291404335-25541-2-git-send-email-jnareb@gmail.com> References: <1291404335-25541-1-git-send-email-jnareb@gmail.com> Cc: John 'Warthog9' Hawley , John 'Warthog9' Hawley , Junio C Hamano , Thomas Rast , Jakub Narebski To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Fri Dec 03 20:26:32 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PObH3-0002Rm-DY for gcvg-git-2@lo.gmane.org; Fri, 03 Dec 2010 20:26:30 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752169Ab0LCT0F (ORCPT ); Fri, 3 Dec 2010 14:26:05 -0500 Received: from mail-fx0-f46.google.com ([209.85.161.46]:48443 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751677Ab0LCT0D (ORCPT ); Fri, 3 Dec 2010 14:26:03 -0500 Received: by fxm20 with SMTP id 20so2527297fxm.19 for ; Fri, 03 Dec 2010 11:26:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=JTueaSE1SjHTy0ixxM+/fKsudkzpBXb7b80osXZzK84=; b=XxtY+924ZTQ/dC1t47m0Kq0VJCZnJsHqQnZ+6M8vqoSufCwTbLIWfBsDZNldWgJavi 2teEoC5u05lVdw1O+4qjzLhHZR7YrqZfi8eCLlD8feTPCNvH9GHR7rCBSN0QOgSg9Vda 9ZOexEG3R2vBkJR836eC+Ktu4PmwjwRkWoDWk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=sH4tJ47JoBKQglVLA6yf4m+SmxTTV6DnTeILR04ZRIUyYvLdwerTh881VSKEHrlBj/ bQzVt+bFmRwfCHA+G43MSn0asn2TGHGQmOR0hkezKDOK4VvqCtnZzvoWbDgawc7ZThxd QtDpvJZmplqw/lPIQAdfhOrTVHYnAsQUZUNsM= Received: by 10.204.116.5 with SMTP id k5mr3022181bkq.141.1291404358874; Fri, 03 Dec 2010 11:25:58 -0800 (PST) Received: from localhost.localdomain (abrz239.neoplus.adsl.tpnet.pl [83.8.119.239]) by mx.google.com with ESMTPS id b17sm1064634bku.8.2010.12.03.11.25.55 (version=SSLv3 cipher=RC4-MD5); Fri, 03 Dec 2010 11:25:57 -0800 (PST) X-Mailer: git-send-email 1.7.3 In-Reply-To: <1291404335-25541-1-git-send-email-jnareb@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Prepare gitweb for having been split into modules that are to be installed alongside gitweb in 'lib/' subdirectory, by adding use lib __DIR__.'/lib'; to gitweb.perl (to main gitweb script), and preparing for putting modules (relative path) in $(GITWEB_MODULES) in gitweb/Makefile. This preparatory work allows to add new module to gitweb by simply adding GITWEB_MODULES += to gitweb/Makefile (assuming that the module is in 'gitweb/lib/' directory). While at it pass GITWEBLIBDIR in addition to GITWEB_TEST_INSTALLED to allow testing installed version of gitweb and installed version of modules (for future tests which would check individual (sub)modules). Using __DIR__ from Dir::Self module (not in core, that's why currently gitweb includes excerpt of code from Dir::Self defining __DIR__) was chosen over using FindBin-based solution (in core since perl 5.00307, while gitweb itself requires at least perl 5.8.0) because FindBin uses BEGIN block, which is a problem under mod_perl and other persistent Perl environments (thought there are workarounds). At Pavan Kumar Sankara suggestion gitweb/Makefile uses install [OPTION]... SOURCE... DIRECTORY format (2nd format) with single SOURCE rather than install [OPTION]... SOURCE DEST format (1st format) because of security reasons (race conditions). Modern GNU install has `-T' / `--no-target-directory' option, but we cannot rely that the $(INSTALL) we are using supports this option. The install-modules target in gitweb/Makefile uses shell 'for' loop, instead of make's $(foreach) function, to avoid possible problem with generating a command line that exceeded the maximum argument list length. Signed-off-by: Jakub Narebski --- BUGFIX: shell variables should not be in single quotes I am very sorry about this bug... This version is identical to [PATCHv7.3 1/4 (bugfix)] gitweb: Prepare for splitting gitweb Message-Id: <201012021117.16183.jnareb@gmail.com> http://article.gmane.org/gmane.comp.version-control.git/162690 sent as a separate patch. gitweb/Makefile | 18 +++++++++++++++--- gitweb/gitweb.perl | 8 ++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/gitweb/Makefile b/gitweb/Makefile index 0a6ac00..ad5a282 100644 --- a/gitweb/Makefile +++ b/gitweb/Makefile @@ -57,6 +57,7 @@ PERL_PATH ?= /usr/bin/perl bindir_SQ = $(subst ','\'',$(bindir))#' gitwebdir_SQ = $(subst ','\'',$(gitwebdir))#' gitwebstaticdir_SQ = $(subst ','\'',$(gitwebdir)/static)#' +gitweblibdir_SQ = $(subst ','\'',$(gitwebdir)/lib)#' SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))#' PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))#' DESTDIR_SQ = $(subst ','\'',$(DESTDIR))#' @@ -153,20 +154,31 @@ test: test-installed: GITWEB_TEST_INSTALLED='$(DESTDIR_SQ)$(gitwebdir_SQ)' \ + GITWEBLIBDIR='$(DESTDIR_SQ)$(gitweblibdir_SQ)' \ $(MAKE) -C ../t gitweb-test ### Installation rules -install: all +install: all install-modules $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitwebdir_SQ)' $(INSTALL) -m 755 $(GITWEB_PROGRAMS) '$(DESTDIR_SQ)$(gitwebdir_SQ)' $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitwebstaticdir_SQ)' $(INSTALL) -m 644 $(GITWEB_FILES) '$(DESTDIR_SQ)$(gitwebstaticdir_SQ)' +install-modules: + install_dirs="$(sort $(dir $(GITWEB_MODULES)))" && \ + for dir in $$install_dirs; do \ + test -d '$(DESTDIR_SQ)$(gitweblibdir_SQ)'/"$$dir" || \ + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitweblibdir_SQ)'/"$$dir"; \ + done + gitweb_modules="$(GITWEB_MODULES)" && \ + for mod in $$gitweb_modules; do \ + $(INSTALL) -m 644 "lib/$$mod" '$(DESTDIR_SQ)$(gitweblibdir_SQ)'/"$$(dirname $$mod)"; \ + done + ### Cleaning rules clean: $(RM) gitweb.cgi static/gitweb.min.js static/gitweb.min.css GITWEB-BUILD-OPTIONS -.PHONY: all clean install test test-installed .FORCE-GIT-VERSION-FILE FORCE - +.PHONY: all clean install install-modules test test-installed .FORCE-GIT-VERSION-FILE FORCE diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 679f2da..cfa511c 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -10,6 +10,14 @@ use 5.008; use strict; use warnings; + +use File::Spec; +# __DIR__ is taken from Dir::Self __DIR__ fragment +sub __DIR__ () { + File::Spec->rel2abs(join '', (File::Spec->splitpath(__FILE__))[0, 1]); +} +use lib __DIR__ . '/lib'; + use CGI qw(:standard :escapeHTML -nosticky); use CGI::Util qw(unescape); use CGI::Carp qw(fatalsToBrowser set_message); -- 1.7.3