diff --git a/Makefile b/Makefile index 72906b8..d58486f 100644 --- a/Makefile +++ b/Makefile @@ -31,13 +31,14 @@ FBS = $(subst tests/,target/fb/,${YAMLS:.yml=.fb}) HTMLS = $(subst fb/,html/,${FBS:.fb=.html}) XSLS = $(subst xsl/,target/xsl/,$(wildcard xsl/*.xsl)) JUDGES = judges -DIRS = target target/html target/fb target/xsl target/css +DIRS = target target/html target/fb target/xsl target/css target/js CSS = target/css/main.css +JS = target/js/main.js SAXON = target/saxon.jar export -all: $(CSS) $(XSLS) $(HTMLS) entry rmi verify +all: $(JS) $(CSS) $(XSLS) $(HTMLS) entry rmi verify target/xsl/%.xsl: xsl/%.xsl | target/xsl cp $< $@ @@ -59,6 +60,9 @@ target/fb/%.fb: tests/%.yml Makefile | target/fb $(CSS): sass/*.scss | target/css sass --no-source-map --style=compressed --no-quiet --stop-on-error $< $@ +$(JS): js/*.js | target/js + uglifyjs $< > $@ + clean: rm -rf target diff --git a/entry.sh b/entry.sh index e4a530b..b178abc 100755 --- a/entry.sh +++ b/entry.sh @@ -83,7 +83,7 @@ done <<< "${INPUT_OPTIONS}" # Build a summary HTML. css=$(cat "${SELF}/target/css/main.css") -js=$(uglifyjs "${SELF}/js/*.js") +js=$(cat "${SELF}/target/js/main.js") html=${INPUT_OUTPUT}/${name}.html java -jar "${SELF}/target/saxon.jar" \ "-s:${INPUT_OUTPUT}/${name}.rich.xml" \