Fix uglifyjs conflict
This commit is contained in:
parent
238e6092bc
commit
1652603d39
11
Makefile
11
Makefile
|
@ -34,6 +34,7 @@ UNCOMPRESS=tar xzf
|
|||
LISTCOMPRESSED=tar tzf
|
||||
COMPRESSSUFFIX=tar.gz
|
||||
NGINX=/usr/sbin/nginx
|
||||
UGLIFYJSVERSION:=$(shell uglifyjs --version|perl -pe 's/^[^\d]*(\d).*$$/$$1/')
|
||||
|
||||
# Default directories install
|
||||
# ---------------------------
|
||||
|
@ -308,9 +309,17 @@ $(SRCMANAGERDIR)/site/htdocs/static/js/%.js: $(SRCMANAGERDIR)/site/coffee/%.coff
|
|||
@echo "Compressing $*.css"
|
||||
@yui-compressor $*.css > $*.min.css
|
||||
|
||||
xx:
|
||||
echo $(UGLIFYJSVERSION)
|
||||
echo $(UGLIFYJSVERSION)
|
||||
|
||||
%.min.js: %.js
|
||||
@echo "Compressing $*.js"
|
||||
@uglifyjs $*.js --compress --mangle --comments='/Copyr/i' --source-map $*.min.js.map -o $*.min.js
|
||||
if test "$(UGLIFYJSVERSION)" = 2; then \
|
||||
uglifyjs $*.js --compress --mangle --comments='/Copyr/i' --source-map $*.min.js.map -o $*.min.js; \
|
||||
else \
|
||||
uglifyjs $*.js --compress --mangle --comments='/Copyr/i' --source-map -o $*.min.js; \
|
||||
fi
|
||||
|
||||
fastcgi-server/man/llng-fastcgi-server.1p: fastcgi-server/sbin/llng-fastcgi-server
|
||||
@echo Update FastCGI server man page
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
// Generated by CoffeeScript 1.12.7
|
||||
// Generated by CoffeeScript 1.12.8
|
||||
|
||||
/*
|
||||
* 2ndFA Session explorer
|
||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -1,4 +1,4 @@
|
|||
// Generated by CoffeeScript 1.12.7
|
||||
// Generated by CoffeeScript 1.12.8
|
||||
|
||||
/*
|
||||
LemonLDAP::NG Manager client
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -1,4 +1,4 @@
|
|||
// Generated by CoffeeScript 1.12.7
|
||||
// Generated by CoffeeScript 1.12.8
|
||||
|
||||
/*
|
||||
* Sessions explorer
|
||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -1,4 +1,4 @@
|
|||
// Generated by CoffeeScript 1.12.7
|
||||
// Generated by CoffeeScript 1.12.8
|
||||
|
||||
/*
|
||||
LemonLDAP::NG Viewer client
|
||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -1,4 +1,4 @@
|
|||
// Generated by CoffeeScript 1.12.7
|
||||
// Generated by CoffeeScript 1.12.8
|
||||
(function() {
|
||||
document.onreadystatechange = function() {
|
||||
var redirect;
|
||||
|
|
Loading…
Reference in New Issue