dani/lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix uglifyjs conflict

Browse Source
This commit is contained in:
Xavier Guimard 2019-08-21 15:55:22 +02:00
parent 238e6092bc
commit 1652603d39
13 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -34,6 +34,7 @@ UNCOMPRESS=tar xzf
LISTCOMPRESSED=tar tzf LISTCOMPRESSED=tar tzf
COMPRESSSUFFIX=tar.gz COMPRESSSUFFIX=tar.gz
NGINX=/usr/sbin/nginx NGINX=/usr/sbin/nginx
UGLIFYJSVERSION:=$(shell uglifyjs --version|perl -pe 's/^[^\d]*(\d).*$$/$$1/')
# Default directories install # Default directories install
# --------------------------- # ---------------------------
@ -308,9 +309,17 @@ $(SRCMANAGERDIR)/site/htdocs/static/js/%.js: $(SRCMANAGERDIR)/site/coffee/%.coff
@echo "Compressing $*.css" @echo "Compressing $*.css"
@yui-compressor $*.css > $*.min.css @yui-compressor $*.css > $*.min.css
xx:
echo $(UGLIFYJSVERSION)
echo $(UGLIFYJSVERSION)
%.min.js: %.js %.min.js: %.js
@echo "Compressing $*.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 fastcgi-server/man/llng-fastcgi-server.1p: fastcgi-server/sbin/llng-fastcgi-server
@echo Update FastCGI server man page @echo Update FastCGI server man page

2
lemonldap-ng-manager/site/htdocs/static/js/2ndfa.js
View File

@ -1,4 +1,4 @@
// Generated by CoffeeScript 1.12.7 // Generated by CoffeeScript 1.12.8
/* /*
* 2ndFA Session explorer * 2ndFA Session explorer

3
lemonldap-ng-manager/site/htdocs/static/js/2ndfa.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
lemonldap-ng-manager/site/htdocs/static/js/2ndfa.min.js.map
View File

File diff suppressed because one or more lines are too long

2
lemonldap-ng-manager/site/htdocs/static/js/manager.js
View File

@ -1,4 +1,4 @@
// Generated by CoffeeScript 1.12.7 // Generated by CoffeeScript 1.12.8
/* /*
LemonLDAP::NG Manager client LemonLDAP::NG Manager client

2
lemonldap-ng-manager/site/htdocs/static/js/manager.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
lemonldap-ng-manager/site/htdocs/static/js/sessions.js
View File

@ -1,4 +1,4 @@
// Generated by CoffeeScript 1.12.7 // Generated by CoffeeScript 1.12.8
/* /*
* Sessions explorer * Sessions explorer

3
lemonldap-ng-manager/site/htdocs/static/js/sessions.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
lemonldap-ng-manager/site/htdocs/static/js/sessions.min.js.map
View File

File diff suppressed because one or more lines are too long

2
lemonldap-ng-manager/site/htdocs/static/js/viewer.js
View File

@ -1,4 +1,4 @@
// Generated by CoffeeScript 1.12.7 // Generated by CoffeeScript 1.12.8
/* /*
LemonLDAP::NG Viewer client LemonLDAP::NG Viewer client

3
lemonldap-ng-manager/site/htdocs/static/js/viewer.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
lemonldap-ng-manager/site/htdocs/static/js/viewer.min.js.map
View File

File diff suppressed because one or more lines are too long

2
lemonldap-ng-portal/site/htdocs/static/common/js/redirect.js
View File

@ -1,4 +1,4 @@
// Generated by CoffeeScript 1.12.7 // Generated by CoffeeScript 1.12.8
(function() { (function() {
document.onreadystatechange = function() { document.onreadystatechange = function() {
var redirect; var redirect;