Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'jh/gitweb-caching' (early part)
* 'jh/gitweb-caching' (early part): gitweb: Add optional extra parameter to die_error, for extended explanation gitweb: add a "string" variant of print_sort_th gitweb: add a "string" variant of print_local_time gitweb: Check that $site_header etc. are defined before using them gitweb: Makefile improvements gitweb: Load checking gitweb: Make running t9501 test with '--debug' reliable and usable
- Loading branch information
Showing
6 changed files
with
248 additions
and
76 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,129 @@ | ||
| # The default target of this Makefile is... | ||
| all:: | ||
|
|
||
| # Define V=1 to have a more verbose compile. | ||
| # | ||
| # Define JSMIN to point to JavaScript minifier that functions as | ||
| # a filter to have gitweb.js minified. | ||
| # | ||
|
|
||
| prefix ?= $(HOME) | ||
| bindir ?= $(prefix)/bin | ||
| RM ?= rm -f | ||
|
|
||
| # JavaScript minifier invocation that can function as filter | ||
| JSMIN ?= | ||
|
|
||
| # default configuration for gitweb | ||
| GITWEB_CONFIG = gitweb_config.perl | ||
| GITWEB_CONFIG_SYSTEM = /etc/gitweb.conf | ||
| GITWEB_HOME_LINK_STR = projects | ||
| GITWEB_SITENAME = | ||
| GITWEB_PROJECTROOT = /pub/git | ||
| GITWEB_PROJECT_MAXDEPTH = 2007 | ||
| GITWEB_EXPORT_OK = | ||
| GITWEB_STRICT_EXPORT = | ||
| GITWEB_BASE_URL = | ||
| GITWEB_LIST = | ||
| GITWEB_HOMETEXT = indextext.html | ||
| GITWEB_CSS = gitweb.css | ||
| GITWEB_LOGO = git-logo.png | ||
| GITWEB_FAVICON = git-favicon.png | ||
| ifdef JSMIN | ||
| GITWEB_JS = gitweb.min.js | ||
| else | ||
| GITWEB_JS = gitweb.js | ||
| endif | ||
| GITWEB_SITE_HEADER = | ||
| GITWEB_SITE_FOOTER = | ||
|
|
||
| # include user config | ||
| -include ../config.mak.autogen | ||
| -include ../config.mak | ||
|
|
||
| # determine version | ||
| ../GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE | ||
| $(QUIET_SUBDIR0)../ $(QUIET_SUBDIR1) GIT-VERSION-FILE | ||
|
|
||
| -include ../GIT-VERSION-FILE | ||
|
|
||
| ### Build rules | ||
|
|
||
| SHELL_PATH ?= $(SHELL) | ||
| PERL_PATH ?= /usr/bin/perl | ||
|
|
||
| # Shell quote; | ||
| bindir_SQ = $(subst ','\'',$(bindir)) #' | ||
| SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH)) #' | ||
| PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH)) #' | ||
|
|
||
| # Quiet generation (unless V=1) | ||
| QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir | ||
| QUIET_SUBDIR1 = | ||
|
|
||
| ifneq ($(findstring $(MAKEFLAGS),w),w) | ||
| PRINT_DIR = --no-print-directory | ||
| else # "make -w" | ||
| NO_SUBDIR = : | ||
| endif | ||
|
|
||
| ifneq ($(findstring $(MAKEFLAGS),s),s) | ||
| ifndef V | ||
| QUIET = @ | ||
| QUIET_GEN = $(QUIET)echo ' ' GEN $@; | ||
| QUIET_SUBDIR0 = +@subdir= | ||
| QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ | ||
| $(MAKE) $(PRINT_DIR) -C $$subdir | ||
| export V | ||
| export QUIET | ||
| export QUIET_GEN | ||
| export QUIET_SUBDIR0 | ||
| export QUIET_SUBDIR1 | ||
| endif | ||
| endif | ||
|
|
||
| all:: gitweb.cgi | ||
|
|
||
| ifdef JSMIN | ||
| FILES=gitweb.cgi gitweb.min.js | ||
| gitweb.cgi: gitweb.perl gitweb.min.js | ||
| else # !JSMIN | ||
| FILES=gitweb.cgi | ||
| gitweb.cgi: gitweb.perl | ||
| endif # JSMIN | ||
|
|
||
| gitweb.cgi: | ||
| $(QUIET_GEN)$(RM) $@ $@+ && \ | ||
| sed -e '1s|#!.*perl|#!$(PERL_PATH_SQ)|' \ | ||
| -e 's|++GIT_VERSION++|$(GIT_VERSION)|g' \ | ||
| -e 's|++GIT_BINDIR++|$(bindir)|g' \ | ||
| -e 's|++GITWEB_CONFIG++|$(GITWEB_CONFIG)|g' \ | ||
| -e 's|++GITWEB_CONFIG_SYSTEM++|$(GITWEB_CONFIG_SYSTEM)|g' \ | ||
| -e 's|++GITWEB_HOME_LINK_STR++|$(GITWEB_HOME_LINK_STR)|g' \ | ||
| -e 's|++GITWEB_SITENAME++|$(GITWEB_SITENAME)|g' \ | ||
| -e 's|++GITWEB_PROJECTROOT++|$(GITWEB_PROJECTROOT)|g' \ | ||
| -e 's|"++GITWEB_PROJECT_MAXDEPTH++"|$(GITWEB_PROJECT_MAXDEPTH)|g' \ | ||
| -e 's|++GITWEB_EXPORT_OK++|$(GITWEB_EXPORT_OK)|g' \ | ||
| -e 's|++GITWEB_STRICT_EXPORT++|$(GITWEB_STRICT_EXPORT)|g' \ | ||
| -e 's|++GITWEB_BASE_URL++|$(GITWEB_BASE_URL)|g' \ | ||
| -e 's|++GITWEB_LIST++|$(GITWEB_LIST)|g' \ | ||
| -e 's|++GITWEB_HOMETEXT++|$(GITWEB_HOMETEXT)|g' \ | ||
| -e 's|++GITWEB_CSS++|$(GITWEB_CSS)|g' \ | ||
| -e 's|++GITWEB_LOGO++|$(GITWEB_LOGO)|g' \ | ||
| -e 's|++GITWEB_FAVICON++|$(GITWEB_FAVICON)|g' \ | ||
| -e 's|++GITWEB_JS++|$(GITWEB_JS)|g' \ | ||
| -e 's|++GITWEB_SITE_HEADER++|$(GITWEB_SITE_HEADER)|g' \ | ||
| -e 's|++GITWEB_SITE_FOOTER++|$(GITWEB_SITE_FOOTER)|g' \ | ||
| $< >$@+ && \ | ||
| chmod +x $@+ && \ | ||
| mv $@+ $@ | ||
|
|
||
| ifdef JSMIN | ||
| gitweb.min.js: gitweb.js | ||
| $(QUIET_GEN)$(JSMIN) <$< >$@ | ||
| endif # JSMIN | ||
|
|
||
| clean: | ||
| $(RM) $(FILES) | ||
|
|
||
| .PHONY: all clean .FORCE-GIT-VERSION-FILE |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.