* [PATCHv6 3/6] Gitweb: add autoconfigure support for minifiers
@ 2010-04-03 0:35 Mark Rada
0 siblings, 0 replies; only message in thread
From: Mark Rada @ 2010-04-03 0:35 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Jakub Narebski
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>
---
Changes since last revision:
- Removed a sentence from the commit regarding the need to
edit the Makefiles manually
Makefile | 4 ----
configure.ac | 20 ++++++++++++++++++++
gitweb/Makefile | 14 ++------------
3 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/Makefile b/Makefile
index a48f42f..4a6bc62 100644
--- a/Makefile
+++ b/Makefile
@@ -282,10 +282,6 @@ lib = lib
# DESTDIR=
pathsep = :
-# JavaScript/CSS minifier invocation that can function as filter
-JSMIN =
-CSSMIN =
-
export prefix bindir sharedir sysconfdir
CC = gcc
diff --git a/configure.ac b/configure.ac
index 914ae57..f4d7372 100644
--- a/configure.ac
+++ b/configure.ac
@@ -179,6 +179,26 @@ fi],
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)
## --with-PACKAGE[=ARG] and --without-PACKAGE
AC_MSG_NOTICE([CHECKS for site configuration])
diff --git a/gitweb/Makefile b/gitweb/Makefile
index fffe700..ffee4bd 100644
--- a/gitweb/Makefile
+++ b/gitweb/Makefile
@@ -14,10 +14,6 @@ prefix ?= $(HOME)
bindir ?= $(prefix)/bin
RM ?= rm -f
-# JavaScript/CSS minifier invocation that can function as filter
-JSMIN ?=
-CSSMIN ?=
-
# default configuration for gitweb
GITWEB_CONFIG = gitweb_config.perl
GITWEB_CONFIG_SYSTEM = /etc/gitweb.conf
@@ -30,18 +26,10 @@ GITWEB_STRICT_EXPORT =
GITWEB_BASE_URL =
GITWEB_LIST =
GITWEB_HOMETEXT = indextext.html
-ifdef CSSMIN
-GITWEB_CSS = gitweb.min.css
-else
GITWEB_CSS = gitweb.css
-endif
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 =
@@ -95,9 +83,11 @@ all:: gitweb.cgi
FILES = gitweb.cgi
ifdef JSMIN
FILES += gitweb.min.js
+GITWEB_JS = gitweb.min.js
endif
ifdef CSSMIN
FILES += gitweb.min.css
+GITWEB_CSS = gitweb.min.css
endif
gitweb.cgi: gitweb.perl $(GITWEB_JS) $(GITWEB_CSS)
--
1.7.0.3.519.g7e0613
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2010-04-03 0:36 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-04-03 0:35 [PATCHv6 3/6] Gitweb: add autoconfigure support for minifiers Mark Rada
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.