Mercurial > hg > batmud > maputils
annotate maps/Makefile @ 1536:796cf56a9b0a
Disable plain HTML (non-javascript enhanced) versions.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Tue, 03 Mar 2015 00:04:34 +0200 |
parents | 677002de7795 |
children | 2768b2b396a5 |
rev | line source |
---|---|
346
721bfe123726
Minor refactoring of the build files.
Matti Hamalainen <ccr@tnsp.org>
parents:
338
diff
changeset
|
1 include ../config.mak |
721bfe123726
Minor refactoring of the build files.
Matti Hamalainen <ccr@tnsp.org>
parents:
338
diff
changeset
|
2 include config.mak |
721bfe123726
Minor refactoring of the build files.
Matti Hamalainen <ccr@tnsp.org>
parents:
338
diff
changeset
|
3 |
721bfe123726
Minor refactoring of the build files.
Matti Hamalainen <ccr@tnsp.org>
parents:
338
diff
changeset
|
4 # |
347 | 5 # Mangles and targets |
346
721bfe123726
Minor refactoring of the build files.
Matti Hamalainen <ccr@tnsp.org>
parents:
338
diff
changeset
|
6 # |
1237
3bbafec29fcb
Change internal handling of some Makefile settings.
Matti Hamalainen <ccr@tnsp.org>
parents:
1226
diff
changeset
|
7 TARGETS=$(addsuffix .html,$(MAPLIST)) \ |
3bbafec29fcb
Change internal handling of some Makefile settings.
Matti Hamalainen <ccr@tnsp.org>
parents:
1226
diff
changeset
|
8 $(addsuffix .ansi,$(MAPLIST)) \ |
3bbafec29fcb
Change internal handling of some Makefile settings.
Matti Hamalainen <ccr@tnsp.org>
parents:
1226
diff
changeset
|
9 $(addsuffix .png,$(MAPLIST)) |
346
721bfe123726
Minor refactoring of the build files.
Matti Hamalainen <ccr@tnsp.org>
parents:
338
diff
changeset
|
10 |
1536
796cf56a9b0a
Disable plain HTML (non-javascript enhanced) versions.
Matti Hamalainen <ccr@tnsp.org>
parents:
1515
diff
changeset
|
11 # $(addsuffix .htm,$(MAPLIST)) \ |
796cf56a9b0a
Disable plain HTML (non-javascript enhanced) versions.
Matti Hamalainen <ccr@tnsp.org>
parents:
1515
diff
changeset
|
12 |
796cf56a9b0a
Disable plain HTML (non-javascript enhanced) versions.
Matti Hamalainen <ccr@tnsp.org>
parents:
1515
diff
changeset
|
13 |
842
f5dda74e6e07
Print help if no target is given. Remove generation of worldmap.
Matti Hamalainen <ccr@tnsp.org>
parents:
807
diff
changeset
|
14 all: |
1512 | 15 @echo "Usage: make <maps|fetch|diff|upload|clean>" |
842
f5dda74e6e07
Print help if no target is given. Remove generation of worldmap.
Matti Hamalainen <ccr@tnsp.org>
parents:
807
diff
changeset
|
16 @echo |
f5dda74e6e07
Print help if no target is given. Remove generation of worldmap.
Matti Hamalainen <ccr@tnsp.org>
parents:
807
diff
changeset
|
17 @echo "maps : Build HTML, HTML+JS, PNG image and ANSI format maps." |
f5dda74e6e07
Print help if no target is given. Remove generation of worldmap.
Matti Hamalainen <ccr@tnsp.org>
parents:
807
diff
changeset
|
18 @echo "fetch : Fetch latest raw ASCII map data from bat.org." |
f5dda74e6e07
Print help if no target is given. Remove generation of worldmap.
Matti Hamalainen <ccr@tnsp.org>
parents:
807
diff
changeset
|
19 @echo "diff : Do special diff operation between new data (gotten via 'fetch')" |
f5dda74e6e07
Print help if no target is given. Remove generation of worldmap.
Matti Hamalainen <ccr@tnsp.org>
parents:
807
diff
changeset
|
20 @echo " and update .loc files for each continent with new locations." |
f5dda74e6e07
Print help if no target is given. Remove generation of worldmap.
Matti Hamalainen <ccr@tnsp.org>
parents:
807
diff
changeset
|
21 @echo " A diff -u of new and old location files is outputted." |
f5dda74e6e07
Print help if no target is given. Remove generation of worldmap.
Matti Hamalainen <ccr@tnsp.org>
parents:
807
diff
changeset
|
22 @echo "upload: Uploads map and loc-files via SCP to server specified in" |
f5dda74e6e07
Print help if no target is given. Remove generation of worldmap.
Matti Hamalainen <ccr@tnsp.org>
parents:
807
diff
changeset
|
23 @echo " ../config.mak" |
1514
835360392879
Add target for automatically running Gimp for PNG post-processing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1512
diff
changeset
|
24 @echo "gimp : Execute Gimp with all PNG targets for post-processing." |
1512 | 25 @echo "clean : Delete all the generated files." |
26 @echo | |
842
f5dda74e6e07
Print help if no target is given. Remove generation of worldmap.
Matti Hamalainen <ccr@tnsp.org>
parents:
807
diff
changeset
|
27 |
f5dda74e6e07
Print help if no target is given. Remove generation of worldmap.
Matti Hamalainen <ccr@tnsp.org>
parents:
807
diff
changeset
|
28 |
1237
3bbafec29fcb
Change internal handling of some Makefile settings.
Matti Hamalainen <ccr@tnsp.org>
parents:
1226
diff
changeset
|
29 maps: $(addsuffix .ppm,$(MAPLIST)) $(TARGETS) |
39 | 30 |
346
721bfe123726
Minor refactoring of the build files.
Matti Hamalainen <ccr@tnsp.org>
parents:
338
diff
changeset
|
31 |
721bfe123726
Minor refactoring of the build files.
Matti Hamalainen <ccr@tnsp.org>
parents:
338
diff
changeset
|
32 include Makefile.inc |
99 | 33 |
950 | 34 ### |
35 ### Special targets | |
36 ### | |
37 | |
38 # Upload changed files to site | |
1226 | 39 upload: $(TARGETS) renardy.map tormentas.map *.loc util.js |
432
611b19fba3be
Use compression with scp transfers, duh.
Matti Hamalainen <ccr@tnsp.org>
parents:
405
diff
changeset
|
40 scp -C $? $(UPURL) |
141 | 41 touch $@ |
95
0d2b25e342df
Also make PNG images from maps
Matti Hamalainen <ccr@tnsp.org>
parents:
90
diff
changeset
|
42 |
1514
835360392879
Add target for automatically running Gimp for PNG post-processing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1512
diff
changeset
|
43 # Open PNG files in Gimp |
835360392879
Add target for automatically running Gimp for PNG post-processing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1512
diff
changeset
|
44 gimp: $(addsuffix .png,$(MAPLIST)) |
835360392879
Add target for automatically running Gimp for PNG post-processing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1512
diff
changeset
|
45 gimp $+ |
835360392879
Add target for automatically running Gimp for PNG post-processing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1512
diff
changeset
|
46 touch $@ |
835360392879
Add target for automatically running Gimp for PNG post-processing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1512
diff
changeset
|
47 |
950 | 48 # Upload only *.loc files |
317 | 49 uploc: *.loc |
800 | 50 scp $+ $(UPURL) |
291
b78d089a0cf4
Upload target for location files only.
Matti Hamalainen <ccr@tnsp.org>
parents:
255
diff
changeset
|
51 |
950 | 52 # Fetch raw ASCII maps from bat.org to *.new |
459 | 53 fetch: |
1237
3bbafec29fcb
Change internal handling of some Makefile settings.
Matti Hamalainen <ccr@tnsp.org>
parents:
1226
diff
changeset
|
54 for i in $(MAPMAP); do wget -O "$$i.new" "$(BATMAPURL)$$i.txt"; done |
459 | 55 |
950 | 56 # Diff target between .map file and .new file. Makes necessary changes in .map and .loc |
459 | 57 %.diff: %.map %.new |
670
8f16bf5c2f9e
Do the diffs more intelligently.
Matti Hamalainen <ccr@tnsp.org>
parents:
653
diff
changeset
|
58 @echo DIFFING $< ... |
8f16bf5c2f9e
Do the diffs more intelligently.
Matti Hamalainen <ccr@tnsp.org>
parents:
653
diff
changeset
|
59 @if ! $(DIFFMAP_BIN) $+ -o $@ -a; then \ |
8f16bf5c2f9e
Do the diffs more intelligently.
Matti Hamalainen <ccr@tnsp.org>
parents:
653
diff
changeset
|
60 $(MAP2PPM_BIN) $@ -o $@.ppm -d; \ |
8f16bf5c2f9e
Do the diffs more intelligently.
Matti Hamalainen <ccr@tnsp.org>
parents:
653
diff
changeset
|
61 $(PATCHMAP_BIN) $< $@ -o $<; \ |
8f16bf5c2f9e
Do the diffs more intelligently.
Matti Hamalainen <ccr@tnsp.org>
parents:
653
diff
changeset
|
62 fi |
674
02d23acc346d
Fix updating of location markers.
Matti Hamalainen <ccr@tnsp.org>
parents:
672
diff
changeset
|
63 @echo UPDATING LOCATIONS ... |
798
11e3bed89e35
Use verbosity flag in accordance to changes in mkloc.
Matti Hamalainen <ccr@tnsp.org>
parents:
791
diff
changeset
|
64 @$(MKLOC_BIN) -v -m $(patsubst %.map,%.new,$<) -l $(patsubst %.map,%.loc,$<) -L -g -o $(patsubst %.map,%.nloc,$<) |
674
02d23acc346d
Fix updating of location markers.
Matti Hamalainen <ccr@tnsp.org>
parents:
672
diff
changeset
|
65 @diff -ubB $(patsubst %.map,%.loc,$<) $(patsubst %.map,%.nloc,$<) | patch |
459 | 66 |
950 | 67 # Remove all temporary .diff files |
653
b5bd0d457481
Improved 'make diff' target.
Matti Hamalainen <ccr@tnsp.org>
parents:
605
diff
changeset
|
68 cleardiff: |
b5bd0d457481
Improved 'make diff' target.
Matti Hamalainen <ccr@tnsp.org>
parents:
605
diff
changeset
|
69 $(RM) *.diff |
b5bd0d457481
Improved 'make diff' target.
Matti Hamalainen <ccr@tnsp.org>
parents:
605
diff
changeset
|
70 |
950 | 71 # Diff target - run diff for each .map and .new (fetched via 'fetch' target). |
1069
25cf3cf2acc8
Change to use Mercurial instead of Subversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
950
diff
changeset
|
72 # Finally do 'hg diff' to show changes. |
1237
3bbafec29fcb
Change internal handling of some Makefile settings.
Matti Hamalainen <ccr@tnsp.org>
parents:
1226
diff
changeset
|
73 diff: cleardiff $(addsuffix .diff,$(MAPMAP)) |
1155
2f7ca3ec98e8
Only 'hg diff' current directory with 'make diff'.
Matti Hamalainen <ccr@tnsp.org>
parents:
1069
diff
changeset
|
74 @hg diff . |
459 | 75 |
950 | 76 # Clean temporary and generated targets |
39 | 77 clean: |
937
9342d636bc21
Remove *.script files on clean target.
Matti Hamalainen <ccr@tnsp.org>
parents:
911
diff
changeset
|
78 $(RM) $(TARGETS) *.diff *.ppm *.o *.script |
39 | 79 |
80 srcclean: clean | |
299 | 81 $(RM) *~ |
39 | 82 |
297
5482736f3913
ChangeLog generation target added.
Matti Hamalainen <ccr@tnsp.org>
parents:
291
diff
changeset
|
83 update: |
1069
25cf3cf2acc8
Change to use Mercurial instead of Subversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
950
diff
changeset
|
84 @echo "* Updating from HG ..." |
25cf3cf2acc8
Change to use Mercurial instead of Subversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
950
diff
changeset
|
85 @hg fetch |
297
5482736f3913
ChangeLog generation target added.
Matti Hamalainen <ccr@tnsp.org>
parents:
291
diff
changeset
|
86 |
5482736f3913
ChangeLog generation target added.
Matti Hamalainen <ccr@tnsp.org>
parents:
291
diff
changeset
|
87 .changelog: update |
5482736f3913
ChangeLog generation target added.
Matti Hamalainen <ccr@tnsp.org>
parents:
291
diff
changeset
|
88 @echo "* Making ChangeLog ..." |
1069
25cf3cf2acc8
Change to use Mercurial instead of Subversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
950
diff
changeset
|
89 @hg2cl --strip-prefix "maputils/trunk/maps/" |
297
5482736f3913
ChangeLog generation target added.
Matti Hamalainen <ccr@tnsp.org>
parents:
291
diff
changeset
|
90 @touch $@ |
5482736f3913
ChangeLog generation target added.
Matti Hamalainen <ccr@tnsp.org>
parents:
291
diff
changeset
|
91 |
5482736f3913
ChangeLog generation target added.
Matti Hamalainen <ccr@tnsp.org>
parents:
291
diff
changeset
|
92 ChangeLog: .changelog |
5482736f3913
ChangeLog generation target added.
Matti Hamalainen <ccr@tnsp.org>
parents:
291
diff
changeset
|
93 |