From 87577944fbe3e5b85759d34b167ecb8f357c6851 Mon Sep 17 00:00:00 2001 From: Matthew Slowe Date: Sun, 5 Apr 2020 12:25:43 +0100 Subject: [PATCH] makefile --- Makefile | 32 ++++++++++++++++++++++++++++++++ war/base.css | 8 ++++---- war/build.jsp | 1 + war/index.jsp | 1 + 4 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..dd48106 --- /dev/null +++ b/Makefile @@ -0,0 +1,32 @@ +JAVA = /usr/bin/java +# JAVAFLAGS = -version # -classpath $(LIBS) +JAVAC = /usr/bin/javac +JFLAGS = -g # -classpath $(LIBS) + +SRCS = uk/org/mafoo/wordsearch/CouldNotPlaceWordException.java \ + uk/org/mafoo/wordsearch/Bounds.java \ + uk/org/mafoo/wordsearch/GridFactory.java \ + uk/org/mafoo/wordsearch/DistributedRandomNumberGenerator.java \ + uk/org/mafoo/wordsearch/Direction.java + +JSPS = $(wildcard war/*.jsp war/*.css) + +OBJS = ${SRCS:.java=.class} + +.SUFFIXES: .java .class + +.PHONY: default clean +default: wordsearch.war + +clean: + rm -f $(OBJS) wordsearch.jar wordsearch.war + +.java.class: + $(JAVAC) $(JFLAGS) $< + +wordsearch.jar: $(OBJS) + jar cf $@ $(OBJS) + +wordsearch.war: wordsearch.jar + cp -f wordsearch.jar war/lib + jar -c -f $@ -C war . \ No newline at end of file diff --git a/war/base.css b/war/base.css index 1a778f0..0235e15 100755 --- a/war/base.css +++ b/war/base.css @@ -1,5 +1,5 @@ -body { - font-family: sans-serif; +body { + font-family: 'Roboto', sans-serif; } .tooltip { @@ -14,8 +14,8 @@ table, th, td { } table#grid td { - font-family: monospace; - font-size: 22px; + font-family: 'Fira Mono', monospace; + font-size: 14pt; } #wrapper { diff --git a/war/build.jsp b/war/build.jsp index ef05263..cb3c25d 100755 --- a/war/build.jsp +++ b/war/build.jsp @@ -3,6 +3,7 @@ Wordsearch builder + <%@ page import="uk.org.mafoo.wordsearch.*" %> <%@ page import="java.util.*" %> diff --git a/war/index.jsp b/war/index.jsp index 34d63aa..491f686 100755 --- a/war/index.jsp +++ b/war/index.jsp @@ -3,6 +3,7 @@ Wordsearch Builder +

Wordsearch Builder