undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Gitweb: add autoconfigure support for minifiers

Browse Source 
This will allow users to set a JavaScript/CSS minifier when/if they run
the autoconfigure script while building git.

Signed-off-by: Mark Rada <marada@uwaterloo.ca>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Mark Rada 2010-04-02 20:35:54 -04:00 committed by Junio C Hamano
parent 0e6ce21361
commit bb4bbf7582
3 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -282,10 +282,6 @@ lib = lib
# DESTDIR= # DESTDIR=
pathsep = : pathsep = :
# JavaScript/CSS minifier invocation that can function as filter
JSMIN =
CSSMIN =
export prefix bindir sharedir sysconfdir export prefix bindir sharedir sysconfdir
CC = gcc CC = gcc

20
configure.ac
View File

@ -179,6 +179,26 @@ fi],
AC_MSG_NOTICE([Will try -pthread then -lpthread to enable POSIX Threads.]) AC_MSG_NOTICE([Will try -pthread then -lpthread to enable POSIX Threads.])
]) ])
# Define option to enable JavaScript minification
AC_ARG_ENABLE([jsmin],
[AS_HELP_STRING([--enable-jsmin=PATH],
[PATH is the name of a JavaScript minifier or the absolute path to one.])],
[
JSMIN=$enableval;
AC_MSG_NOTICE([Setting JSMIN to '$JSMIN' to enable JavaScript minifying])
GIT_CONF_APPEND_LINE(JSMIN=$enableval);
])
# Define option to enable CSS minification
AC_ARG_ENABLE([cssmin],
[AS_HELP_STRING([--enable-cssmin=PATH],
[PATH is the name of a CSS minifier or the absolute path to one.])],
[
CSSMIN=$enableval;
AC_MSG_NOTICE([Setting CSSMIN to '$CSSMIN' to enable CSS minifying])
GIT_CONF_APPEND_LINE(CSSMIN=$enableval);
])
## Site configuration (override autodetection) ## Site configuration (override autodetection)
## --with-PACKAGE[=ARG] and --without-PACKAGE ## --with-PACKAGE[=ARG] and --without-PACKAGE
AC_MSG_NOTICE([CHECKS for site configuration]) AC_MSG_NOTICE([CHECKS for site configuration])

14
gitweb/Makefile
View File

@ -14,10 +14,6 @@ prefix ?= $(HOME)
bindir ?= $(prefix)/bin bindir ?= $(prefix)/bin
RM ?= rm -f RM ?= rm -f
# JavaScript/CSS minifier invocation that can function as filter
JSMIN ?=
CSSMIN ?=
# default configuration for gitweb # default configuration for gitweb
GITWEB_CONFIG = gitweb_config.perl GITWEB_CONFIG = gitweb_config.perl
GITWEB_CONFIG_SYSTEM = /etc/gitweb.conf GITWEB_CONFIG_SYSTEM = /etc/gitweb.conf
@ -30,18 +26,10 @@ GITWEB_STRICT_EXPORT =
GITWEB_BASE_URL = GITWEB_BASE_URL =
GITWEB_LIST = GITWEB_LIST =
GITWEB_HOMETEXT = indextext.html GITWEB_HOMETEXT = indextext.html
ifdef CSSMIN
GITWEB_CSS = gitweb.min.css
else
GITWEB_CSS = gitweb.css GITWEB_CSS = gitweb.css
endif
GITWEB_LOGO = git-logo.png GITWEB_LOGO = git-logo.png
GITWEB_FAVICON = git-favicon.png GITWEB_FAVICON = git-favicon.png
ifdef JSMIN
GITWEB_JS = gitweb.min.js
else
GITWEB_JS = gitweb.js GITWEB_JS = gitweb.js
endif
GITWEB_SITE_HEADER = GITWEB_SITE_HEADER =
GITWEB_SITE_FOOTER = GITWEB_SITE_FOOTER =
@ -95,9 +83,11 @@ all:: gitweb.cgi
FILES = gitweb.cgi FILES = gitweb.cgi
ifdef JSMIN ifdef JSMIN
FILES += gitweb.min.js FILES += gitweb.min.js
GITWEB_JS = gitweb.min.js
endif endif
ifdef CSSMIN ifdef CSSMIN
FILES += gitweb.min.css FILES += gitweb.min.css
GITWEB_CSS = gitweb.min.css
endif endif
gitweb.cgi: gitweb.perl $(GITWEB_JS) $(GITWEB_CSS) gitweb.cgi: gitweb.perl $(GITWEB_JS) $(GITWEB_CSS)