Skip to content

Commit 9663909

Browse files
committed
improve ability to run vimcoder in-place (i.e. jar-less)
1 parent 15cdeb7 commit 9663909

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

Makefile

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,17 @@ project = VimCoder
66
version = 0.3.4
77

88
sources = $(wildcard src/com/dogcows/*.java)
9+
classes = $(sources:src/%.java=%.class)
910
library = lib/ContestApplet.jar
1011
jarfile = $(project)-$(version).jar
11-
resources = $(wildcard src/com/dogcows/resources/*)
12+
resource_path = com/dogcows/resources
13+
resources = $(wildcard src/$(resource_path)/*)
1214

1315
JAVAC = javac
1416
JAVACFLAGS = -d . -sourcepath src -classpath $(library)
1517

1618

17-
classes = $(sources:src/%.java=%.class)
18-
all: $(firstword $(classes))
19+
all: $(classes) $(resources:src/%=%)
1920

2021
clean:
2122
rm -rf com
@@ -31,21 +32,23 @@ fetch: $(library)
3132
jar: $(jarfile)
3233

3334

34-
$(classes): $(sources) $(library)
35-
$(JAVAC) $(JAVACFLAGS) $<
35+
$(classes): $(sources) | $(library)
36+
$(JAVAC) $(JAVACFLAGS) $^
37+
38+
$(resource_path):
39+
mkdir -p "$@"
40+
41+
$(resource_path)/%: src/$(resource_path)/% | $(resource_path)
42+
cp "$<" "$@"
43+
3644

3745
$(library):
38-
@echo "Fetching dependencies..."
3946
mkdir -p lib
4047
curl -o $@ http://www.topcoder.com/contest/classes/ContestApplet.jar
4148

42-
$(jarfile): $(classes) $(resources)
43-
@echo "Packaging jar file..."
44-
mkdir -p com/dogcows/resources
45-
cp src/com/dogcows/resources/* com/dogcows/resources
49+
$(jarfile): all
4650
rm -f $@
4751
jar cvf $@ COPYING README.md com
48-
@echo "Done."
4952

5053

5154
.PHONY: all clean distclean dist fetch jar

0 commit comments

Comments
 (0)