Item14120: remove outdated compression tools

foswiki · Jul 25, 2016 · 43b8b51 · 43b8b51
1 parent e858049
commit 43b8b51
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 28 deletions.
diff --git a/JQueryPlugin/pub/System/JQueryPlugin/Makefile.include b/JQueryPlugin/pub/System/JQueryPlugin/Makefile.include
@@ -3,17 +3,20 @@ FOSWIKI_LIB=$(FOSWIKI_ROOT)/lib
 JQUERYPLUGIN_LIB=$(FOSWIKI_LIB)/Foswiki/Plugins/JQueryPlugin
 
 MINIFYJS=$(shell if which uglifyjs >/dev/null; then echo $(UGLIFYJS); else echo $(NOMINIFYJS); fi)
-MINIFYCSS=$(shell if which cssmin >/dev/null; then echo $(CSSMIN); else echo $(NOMINIFYCSS); fi)
-
 UGLIFYJS="uglifyjs -m -b beautify=false,ascii-only=true"
-CSSMIN="cssmin"
+NOMINIFYJS="echo 'WARNING: no javascript minifier found' >&2"
 
+MINIFYCSS=$(shell if which cssmin >/dev/null; then echo $(CSSMIN); else echo $(NOMINIFYCSS); fi)
+CSSMIN="cssmin"
 NOMINIFYCSS="echo 'WARNING: no css minifier found' >&2"
-NOMINIFYJS="echo 'WARNING: no javascript minifier found' >&2"
 
 JSLINT=$(shell if which eslint > /dev/null; then echo $(ESHINT); else echo $(NOJSLINT); fi)
 NOJSLINT="echo 'WARNING: no javascrit linter found' >&2"
 
+SASS=$(shell if which node-sass >/dev/null; then echo $(SASS_CMD); else echo $(NOSASS); fi)
+SASS_CMD="node-sass --output-style expanded"
+NOSASS="echo 'WARNING: no sass preprocessor found' >&2"
+
 ESHINT="eslint"
 GZIP="gzip"
 CAT="cat"
@@ -59,6 +62,10 @@ jslint: subdirs $(TARGET:.js=.jslint)
 	@echo minifying $@ from $<
 	@$(MINIFYCSS) $< > $@
 
+%.uncompressed.css: %.scss
+	@echo sassing $@ from $<
+	@$(SASS) $< > $@
+
 %.css: %_src.css
 	@echo minifying $@ from $<
 	@$(MINIFYCSS) $< > $@

diff --git a/JQueryPlugin/tools/jslint4java.jar b/JQueryPlugin/tools/jslint4java.jar
diff --git a/JQueryPlugin/tools/minifycss b/JQueryPlugin/tools/minifycss
diff --git a/JQueryPlugin/tools/minifyjs b/JQueryPlugin/tools/minifyjs
diff --git a/JQueryPlugin/tools/yuicompressor.jar b/JQueryPlugin/tools/yuicompressor.jar